Merge pull request #109 from BUTR/dev

Release 1.0.3
BUTR · May 28, 2024 · e7bbe6a · e7bbe6a
2 parents 86b9811 + 6f0d625
commit e7bbe6a
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 908 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -11,18 +11,18 @@
 
 		},
 		"ghcr.io/devcontainers/features/git:1": {
-            "version": "latest",
-            "ppa": "false"
-        },
+      "version": "latest",
+      "ppa": "false"
+    },
 		"ghcr.io/butr/devcontainer/7z:1": {
 
 		},
-        "ghcr.io/devcontainers/features/node:1": {
-            "version": "18.17.1",
-            "nodeGypDependencies": "true"
-        },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "18.17.1",
+      "nodeGypDependencies": "true"
+    },
 		"ghcr.io/devcontainers/features/powershell:1": {
-            "version": "latest"
+      "version": "latest"
 		}
 	},
 	"overrideFeatureInstallOrder": [
@@ -32,12 +32,12 @@
 		"ghcr.io/devcontainers/features/node",
 		"ghcr.io/devcontainers/features/powershell"
 	],
-    "mounts": [
-		{
-		   	"source":"${localEnv:HOME}${localEnv:USERPROFILE}/AppData/Roaming/Vortex/plugins",
-		   	"target":"/vortex-plugins",
-		   	"type":"bind"
-		}
+  "mounts": [
+    {
+      "source":"${localEnv:HOME}${localEnv:USERPROFILE}/AppData/Roaming/Vortex/plugins",
+      "target":"/vortex-plugins",
+      "type":"bind"
+    }
 	],
 	"postAttachCommand": "yarn install",
 	"customizations": {
@@ -62,4 +62,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -73,8 +73,9 @@ jobs:
       nexusmods_mod_id: 875
       mod_filename: game-mount-and-blade2
       mod_version: ${{ needs.get-version.outputs.version }}
-      mod_description: Download and drag the archive onto the lower right drop zone in Vortex's Extensions page.
+      mod_description: "Download and drag the archive onto the lower right drop zone in Vortex's Extensions page."
       artifact_name: game-mount-and-blade2
+      append_v_to_version: false
     secrets:
       NEXUSMODS_APIKEY: ${{ secrets.ARAGAS_NEXUSMODS_API_KEY }}
       NEXUSMODS_SESSION_COOKIE: ${{ secrets.ARAGAS_NEXUSMODS_SESSION_COOKIE }}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "game-mount-and-blade-ii-bannerlord-butr",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A Vortex extension for Mount and Blade II: Bannerlord mod management.",
   "author": "BUTR Team & Nexus Mods",
   "license": "GPL-3.0+",
@@ -31,7 +31,6 @@
     "@types/react-redux": "^7.1.9",
     "@types/redux": "^3.6.0",
     "@types/webpack": "^5.28.5",
-    "@types/xml2js": "^0.4.5",
     "@typescript-eslint/eslint-plugin": "7.0.0",
     "@typescript-eslint/parser": "^6",
     "bluebird": "^3.7.2",
@@ -56,24 +55,20 @@
     "redux-act": "^1.7.7",
     "ts-loader": "^9.2.6",
     "ts-node": "^10.7.0",
-    "turbowalk": "git+https://github.com/Nexus-Mods/node-turbowalk",
     "typescript": "^5.3.3",
-    "vortex-api": "git+https://github.com/Nexus-Mods/vortex-api#fblo_api_update",
+    "vortex-api": "git+https://github.com/Nexus-Mods/vortex-api",
     "vortex-ext-common": "^0.4.0",
     "webpack": "^5.76.0",
     "webpack-cli": "^5.1.4",
-    "webpack-node-externals": "^3.0.0",
-    "xml2js": "^0.5.0"
+    "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
-    "@butr/vortexextensionnative": "1.0.110",
+    "@butr/vortexextensionnative": "1.0.114",
     "ticks-to-date": "^1.0.6"
   },
   "resolutions": {
-    "node-gyp": "^9.0.0",
     "@types/react": "^16.14.34",
-    "**/dir-compare/minimatch": "3.0.5",
-    "winapi-bindings": "git+https://github.com/Nexus-Mods/node-winapi-bindings"
+    "**/dir-compare/minimatch": "3.0.5"
   },
   "packageManager": "[email protected]"
 }
diff --git a/src/utils/loadOrder/persistence.ts b/src/utils/loadOrder/persistence.ts
@@ -2,6 +2,7 @@ import path from 'path';
 import { fs, selectors, types } from 'vortex-api';
 import { GAME_ID, LOAD_ORDER_SUFFIX } from '../../common';
 import { PersistenceLoadOrderStorage } from '../../types';
+import { filterEntryWithInvalidId } from '../util';
 
 const getLoadOrderFileName = (profileId: string): string => {
   return `${profileId}${LOAD_ORDER_SUFFIX}`;
@@ -22,7 +23,9 @@ export const readLoadOrder = (api: types.IExtensionApi): PersistenceLoadOrderSto
     const loFileName = getLoadOrderFileName(profileId);
     const loFilePath = getLoadOrderFilePath(api, loFileName);
     const fileContents = fs.readFileSync(loFilePath, 'utf8');
-    return JSON.parse(fileContents);
+
+    const loadOrder: PersistenceLoadOrderStorage = JSON.parse(fileContents);
+    return loadOrder.filter((x) => filterEntryWithInvalidId(x));
   } catch {
     return [];
   }

diff --git a/src/utils/util.ts b/src/utils/util.ts
@@ -11,3 +11,14 @@ export const getPathExistsAsync = async (path: string): Promise<boolean> => {
 export const findGame = async (): Promise<types.IGameStoreEntry> => {
   return util.GameStoreHelper.findByAppId([EPICAPP_ID, STEAMAPP_ID.toString(), ...GOG_IDS, XBOX_ID]);
 };
+
+type HasId = {
+  id: string;
+}
+const hasId = (persistent: HasId): persistent is HasId => {
+  return !!persistent.id && persistent.id !== '';
+};
+
+export const filterEntryWithInvalidId = (entry: HasId): boolean => {
+  return hasId(entry);
+};
diff --git a/src/utils/vortexLauncherManager.ts b/src/utils/vortexLauncherManager.ts
@@ -12,6 +12,7 @@ import {
   readLoadOrder,
   hasPersistentLoadOrder,
   libraryToLibraryVM,
+  filterEntryWithInvalidId,
 } from '.';
 import { GAME_ID } from '../common';
 import { IModuleCache, VortexLoadOrderStorage, VortexStoreIds } from '../types';
@@ -65,7 +66,7 @@ export class VortexLauncherManager {
     if (!Array.isArray(loadOrder)) {
       return [];
     }
-    return loadOrder;
+    return loadOrder.filter((x) => filterEntryWithInvalidId(x));
   };
 
   public loadLoadOrderVortex = (): vetypes.LoadOrder => {
@@ -340,6 +341,22 @@ export class VortexLauncherManager {
           displayMS: delayMS,
         });
         break;
+      case 'warning':
+        this._api.sendNotification?.({
+          id: id,
+          type: 'warning',
+          message: message,
+          displayMS: delayMS,
+        });
+        break;
+      case 'error':
+        this._api.sendNotification?.({
+          id: id,
+          type: 'error',
+          message: message,
+          displayMS: delayMS,
+        });
+        break;
     }
   };
   /**

diff --git a/src/views/LoadOrderItemRenderer/LoadOrderItemRenderer.tsx b/src/views/LoadOrderItemRenderer/LoadOrderItemRenderer.tsx
@@ -122,16 +122,16 @@ function renderModuleIcon(item: types.IFBLOLoadOrderEntry<IVortexViewModelData>)
 
 function renderValidationError(props: IBaseProps): JSX.Element | null {
   const { invalidEntries, loEntry } = props.item;
-  const invalidEntry =
+  const invalidEntryList =
     invalidEntries !== undefined
-      ? invalidEntries.find((inv) => inv.id.toLowerCase() === loEntry.id.toLowerCase())
+      ? invalidEntries.filter((inv) => inv.id.toLowerCase() === loEntry.id.toLowerCase()).map(x => x.reason).join('\n')
       : undefined;
-  return invalidEntry !== undefined ? (
+  return invalidEntryList !== undefined && invalidEntryList !== '' ? (
     <tooltip.Icon
       className="fblo-invalid-entry"
       name="feedback-error"
       style={{ width: `1.5em`, height: `1.5em`, }}
-      tooltip={invalidEntry.reason}>
+      tooltip={invalidEntryList}>
     </tooltip.Icon>
   ) : null;
 }