Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-12 01:08:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #121 from zkldi:zkldi/issue104

Browse Source 
BMS ChartHash batch-manual test
This commit is contained in:
zkldi
2021-05-24 13:55:28 +01:00
committed by GitHub
parent 2e5057439e daf39b400d
commit 63582ba6d1
9 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/.gitignore
+1 -1
View File
@@ -19,4 +19,4 @@ scripts/validate-database-errs/*
# we don't need to commit
scripts/__MDB-PARSERS/*/*
!scripts/__MDB-PARSERS/*/main.ts
!scripts/__MDB-PARSERS/*/import.ts
!scripts/__MDB-PARSERS/*/convert.ts
server/scripts/__MDB-PARSERS/beatoraja/main.ts → server/scripts/__MDB-PARSERS/beatoraja/convert.ts
+3 -3
View File
@@ -66,9 +66,9 @@ for (const song of stmt.iterate()) {
artist: song.artist,
firstVersion: null,
data: {
subtitle: song.subtitle ?? null,
subartist: song.subartist ?? null,
genre: song.genre ?? null,
subtitle: song.subtitle || null,
subartist: song.subartist || null,
genre: song.genre || null,
},
"search-titles": [],
"alt-titles": [],
server/scripts/__MDB-PARSERS/beatoraja/import.ts
+2
View File
@@ -9,9 +9,11 @@ const songs = JSON.parse(fs.readFileSync(path.join(__dirname, "./songs.json"), "
(async () => {
logger.info("starting chart import.");
await db.charts.bms.remove({});
await db.charts.bms.insert(charts);
logger.info("imported charts.");
await db.songs.bms.remove({});
await db.songs.bms.insert(songs);
logger.info("done.");
server/src/score-import/import-types/common/batch-manual/converter.test.ts
+18 -12
View File
@@ -1,11 +1,11 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import t from "tap";
import CreateLogCtx from "../../../../common/logger";
import { Testing511Song, Testing511SPA } from "../../../../test-utils/test-data";
import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data";
import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter";
import deepmerge from "deepmerge";
import { EscapeStringRegexp } from "../../../../common/util";
import { CloseMongoConnection } from "../../../../db/db";
import db, { CloseMongoConnection } from "../../../../db/db";
import { Game } from "kamaitachi-common";
import ResetDBState from "../../../../test-utils/reset-db-state";
import { InvalidScoreFailure } from "../../../framework/common/converter-failures";
@@ -99,21 +99,28 @@ t.test("#ResolveMatchTypeToKTData", (t) => {
t.end();
});
t.skip("Should resolve for the bms chartHash if the matchType is bmsChartHash", async (t) => {
t.test("Should resolve for the bms chartHash if the matchType is bmsChartHash", async (t) => {
const GAZER17MD5 = "38616b85332037cc12924f2ae2840262";
const GAZER17SHA256 = "195fe1be5c3e74fccd04dc426e05f8a9cfa8a1059c339d0a23e99f63661f0b7d";
const gazerSong = GetKTDataJSON("./kamaitachi/bms-gazer-song.json");
const gazerChart = GetKTDataJSON("./kamaitachi/bms-gazer-chart.json");
const bmsContext = deepmerge(context, { game: "bms" }) as any;
const resMD5 = await ResolveMatchTypeToKTData(
deepmerge(baseBatchManualScore, { matchType: "bmsChartHash", identifier: GAZER17MD5 }),
context,
deepmerge(baseBatchManualScore, {
matchType: "bmsChartHash",
identifier: GAZER17MD5,
}),
bmsContext,
importType,
logger
);
t.hasStrict(
resMD5,
// @todo #104 add gazer's details here
{ song: { id: 1 }, chart: {} } as any,
{ song: gazerSong, chart: gazerChart } as any,
"Should return the right song and chart."
);
@@ -122,15 +129,14 @@ t.test("#ResolveMatchTypeToKTData", (t) => {
matchType: "bmsChartHash",
identifier: GAZER17SHA256,
}),
context,
bmsContext,
importType,
logger
);
t.hasStrict(
resSHA256,
// @todo #104 Add Gazer sp17 data here.
{ song: { id: 1 }, chart: {} } as any,
{ song: gazerSong, chart: gazerChart } as any,
"Should return the right song and chart."
);
@@ -141,11 +147,11 @@ t.test("#ResolveMatchTypeToKTData", (t) => {
matchType: "bmsChartHash",
identifier: "bad_hash",
}),
context,
bmsContext,
importType,
logger
),
ktdWrap("Cannot find chart with hash ", "bms")
ktdWrap("Cannot find chart for hash ", "bms")
);
t.end();
server/src/test-utils/mock-db/charts-bms.json
+18
View File
@@ -0,0 +1,18 @@
[
{
"songID": 27339,
"chartID": "88eb6cc5683e2740cbd07f588a5f3db1db8d467b",
"rgcID": null,
"data": {
"notecount": 2256,
"hashMD5": "38616b85332037cc12924f2ae2840262",
"hashSHA256": "195fe1be5c3e74fccd04dc426e05f8a9cfa8a1059c339d0a23e99f63661f0b7d"
},
"level": "?",
"levelNum": 0,
"difficulty": "CUSTOM",
"playtype": "7K",
"isPrimary": true,
"versions": []
}
]
server/src/test-utils/mock-db/songs-bms.json
+15
View File
@@ -0,0 +1,15 @@
[
{
"id": 27339,
"title": "gazer [MANIAQ]",
"artist": "scytheleg / obj.siokaze",
"firstVersion": null,
"data": {
"subtitle": null,
"subartist": null,
"genre": "ELECTRANCE"
},
"search-titles": [],
"alt-titles": []
}
]
server/src/test-utils/test-data/kamaitachi/bms-gazer-chart.json
+16
View File
@@ -0,0 +1,16 @@
{
"songID": 27339,
"chartID": "88eb6cc5683e2740cbd07f588a5f3db1db8d467b",
"rgcID": null,
"data": {
"notecount": 2256,
"hashMD5": "38616b85332037cc12924f2ae2840262",
"hashSHA256": "195fe1be5c3e74fccd04dc426e05f8a9cfa8a1059c339d0a23e99f63661f0b7d"
},
"level": "?",
"levelNum": 0,
"difficulty": "CUSTOM",
"playtype": "7K",
"isPrimary": true,
"versions": []
}
server/src/test-utils/test-data/kamaitachi/bms-gazer-song.json
+13
View File
@@ -0,0 +1,13 @@
{
"id": 27339,
"title": "gazer [MANIAQ]",
"artist": "scytheleg / obj.siokaze",
"firstVersion": null,
"data": {
"subtitle": null,
"subartist": null,
"genre": "ELECTRANCE"
},
"search-titles": [],
"alt-titles": []
}
server/src/test-utils/test-data/kamaitachi/iidx-511spa.json
+1 -2
View File
@@ -45,7 +45,6 @@
"25",
"26",
"27",
"28",
"3cs"
"28"
]
}