From 9743e1a53a866ad8dcc1b4066aa71bcdd0d66878 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Sun, 3 Jan 2021 00:44:19 -0700 Subject: [PATCH] Update config to nest card information within a separate object. --- server/src/objects/Game.ts | 10 +++++----- server/src/types/config.d.ts | 11 +++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/server/src/objects/Game.ts b/server/src/objects/Game.ts index b043aa2..c5989c6 100644 --- a/server/src/objects/Game.ts +++ b/server/src/objects/Game.ts @@ -70,17 +70,17 @@ export class Game { */ // parse the questions from the CSV - let data = readFileSync(conf.game.cards.questions, `utf-8`).replace(/\r/g, ``); + let data = readFileSync(conf.game.cards.questions.fingerprint, `utf-8`).replace(/\r/g, ``); let questions: question_deck[] = []; - for (var line of data.split(`\n`).slice(1)) { - questions.push(line.split(`,`)[0]); + for (var line of data.split(`\n`).slice(conf.game.cards.questions.header_rows)) { + questions.push(line.split(`,`)[conf.game.cards.questions.column]); }; this._questions = new Deck(questions); // Parse the object deck from CSV - let objectsCSV = readFileSync(conf.game.cards.objects, `utf-8`).replace(/\r/g, ``); + let objectsCSV = readFileSync(conf.game.cards.objects.fingerprint, `utf-8`).replace(/\r/g, ``); let objects: object_deck[] = []; - for (var line of objectsCSV.split(`\n`).slice(1)) { + for (var line of objectsCSV.split(`\n`).slice(conf.game.cards.objects.header_rows)) { objects.push(line.split(`,`)); }; this._objects = new Deck(objects); diff --git a/server/src/types/config.d.ts b/server/src/types/config.d.ts index 6a29ba5..ebf251c 100644 --- a/server/src/types/config.d.ts +++ b/server/src/types/config.d.ts @@ -18,8 +18,15 @@ interface config { cards: { type: `csv` | `sheets`; key?: string; - questions: string; - objects: string; + questions: { + fingerprint: string; + column: number; + header_rows: number; + }; + objects: { + fingerprint: string; + header_rows: number; + }; }; }; } \ No newline at end of file