Merge pull request #157 from Accedia/fix/changes-to-magic-button-logic

Fix/changes to magic button logic

Author: gbogomilovAccedia

electron-app/src/main.ts

@@ -1,5 +1,5 @@
 import { ResponseData } from './interfaces/ResponseData';
-import { app, globalShortcut, ipcMain, shell } from 'electron';
+import { app, globalShortcut, ipcMain, shell,dialog } from 'electron';
 import WindowManager from './utils/window_manager';
 import importer from './utils/importer';
 import { MESSAGE } from './constants/messages';
@@ -13,8 +13,11 @@ import { isAppDev, isDev } from './utils/is_dev';
 import log from 'electron-log';
 import { FirebaseService, SessionStatus } from './utils/firebase';
 import mitchell_importer from './utils/mitchell_importer';
+import os from 'os';
+import { spawn } from 'child_process';
 
 const INPUT_SPEED_STORAGE_KEY = 'inputSpeed';
+const downloadFolderPath = path.join(os.homedir(), 'Downloads', 'FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
 
 if (isDev() && isAppDev(app)) {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -60,9 +63,16 @@ class Main {
       app.on('second-instance', async (e, argv) => {
         const url = getCustomProtocolUrl(argv);
         if (argv.some((url) => url.includes('openVBS'))) {
-          shell.openPath('C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
-          app.quit();
-          return;
+          try {
+            const bat = spawn(downloadFolderPath, [], { windowsHide: true });
+            bat.on('close', (code) => {
+            log.info(`Child process exited with code ${code}`);
+              app.quit();
+            });
+            return;
+          } catch (error) {
+            dialog.showErrorBox('Error', 'The specified file was not found: Downloads\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
+          }
         }
         this.finalUrl = url;
         if (this.windowManager.mainWindow) {

electron-app/src/utils/window_manager.ts

@@ -1,5 +1,5 @@
 import { isAppDev, isDev } from './is_dev';
-import { app, BrowserWindow, screen, shell } from 'electron';
+import { app, BrowserWindow, screen, shell, dialog } from 'electron';
 import * as path from 'path';
 import { getCustomProtocolUrl } from './get_custom_protocol_url';
 import { fetchDataAndStartImporter, store } from '../main';
@@ -11,6 +11,10 @@ import { FirebaseService } from './firebase';
 import { extractSessionIdFromUrl } from './extract_sessionid_from_url';
 import mitchell_importer from './mitchell_importer';
 import log from 'electron-log';
+import os from 'os';
+import { spawn } from 'child_process';
+
+const downloadFolderPath = path.join(os.homedir(), 'Downloads', 'FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
 
 type MaybeBrowserWindow = BrowserWindow | null;
 
@@ -63,14 +67,27 @@ class WindowManager {
 
   public startLoading = (): void => {
     console.log('starting loading');
-    this.loadingWindow = new BrowserWindow(WINDOW_CONFIG.loading);
+    const shouldOpenVBS = process && process.argv.some((url) => url.includes('openVBS'))
+    this.loadingWindow = new BrowserWindow({...WINDOW_CONFIG.loading, 
+      show: shouldOpenVBS ? false : true
+    });
+    if(shouldOpenVBS){
+      this.loadingWindow.minimize();
+    }
     this.loadLoadingWindowContent();
     this.loadingWindow.once('show', async () => {
       console.log('VBS URL', process.argv);
-      if (process && process.argv.some((url) => url.includes('openVBS'))) {
-        shell.openPath('C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
-        app.quit();
-        return;
+      if (shouldOpenVBS) {
+        try {
+          const bat = spawn(downloadFolderPath, [], { windowsHide: true });
+          bat.on('close', (code) => {
+            console.log(`Child process exited with code ${code}`);
+            app.quit();
+          });
+          return;
+        } catch (error) {
+          dialog.showErrorBox('Error', 'The specified file was not found: Downloads\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
+        }
       }
       log.info('loading has started this is on show');
       const storedUrl = store.get('url') as string | null;