@audiofool/moondog 0.3.0-beta.6 → 0.3.0-beta.8

package/src/i18n/screen/es.mjs

@@ -874,6 +874,7 @@ export default {
   "See what you're listening to": "Ver lo que escuchas",
   "Control the Music app": "Controlar la app Música",
   "Choose a music service": "Elegir un servicio de música",
+  "Read or change Moondog's settings": "Ver o cambiar los ajustes de Moondog",
   "Search outside your library": "Buscar fuera de tu biblioteca",
   "Find music nearby": "Buscar música cercana",
   "Remember what you've told me": "Recordar lo que me has dicho",
@@ -1118,4 +1119,21 @@ export default {
   "downloading the model": "descargando el modelo",
   "checking the files": "comprobando los archivos",
   "Stable Audio 3's Python environment couldn't be set up. Check your connection, then use /generation download to try again.": "No se pudo preparar el entorno de Python de Stable Audio 3. Revisa tu conexión y usa /generation download para intentarlo de nuevo.",
+  "The library isn't available here.": "La biblioteca no está disponible aquí.",
+  "Saved": "Guardadas",
+  "Play one with `/library play <name>`, or keep the song playing now with `/library save`.": "Reproduce una con `/library play <nombre>` o guarda lo que suena con `/library save`.",
+  "No playlist is called “{name}”.": "No hay ninguna lista llamada “{name}”.",
+  "{name} has nothing in it yet.": "{name} aún no tiene nada.",
+  "None of its songs could be found.": "No se encontró ninguna de sus canciones.",
+  "Playing {name}.": "Reproduciendo {name}.",
+  "Moondog's tracks were left out. They play with Apple Music chosen.": "Las pistas de Moondog se quedaron fuera. Suenan con Apple Music elegido.",
+  "Some songs couldn't be found.": "No se encontraron algunas canciones.",
+  "Already in {name}.": "Ya está en {name}.",
+  "Saved.": "Guardada.",
+  "Saved to {name}.": "Guardada en {name}.",
+  "Use /library, /library play <name>, or /library save [playlist].": "Usa /library, /library play <nombre> o /library save [lista].",
+  "Your saved songs and playlists": "Tus canciones guardadas y tus listas",
+  "Look in the library": "Mirar en la biblioteca",
+  "Save to the library": "Guardar en la biblioteca",
+  "Play from the library": "Reproducir de la biblioteca",
 };

package/src/i18n/screen/ja.mjs

@@ -874,6 +874,7 @@ export default {
   "See what you're listening to": "聴いている曲を確認",
   "Control the Music app": "ミュージックAppを操作",
   "Choose a music service": "音楽サービスを選ぶ",
+  "Read or change Moondog's settings": "Moondog の設定を確認・変更",
   "Search outside your library": "ライブラリの外を探す",
   "Find music nearby": "近い音楽を探す",
   "Remember what you've told me": "教えてもらったことを覚える",
@@ -1118,4 +1119,21 @@ export default {
   "downloading the model": "モデルをダウンロード中",
   "checking the files": "ファイルを確認中",
   "Stable Audio 3's Python environment couldn't be set up. Check your connection, then use /generation download to try again.": "Stable Audio 3 の Python 環境を準備できませんでした。接続を確かめてから、/generation download でやり直してください。",
+  "The library isn't available here.": "ここではライブラリを使えません。",
+  "Saved": "保存済み",
+  "Play one with `/library play <name>`, or keep the song playing now with `/library save`.": "`/library play <名前>` で再生するか、`/library save` で再生中の曲を保存してください。",
+  "No playlist is called “{name}”.": "「{name}」というプレイリストはありません。",
+  "{name} has nothing in it yet.": "{name} にはまだ何もありません。",
+  "None of its songs could be found.": "曲がひとつも見つかりませんでした。",
+  "Playing {name}.": "{name} を再生しています。",
+  "Moondog's tracks were left out. They play with Apple Music chosen.": "Moondog の曲は再生されませんでした。Apple Music を選ぶと再生されます。",
+  "Some songs couldn't be found.": "見つからない曲がありました。",
+  "Already in {name}.": "すでに「{name}」にあります。",
+  "Saved.": "保存しました。",
+  "Saved to {name}.": "「{name}」に保存しました。",
+  "Use /library, /library play <name>, or /library save [playlist].": "/library、/library play <名前>、または /library save [プレイリスト] を使ってください。",
+  "Your saved songs and playlists": "保存した曲とプレイリスト",
+  "Look in the library": "ライブラリを見る",
+  "Save to the library": "ライブラリに保存",
+  "Play from the library": "ライブラリから再生",
 };

package/src/i18n/screen/pt.mjs

@@ -874,6 +874,7 @@ export default {
   "See what you're listening to": "Ver o que você está ouvindo",
   "Control the Music app": "Controlar o app Música",
   "Choose a music service": "Escolher um serviço de música",
+  "Read or change Moondog's settings": "Ver ou mudar as configurações do Moondog",
   "Search outside your library": "Buscar fora da sua biblioteca",
   "Find music nearby": "Encontrar música parecida",
   "Remember what you've told me": "Lembrar o que você me disse",
@@ -1118,4 +1119,21 @@ export default {
   "downloading the model": "baixando o modelo",
   "checking the files": "conferindo os arquivos",
   "Stable Audio 3's Python environment couldn't be set up. Check your connection, then use /generation download to try again.": "Não foi possível preparar o ambiente Python do Stable Audio 3. Verifique sua conexão e use /generation download para tentar de novo.",
+  "The library isn't available here.": "A biblioteca não está disponível aqui.",
+  "Saved": "Salvas",
+  "Play one with `/library play <name>`, or keep the song playing now with `/library save`.": "Toque uma com `/library play <nome>` ou salve o que está tocando com `/library save`.",
+  "No playlist is called “{name}”.": "Nenhuma playlist se chama “{name}”.",
+  "{name} has nothing in it yet.": "{name} ainda não tem nada.",
+  "None of its songs could be found.": "Nenhuma das músicas foi encontrada.",
+  "Playing {name}.": "Tocando {name}.",
+  "Moondog's tracks were left out. They play with Apple Music chosen.": "As faixas do Moondog ficaram de fora. Elas tocam com o Apple Music escolhido.",
+  "Some songs couldn't be found.": "Algumas músicas não foram encontradas.",
+  "Already in {name}.": "Já está em {name}.",
+  "Saved.": "Salva.",
+  "Saved to {name}.": "Salva em {name}.",
+  "Use /library, /library play <name>, or /library save [playlist].": "Use /library, /library play <nome> ou /library save [playlist].",
+  "Your saved songs and playlists": "Suas músicas salvas e playlists",
+  "Look in the library": "Olhar na biblioteca",
+  "Save to the library": "Salvar na biblioteca",
+  "Play from the library": "Tocar da biblioteca",
 };

package/src/i18n/screen/zh.mjs

@@ -874,6 +874,7 @@ export default {
   "See what you're listening to": "查看你在听什么",
   "Control the Music app": "控制“音乐”App",
   "Choose a music service": "选择音乐服务",
+  "Read or change Moondog's settings": "读取或更改 Moondog 的设置",
   "Search outside your library": "在你的曲库之外搜索",
   "Find music nearby": "找附近的音乐",
   "Remember what you've told me": "记住你告诉我的",
@@ -1118,4 +1119,21 @@ export default {
   "downloading the model": "正在下载模型",
   "checking the files": "正在校验文件",
   "Stable Audio 3's Python environment couldn't be set up. Check your connection, then use /generation download to try again.": "没能准备好 Stable Audio 3 的 Python 环境。检查网络连接，再用 /generation download 重试。",
+  "The library isn't available here.": "这里用不了资料库。",
+  "Saved": "收藏",
+  "Play one with `/library play <name>`, or keep the song playing now with `/library save`.": "用 `/library play <名字>` 播放一个，或者用 `/library save` 收藏正在播放的歌。",
+  "No playlist is called “{name}”.": "没有叫“{name}”的播放列表。",
+  "{name} has nothing in it yet.": "{name} 里还是空的。",
+  "None of its songs could be found.": "里面的歌都没有找到。",
+  "Playing {name}.": "正在播放 {name}。",
+  "Moondog's tracks were left out. They play with Apple Music chosen.": "Moondog 做的曲子没有放。选择 Apple Music 时才会播放它们。",
+  "Some songs couldn't be found.": "有些歌没有找到。",
+  "Already in {name}.": "已经在“{name}”里了。",
+  "Saved.": "已收藏。",
+  "Saved to {name}.": "已收藏到“{name}”。",
+  "Use /library, /library play <name>, or /library save [playlist].": "用 /library、/library play <名字> 或 /library save [播放列表]。",
+  "Your saved songs and playlists": "你收藏的歌和播放列表",
+  "Look in the library": "翻翻资料库",
+  "Save to the library": "收进资料库",
+  "Play from the library": "播放资料库里的歌",
 };

package/src/integrations/apple-music/music-app.mjs

@@ -12,6 +12,8 @@ const READ_TIMEOUT_MS = 15_000;
 // A playlist longer than this is read as a window around the playing song.
 const PLAYLIST_WINDOW = 50;
 const PLAYLIST_BEFORE = 5;
+// Keeping the rest of a playlist reads up to as many songs as a library playlist holds.
+const REST_MAX = 2_000;
 const COLUMN_READ_MAX = 2_000;
 // Covers already drawn, by album, or by song for one without an album.
 const KNOWN_COVERS = 40;
@@ -47,13 +49,15 @@ function run(argv) {
     const playlist = music.currentPlaylist;
     answer.playlist = { id: playlist.persistentID(), name: playlist.name() };
     try { answer.playlist.special = playlist.specialKind(); } catch (error) {}
-    if (action === "tracks") {
+    if (action === "tracks" || action === "rest") {
       const tracks = playlist.tracks;
       const ids = tracks.persistentID();
       answer.playlist.count = ids.length;
       const at = answer.track ? ids.indexOf(answer.track.id) : -1;
-      const start = ids.length <= ${PLAYLIST_WINDOW} || at < 0 ? 0 : Math.max(0, Math.min(at - ${PLAYLIST_BEFORE}, ids.length - ${PLAYLIST_WINDOW}));
-      const end = Math.min(ids.length, start + ${PLAYLIST_WINDOW});
+      // "rest" reads from the playing song to the playlist's end, for keeping it in the library.
+      const start = action === "rest" ? Math.max(0, at)
+        : ids.length <= ${PLAYLIST_WINDOW} || at < 0 ? 0 : Math.max(0, Math.min(at - ${PLAYLIST_BEFORE}, ids.length - ${PLAYLIST_WINDOW}));
+      const end = Math.min(ids.length, start + (action === "rest" ? ${REST_MAX} : ${PLAYLIST_WINDOW}));
       answer.playlist.index = at;
       answer.playlist.start = start;
       answer.playlist.tracks = [];
@@ -197,6 +201,8 @@ export function createMusicAppPlayer({ platform = process.platform, run = osascr
   return {
     available,
     nowPlaying: ({ tracks = false } = {}) => read(tracks ? "tracks" : "read"),
+    // The playing song and the rest of its playlist, past the window nowPlaying reads, for keeping in the library.
+    remainingPlaylist: () => read("rest"),
     pause: () => read("pause"),
     resume: () => read("resume"),
     next: () => read("next"),

package/src/integrations/apple-music/terminal-preview-player.mjs

@@ -19,6 +19,8 @@ const systemPlayers = {
   ],
 };
 const longestQueue = 30;
+// A library playlist plays as many entries as the application sends it, as the window does.
+const longestPlaylist = 50;
 const largestPreview = 10 * 1024 * 1024;
 // Some routes to Apple's audio host take over 20 seconds for one preview.
 const downloadTimeoutMs = 60_000;
@@ -213,13 +215,29 @@ export async function createTerminalPreviewPlayer({
       });
       start(accepted);
     },
+    // A playlist from the listener's library: Apple Music previews and tracks Moondog made, in one queue.
+    // A song is { title, artist_credit, catalog_url, preview_url }; a made track { generated: true, id, title, file }.
+    playList(tracks) {
+      if (closed) return;
+      const accepted = (Array.isArray(tracks) ? tracks : []).map((track) => (track?.generated === true
+        ? { title: String(track.title ?? "").trim(), artist_credit: "", generated: true, id: String(track.id ?? ""),
+          file: typeof track.file === "string" && path.isAbsolute(track.file) ? track.file : null }
+        : { title: String(track?.title ?? "").trim(), artist_credit: String(track?.artist_credit ?? "").trim(),
+          catalog_url: https(track?.catalog_url, linkHost), preview: https(track?.preview_url, previewHost) }))
+        .filter((track) => track.title && (track.generated ? track.file : track.catalog_url && track.preview)).slice(0, longestPlaylist);
+      if (!accepted.length) return;
+      stop();
+      emit({ type: "queue", tracks: accepted.map(({ title, artist_credit, catalog_url, generated, id }) => (generated
+        ? { title, artist_credit: "", generated: true, id } : { title, artist_credit, catalog_url })), album: null });
+      start(accepted);
+    },
     // A track Moondog made on this Mac: { id, title, file }, played whole and kept after it ends.
     playGenerated({ id, title, file } = {}) {
       const name = String(title ?? "").trim();
       if (closed || !name || typeof file !== "string" || !path.isAbsolute(file)) return;
       stop();
       const track = { title: name, artist_credit: "", generated: true, id: String(id ?? "") };
-      emit({ type: "queue", tracks: [{ title: track.title, artist_credit: "", generated: true }], album: null });
+      emit({ type: "queue", tracks: [{ title: track.title, artist_credit: "", generated: true, id: track.id }], album: null });
       start([{ ...track, file }]);
     },
     // A made track queued behind the one playing, as Moondog's stream does; with nothing playing, it plays now.
@@ -228,7 +246,7 @@ export async function createTerminalPreviewPlayer({
       if (closed || !name || typeof file !== "string" || !path.isAbsolute(file)) return;
       if (!queue || !queue.tracks.every((track) => track.generated)) return this.playGenerated({ id, title, file });
       queue.tracks.push({ title: name, artist_credit: "", generated: true, id: String(id ?? ""), file });
-      now.appended({ title: name, generated: true });
+      now.appended({ title: name, generated: true, id: String(id ?? "") });
     },
     // Ends the song now playing, or still loading; the next one starts after it.
     skip() {
@@ -240,6 +258,8 @@ export async function createTerminalPreviewPlayer({
     stop,
     // What plays now, as createPlayerNow reads it: null, or { state, song, position, count, next }.
     nowPlaying: () => (closed ? null : now.read()),
+    // The song playing and every one after it, for keeping the whole queue in the library.
+    remaining: () => (closed ? [] : now.remaining()),
     // Leaving Apple Music stops its previews here, never the tracks Moondog made.
     holdsCatalogSongs: () => Boolean(queue?.tracks.some((track) => !track.generated)),
     subscribe(listener) {

package/src/integrations/spotify/service.mjs

@@ -587,7 +587,8 @@ function refusedMove(error, target, player) {
   const refused = new SpotifyServiceError("spotify_device_refused",
     `Spotify would not move playback to ${clipText(target.name, 80)}, either as a transfer or as a song started there. ` +
     `${stayed ? `Playback stays on ${stayed}${player.is_playing === false ? ", paused" : ""}. ` : ""}` +
-    "The Spotify app on that device usually needs to be open and played once before it accepts remote control.");
+    "The Spotify app on that device usually needs to be open and played once before it accepts remote control. " +
+    "Both ways were already tried, so do not try another way in this turn; tell the listener.");
   refused.status = error?.status;
   refused.playbackStayedOn = stayed;
   return refused;

package/src/integrations/stable-audio/local-generator.mjs

@@ -229,6 +229,8 @@ export function createLocalGenerator({
   arch = process.arch,
   spawnImpl = spawn,
   now = () => new Date(),
+  // Whether the listener's library holds a made track: a stream never drops the audio of one they kept.
+  keeps = () => false,
 } = {}) {
   let current = { state: "unknown", enabled: false, install: "unknown", path: null, source: null, model: DEFAULT_STABLE_AUDIO_MODEL, managed: false };
   let running = null;
@@ -437,6 +439,9 @@ export function createLocalGenerator({
           close(false);
           playing = { id: track.id, heardMs: 0, since: Date.now() };
         } else if (playing.since === null) playing.since = Date.now();
+      } else if (event?.type === "playing" && playing && track && track.generated !== true) {
+        // A song from the catalog after a made track in a library playlist: the made track's play ended there.
+        close(false);
       } else if (event?.type === "paused" && playing && playing.since !== null) {
         playing.heardMs += Date.now() - playing.since;
         playing.since = null;
@@ -452,9 +457,11 @@ export function createLocalGenerator({
     /** Waits for the outcomes still being written, as a room does before it closes. */
     flush: () => Promise.allSettled([...writing]),
     // A replay of the track playing now starts it over; that is not a skip.
-    // A stream keeps only its newest tracks' audio; the receipt and outcomes of the rest stay.
+    // A stream keeps only its newest tracks' audio; the receipt and outcomes of the rest stay. A track in the
+    // listener's library keeps its audio, and a library that can't be read keeps it too.
     async removeAudio(id) {
       if (!isGeneratedTrackId(id)) return;
+      try { if (keeps(id)) return; } catch { return; }
       await rm(path.join(tracksDirectory(), id, "track.wav"), { force: true }).catch(() => {});
       const entry = made.get(id);
       if (entry) entry.audio_kept = false;