Bug fixes, dummied out INI code

Author: mcoot

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tribeslauncher",
   "productName": "tribeslauncher",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "My Electron application description",
   "main": "src/main/index.ts",
   "scripts": {
@@ -57,6 +57,7 @@
     "@types/electron-devtools-installer": "^2.0.2",
     "@types/fs-extra": "^5.0.1",
     "@types/howler": "^2.0.5",
+    "@types/ini": "^1.3.29",
     "@types/node": "^9.6.1",
     "@types/react": "^0.14.55",
     "@types/react-dom": "^0.14.20",
@@ -76,6 +77,7 @@
     "fs-extra": "^5.0.0",
     "fs-promise": "^2.0.3",
     "howler": "^2.0.9",
+    "ini": "^1.3.5",
     "is-admin": "^2.1.1",
     "jsonschema": "^1.2.4",
     "node-dll-injector": "^0.1.1",

src/common/launcher-config.ts

@@ -89,7 +89,7 @@ export const generateDefaultConfig = (userDataPath: string = '.'): LauncherConfi
         releaseChannel: 'stable',
         updateUrl: 'https://raw.githubusercontent.com/mcoot/tamodsupdate/release',
         autoInjectEnabled: false,
-        autoInjectTimer: 20
+        autoInjectTimer: 30
     };
 };
 

src/common/launcher-news.ts

@@ -45,6 +45,15 @@ export interface CommunityWeblink {
 
 export type CommunityItem = CommunityDiscord | CommunityMumble | CommunityReddit | CommunityIframe | CommunityWeblink;
 
+/////// INIs
+
+export interface IniPreset {
+    name: string;
+    category: string;
+    description: string;
+    remotePath: string;
+}
+
 /////// News
 
 export interface NewsItem {
@@ -59,6 +68,7 @@ export interface LauncherNews {
     community: CommunityItem[];
     latestLauncherVersion: string;
     launcherUpdateLink: string;
+    iniPresets: IniPreset[];
 }
 
 /////// Functions
@@ -71,5 +81,6 @@ export const downloadLauncherNews = async (newsUrl: string): Promise<LauncherNew
     }
 
     // Parse news to JSON - may throw exception if launcher news is invalid
-    return JSON.parse(newsBuffer.toString('utf8'));
+    const result = JSON.parse(newsBuffer.toString('utf8'));
+    return result;
 };

src/main/index.ts

@@ -3,6 +3,7 @@ import * as commandLineArgs from 'command-line-args';
 import { app, BrowserWindow, ipcMain } from 'electron';
 import installExtension, { REACT_DEVELOPER_TOOLS } from 'electron-devtools-installer';
 import { enableLiveReload } from 'electron-compile';
+import * as download from 'download';
 import * as path from 'path';
 
 import { InjectionResult, Injector } from '../common/injector';
@@ -116,6 +117,15 @@ const createWindow = async () => {
     event.sender.send('uninstall-finished-request');
   });
 
+  ipcMain.on('retrieve-ini-request', async (event: any, args: any) => {
+    try {
+      const result = await download(args[0]);
+      event.sender.send('retrieve-ini-finished', [true, result]);
+    } catch (err) {
+      event.sender.send('retrieve-ini-finished', [false, err]);
+    }
+  });
+
   ipcMain.on('news-request', async (event: any, newsUrl: string) => {
     let result;
     try {

src/renderer/components/app.tsx

@@ -11,6 +11,7 @@ import { ipcRenderer, remote } from 'electron';
 import { NewsDisplay } from './newsDisplay';
 import { CommunityDisplay } from './communityDisplay';
 import { InfoModal } from './infoModal';
+import { ConfigureModal } from './configureModal';
 import { SettingsModal } from './settingsModal';
 import { OnLaunchModal, OnLaunchModelStatus } from './onLaunchModal';
 
@@ -64,7 +65,14 @@ export class App extends React.Component<AppProps, AppState> {
     window.addEventListener('beforeunload', this.componentCleanup);
     if (this.props.userDataPath) {
       // Load config
-      const loadedConfig = await loadLauncherConfig(`${this.props.userDataPath}/launcherConfig.json`, this.props.userDataPath);
+      let loadedConfig = generateDefaultConfig();
+      try {
+        loadedConfig = await loadLauncherConfig(`${this.props.userDataPath}/launcherConfig.json`, this.props.userDataPath);
+      } catch (err) {
+        remote.dialog.showErrorBox('Error loading configuration',
+              `Unable to load launcher configuration; default configuration restored. Error: ${err.message || err}`);
+      }
+
       this.setState((s) => ({
         config: loadedConfig,
         launcherState: s.launcherState,
@@ -366,14 +374,20 @@ export class App extends React.Component<AppProps, AppState> {
                 launcherVersion={LAUNCHER_VERSION}
                 onModalButtonClick={(pth) => this.handleOnLaunchModelStateChange(null, null, pth)}
               />
+              <ConfigureModal
+                config={this.state.config}
+                news={this.state.news}
+                userDataPath={this.props.userDataPath}
+                userConfigPath={this.props.userConfigPath}
+                onUninstallComplete={this.handleUninstallComplete}
+              />
               <SettingsModal
                 initialConfig={this.state.config}
                 onSettingsFormSave={this.onSettingsFormSave}
                 userDataPath={this.props.userDataPath}
                 userConfigPath={this.props.userConfigPath}
-                onUninstallComplete={this.handleUninstallComplete}
               />
-              <InfoModal launcherVersion={LAUNCHER_VERSION} />
+              <InfoModal launcherVersion={LAUNCHER_VERSION} news={this.state.news} />
               <Button compact size={'tiny'} icon onClick={this.onBtnMinimisePressed}>
                 <Icon fitted name='window minimize' />
               </Button>