await finish dialog when preset-installing collection

also load preset files in a predictable order but in practice this will be the same order that it would have been "implicitly" anyway
Nexus-Mods · Sep 8, 2022 · 6e46855 · 6e46855
1 parent 75764fd
commit 6e46855
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 11 deletions.
diff --git a/src/extensions/download_management/index.ts b/src/extensions/download_management/index.ts
@@ -1076,6 +1076,7 @@ function init(context: IExtensionContextExt): boolean {
       removeDownloadsWithoutFile(store, downloads);
 
       processCommandline(context.api);
+
       presetManager.on('installmod', (stepIn: IPresetStep) => {
         const step = stepIn as IPresetStepInstallMod;
         log('info', 'preset starting download', { url: step.url });
@@ -1090,11 +1091,27 @@ function init(context: IExtensionContextExt): boolean {
             }
           };
           context.api.events.on('did-install-dependencies', callback);
-        }
+        };
+
+        const onDidInstallCollection = (dlId: string, cb: () => void) => {
+          const callback = (gameId: string, modId: string) => {
+            const installedDLId =
+              context.api.getState().persistent.mods[gameId]?.[modId]?.archiveId;
+            if (installedDLId === dlId) {
+              context.api.events.off('did-install-collection', callback);
+              cb();
+            }
+          };
+          context.api.events.on('did-install-collection', callback);
+        };
+
+        let isCollection: boolean = false;
 
         try {
           const urlParsed = new NXMUrl(step.url);
           if (urlParsed.collectionSlug !== undefined) {
+            isCollection = true;
+
             const state = context.api.getState();
             const games = knownGames(state);
             const gameId = convertNXMIdReverse(games, urlParsed.gameId);
@@ -1103,7 +1120,7 @@ function init(context: IExtensionContextExt): boolean {
               .find(modId => mods[modId].attributes?.collectionSlug === urlParsed.collectionSlug);
             if (existing !== undefined) {
               return new Promise((resolve) => {
-                onDidInstallDependencies(mods[existing].archiveId, resolve);
+                onDidInstallCollection(mods[existing].archiveId, resolve);
                 context.api.events.emit('resume-collection', gameId, existing);
               });
             }
@@ -1123,7 +1140,11 @@ function init(context: IExtensionContextExt): boolean {
           .then((dlId: string) => {
             log('info', 'download finished', { dlId });
             return new Promise((resolve) => {
-              onDidInstallDependencies(dlId, resolve);
+              if (isCollection) {
+                onDidInstallCollection(dlId, resolve);
+              } else {
+                onDidInstallDependencies(dlId, resolve);
+              }
               context.api.events.emit('start-install-download', dlId);
             });
           });

diff --git a/src/types/IPreset.ts b/src/types/IPreset.ts
@@ -53,5 +53,5 @@ export interface IPreset {
 
 export interface IPresetsState {
   presets: { [presetId: string]: IPresetState };
-  processing: string;
+  processing?: string;
 }
diff --git a/src/util/PresetManager.ts b/src/util/PresetManager.ts
@@ -63,7 +63,9 @@ class PresetManager {
     let presetFiles: string[] = [];
 
     try {
-      presetFiles = fs.readdirSync(basePath).filter(fileName => path.extname(fileName) === '.json');
+      presetFiles = fs.readdirSync(basePath)
+        .filter(fileName => path.extname(fileName) === '.json')
+        .sort();
     } catch (err) {
       log((err.code === 'ENOENT') ? 'debug' : 'error', 'no preset files', { basePath, error: err.message });
     }

diff --git a/src/validationCode/IPreset.validate.js b/src/validationCode/IPreset.validate.js
diff --git a/src/validationCode/validation.ts b/src/validationCode/validation.ts
@@ -1,7 +1,7 @@
-import validateeBCskdwG from "./IPreset.validate";export function validateIPreset(data): any[] {
-    var res = validateeBCskdwG(data);
-    return (res === false) ? validateeBCskdwG.prototype.constructor.errors : [];
+import validateLnwojjqti from "./IPreset.validate";export function validateIPreset(data): any[] {
+    var res = validateLnwojjqti(data);
+    return (res === false) ? validateLnwojjqti.prototype.constructor.errors : [];
 }export function validateIPresetsState(data): any[] {
-    var res = validateeBCskdwG(data);
-    return (res === false) ? validateeBCskdwG.prototype.constructor.errors : [];
+    var res = validateLnwojjqti(data);
+    return (res === false) ? validateLnwojjqti.prototype.constructor.errors : [];
 }