Add Lazer Support

package.json

@@ -39,6 +39,8 @@
     "lucide-solid": "^0.452.0",
     "node-addon-api": "^8.2.1",
     "polished": "^4.3.1",
+    "realm": "~12.6.2",
+    "remixicon": "^4.3.0",
     "sharp": "^0.33.5",
     "solid-focus-trap": "^0.1.7",
     "tailwind-merge": "^2.5.3"

src/RequestAPI.d.ts

@@ -15,6 +15,7 @@ import type {
 } from "./@types";
 import type { SearchQuery } from "./main/lib/search-parser/@search-types";
 import type { ConfigError, ConfigSuccess } from "./main/lib/template-parser/parser/TemplateParser";
+import { OsuDirectory } from "./main/router/dir-router";
 
 export type RequestAPI = {
   "resource::get": (
@@ -37,11 +38,11 @@ export type RequestAPI = {
   "queue::create": (payload: QueueCreatePayload) => void;
   "queue::shuffle": () => void;
 
-  "dir::select": () => Optional<string>;
-  "dir::autoGetOsuDir": () => Optional<string>;
-  "dir::submit": (dir: string) => void;
+  "dir::select": () => Optional<OsuDirectory>;
+  "dir::autoGetOsuDirs": () => Optional<OsuDirectory[]>;
+  "dir::submit": (dir: OsuDirectory) => void;
 
-  "discord::play": (song: Song, duration?: number) => void;
+  "discord::play": (song: Song, length?: number, duration?: number) => void;
   "discord::pause": (song: Song) => void;
 
   "error::dismissed": () => void;

src/main/lib/osu-file-parser/LazerTypes.ts

@@ -0,0 +1,67 @@
+type BeatmapMetadata = {
+  Title: string;
+  TitleUnicode: string;
+  Artist: string;
+  ArtistUnicode: string;
+  Author: { OnlineID: number; Username: string; CountryCode: string };
+  Source: string;
+  Tags: string;
+  PreviewTime: number;
+  AudioFile: string;
+  BackgroundFile: string;
+};
+
+export type Beatmap = {
+  ID: Realm.BSON.UUID;
+  DifficultyName: string;
+  Metadata: BeatmapMetadata;
+  BeatmapSet: BeatmapSet;
+  Status: number;
+  OnlineID: number;
+  Length: number;
+  BPM: number;
+  Hash: string;
+  StarRating: number;
+  MD5Hash: string;
+  OnlineMD5Hash: string;
+  LastLocalUpdate: string | null;
+  LastOnlineUpdate: string | null;
+  Hidden: boolean;
+  EndTimeObjectCount: number;
+  TotalObjectCount: number;
+  AudioLeadIn: number;
+  StackLeniency: number;
+  SpecialStyle: boolean;
+  LetterboxInBreaks: boolean;
+  WidescreenStoryboard: boolean;
+  EpilepsyWarning: boolean;
+  SamplesMatchPlaybackRate: boolean;
+  LastPlayed: string | null;
+  DistanceSpacing: number;
+  BeatDivisor: number;
+  GridSize: number;
+  TimelineZoom: number;
+  EditorTimestamp: number;
+  CountdownOffset: number;
+};
+
+type RealmFile = {
+  File: {
+    Hash: string;
+  };
+  Filename: string;
+};
+
+export type BeatmapSet = {
+  ID: Realm.BSON.UUID;
+  OnlineID: number;
+  DateAdded: string;
+  DateSubmitted: string;
+  DateRanked: string | null;
+  Beatmaps: Beatmap[];
+  Status: number;
+  DeletePending: boolean;
+  Hash: string;
+  Protected: boolean;
+  Files: RealmFile[];
+};

src/main/lib/osu-file-parser/OsuParser.ts

@@ -1,12 +1,14 @@
+import fs from "graceful-fs";
+import os from "os";
+import path from "path/posix";
+import readline from "readline";
+import Realm from "realm";
 import { AudioSource, ImageSource, ResourceID, Result, Song } from "../../../@types";
 import { access } from "../fs-promises";
 import { fail, ok } from "../rust-like-utils-backend/Result";
 import { assertNever } from "../tungsten/assertNever";
+import { Beatmap, BeatmapSet } from "./LazerTypes";
 import { OsuFile } from "./OsuFile";
-import fs from "graceful-fs";
-import os from "os";
-import path from "path/posix";
-import readline from "readline";
 
 const bgFileNameRegex = /.*"(?<!Video.*)(.*)".*/;
 const beatmapSetIDRegex = /([0-9]+) .*/;
@@ -32,9 +34,6 @@ export type DirParseResult = Promise<
   Result<[Table<Song>, Table<AudioSource>, Table<ImageSource>], string>
 >;
 
-// Overriding Buffer prototype because I'm lazy.
-// Should probably get moved to another file, or make a wrapper instead.
-
 class BufferReader {
   buffer: Buffer;
   pos: number;
@@ -112,8 +111,123 @@ class BufferReader {
   }
 }
 
+// TODO: Add all diffs of same song to beatmap
+function removeUnoriginalBeatmaps(maps: Beatmap[]): Beatmap[] {
+  const mp3List: string[] = [];
+  const finalMaps: Beatmap[] = [];
+
+  for (const map of maps) {
+    if (mp3List.includes(map.Metadata.AudioFile)) {
+      continue;
+    }
+
+    mp3List.push(map.Metadata.AudioFile);
+    finalMaps.push(map);
+  }
+
+  return finalMaps;
+}
 export class OsuParser {
-  static async parseDatabase(
+  static async parseLazerDatabase(
+    databasePath: string,
+    update?: (i: number, total: number, file: string) => any,
+  ): DirParseResult {
+    const currentDir = databasePath.replaceAll("\\", "/");
+
+    const realm = await Realm.open({
+      path: currentDir + "/client.realm",
+      readOnly: true,
+      schemaVersion: 23,
+    });
+    const beatmapSets = realm.objects<BeatmapSet>("BeatmapSet");
+
+    const songTable = new Map<ResourceID, Song>();
+    const audioTable = new Map<ResourceID, AudioSource>();
+    const imageTable = new Map<ResourceID, ImageSource>();
+
+    let i = 0;
+    for (const beatmapSet of beatmapSets) {
+      try {
+        const beatmaps = removeUnoriginalBeatmaps(beatmapSet.Beatmaps);
+
+        for (const beatmap of beatmaps) {
+          try {
+            const song: Song = {
+              audio: "",
+              osuFile: "",
+              path: "",
+              ctime: "",
+              dateAdded: beatmapSet.DateAdded,
+              title: beatmap.Metadata.Title,
+              artist: beatmap.Metadata.Artist,
+              creator: beatmap.Metadata.Author.Username,
+              bpm: [],
+              duration: beatmap.Length,
+              diffs: [beatmap.DifficultyName],
+            };
+
+            song.osuFile = path.join(
+              currentDir,
+              "files",
+              beatmap.Hash[0],
+              beatmap.Hash.substring(0, 2),
+              beatmap.Hash,
+            );
+
+            const songHash = beatmapSet.Files.find(
+              (file) => file.Filename.toLowerCase() === beatmap.Metadata.AudioFile.toLowerCase(),
+            )?.File.Hash;
+
+            if (songHash) {
+              song.audio = path.join(
+                currentDir,
+                "files",
+                songHash[0],
+                songHash.substring(0, 2),
+                songHash,
+              );
+            }
+
+            /* Note: in lots of places throughout the application, it relies on the song.path parameter, which in the
+            stable parser is the path of the folder that holds all the files. This folder doesn't exist in lazer's
+            file structure, so for now I'm just passing the audio location as the path parameter. In initial testing
+            this doesn't seem to break anything but just leaving this note in case it does */
+            song.path = song.audio;
+
+            const bgHash = beatmapSet.Files.find(
+              (file) => file.Filename === beatmap.Metadata.BackgroundFile,
+            )?.File.Hash;
+
+            if (bgHash) {
+              song.bg = path.join(currentDir, "files", bgHash[0], bgHash.substring(0, 2), bgHash);
+            }
+
+            song.beatmapSetID = beatmapSet.OnlineID;
+
+            songTable.set(song.audio, song);
+            audioTable.set(song.audio, {
+              songID: song.audio,
+              path: song.audio,
+              ctime: String(beatmapSet.DateAdded),
+            });
+
+            if (update) {
+              update(i + 1, beatmapSets.length, song.title);
+              i++;
+            }
+          } catch (err) {
+            console.error("Error while parsing beatmap: ", err);
+          }
+        }
+      } catch (err) {
+        console.error("Error while parsing beatmapset: ", err);
+      }
+    }
+
+    return ok([songTable, audioTable, imageTable]);
+  }
+
+  static async parseStableDatabase(
     databasePath: string,
     update?: (i: number, total: number, file: string) => any,
   ): DirParseResult {
@@ -300,11 +414,11 @@ export class OsuParser {
         db.readInt(); // last edit time
         db.readByte(); // mania scroll speed
 
-        const audioFilePath = songsFolderPath + "/" + folder + "/" + audio_filename;
-        const osuFilePath = songsFolderPath + "/" + folder + "/" + osu_filename;
+        const audioFilePath = path.join(songsFolderPath, folder, audio_filename);
+        const osuFilePath = path.join(songsFolderPath, folder, osu_filename);
         song.osuFile = osuFilePath;
         song.audio = audioFilePath;
-        song.path = songsFolderPath + "/" + folder;
+        song.path = path.join(songsFolderPath, folder);
 
         // Check if the song has already been processed, and add the diff name to the existing song if so
         const existingSong = songTable.get(audioFilePath);
@@ -320,7 +434,9 @@ export class OsuParser {
         }
 
         const bgSrc = osuFile.value.props.get("bgSrc");
-        song.bg = songsFolderPath + "/" + folder + "/" + bgSrc;
+        if (bgSrc) {
+          song.bg = path.join(songsFolderPath, folder, bgSrc);
+        }
 
         if (song.audio != last_audio_filepath) {
           songTable.set(song.audio, song);

src/main/main.ts

@@ -1,3 +1,4 @@
+import { BrowserWindow } from "electron";
 import { DirParseResult, OsuParser } from "./lib/osu-file-parser/OsuParser";
 import { Router } from "./lib/route-pass/Router";
 import { orDefault } from "./lib/rust-like-utils-backend/Optional";
@@ -7,7 +8,6 @@ import { throttle } from "./lib/throttle";
 import { dirSubmit } from "./router/dir-router";
 import { showError } from "./router/error-router";
 import "./router/import";
-import { BrowserWindow } from "electron";
 
 export let mainWindow: BrowserWindow;
 
@@ -17,7 +17,7 @@ export async function main(window: BrowserWindow) {
   const settings = Storage.getTable("settings");
 
   // Deleting osuSongsDir will force initial beatmap import
-  // settings.delete("osuSongsDir");
+  settings.delete("osuSongsDir");
   const osuSongsDir = settings.get("osuSongsDir");
 
   if (osuSongsDir.isNone) {
@@ -54,7 +54,7 @@ async function configureOsuDir(mainWindow: BrowserWindow) {
 
   while (true) {
     await Router.dispatch(mainWindow, "changeScene", "dir-select");
-    const dir = await dirSubmit();
+    const dirData = await dirSubmit();
 
     await Router.dispatch(mainWindow, "changeScene", "loading");
     await Router.dispatch(mainWindow, "loadingScene::setTitle", "Importing songs from osu!");
@@ -68,7 +68,11 @@ async function configureOsuDir(mainWindow: BrowserWindow) {
       });
     }, UPDATE_DELAY_MS);
 
-    tables = await OsuParser.parseDatabase(dir, update);
+    if (dirData.version == "stable") {
+      tables = await OsuParser.parseStableDatabase(dirData.path, update);
+    } else {
+      tables = await OsuParser.parseLazerDatabase(dirData.path, update);
+    }
     // Cancel ongoing throttled update, so it does not look bad when it finishes and afterward the update overwrites
     // finished state
     cancelUpdate();
@@ -82,14 +86,14 @@ async function configureOsuDir(mainWindow: BrowserWindow) {
     if (tables.value[SONGS].size === 0) {
       await showError(
         mainWindow,
-        `No songs found in folder: ${dir}. Please make sure this is the directory where you have all your songs saved.`,
+        `No songs found in folder: ${dirData.path}. Please make sure this is the directory where you have all your songs saved.`,
       );
       // Try again
       continue;
     }
 
     // All went smoothly. Save osu directory and continue with import procedure
-    settings.write("osuSongsDir", dir);
+    settings.write("osuSongsDir", dirData.path);
     break;
   }