Fix update check on dev env, remove TTSMM flags from mod names

FLSoz · Jun 5, 2022 · 87cf106 · 87cf106
1 parent e0a496c
commit 87cf106
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -134,7 +134,9 @@ const createWindow = async () => {
 	});
 
 	// Remove this if your app does not use auto updates
-	autoUpdater.checkForUpdates();
+	if (!isDevelopment) {
+		autoUpdater.checkForUpdates();
+	}
 	// eslint-disable-next-line
 	new App();
 };

diff --git a/src/model/ModCollection.ts b/src/model/ModCollection.ts
@@ -5,6 +5,7 @@ import { ModData } from './Mod';
 export interface ModCollection {
 	name: string;
 	description?: string;
+	linkedId?: bigint;
 	mods: string[];
 }
 
@@ -36,7 +37,10 @@ export enum CollectionManagerModalType {
 	DESELECTING_MOD_MANAGER = 1,
 	VIEW_SETTINGS = 2,
 	ERRORS_FOUND = 'errors_found',
-	WARNINGS_FOUND = 'warnings_found'
+	WARNINGS_FOUND = 'warnings_found',
+	IMPORT_COLLECTION = 5,
+	EXPORT_COLLECTION = 6,
+	WARN_OVERWRITE_COLLECTION = 7
 }
 
 export interface NotificationProps {

diff --git a/src/renderer/components/collections/CollectionManagementToolbar.tsx b/src/renderer/components/collections/CollectionManagementToolbar.tsx
@@ -245,7 +245,6 @@ export default class CollectionManagementToolbarComponent extends Component<
 								key="export"
 								type="primary"
 								icon={<ExportOutlined />}
-								onClick={saveCollectionCallback}
 								disabled={true || disabledFeatures || !madeEdits}
 								loading={savingCollection}
 							>
@@ -256,7 +255,6 @@ export default class CollectionManagementToolbarComponent extends Component<
 								key="copy"
 								type="primary"
 								icon={<CopyOutlined />}
-								onClick={saveCollectionCallback}
 								disabled={true || disabledFeatures || !madeEdits}
 								loading={savingCollection}
 							/>

diff --git a/src/renderer/components/collections/CollectionManagerModal.tsx b/src/renderer/components/collections/CollectionManagerModal.tsx
@@ -322,6 +322,9 @@ export default class CollectionManagerModal extends Component<CollectionManagerM
 					default:
 						return null;
 				}
+				break;
+			case CollectionManagerModalType.IMPORT_COLLECTION:
+				return null;
 			default:
 				return null;
 		}

diff --git a/src/renderer/components/collections/MainCollectionComponent.tsx b/src/renderer/components/collections/MainCollectionComponent.tsx
@@ -223,6 +223,11 @@ const MAIN_COLUMN_SCHEMA: ColumnSchema<DisplayModData>[] = [
 						updateType = 'warning';
 					}
 				}
+				let correctedName = name;
+				const matches = name.match(/(.*)\s*\(([^()]*[Tt][Tt][Ss][Mm][Mm][^()]*)\)$/);
+				if (matches && matches[1]) {
+					correctedName = matches[1];
+				}
 				return (
 					<button
 						type="submit"
@@ -251,7 +256,7 @@ const MAIN_COLUMN_SCHEMA: ColumnSchema<DisplayModData>[] = [
 							strong={record.needsUpdate}
 							type={updateType}
 							style={{ whiteSpace: 'normal', width: '100%', verticalAlign: 'middle' }}
-						>{` ${name}`}</Text>
+						>{` ${correctedName}`}</Text>
 					</button>
 				);
 			};