osu-play 1.3.1 → 1.3.3

package/dist/cli.js

@@ -29,8 +29,33 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/core/utils/mod.ts
+var exports_mod = {};
+__export(exports_mod, {
+  revealFile: () => revealFile,
+  hashedFilePath: () => hashedFilePath,
+  getRealmDBPath: () => getRealmDBPath,
+  getDefaultOsuDataDir: () => getDefaultOsuDataDir,
+  getDefaultConfigPath: () => getDefaultConfigPath,
+  getDataDir: () => getDataDir,
+  getConfigDir: () => getConfigDir
+});
 import path from "node:path";
 import { existsSync } from "node:fs";
+import { spawn } from "node:child_process";
+function revealFile(filePath) {
+  const command = process.platform === "darwin" ? { args: ["-R", filePath], executable: "open" } : process.platform === "win32" ? { args: ["/select,", filePath], executable: "explorer.exe" } : { args: [path.dirname(filePath)], executable: "xdg-open" };
+  return new Promise((resolve, reject) => {
+    const child = spawn(command.executable, command.args, {
+      detached: true,
+      stdio: "ignore"
+    });
+    child.once("error", reject);
+    child.once("spawn", () => {
+      child.unref();
+      resolve();
+    });
+  });
+}
 function getDataDir() {
   switch (process.platform) {
     case "linux":
@@ -400,8 +425,8 @@ var init_mod2 = __esm(() => {
 });
 
 // src/core/lazer/mod.ts
-var exports_mod = {};
-__export(exports_mod, {
+var exports_mod2 = {};
+__export(exports_mod2, {
   inspectLazerSchemaEntries: () => inspectLazerSchemaEntries,
   inspectLazerSchema: () => inspectLazerSchema,
   hashedFilePath: () => hashedFilePath,
@@ -540,7 +565,7 @@ function buildPlaylist(beatmapSets, osuDataDir) {
 }
 
 // src/core/player/mpv.ts
-import { spawn } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 import { existsSync as existsSync2, rmSync } from "node:fs";
 import net from "node:net";
 import os from "node:os";
@@ -695,7 +720,7 @@ class MpvPlayerBackend {
     this.cleanupSocketPath();
     this.disposing = false;
     this.stderrBuffer = "";
-    const processHandle = spawn("mpv", [
+    const processHandle = spawn2("mpv", [
       "--no-config",
       "--no-terminal",
       "--idle=yes",
@@ -974,6 +999,13 @@ function findTrackIndexByQuery(playlist, query) {
   }
   return playlist.findIndex((track) => normalizeSearchText(track.title).includes(normalizedQuery));
 }
+function findTrackIndicesByQuery(playlist, query) {
+  const normalizedQuery = normalizeSearchText(query);
+  if (!normalizedQuery) {
+    return playlist.map((_, index) => index);
+  }
+  return playlist.flatMap((track, index) => normalizeSearchText(track.title).includes(normalizedQuery) ? [index] : []);
+}
 
 class PlaylistPlayerSession {
   backend;
@@ -984,6 +1016,7 @@ class PlaylistPlayerSession {
   deleteTrack;
   playlist;
   reloadPlaylist;
+  revealTrack;
   searchQuery = "";
   selectedIndex = 0;
   operationQueue = Promise.resolve();
@@ -994,6 +1027,7 @@ class PlaylistPlayerSession {
     this.deleteTrack = options.deleteTrack;
     this.loop = options.loop ?? false;
     this.reloadPlaylist = options.reloadPlaylist;
+    this.revealTrack = options.revealTrack;
     this.unsubscribeBackend = backend.subscribe((event) => {
       this.handleBackendEvent(event);
     });
@@ -1034,24 +1068,44 @@ class PlaylistPlayerSession {
     if (this.playlist.length === 0) {
       return;
     }
+    if (this.searchQuery) {
+      this.moveSearchSelection(delta);
+      return;
+    }
     this.selectedIndex = wrapIndex(this.selectedIndex + delta, this.playlist.length);
     this.emit();
   }
   moveSelectionPage(delta, pageSize) {
+    if (this.searchQuery) {
+      this.moveSearchSelection(delta * Math.max(1, pageSize));
+      return;
+    }
     this.moveSelection(delta * Math.max(1, pageSize));
   }
+  moveSearchSelection(delta) {
+    const matches = findTrackIndicesByQuery(this.playlist, this.searchQuery);
+    if (matches.length === 0) {
+      return;
+    }
+    const currentMatchIndex = matches.indexOf(this.selectedIndex);
+    const nextMatchIndex = wrapIndex(currentMatchIndex + delta, matches.length);
+    this.selectedIndex = matches[nextMatchIndex] ?? this.selectedIndex;
+    this.emit();
+  }
   selectHome() {
     if (this.playlist.length === 0) {
       return;
     }
-    this.selectedIndex = 0;
+    const matches = findTrackIndicesByQuery(this.playlist, this.searchQuery);
+    this.selectedIndex = matches[0] ?? 0;
     this.emit();
   }
   selectEnd() {
     if (this.playlist.length === 0) {
       return;
     }
-    this.selectedIndex = this.playlist.length - 1;
+    const matches = findTrackIndicesByQuery(this.playlist, this.searchQuery);
+    this.selectedIndex = matches.at(-1) ?? this.playlist.length - 1;
     this.emit();
   }
   setSelectionIndex(index) {
@@ -1157,6 +1211,22 @@ class PlaylistPlayerSession {
       }
     });
   }
+  async revealSelectedTrack() {
+    const track = this.playlist[this.selectedIndex];
+    if (!track) {
+      return;
+    }
+    if (!this.revealTrack) {
+      this.reportError(new Error("Opening the containing folder is unavailable."));
+      return;
+    }
+    try {
+      this.clearError();
+      await this.revealTrack(track);
+    } catch (error) {
+      this.reportError(error);
+    }
+  }
   async deleteSelectedTrack() {
     const selectedIndex = this.selectedIndex;
     await this.enqueueOperation(async () => {
@@ -1463,6 +1533,10 @@ class PlaylistPlayerScreen {
       this.session.toggleLoop();
       return;
     }
+    if (matchesKey(data, "o")) {
+      this.session.revealSelectedTrack();
+      return;
+    }
     if (matchesKey(data, Key.backspace)) {
       this.session.deleteSearchCharacter();
       return;
@@ -1474,9 +1548,11 @@ class PlaylistPlayerScreen {
   }
   render(width) {
     const { playlist } = this.snapshot;
+    const visibleIndices = this.snapshot.searchQuery ? findTrackIndicesByQuery(playlist, this.snapshot.searchQuery) : playlist.map((_, index) => index);
+    const selectedVisibleIndex = Math.max(0, visibleIndices.indexOf(this.snapshot.selectedIndex));
     const viewportHeight = Math.max(this.getViewportHeight(), RESERVED_ROWS);
     const listHeight = this.getListHeight(viewportHeight);
-    const { start, end } = getVisibleTrackRange(this.snapshot.selectedIndex, playlist.length, listHeight);
+    const { start, end } = getVisibleTrackRange(selectedVisibleIndex, visibleIndices.length, listHeight);
     const position = formatSeconds(this.snapshot.timePositionSeconds);
     const duration = formatSeconds(this.snapshot.durationSeconds);
     const glyph = STATUS_GLYPH[this.snapshot.status] ?? "·";
@@ -1498,8 +1574,14 @@ class PlaylistPlayerScreen {
     }
     if (playlist.length === 0) {
       lines.push(truncateToWidth("No tracks were found in your osu!lazer library.", width));
+    } else if (visibleIndices.length === 0) {
+      lines.push(truncateToWidth("No tracks match the current search.", width));
     } else {
-      for (let index = start;index < end; index += 1) {
+      for (let visibleIndex = start;visibleIndex < end; visibleIndex += 1) {
+        const index = visibleIndices[visibleIndex];
+        if (index === undefined) {
+          continue;
+        }
         const track = playlist[index];
         if (!track) {
           continue;
@@ -1514,7 +1596,7 @@ class PlaylistPlayerScreen {
     while (lines.length < viewportHeight - 1) {
       lines.push("");
     }
-    lines.push(truncateToWidth(style(this.searchMode ? "type to jump · backspace edit · enter keep · esc leave" : "j/k move · ⏎ play · space pause · n/p track · h/l seek · r loop · d delete · / search · q quit", DIM), width));
+    lines.push(truncateToWidth(style(this.searchMode ? "type to filter · ↑/↓ results · enter play · backspace edit · esc leave" : "j/k move · ⏎ play · space pause · n/p track · h/l seek · o reveal · r loop · d delete · / search · q quit", DIM), width));
     return lines;
   }
   armPendingGoToTop() {
@@ -1556,6 +1638,7 @@ class PlaylistPlayerScreen {
     }
     if (matchesKey(data, Key.enter)) {
       this.searchMode = false;
+      this.session.playSelected();
       return;
     }
     if (matchesKey(data, Key.escape)) {
@@ -1570,8 +1653,16 @@ class PlaylistPlayerScreen {
       this.session.clearSearch();
       return;
     }
+    if (matchesKey(data, Key.up) || matchesKey(data, Key.ctrl("p"))) {
+      this.session.moveSearchSelection(-1);
+      return;
+    }
+    if (matchesKey(data, Key.down) || matchesKey(data, Key.ctrl("n"))) {
+      this.session.moveSearchSelection(1);
+      return;
+    }
     const printable = decodePrintableText(data);
-    if (!printable || printable === " ") {
+    if (!printable) {
       return;
     }
     this.session.appendSearchQuery(printable);
@@ -1614,7 +1705,7 @@ async function loadRealmDependencies() {
   try {
     const [{ default: Realm8 }, lazerModule] = await Promise.all([
       import("realm"),
-      Promise.resolve().then(() => (init_mod3(), exports_mod))
+      Promise.resolve().then(() => (init_mod3(), exports_mod2))
     ]);
     return {
       Realm: Realm8,
@@ -1679,11 +1770,13 @@ async function deleteTrackFromCollection(track, osuDataDir) {
   await deleteBeatmapSet2(track, osuDataDir);
 }
 async function runTuiPlayer(playlist, osuDataDir, loop) {
+  const { revealFile: revealFile2 } = await Promise.resolve().then(() => (init_mod(), exports_mod));
   const backend = new MpvPlayerBackend;
   const session = new PlaylistPlayerSession(playlist, backend, {
     deleteTrack: (track) => deleteTrackFromCollection(track, osuDataDir),
     loop,
-    reloadPlaylist: () => createPlaylist(osuDataDir)
+    reloadPlaylist: () => createPlaylist(osuDataDir),
+    revealTrack: (track) => revealFile2(track.path)
   });
   const terminal = new ProcessTerminal;
   const tui = new TUI(terminal);
@@ -1742,4 +1835,4 @@ main().then(() => {
   process.exit(1);
 });
 
-//# debugId=2535B39351F13C9664756E2164756E21
+//# debugId=E1B92021231DEE2064756E2164756E21