Update version to 0.2.0 and add deepmerge dependency; enhance character selection logic

Author: daydreamer-json

bun.lock

@@ -14,6 +14,7 @@
         "clear": "^0.1.0",
         "cli-progress": "^3.12.0",
         "clui": "^0.3.6",
+        "deepmerge": "^4.3.1",
         "figlet": "^1.8.0",
         "fluent-ffmpeg": "^2.1.3",
         "hono": "^4.7.7",
@@ -236,6 +237,8 @@
 
     "deep-extend": ["[email protected]", "", {}, "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="],
 
+    "deepmerge": ["[email protected]", "", {}, "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="],
+
     "default-browser": ["[email protected]", "", { "dependencies": { "bundle-name": "^4.1.0", "default-browser-id": "^5.0.0" } }, "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg=="],
 
     "default-browser-id": ["[email protected]", "", {}, "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA=="],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uma-db-stuff",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "A set of experimental scripts to process Umamusume Pretty Derby game assets and database files",
   "author": "daydreamer-json <[email protected]> (https://github.com/daydreamer-json)",
   "license": "AGPL-3.0-or-later",
@@ -45,6 +45,7 @@
     "clear": "^0.1.0",
     "cli-progress": "^3.12.0",
     "clui": "^0.3.6",
+    "deepmerge": "^4.3.1",
     "figlet": "^1.8.0",
     "fluent-ffmpeg": "^2.1.3",
     "hono": "^4.7.7",

src/utils/audioGenerate.ts

@@ -17,8 +17,9 @@ import assetsUtils from './assets';
 import mathUtils from './math';
 import reaperUtils from './reaper';
 import subProcessUtils from './subProcess';
-import * as TypesAssetCsvStructure from '../types/AssetCsvStructure';
 import configEmbed from './configEmbed';
+import exitUtils from './exit';
+import * as TypesAssetCsvStructure from '../types/AssetCsvStructure';
 const execPromise = util.promisify(child_process.exec);
 
 async function askToUserLiveId(): Promise<number> {
@@ -51,6 +52,17 @@ async function askToUserLiveId(): Promise<number> {
             })),
         })
       ).value;
+  if (!argvUtils.getArgv().liveId) process.stdout.write('\x1b[1A\x1b[2K');
+  console.log(
+    'Selected live track: ' +
+      liveId +
+      ': ' +
+      chalk.bold.green(
+        db.text_data.find(
+          (texEntry: any) => texEntry.id === 16 && texEntry.category === 16 && texEntry.index === liveId,
+        ).text,
+      ),
+  );
   if (!db.live_data.find((entry: { [key: string]: any }) => entry.music_id === liveId)) {
     throw new Error(`live '${liveId}' not found`);
   }
@@ -203,7 +215,6 @@ async function askToUserCharaId(
       }
       return retObj;
     } else {
-      console.log(`Available positions: ${availablePositionArray.map((el) => chalk.bold.green(el)).join(', ')}`);
       const retObj: Record<string, number | null> = {
         left3: null,
         left2: null,
@@ -213,15 +224,79 @@ async function askToUserCharaId(
         right2: null,
         right3: null,
       };
-      for (let i = 0; i < availablePositionArray.length; i++) {
-        const rsp = await questionBuilder(availablePositionArray[i]!, i > 0);
-        if (rsp !== -1) {
-          selectedCharaArray.push(rsp);
-          retObj[availablePositionArray[i]!] = rsp;
-        } else {
-          i -= 2;
-          process.stdout.write('\x1b[1A\x1b[2K\x1b[1A\x1b[2K');
+      while (true) {
+        const positionTargetIndex: number = (
+          await prompts(
+            {
+              type: 'select',
+              name: 'value',
+              message: `Map the chara to each position`,
+              choices: (() => {
+                const _ = [
+                  ...availablePositionArray.map((str, index) => ({
+                    title:
+                      chalk.bold.cyan(
+                        str.padEnd(mathUtils.arrayMax(availablePositionArray.map((_) => _.length)), ' '),
+                      ) +
+                      ' - ' +
+                      (!retObj[str]
+                        ? chalk.bold.red('Chara not selected')
+                        : `${chalk.green(retObj[str])}: ${chalk.bold.green(
+                            db.masterDb.text_data.find(
+                              (texEntry: any) =>
+                                texEntry.id === 6 && texEntry.category === 6 && texEntry.index === retObj[str],
+                            ).text,
+                          )}`),
+                    value: index,
+                  })),
+                ];
+                if (availablePositionArray.map((str) => retObj[str]).filter((el) => el === null).length === 0) {
+                  _.push({
+                    title: chalk.bold.yellow('=== Finish selecting ==='),
+                    value: -1,
+                  });
+                }
+                return _;
+              })(),
+            },
+            {
+              onCancel: async () => {
+                process.stdout.write('\x1b[1A\x1b[2K');
+                await exitUtils.pressAnyKeyToExit(1);
+              },
+            },
+          )
+        ).value;
+        process.stdout.write('\x1b[1A\x1b[2K');
+        if (positionTargetIndex === -1) {
+          break;
         }
+        retObj[availablePositionArray[positionTargetIndex]!] = (
+          await prompts({
+            type: 'select',
+            name: 'value',
+            message: `Select singing chara for '${availablePositionArray[positionTargetIndex]}' position`,
+            choices: [
+              ...liveCanUseCharaArray
+                // .filter((entry) => selectedCharaArray.includes(entry) === false) // to eliminate duplicates
+                .map((entry) => ({
+                  title:
+                    entry +
+                    ': ' +
+                    db.masterDb.text_data.find(
+                      (texEntry: any) => texEntry.id === 6 && texEntry.category === 6 && texEntry.index === entry,
+                    ).text,
+                  description:
+                    'CV: ' +
+                    db.masterDb.text_data.find(
+                      (texEntry: any) => texEntry.id === 7 && texEntry.category === 7 && texEntry.index === entry,
+                    ).text,
+                  value: entry,
+                })),
+            ],
+          })
+        ).value;
+        process.stdout.write('\x1b[1A\x1b[2K');
       }
       return retObj;
     }

src/utils/configEmbed.ts

@@ -2,5 +2,5 @@ import semver from 'semver';
 
 export default {
   APPLICATION_NAME: 'uma-db-stuff',
-  VERSION_NUMBER: semver.valid('0.1.2'),
+  VERSION_NUMBER: semver.valid('0.2.0'),
 };

src/utils/configUser.ts

@@ -1,6 +1,7 @@
 import bun from 'bun';
 import path from 'node:path';
 import YAML from 'yaml';
+import deepmerge from 'deepmerge';
 
 type Freeze<T> = Readonly<{
   [P in keyof T]: T[P] extends object ? Freeze<T[P]> : T[P];
@@ -26,6 +27,7 @@ type ConfigType = AllRequired<{
     };
   };
   audio: {
+    useCheersInst: boolean; // Whether to include audience cheers in the live audio
     targetLoudness: number; // Target for volume normalization during winning live audio generation
     volumeCompensation: {
       //! Probably still does not work
@@ -53,6 +55,7 @@ const initialConfig: ConfigType = {
     },
   },
   audio: {
+    useCheersInst: false,
     targetLoudness: -7.2,
     volumeCompensation: {
       inst: 0.0,
@@ -71,7 +74,11 @@ if ((await bun.file(filePath).exists()) === false) {
 
 let config: ConfigType = await (async () => {
   const rawFileData: ConfigType = YAML.parse(await bun.file(filePath).text()) as ConfigType;
-  return rawFileData;
+  const mergedConfig = deepmerge(initialConfig, rawFileData);
+  if (JSON.stringify(rawFileData) !== JSON.stringify(mergedConfig)) {
+    await bun.write(filePath, YAML.stringify(mergedConfig, null, 2));
+  }
+  return mergedConfig;
 })();
 
 export default {