Merge pull request #4 from Plextora/master

Added an "Autodetect folder" button for first run library screen

src/RequestAPI.d.ts

@@ -36,6 +36,7 @@ export type RequestAPI = {
   "queue::shuffle": () => void,
 
   "dir::select": () => Optional<string>,
+  "dir::autoGetOsuSongsDir": () => Optional<string>,
   "dir::submit": (dir: string) => void,
 
   "error::dismissed": () => void,

src/main/router/dir-router.ts

@@ -1,6 +1,7 @@
 import { Router } from '../lib/route-pass/Router';
 import { none, some } from '../lib/rust-like-utils-backend/Optional';
 import { dialog } from 'electron';
+import path from "path";
 
 
 
@@ -19,6 +20,14 @@ Router.respond("dir::select", () => {
   return some(path[0]);
 });
 
+Router.respond("dir::autoGetOsuSongsDir", () => {
+  if (process.env.LOCALAPPDATA === undefined) {
+    return none();
+  }
+
+  return some(path.join(process.env.LOCALAPPDATA, "osu!", "Songs"));
+});
+
 Router.respond("dir::submit", (_evt, dir) => {
   for (let i = 0; i < waitList.length; i++) {
     waitList[i](dir);

src/renderer/src/components/scenes/DirSelectScene.tsx

@@ -1,8 +1,6 @@
 import { createSignal } from 'solid-js';
 import '../../assets/css/scenes/dir-select.css';
 
-
-
 export default function DirSelectScene() {
   const [dir, setDir] = createSignal("")
 
@@ -15,6 +13,15 @@ export default function DirSelectScene() {
     setDir(opt.value);
   }
 
+  const autodetectDir = async () => {
+    const autoGetDir = await window.api.request("dir::autoGetOsuSongsDir");
+    if (autoGetDir.isNone) {
+      return;
+    }
+
+    setDir(autoGetDir.value);
+  }
+
   const submitDir = async () => {
     await window.api.request("dir::submit", dir());
   }
@@ -27,6 +34,7 @@ export default function DirSelectScene() {
           {dir() === "" ? "[No folder selected]" : dir()}
         </code>
         <div class="row">
+          <button onClick={autodetectDir}>Autodetect folder</button>
           <button onClick={selectDir}>Select folder</button>
           <button onClick={submitDir}>Submit</button>
         </div>