From 7fef820fa45a4c6b7e58039bf5e0d2ed2c2812b0 Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:37:01 +0100 Subject: [PATCH] refactor: move all the rerunner scripts into better folders --- .../{ => bms-pms}/add-beatoraja-courses.js | 2 +- .../{ => bms-pms}/add-lr2crs-file.js | 2 +- .../{ => bms-pms}/apply-sieglinde.js | 2 +- .../{ => bms-pms}/parse-pms-charts.js | 20 +++++++++---------- .../rerunners/{ => iidx}/add-2dxtra.js | 2 +- .../{ => iidx}/add-new-primary-iidx-charts.js | 2 +- .../aix-output/parse-aix-json.ts} | 0 .../{ => iidx}/iidx-mdb-parse/.gitignore | 0 .../{ => iidx}/iidx-mdb-parse/HOWTO.md | 0 .../{ => iidx}/iidx-mdb-parse/blacklist.txt | 0 .../{ => iidx}/iidx-mdb-parse/convert.ts | 0 .../iidx-mdb-parse/dot-one-parser/parser.ts | 0 .../iidx-mdb-parse/dot-one-parser/types.ts | 0 .../{ => iidx}/iidx-mdb-parse/merge-mdb.ts | 0 .../rerunners/{ => iidx}/iidx-pe-kr/_README | 0 .../iidx-pe-kr/parse-iidxkr-data.js | 0 .../make-things-available-in-inf.js | 2 +- .../{ => iidx}/update-bpi-poyashi.js | 4 ++-- .../{ => jubeat}/add-jubeat-folders.js | 2 +- .../rerunners/{ => popn}/parse-duck-popn.js | 2 +- .../{ => sdvx}/add-sdvx-clear-tierlist.js | 10 +++++----- .../rerunners/{ => sdvx}/add-sdvx-konaste.js | 0 .../rerunners/{ => usc}/add-usc-converts.js | 2 +- .../rerunners/{ => usc}/add-usc-tables.ts | 0 24 files changed, 26 insertions(+), 26 deletions(-) rename database-seeds/scripts/rerunners/{ => bms-pms}/add-beatoraja-courses.js (95%) rename database-seeds/scripts/rerunners/{ => bms-pms}/add-lr2crs-file.js (95%) rename database-seeds/scripts/rerunners/{ => bms-pms}/apply-sieglinde.js (97%) rename database-seeds/scripts/rerunners/{ => bms-pms}/parse-pms-charts.js (92%) rename database-seeds/scripts/rerunners/{ => iidx}/add-2dxtra.js (97%) rename database-seeds/scripts/rerunners/{ => iidx}/add-new-primary-iidx-charts.js (93%) rename database-seeds/scripts/rerunners/{aix-inf/parse-aix-inf.ts => iidx/aix-output/parse-aix-json.ts} (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-mdb-parse/.gitignore (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-mdb-parse/HOWTO.md (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-mdb-parse/blacklist.txt (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-mdb-parse/convert.ts (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-mdb-parse/dot-one-parser/parser.ts (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-mdb-parse/dot-one-parser/types.ts (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-mdb-parse/merge-mdb.ts (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-pe-kr/_README (100%) rename database-seeds/scripts/rerunners/{ => iidx}/iidx-pe-kr/parse-iidxkr-data.js (100%) rename database-seeds/scripts/rerunners/{ => iidx}/make-things-available-in-inf.js (88%) rename database-seeds/scripts/rerunners/{ => iidx}/update-bpi-poyashi.js (96%) rename database-seeds/scripts/rerunners/{ => jubeat}/add-jubeat-folders.js (98%) rename database-seeds/scripts/rerunners/{ => popn}/parse-duck-popn.js (98%) rename database-seeds/scripts/rerunners/{ => sdvx}/add-sdvx-clear-tierlist.js (98%) rename database-seeds/scripts/rerunners/{ => sdvx}/add-sdvx-konaste.js (100%) rename database-seeds/scripts/rerunners/{ => usc}/add-usc-converts.js (99%) rename database-seeds/scripts/rerunners/{ => usc}/add-usc-tables.ts (100%) diff --git a/database-seeds/scripts/rerunners/add-beatoraja-courses.js b/database-seeds/scripts/rerunners/bms-pms/add-beatoraja-courses.js similarity index 95% rename from database-seeds/scripts/rerunners/add-beatoraja-courses.js rename to database-seeds/scripts/rerunners/bms-pms/add-beatoraja-courses.js index 097c23769..9b3761803 100644 --- a/database-seeds/scripts/rerunners/add-beatoraja-courses.js +++ b/database-seeds/scripts/rerunners/bms-pms/add-beatoraja-courses.js @@ -1,4 +1,4 @@ -const { MutateCollection } = require("../util"); +const { MutateCollection } = require("../../util"); const fetch = require("node-fetch"); const { Command } = require("commander"); diff --git a/database-seeds/scripts/rerunners/add-lr2crs-file.js b/database-seeds/scripts/rerunners/bms-pms/add-lr2crs-file.js similarity index 95% rename from database-seeds/scripts/rerunners/add-lr2crs-file.js rename to database-seeds/scripts/rerunners/bms-pms/add-lr2crs-file.js index 094a65d40..873e7275d 100644 --- a/database-seeds/scripts/rerunners/add-lr2crs-file.js +++ b/database-seeds/scripts/rerunners/bms-pms/add-lr2crs-file.js @@ -1,4 +1,4 @@ -const { MutateCollection } = require("../util"); +const { MutateCollection } = require("../../util"); const fs = require("fs"); const { XMLParser } = require("fast-xml-parser"); diff --git a/database-seeds/scripts/rerunners/apply-sieglinde.js b/database-seeds/scripts/rerunners/bms-pms/apply-sieglinde.js similarity index 97% rename from database-seeds/scripts/rerunners/apply-sieglinde.js rename to database-seeds/scripts/rerunners/bms-pms/apply-sieglinde.js index 3cbeb43fe..6d7c750ca 100644 --- a/database-seeds/scripts/rerunners/apply-sieglinde.js +++ b/database-seeds/scripts/rerunners/bms-pms/apply-sieglinde.js @@ -1,7 +1,7 @@ const { Command } = require("commander"); const fs = require("fs"); const path = require("path"); -const { MutateCollection } = require("../util"); +const { MutateCollection } = require("../../util"); const program = new Command(); program.option("-i, --input "); diff --git a/database-seeds/scripts/rerunners/parse-pms-charts.js b/database-seeds/scripts/rerunners/bms-pms/parse-pms-charts.js similarity index 92% rename from database-seeds/scripts/rerunners/parse-pms-charts.js rename to database-seeds/scripts/rerunners/bms-pms/parse-pms-charts.js index 542f44080..b767d137e 100644 --- a/database-seeds/scripts/rerunners/parse-pms-charts.js +++ b/database-seeds/scripts/rerunners/bms-pms/parse-pms-charts.js @@ -1,6 +1,6 @@ const fetch = require("node-fetch"); -const { MutateCollection, ReadCollection, CreateChartID } = require("../util"); -const logger = require("../logger"); +const { MutateCollection, ReadCollection, CreateChartID } = require("../../util"); +const logger = require("../../logger"); const tableInfos = [ { @@ -162,7 +162,7 @@ if (require.main === module) { const charts = []; const songs = []; const existingMD5s = new Set(ReadCollection("charts-pms.json").map((e) => e.data.hashMD5)); - let i = Math.max(...ReadCollection("songs-pms.json").map(s => s.id)) + 1; + let i = Math.max(...ReadCollection("songs-pms.json").map((s) => s.id)) + 1; for (const tableInfo of tableInfos) { // THE JSON SENT OVER THE WIRE IS INVALID! @@ -208,11 +208,11 @@ if (require.main === module) { const l = Number(d.level); const tierlistInfo = Number.isNaN(l) - ? {} - : { - "sgl-EC": MakeTierlistStuff(l, tableInfo.symbol), - "sgl-HC": MakeTierlistStuff(l, tableInfo.symbol), - }; + ? {} + : { + "sgl-EC": MakeTierlistStuff(l, tableInfo.symbol), + "sgl-HC": MakeTierlistStuff(l, tableInfo.symbol), + }; const chart = { songID: i, @@ -247,8 +247,8 @@ if (require.main === module) { ); } } - MutateCollection("songs-pms.json", currentSongs => currentSongs.concat(songs)); - MutateCollection("charts-pms.json", currentCharts => currentCharts.concat(charts)); + MutateCollection("songs-pms.json", (currentSongs) => currentSongs.concat(songs)); + MutateCollection("charts-pms.json", (currentCharts) => currentCharts.concat(charts)); })(); } diff --git a/database-seeds/scripts/rerunners/add-2dxtra.js b/database-seeds/scripts/rerunners/iidx/add-2dxtra.js similarity index 97% rename from database-seeds/scripts/rerunners/add-2dxtra.js rename to database-seeds/scripts/rerunners/iidx/add-2dxtra.js index 23fe58582..33f041ac3 100644 --- a/database-seeds/scripts/rerunners/add-2dxtra.js +++ b/database-seeds/scripts/rerunners/iidx/add-2dxtra.js @@ -1,7 +1,7 @@ const { Command } = require("commander"); const { XMLParser } = require("fast-xml-parser"); const fs = require("fs"); -const { MutateCollection, CreateChartID } = require("../util"); +const { MutateCollection, CreateChartID } = require("../../util"); const program = new Command(); program diff --git a/database-seeds/scripts/rerunners/add-new-primary-iidx-charts.js b/database-seeds/scripts/rerunners/iidx/add-new-primary-iidx-charts.js similarity index 93% rename from database-seeds/scripts/rerunners/add-new-primary-iidx-charts.js rename to database-seeds/scripts/rerunners/iidx/add-new-primary-iidx-charts.js index 5e3c53983..84b12a9ee 100644 --- a/database-seeds/scripts/rerunners/add-new-primary-iidx-charts.js +++ b/database-seeds/scripts/rerunners/iidx/add-new-primary-iidx-charts.js @@ -1,4 +1,4 @@ -const { MutateCollection, CreateChartID } = require("../util"); +const { MutateCollection, CreateChartID } = require("../../util"); const inGameID = 19017; const tachiSongID = 1014; diff --git a/database-seeds/scripts/rerunners/aix-inf/parse-aix-inf.ts b/database-seeds/scripts/rerunners/iidx/aix-output/parse-aix-json.ts similarity index 100% rename from database-seeds/scripts/rerunners/aix-inf/parse-aix-inf.ts rename to database-seeds/scripts/rerunners/iidx/aix-output/parse-aix-json.ts diff --git a/database-seeds/scripts/rerunners/iidx-mdb-parse/.gitignore b/database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/.gitignore similarity index 100% rename from database-seeds/scripts/rerunners/iidx-mdb-parse/.gitignore rename to database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/.gitignore diff --git a/database-seeds/scripts/rerunners/iidx-mdb-parse/HOWTO.md b/database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/HOWTO.md similarity index 100% rename from database-seeds/scripts/rerunners/iidx-mdb-parse/HOWTO.md rename to database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/HOWTO.md diff --git a/database-seeds/scripts/rerunners/iidx-mdb-parse/blacklist.txt b/database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/blacklist.txt similarity index 100% rename from database-seeds/scripts/rerunners/iidx-mdb-parse/blacklist.txt rename to database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/blacklist.txt diff --git a/database-seeds/scripts/rerunners/iidx-mdb-parse/convert.ts b/database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/convert.ts similarity index 100% rename from database-seeds/scripts/rerunners/iidx-mdb-parse/convert.ts rename to database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/convert.ts diff --git a/database-seeds/scripts/rerunners/iidx-mdb-parse/dot-one-parser/parser.ts b/database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/dot-one-parser/parser.ts similarity index 100% rename from database-seeds/scripts/rerunners/iidx-mdb-parse/dot-one-parser/parser.ts rename to database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/dot-one-parser/parser.ts diff --git a/database-seeds/scripts/rerunners/iidx-mdb-parse/dot-one-parser/types.ts b/database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/dot-one-parser/types.ts similarity index 100% rename from database-seeds/scripts/rerunners/iidx-mdb-parse/dot-one-parser/types.ts rename to database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/dot-one-parser/types.ts diff --git a/database-seeds/scripts/rerunners/iidx-mdb-parse/merge-mdb.ts b/database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/merge-mdb.ts similarity index 100% rename from database-seeds/scripts/rerunners/iidx-mdb-parse/merge-mdb.ts rename to database-seeds/scripts/rerunners/iidx/iidx-mdb-parse/merge-mdb.ts diff --git a/database-seeds/scripts/rerunners/iidx-pe-kr/_README b/database-seeds/scripts/rerunners/iidx/iidx-pe-kr/_README similarity index 100% rename from database-seeds/scripts/rerunners/iidx-pe-kr/_README rename to database-seeds/scripts/rerunners/iidx/iidx-pe-kr/_README diff --git a/database-seeds/scripts/rerunners/iidx-pe-kr/parse-iidxkr-data.js b/database-seeds/scripts/rerunners/iidx/iidx-pe-kr/parse-iidxkr-data.js similarity index 100% rename from database-seeds/scripts/rerunners/iidx-pe-kr/parse-iidxkr-data.js rename to database-seeds/scripts/rerunners/iidx/iidx-pe-kr/parse-iidxkr-data.js diff --git a/database-seeds/scripts/rerunners/make-things-available-in-inf.js b/database-seeds/scripts/rerunners/iidx/make-things-available-in-inf.js similarity index 88% rename from database-seeds/scripts/rerunners/make-things-available-in-inf.js rename to database-seeds/scripts/rerunners/iidx/make-things-available-in-inf.js index b56035a5a..d756a1d9f 100644 --- a/database-seeds/scripts/rerunners/make-things-available-in-inf.js +++ b/database-seeds/scripts/rerunners/iidx/make-things-available-in-inf.js @@ -1,4 +1,4 @@ -const { MutateCollection } = require("../util"); +const { MutateCollection } = require("../../util"); module.exports = (idSet) => MutateCollection("charts-iidx.json", (charts) => { diff --git a/database-seeds/scripts/rerunners/update-bpi-poyashi.js b/database-seeds/scripts/rerunners/iidx/update-bpi-poyashi.js similarity index 96% rename from database-seeds/scripts/rerunners/update-bpi-poyashi.js rename to database-seeds/scripts/rerunners/iidx/update-bpi-poyashi.js index 50302fa2c..0b07fa65e 100644 --- a/database-seeds/scripts/rerunners/update-bpi-poyashi.js +++ b/database-seeds/scripts/rerunners/iidx/update-bpi-poyashi.js @@ -3,8 +3,8 @@ const { Command } = require("commander"); const fs = require("fs"); const fetch = require("node-fetch"); const path = require("path"); -const logger = require("../logger"); -const { MutateCollection, ReadCollection } = require("../util"); +const logger = require("../../logger"); +const { MutateCollection, ReadCollection } = require("../../util"); const program = new Command(); diff --git a/database-seeds/scripts/rerunners/add-jubeat-folders.js b/database-seeds/scripts/rerunners/jubeat/add-jubeat-folders.js similarity index 98% rename from database-seeds/scripts/rerunners/add-jubeat-folders.js rename to database-seeds/scripts/rerunners/jubeat/add-jubeat-folders.js index c83849e79..09a54d38f 100644 --- a/database-seeds/scripts/rerunners/add-jubeat-folders.js +++ b/database-seeds/scripts/rerunners/jubeat/add-jubeat-folders.js @@ -1,4 +1,4 @@ -const { MutateCollection, CreateFolderID } = require("../util"); +const { MutateCollection, CreateFolderID } = require("../../util"); function CreateFolder(criteria, title) { const f = { diff --git a/database-seeds/scripts/rerunners/parse-duck-popn.js b/database-seeds/scripts/rerunners/popn/parse-duck-popn.js similarity index 98% rename from database-seeds/scripts/rerunners/parse-duck-popn.js rename to database-seeds/scripts/rerunners/popn/parse-duck-popn.js index e560c28d4..b2a33a6c1 100644 --- a/database-seeds/scripts/rerunners/parse-duck-popn.js +++ b/database-seeds/scripts/rerunners/popn/parse-duck-popn.js @@ -6,7 +6,7 @@ const { ReadCollection, GetFreshScoreIDGenerator, WriteCollection, -} = require("../util"); +} = require("../../util"); const program = new Command(); program.requiredOption("-f, --file "); diff --git a/database-seeds/scripts/rerunners/add-sdvx-clear-tierlist.js b/database-seeds/scripts/rerunners/sdvx/add-sdvx-clear-tierlist.js similarity index 98% rename from database-seeds/scripts/rerunners/add-sdvx-clear-tierlist.js rename to database-seeds/scripts/rerunners/sdvx/add-sdvx-clear-tierlist.js index fe9bbdba2..db637b7a2 100644 --- a/database-seeds/scripts/rerunners/add-sdvx-clear-tierlist.js +++ b/database-seeds/scripts/rerunners/sdvx/add-sdvx-clear-tierlist.js @@ -1,7 +1,7 @@ const { Command } = require("commander"); const { parse } = require("csv-parse/sync"); const fs = require("fs"); -const { ReadCollection, MutateCollection } = require("../util"); +const { ReadCollection, MutateCollection } = require("../../util"); // The tier lists are available at // https://docs.google.com/spreadsheets/d/1cFltguBvPplBem-x1STHnG3k4TZzFfyNEZ-RwsQszoo/edit @@ -55,7 +55,7 @@ const TIERS = { text: "17D", value: 17.3, }, - "C": { + C: { text: "17C", value: 17.4, }, @@ -216,7 +216,7 @@ const MANUAL_TITLE_MAP = { "しゅわスパ大作戦☆(カシオれ！くーにゃん)": "しゅわスパ大作戦☆ (カシオれ！くーにゃんリミックス)", "双翼 Black Wings - SDVX Edit. -": "双翼 - Black Wings - SDVX Edit. -", "VALKYRIE ASAULT": "VALKYRIE ASSAULT", - "SuperMiracleEmsemble": "SuperMiracleEnsemble", + SuperMiracleEmsemble: "SuperMiracleEnsemble", "仔羊のナヴァラン・クリシェを添えて": "～仔羊のナヴァラン・クリシェを添えて～", // 17s @@ -246,7 +246,7 @@ const MANUAL_TITLE_MAP = { "The Sampling Paradise(P*Light)": "The Sampling Paradise (P*Light Remix)", "イゴモヨスのブヨブヨ・スケッチ": "イゴモヨス＝オムルのテーマによるブヨブヨ・スケッチの試み", "ABSOLUTE(ismk passionate mix)": "ABSOLUTE(ismK passionate remix)", - "泥の分際で私だけの大切を奪おうなんて" : "泥の分際で私だけの大切を奪おうだなんて", + 泥の分際で私だけの大切を奪おうなんて: "泥の分際で私だけの大切を奪おうだなんて", "Rhapsody ⚙︎f Triumph": "Rhapsody ⚙f Triumph", // There is some weird non-printing character here fml // 18s @@ -337,7 +337,7 @@ function addTiers(levelNum, csvData, headerRow, leftOffset, simple) { // For 17, apparently they include the number of songs in each tier. // e.g. "A 曲数:54" // So we cut this out. - tierName = tierName.split(" ")[0] + tierName = tierName.split(" ")[0]; } if (tierName === "" && col > leftOffset) { // This might be a double column (two columns for the same tier), diff --git a/database-seeds/scripts/rerunners/add-sdvx-konaste.js b/database-seeds/scripts/rerunners/sdvx/add-sdvx-konaste.js similarity index 100% rename from database-seeds/scripts/rerunners/add-sdvx-konaste.js rename to database-seeds/scripts/rerunners/sdvx/add-sdvx-konaste.js diff --git a/database-seeds/scripts/rerunners/add-usc-converts.js b/database-seeds/scripts/rerunners/usc/add-usc-converts.js similarity index 99% rename from database-seeds/scripts/rerunners/add-usc-converts.js rename to database-seeds/scripts/rerunners/usc/add-usc-converts.js index 05af97653..dabaced28 100644 --- a/database-seeds/scripts/rerunners/add-usc-converts.js +++ b/database-seeds/scripts/rerunners/usc/add-usc-converts.js @@ -6,7 +6,7 @@ const { ReadCollection, WriteCollection, GetFreshScoreIDGenerator, -} = require("../util"); +} = require("../../util"); const program = new Command(); program.requiredOption("-d, --db "); diff --git a/database-seeds/scripts/rerunners/add-usc-tables.ts b/database-seeds/scripts/rerunners/usc/add-usc-tables.ts similarity index 100% rename from database-seeds/scripts/rerunners/add-usc-tables.ts rename to database-seeds/scripts/rerunners/usc/add-usc-tables.ts