fix for load order handling of imported mods (from Share Mods)

Shazbot · Nov 13, 2023 · 50c8dd7 · 50c8dd7
1 parent 1845080
commit 50c8dd7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/src/appSlice.ts b/src/appSlice.ts
@@ -90,12 +90,14 @@ const appSlice = createSlice({
       console.log("ordering imported mods");
       for (let i = 0; i < state.importedMods.length; i++) {
         const importedMod = state.importedMods[i];
-        if (importedMod.loadOrder != undefined) {
-          const currentMod = state.currentPreset.mods.find(
-            (mod) => mod.workshopId == state.importedMods[i].workshopId
-          );
-          if (!currentMod) continue;
+        console.log("imported mod:", importedMod.workshopId, importedMod.loadOrder);
+
+        const currentMod = state.currentPreset.mods.find(
+          (mod) => mod.workshopId == state.importedMods[i].workshopId
+        );
+        if (!currentMod) continue;
 
+        if (importedMod.loadOrder == undefined) {
           const currentModIndex = currentMod && state.currentPreset.mods.indexOf(currentMod);
           if (currentModIndex == -1) continue;
 
@@ -110,9 +112,15 @@ const appSlice = createSlice({
             if (previousSiblingModIndex != -1) {
               // put the mod with the load order after the previous sibling
               state.currentPreset.mods.splice(currentModIndex, 1);
-              state.currentPreset.mods.splice(0, 0, currentMod);
+              state.currentPreset.mods.splice(previousSiblingModIndex, 0, currentMod);
             }
           }
+        } else {
+          const currentModIndex = currentMod && state.currentPreset.mods.indexOf(currentMod);
+          if (currentModIndex == -1) continue;
+          state.currentPreset.mods.splice(currentModIndex, 1);
+          state.currentPreset.mods.splice(importedMod.loadOrder, 0, currentMod);
+          currentMod.loadOrder = importedMod.loadOrder;
         }
       }
 
@@ -207,7 +215,16 @@ const appSlice = createSlice({
 
       const alreadyExistsByName = state.currentPreset.mods.find((iterMod) => iterMod.name === mod.name);
       if (!alreadyExistsByName) {
-        state.currentPreset.mods.push(mod);
+        for (const iterMod of state.currentPreset.mods.filter((mod) => mod.loadOrder == undefined)) {
+          if (compareModNames(mod.name, iterMod.name) < 1) {
+            state.currentPreset.mods.splice(state.currentPreset.mods.indexOf(mod), 1);
+            state.currentPreset.mods.splice(state.currentPreset.mods.indexOf(iterMod), 0, mod);
+            break;
+          }
+        }
+
+        // if we couldn't find a place for it
+        if (!state.currentPreset.mods.find((iterMod) => iterMod == mod)) state.currentPreset.mods.push(mod);
       } else if (mod.isInData) {
         const previousIndex = state.currentPreset.mods.indexOf(alreadyExistsByName);
         state.currentPreset.mods.splice(previousIndex, 1, mod);

diff --git a/src/components/ShareMods.tsx b/src/components/ShareMods.tsx
@@ -46,6 +46,7 @@ const ShareMods = memo((props: ShareModsProps) => {
         return { workshopId: idAndOrder, loadOrder: undefined };
       });
 
+    console.log("imported mods:", imported);
     dispatch(setImportedMods(imported));
 
     const onlyIds = imported.map((idAndOrder) => idAndOrder.workshopId);
@@ -89,7 +90,7 @@ const ShareMods = memo((props: ShareModsProps) => {
       dispatch(setSharedMod(newMods));
     }, 100);
     return () => clearInterval(interval);
-  }, [subbedModIdsToWaitFor, mods]);
+  }, [importedMods, subbedModIdsToWaitFor, mods]);
 
   return (
     <>

diff --git a/src/index.ts b/src/index.ts
@@ -698,7 +698,7 @@ if (!gotTheLock) {
       try {
         if (!mainWindow) return;
         const dialogReturnValue = await dialog.showOpenDialog(mainWindow, {
-          properties: ["openDirectory"],
+          properties: ["openDirectory", "showHiddenFiles"],
         });
 
         if (!dialogReturnValue.canceled) {
@@ -716,7 +716,7 @@ if (!gotTheLock) {
       try {
         if (!mainWindow) return;
         const dialogReturnValue = await dialog.showOpenDialog(mainWindow, {
-          properties: ["openDirectory"],
+          properties: ["openDirectory", "showHiddenFiles"],
         });
 
         if (!dialogReturnValue.canceled) {