Windows fixes

electron.js

@@ -65,8 +65,9 @@ function createWindow() {
     // Unmount all items
     for (const i in mountedLocations) {
       const data = mountedData[mountedLocations[i]];
-      helpers.stopMountProcess(data.DataDirectory, data.Version, data.StorageType);
+      helpers.stopMountProcessSync(data.DataDirectory, data.Version, data.StorageType);
     }
+
     mountedLocations = [];
     mountedData = {};
   });
@@ -275,50 +276,49 @@ ipcMain.on(Constants.IPC_Detect_Mounts, (event, data) => {
     driveLetters[provider] = [];
   }
 
-  const grabDriveLetters = (hsLocation, siaLocation, siaPrimeLocation) => {
+  const grabDriveLetters = (locations) => {
     for (let i = 'c'.charCodeAt(0); i <= 'z'.charCodeAt(0); i++) {
       const drive = (String.fromCharCode(i) + ':').toUpperCase();
-      if (!(hsLocation.startsWith(drive) || siaLocation.startsWith(drive) || siaPrimeLocation.startsWith(drive))) {
+      let driveInUse = false;
+      for (const provider of Constants.PROVIDER_LIST) {
+        driveInUse = locations[provider].startsWith(drive);
+        if (driveInUse)
+          break;
+      }
+      if (!driveInUse) {
         try {
           if (!fs.existsSync(drive)) {
-            driveLetters.Hyperspace.push(drive);
+            for (const provider of Constants.PROVIDER_LIST) {
-            driveLetters.Sia.push(drive);
+              driveLetters[provider].push(drive);
-            driveLetters.SiaPrime.push(drive);
+            }
           }
         } catch (e) {
         }
       }
     }
 
-    if (hsLocation.length > 0) {
+    for (const provider of Constants.PROVIDER_LIST) {
-      if (!driveLetters.Hyperspace.find((driveLetter) => {
+      if (locations[provider].length > 0) {
-        return driveLetter === hsLocation;
+        if (!driveLetters[provider].find((driveLetter) => {
-      })) {
+          return driveLetter === locations[provider];
-        driveLetters.Hyperspace.push(hsLocation);
+        })) {
-      }
+          driveLetters[provider].push(locations[provider]);
-    }
+        }
-
-    if (siaLocation.length > 0) {
-      if (!driveLetters.Sia.find((driveLetter) => {
-        return driveLetter === siaLocation;
-      })) {
-        driveLetters.Sia.push(siaLocation);
-      }
-    }
-
-    if (siaPrimeLocation.length > 0) {
-      if (!driveLetters.SiaPrime.find((driveLetter) => {
-        return driveLetter === siaPrimeLocation;
-      })) {
-        driveLetters.SiaPrime.push(siaPrimeLocation);
       }
     }
   };
 
-  const setImage = (hsLocation, siaLocation, siaPrimeLocation) => {
+  const setImage = (locations) => {
     if (os.platform() === 'win32' || os.platform() === 'linux') {
+      let driveInUse = false;
+      for (const provider of Constants.PROVIDER_LIST) {
+        driveInUse = locations[provider].length > 0;
+        if (driveInUse)
+          break;
+      }
+
       let image;
-      if ((siaLocation.length > 0) || (hsLocation.length > 0) || (siaPrimeLocation.length > 0)) {
+      if (driveInUse) {
         image = nativeImage.createFromPath(path.join(__dirname, '/build/logo_both.png'));
       } else {
         image = nativeImage.createFromPath(path.join(__dirname, '/build/logo.png'));
@@ -332,39 +332,28 @@ ipcMain.on(Constants.IPC_Detect_Mounts, (event, data) => {
   helpers
     .detectRepertoryMounts(dataDirectory, data.Version)
     .then((results) => {
-      let hsLocation = results.Hyperspace.Location;
+      let data = {};
-      let siaLocation = results.Sia.Location;
+      let locations = {};
-      if (!results.SiaPrime) {
+      for (const provider of Constants.PROVIDER_LIST) {
-        results.SiaPrime = {
+        data[provider] = results[provider] ? results[provider] : {
           Active: false,
           Location: '',
           PID: -1,
         };
+        if (data[provider].PID !== -1) {
+          expectedUnmount[provider] = false;
+        }
+        locations[provider] = data[provider].Location;
       }
-      let siaPrimeLocation = results.SiaPrime.Location;
+
       if (os.platform() === 'win32') {
-        hsLocation = hsLocation.toUpperCase();
+        grabDriveLetters(locations);
-        siaLocation = siaLocation.toUpperCase();
-        siaPrimeLocation = siaPrimeLocation.toUpperCase();
-        grabDriveLetters(hsLocation, siaLocation, siaPrimeLocation);
       }
-      if (results.Hyperspace.PID !== -1) {
+
-        expectedUnmount['Hyperspace'] = false;
+      setImage(locations);
-      }
-      if (results.Sia.PID !== -1) {
-        expectedUnmount['Sia'] = false;
-      }
-      if (results.SiaPrime.PID !== -1) {
-        expectedUnmount['SiaPrime'] = false;
-      }
-      setImage(hsLocation, siaLocation, siaPrimeLocation);
       standardIPCReply(event, Constants.IPC_Detect_Mounts_Reply, {
         DriveLetters: driveLetters,
-        Locations: {
+        Locations: locations,
-          Hyperspace: hsLocation,
-          Sia: siaLocation,
-          SiaPrime: siaPrimeLocation,
-        }
       });
     })
     .catch(error => {
@@ -541,6 +530,7 @@ ipcMain.on(Constants.IPC_Mount_Drive, (event, data) => {
       StorageType: data.StorageType,
     };
     const errorHandler = (pid, error) => {
+      console.log(pid, error);
       if (mountedLocations.indexOf(data.Location) !== -1) {
         mountedLocations.splice(mountedLocations.indexOf(data.Location), 1);
         delete mountedData[data.Location];

helpers.js

@@ -198,8 +198,6 @@ module.exports.executeMount = (directory, version, storageType, location, noCons
       clearTimeout(timeout);
       exitCallback(code, pid);
     });
-
-    process.unref();
   });
 };
 
@@ -466,6 +464,22 @@ module.exports.stopMountProcess = (directory, version, storageType) => {
         Code: code,
       });
     });
-    process.unref();
   });
+};
+
+module.exports.stopMountProcessSync = (directory, version, storageType) => {
+  const processOptions = {
+    detached: true,
+    shell: true,
+    windowsHide: true,
+  };
+
+  const command = path.join(directory, version, (os.platform() === 'win32') ? 'repertory.exe' : 'repertory');
+  const args = ['-unmount'];
+  if (Constants.PROVIDER_ARG[storageType.toLowerCase()].length > 0) {
+    args.push(Constants.PROVIDER_ARG[storageType.toLowerCase()]);
+  }
+
+  const process = new spawn(command, args, processOptions);
+  process.unref();
 };