feat(App): Set bulk import as default after osu dir setup (#448)

yadPe · May 9, 2021 · c01f692 · c01f692
1 parent 0948254
commit c01f692
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/App/modules/Settings/utils/useSettingsUtils.js b/src/App/modules/Settings/utils/useSettingsUtils.js
@@ -2,6 +2,7 @@ import { remote, ipcRenderer } from 'electron';
 import { error } from 'electron-log';
 import { join } from 'path';
 import { useSelector } from 'react-redux';
+import config from '../../../../shared/config';
 import { useDownloadQueue } from '../../../Providers/downloadManager';
 import { useSetTheme } from '../../../Providers/ThemeProvider';
 import { saveThemeAccentColor, setImportMethod, setOsuSongsPath, setOsuPath } from '../reducer/actions';
@@ -19,6 +20,15 @@ const checkOsuPath = async path => {
   }
 };
 
+const isDirectory = async path => {
+  try {
+    const isDir = await ipcRenderer.invoke('is-dir', path);
+    return !!isDir;
+  } catch (e) {
+    return false;
+  }
+};
+
 const useSettingsUtils = ({ osuSongsPath, importMethod }) => {
   const { setPath } = useDownloadQueue();
   const { setAccentColor } = useSetTheme();
@@ -41,7 +51,11 @@ const useSettingsUtils = ({ osuSongsPath, importMethod }) => {
         }
         setOsuPath(filePaths[0]);
         if (!currentOsuSongsPath) {
-          setOsuSongsPath(join(filePaths[0], 'Songs'));
+          const songsPath = join(filePaths[0], 'Songs');
+          if (await isDirectory(songsPath)) {
+            setOsuSongsPath(join(filePaths[0], 'Songs'));
+            setImportMethod(config.settings.importMethod.bulk);
+          }
         }
       }
     }

diff --git a/src/App/modules/common/Beatmap/beatmap.skeleton.jsx b/src/App/modules/common/Beatmap/beatmap.skeleton.jsx
@@ -20,7 +20,7 @@ const useStyle = createUseStyles({
   buttons: {
     margin: '15px auto 0 auto',
     height: '30px',
-    width: '25%',
+    width: '213px',
   },
 });
 

diff --git a/src/electron/ipcMessages.js b/src/electron/ipcMessages.js
@@ -61,3 +61,12 @@ ipcMain.handle('validate-osu-path', async (event, osuPath) => {
     return false;
   }
 });
+
+ipcMain.handle('is-dir', async (event, path) => {
+  try {
+    const isPathValid = await fs.stat(path);
+    return isPathValid.isDirectory();
+  } catch {
+    return false;
+  }
+});