From 82053543bf4acfded4befd1aed567b08205332ce Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Fri, 19 Nov 2021 09:49:11 +0000 Subject: [PATCH] Some minor fixes --- server/src/lib/score-import/import-types/common/types.ts | 4 ---- .../import-types/file/eamusement-sdvx-csv/converter.ts | 4 ++-- .../import-types/file/eamusement-sdvx-csv/parser.ts | 2 +- .../import-types/file/eamusement-sdvx-csv/types.ts | 4 ++-- server/src/lib/score-import/import-types/parsers.ts | 1 - .../test-data/eamusement-sdvx-csv/exceed-gear-score.csv | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/server/src/lib/score-import/import-types/common/types.ts b/server/src/lib/score-import/import-types/common/types.ts index d8005af92..7ce93f495 100644 --- a/server/src/lib/score-import/import-types/common/types.ts +++ b/server/src/lib/score-import/import-types/common/types.ts @@ -33,8 +33,6 @@ export interface ImportTypeDataMap { "file/solid-state-squad": S3Score; "file/mer-iidx": MerScore; "file/pli-iidx-csv": IIDXEamusementCSVData; - // This is stubbed out so our code still compiles. - "file/eamusement-sdvx-csv": never; // @todo Add proper support for this! "ir/direct-manual": BatchManualScore; "ir/barbatos": BarbatosScore; @@ -62,8 +60,6 @@ export interface ImportTypeContextMap { "file/solid-state-squad": EmptyObject; "file/mer-iidx": EmptyObject; "file/pli-iidx-csv": IIDXEamusementCSVContext; - // This is stubbed out so our code still compiles. - "file/eamusement-sdvx-csv": never; // @todo Add proper support for this! "ir/direct-manual": BatchManualContext; "ir/barbatos": EmptyObject; diff --git a/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/converter.ts b/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/converter.ts index b88801be1..8d1502584 100644 --- a/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/converter.ts +++ b/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/converter.ts @@ -100,7 +100,7 @@ const ConvertEamSDVXCSV: ConverterFunction = service: "e-amusement", game: "sdvx", scoreMeta: {}, - // i cri + // No timestamp data :( timeAchieved: null, comment: null, importType, @@ -114,7 +114,7 @@ const ConvertEamSDVXCSV: ConverterFunction = }, }; - logger.info(`Returning dryscore with ${dryScore.scoreData.score} for ${humanisedChartTitle}`) + logger.info(`Returning dryscore with ${dryScore.scoreData.score} for ${humanisedChartTitle}`); return { chart, song, dryScore }; }; diff --git a/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/parser.ts b/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/parser.ts index afd8f8c31..d2583bdd1 100644 --- a/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/parser.ts @@ -41,7 +41,7 @@ export default function ParseEamusementSDVXCSV( // It is 0 if the score was played without S-criticals. exscore: cells[6], // The other columns (grade, # of different clears) are essentially useless. - // There is no timestamp 😢 + // There is no timestamp :( })); return { diff --git a/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/types.ts b/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/types.ts index 519108016..7bd909184 100644 --- a/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/types.ts +++ b/server/src/lib/score-import/import-types/file/eamusement-sdvx-csv/types.ts @@ -1,8 +1,8 @@ -export type SDVXEamusementCSVData = { +export interface SDVXEamusementCSVData { title: string; difficulty: string; level: string; lamp: string; score: string; exscore: string; -}; +} diff --git a/server/src/lib/score-import/import-types/parsers.ts b/server/src/lib/score-import/import-types/parsers.ts index 0a83aec9b..842781a87 100644 --- a/server/src/lib/score-import/import-types/parsers.ts +++ b/server/src/lib/score-import/import-types/parsers.ts @@ -5,7 +5,6 @@ import { ParseEagSDVX } from "./api/eag-sdvx/parser"; import { ParseFloIIDX } from "./api/flo-iidx/parser"; import { ParseFloSDVX } from "./api/flo-sdvx/parser"; import { ParseMinSDVX } from "./api/min-sdvx/parser"; -import { ParserFunctionReturns } from "./common/types"; import ParseBatchManual from "./file/batch-manual/parser"; import ParseEamusementIIDXCSV from "./file/eamusement-iidx-csv/parser"; import ParseEamusementSDVXCSV from "./file/eamusement-sdvx-csv/parser"; diff --git a/server/src/test-utils/test-data/eamusement-sdvx-csv/exceed-gear-score.csv b/server/src/test-utils/test-data/eamusement-sdvx-csv/exceed-gear-score.csv index d6dcf4fd4..f3f381818 100644 --- a/server/src/test-utils/test-data/eamusement-sdvx-csv/exceed-gear-score.csv +++ b/server/src/test-utils/test-data/eamusement-sdvx-csv/exceed-gear-score.csv @@ -202,5 +202,4 @@ neu BSP style,EXHAUST,16,EXCESSIVE COMPLETE,S,9931212,0,7,7,0,0 FLOWER REDALiCE Remix,EXHAUST,16,COMPLETE,AA,9327691,0,2,2,0,0 Xepher Light and Darkness Dragon REMIX,EXHAUST,16,ULTIMATE CHAIN,AAA+,9887187,0,15,15,1,0 冥 Rockin' SWING REMIX,EXHAUST,16,COMPLETE,AA+,9645522,0,3,2,0,0 -Evans VolteX Pf arrange,EXHAUST,15,COMPLETE,AAA+,9848345,0,2,2,0,0 - \ No newline at end of file +Evans VolteX Pf arrange,EXHAUST,15,COMPLETE,AAA+,9848345,0,2,2,0,0 \ No newline at end of file