Merge pull request #220 from 1-alex98/bugfix/#219-error-on-single-player

Error on SinglePlayer page
beyond-all-reason · Jun 19, 2023 · 6fb5adb · 6fb5adb
2 parents 915558b + 1bf8a75
commit 6fb5adb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/renderer/api/cache-db.ts b/src/renderer/api/cache-db.ts
@@ -44,8 +44,6 @@ export class CacheDbAPI extends Kysely<CacheDatabase> {
     }
 
     public async init() {
-        await this.serializePlugin.setSchema(this);
-
         await this.schema
             .createTable("map")
             .ifNotExists()
@@ -122,8 +120,12 @@ export class CacheDbAPI extends Kysely<CacheDatabase> {
             .addColumn("fileName", "varchar", (col) => col.primaryKey())
             .execute();
 
+        await this.serializePlugin.setSchema(this); //might be needed already for migration
+
         await this.migrateToLatest();
 
+        await this.serializePlugin.setSchema(this); //again in case migration changed the database
+
         return this;
     }
 

diff --git a/src/renderer/api/content/engine-content.ts b/src/renderer/api/content/engine-content.ts
@@ -214,7 +214,7 @@ export class EngineContentAPI extends AbstractContentAPI<EngineVersion> {
     }
 
     protected async parseAi(aiPath: string): Promise<EngineAI> {
-        const aiDefinitions = await glob.promise(`${aiPath}/**/{AIInfo.lua,AIOptions.lua}`);
+        const aiDefinitions = await glob.promise(`${aiPath}/**/{AIInfo.lua,AIOptions.lua}`, { windowsPathsNoEscape: true });
         const aiInfoPath = aiDefinitions.find((filePath) => filePath.endsWith("AIInfo.lua"));
         const aiOptionsPath = aiDefinitions.find((filePath) => filePath.endsWith("AIOptions.lua"));
 

diff --git a/src/renderer/api/content/game-content.ts b/src/renderer/api/content/game-content.ts
@@ -128,7 +128,7 @@ export class GameContentAPI extends PrDownloaderAPI<GameVersion | CustomGameVers
         if ("dir" in version) {
             const sdpFiles: Array<SdpFileMeta & { data?: Buffer }> = [];
             const customGameDir = path.join(api.info.contentPath, "games", version.dir);
-            const files = await glob.promise(path.join(customGameDir, filePattern));
+            const files = await glob.promise(path.join(customGameDir, filePattern), { windowsPathsNoEscape: true });
 
             for (const file of files) {
                 const sdpData = {

diff --git a/src/renderer/config/default-battle.ts b/src/renderer/config/default-battle.ts
@@ -15,7 +15,7 @@ export function defaultBattle(mapScriptName?: string) {
     me.battleStatus.isSpectator = false;
 
     const engine = api.content.engine.installedVersions.find((version) => version.id === defaultEngineVersion);
-    const barb = engine?.ais.find((ai) => ai.shortName === "BARb")!;
+    const barb = engine?.ais.find((ai) => ai.shortName === "BARb");
 
     return new OfflineBattle({
         battleOptions: {
@@ -31,6 +31,6 @@ export function defaultBattle(mapScriptName?: string) {
             restrictions: [],
         },
         users: [me],
-        bots: [{ playerId: 1, teamId: 1, ownerUserId: me.userId, name: barb.name, aiShortName: barb.shortName, aiOptions: {} }],
+        bots: barb ? [{ playerId: 1, teamId: 1, ownerUserId: me.userId, name: barb.name, aiShortName: barb.shortName, aiOptions: {} }] : [],
     });
 }
diff --git a/src/renderer/utils/serialize-plugin.ts b/src/renderer/utils/serialize-plugin.ts
@@ -17,6 +17,7 @@ export class SerializePlugin implements KyselyPlugin {
     protected colTypes = new Map<string, "json" | "datetime" | "boolean">();
 
     public async setSchema(db: Kysely<unknown>) {
+        this.colTypes.clear();
         const tableMetadata = await db.introspection.getTables();
         for (const table of tableMetadata) {
             for (const col of table.columns) {