Merge pull request #160 from Accedia/develop

Reverted magic button to c directiory

Author: gbogomilovAccedia

electron-app/package-lock.json

@@ -2,7 +2,7 @@
   "name": "fit-mitchell-rpa",
   "appname": "REV Import Technology",
   "productName": "REV Import Technology",
-  "version": "1.5.91",
+  "version": "1.5.92",
   "homepage": "./",
   "main": "./dist/main.js",
   "description": "Automation for CCC by FIT",

electron-app/package.json

@@ -13,11 +13,9 @@ 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
@@ -64,14 +62,14 @@ class Main {
         const url = getCustomProtocolUrl(argv);
         if (argv.some((url) => url.includes('openVBS'))) {
           try {
-            const bat = spawn(downloadFolderPath, [], { windowsHide: true });
+            const bat = spawn('C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat', [], { 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');
+            dialog.showErrorBox('Error', 'The specified file was not found: C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
           }
         }
         this.finalUrl = url;

electron-app/src/main.ts

@@ -11,11 +11,8 @@ 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;
 
 class WindowManager {
@@ -79,14 +76,14 @@ class WindowManager {
       console.log('VBS URL', process.argv);
       if (shouldOpenVBS) {
         try {
-          const bat = spawn(downloadFolderPath, [], { windowsHide: true });
+          const bat = spawn('C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat', [], { 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');
+          dialog.showErrorBox('Error', 'The specified file was not found: C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
         }
       }
       log.info('loading has started this is on show');