Merge pull request #111 from xDalete/master

Bug fixes + Delete song data option

Author: CaptSiro

src/main/index.ts

@@ -1,5 +1,4 @@
 import { electronApp, is, optimizer } from "@electron-toolkit/utils";
-import { Router } from "@main/lib/route-pass/Router";
 import createMenu from "@main/lib/window/menu";
 import trackBounds, { getBounds, wasMaximized } from "@main/lib/window/resizer";
 import { main } from "@main/main";
@@ -60,14 +59,6 @@ async function createWindow() {
     window.focus();
   });
 
-  window.on("maximize", () => {
-    Router.dispatch(window, "window::maximizeChange", true);
-  });
-
-  window.on("unmaximize", () => {
-    Router.dispatch(window, "window::maximizeChange", false);
-  });
-
   if (wasMaximized()) {
     window.maximize();
   }
@@ -76,7 +67,6 @@ async function createWindow() {
 
   window.on("ready-to-show", async () => {
     window.show();
-    await Router.dispatch(window, "changeScene", "main");
   });
 
   // HMR for renderer base on electron-vite cli.

src/main/main.ts

@@ -23,7 +23,7 @@ export async function main(window: BrowserWindow) {
   if (osuSongsDir.isNone) {
     await configureOsuDir(window);
   } else {
-    //todo check for updates in song files
+    //TODO: check for updates in song files
   }
 
   const songsArray = Object.values(Storage.getTable("songs").getStruct());

src/main/router/discord-router.ts

@@ -3,9 +3,11 @@ import { Client, SetActivity } from "@xhayper/discord-rpc";
 
 const client = new Client({ clientId: "1292942523425099826" });
 
-client.on("ready", () => client.user?.setActivity(defaultPresence));
+client.on("ready", () =>
+  client.user?.setActivity(defaultPresence).catch(catchDiscordActivityError),
+);
 
-client.login();
+client.login().catch(catchDiscordActivityError);
 
 const defaultPresence: SetActivity = {
   details: "Idle",
@@ -44,7 +46,7 @@ Router.respond("discord::play", async (_evt, song, length, position) => {
     });
   }
 
-  client.user?.setActivity(presence);
+  client.user?.setActivity(presence).catch(catchDiscordActivityError);
 });
 
 Router.respond("discord::pause", async (_evt, song) => {
@@ -73,5 +75,9 @@ Router.respond("discord::pause", async (_evt, song) => {
     });
   }
 
-  client.user?.setActivity(presence);
+  client.user?.setActivity(presence).catch(catchDiscordActivityError);
 });
+
+function catchDiscordActivityError(err: unknown) {
+  console.error("Discord activity error:\n", err);
+}

src/main/router/queue-router.ts

@@ -29,7 +29,7 @@ let lastPayload: QueueCreatePayload | undefined;
 Router.respond("queue::create", async (_evt, payload) => {
   if (comparePayload(payload, lastPayload)) {
     // Payload is practically same. Find start song and play queue from there
-    const newIndex = queue.findIndex((s) => s.path === payload.startSong);
+    const newIndex = queue.findIndex((s) => s.osuFile === payload.startSong);
 
     if (newIndex === -1 || newIndex === index) {
       return;
@@ -58,7 +58,7 @@ Router.respond("queue::create", async (_evt, payload) => {
   }
 
   // Set playing index
-  const songIndex = queue.findIndex((s) => s.path === payload.startSong);
+  const songIndex = queue.findIndex((s) => s.osuFile === payload.startSong);
 
   if (songIndex !== -1) {
     index = songIndex;
@@ -72,7 +72,7 @@ Router.respond("queue::create", async (_evt, payload) => {
 
 function getIndexes(view: QueueView): SongIndex[] {
   if (view.playlists !== undefined) {
-    //todo implement multi playlist playback
+    //TODO: implement multi playlist playback
     return [];
   }
 
@@ -86,7 +86,7 @@ function getIndexes(view: QueueView): SongIndex[] {
   }
 
   if (view.playlist) {
-    //todo get playlist
+    //TODO: get playlist
     return [];
   }
 
@@ -167,11 +167,11 @@ Router.respond("queue::shuffle", async () => {
     return;
   }
 
-  const current = queue[index].path;
+  const current = queue[index].osuFile;
   shuffle(queue);
 
   for (let i = 0; i < queue.length; i++) {
-    if (queue[i].path !== current) {
+    if (queue[i].osuFile !== current) {
       continue;
     }
 
@@ -193,7 +193,7 @@ Router.respond("queue::shuffle", async () => {
 
 Router.respond("queue::place", (_evt, what, after) => {
   // Find index of subject
-  const whatIndex = queue.findIndex((s) => s.path === what);
+  const whatIndex = queue.findIndex((s) => s.osuFile === what);
 
   if (whatIndex === -1) {
     return;
@@ -220,7 +220,7 @@ Router.respond("queue::place", (_evt, what, after) => {
     return;
   }
 
-  const afterIndex = queue.findIndex((s) => s.path === after);
+  const afterIndex = queue.findIndex((s) => s.osuFile === after);
 
   if (afterIndex === -1) {
     // After index was not found... put subject back
@@ -249,7 +249,7 @@ Router.respond("queue::place", (_evt, what, after) => {
 
 Router.respond("queue::play", async (_evt, song) => {
   // Point currently playing index to given song
-  const newIndex = queue.findIndex((s) => s.path === song);
+  const newIndex = queue.findIndex((s) => s.osuFile === song);
 
   if (newIndex === -1 || newIndex === index) {
     return;
@@ -264,7 +264,7 @@ Router.respond("queue::playNext", async (_evt, song) => {
     return;
   }
 
-  const songIndex = queue.findIndex((s) => s.path === song);
+  const songIndex = queue.findIndex((s) => s.osuFile === song);
 
   if (songIndex === index) {
     return;
@@ -297,7 +297,7 @@ Router.respond("queue::removeSong", async (_evt, what) => {
     return;
   }
 
-  const whatIndex = queue.findIndex((s) => s.path === what);
+  const whatIndex = queue.findIndex((s) => s.osuFile === what);
 
   if (whatIndex === -1) {
     return;

src/main/router/resource-router.ts

@@ -17,7 +17,7 @@ Router.respond("resource::getPath", (_evt, path) => {
     return fail("Could not provide absolute path because osu! Songs folder is undefined.");
   }
 
-  // todo User may have spaces in osuDir if they are not using default path. Ensure that the whole path is valid URL
+  //TODO: User may have spaces in osuDir if they are not using default path. Ensure that the whole path is valid URL
   return ok(pathToFileURL(path).href);
 });
 

src/main/router/settings-router.ts

@@ -1,5 +1,6 @@
 import { Router } from "@main/lib/route-pass/Router";
 import { Storage } from "@main/lib/storage/Storage";
+import { app } from "electron";
 import os from "os";
 
 Router.respond("settings::get", (_evt, key) => {
@@ -10,6 +11,19 @@ Router.respond("settings::write", (_evt, key, value) => {
   Storage.getTable("settings").write(key, value);
 });
 
+Router.respond("settings::DeleteSongData", () => {
+  Storage.getTable("settings").delete("osuSongsDir");
+  Storage.removeTable("songs");
+  Storage.removeTable("audio");
+  Storage.removeTable("images");
+  Storage.removeTable("system");
+});
+
 Router.respond("os::platform", () => {
   return os.platform();
 });
+
+Router.respond("app::restart", () => {
+  app.relaunch();
+  app.quit();
+});

src/renderer/src/components/button/Button.tsx

@@ -1,27 +1,36 @@
 import { cva, type VariantProps } from "class-variance-authority";
 import { Component, JSX, splitProps } from "solid-js";
 
-const buttonStyles = cva(["rounded-lg transition-colors duration-200 ease font-medium"], {
-  variants: {
-    variant: {
-      primary: "bg-text text-thick-material hover:bg-text/80",
-      secondary: "bg-surface text-text hover:bg-surface/40 border-stroke border border-solid",
-      outlined: "bg-transparent border-stroke text-text hover:bg-surface border border-solid",
-      ghost: "border-transparent hover:bg-surface",
-      link: "bg-transparent text-text hover:underline text-decoration-2 underline-offset-2",
+const buttonStyles = cva(
+  ["rounded-lg transition-colors duration-200 ease font-medium cursor-pointer"],
+  {
+    variants: {
+      variant: {
+        primary: "bg-text text-thick-material hover:bg-text/80",
+        secondary: "bg-surface text-text hover:bg-surface/40 border-stroke border border-solid",
+        outlined: "bg-transparent border-stroke text-text hover:bg-surface border border-solid",
+        ghost: "border-transparent hover:bg-surface",
+        link: "bg-transparent text-text hover:underline text-decoration-2 underline-offset-2",
+        "danger-outlined":
+          "bg-transparent text-danger border border-solid border-danger hover:text-text hover:bg-danger",
+      },
+      size: {
+        medium: "px-4 py-2",
+        large: "px-7 py-2.5",
+        icon: "grid place-items-center aspect-square size-9 p-1 -m-2",
+        square: "grid place-items-center aspect-square h-10",
+      },
+      disabled: {
+        true: "opacity-50 !cursor-default",
+        false: "",
+      },
     },
-    size: {
-      medium: "px-4 py-2",
-      large: "px-7 py-2.5",
-      icon: "grid place-items-center aspect-square size-9 p-1 -m-2",
-      square: "grid place-items-center aspect-square h-10",
+    defaultVariants: {
+      variant: "primary",
+      size: "medium",
     },
   },
-  defaultVariants: {
-    variant: "primary",
-    size: "medium",
-  },
-});
+);
 
 type ButtonProps = JSX.ButtonHTMLAttributes<HTMLButtonElement> & VariantProps<typeof buttonStyles>;
 
@@ -30,7 +39,12 @@ const Button: Component<ButtonProps> = (props) => {
 
   return (
     <button
-      class={buttonStyles({ variant: local.variant, size: local.size, class: local.class })}
+      class={buttonStyles({
+        variant: local.variant,
+        size: local.size,
+        class: local.class,
+        disabled: props.disabled,
+      })}
       {...others}
     >
       {local.children}

src/renderer/src/components/dropdown-list/DropdownListItem.tsx

@@ -1,5 +1,6 @@
 import { RawList } from "../raw-list/RawList";
 import { useDropdownList } from "./DropdownList";
+import { cn } from "@renderer/lib/css.utils";
 import { Component, onCleanup } from "solid-js";
 import { JSX } from "solid-js/jsx-runtime";
 
@@ -24,6 +25,7 @@ const DropdownListItem: Component<Props> = (props) => {
       }}
       {...attrs}
       {...props}
+      class={cn("cursor-pointer", props.class)}
     />
   );
 };

src/renderer/src/components/notice/NoticeAnimations.ts

@@ -28,7 +28,7 @@ export const noticeAnimations = {
   },
   animation: {
     "notice-slide-in": "notice-slide-in 300ms cubic-bezier(0.4, 0, 0.2, 1) forwards",
-    // TODO: Make this 3000ms configurable
+    //TODO: Make this 3000ms configurable
     "notice-progress": "notice-progress 3000ms linear",
     "notice-slide-out": "notice-slide-out 300ms cubic-bezier(0.4, 0, 0.2, 1) forwards",
   },

src/renderer/src/components/select/Select.tsx

@@ -28,7 +28,7 @@ export const SelectTrigger: ParentComponent<Props> = (_props) => {
       {...rest}
       class={cn(
         inputStyles({ variant: props.variant, class: props.class }),
-        "box-border flex h-auto min-h-[42px] items-center justify-between gap-2 hover:bg-surface data-[open='true']:bg-surface",
+        "box-border flex h-auto min-h-[42px] cursor-pointer items-center justify-between gap-2 hover:bg-surface data-[open='true']:bg-surface",
       )}
     >
       <span class="text-base leading-6">{props.children}</span>