Compare commits

...

27 Commits

Author SHA1 Message Date
jeffvli 98b8409592 Update description to include subsonic servers 2024-10-15 03:22:21 -07:00
jeffvli d3480a86c3 Fix release date parsing to use UTC (#794) 2024-10-15 03:15:59 -07:00
jeffvli 3a63ee4b95 Include all playlist types in Jellyfin playlist fetch 2024-10-15 03:04:38 -07:00
jeffvli 876376d65f Update to v0.11.1 2024-10-14 20:26:21 -07:00
Hosted Weblate 215abf615d Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (655 of 655 strings)

Co-authored-by: ENDzZ <godzmichael@outlook.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/zh_Hans/
Translation: feishin/Translation
2024-10-15 04:37:52 +02:00
Hosted Weblate afad2843c6 Translated using Weblate (Spanish)
Currently translated at 100.0% (655 of 655 strings)

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/es/
Translation: feishin/Translation
2024-10-15 04:37:52 +02:00
Hosted Weblate 958ab1f31f Translated using Weblate (Czech)
Currently translated at 100.0% (655 of 655 strings)

Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/cs/
Translation: feishin/Translation
2024-10-15 04:37:51 +02:00
Hosted Weblate 0ca325aac2 Translated using Weblate (Portuguese (Brazil))
Currently translated at 31.1% (204 of 655 strings)

Co-authored-by: Rafael Vieira <rafaelvieiras@pm.me>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/pt_BR/
Translation: feishin/Translation
2024-10-15 04:37:50 +02:00
jeffvli 12b66e5fa0 Convert subsonic coverart property to string (#795) 2024-10-14 19:36:51 -07:00
jeffvli 7e78478fbe Fix combined title cell controls blocking links 2024-10-14 00:38:28 -07:00
jeffvli f783a6360e Update to v0.11.0 2024-10-09 20:04:42 -07:00
Hosted Weblate 8eb6c6a213 Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (653 of 653 strings)

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: 無情天 <kofzhanganguo@126.com>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/zh_Hans/
Translation: feishin/Translation
2024-10-10 03:28:31 +02:00
Hosted Weblate ea5f0268cb Translated using Weblate (Serbian)
Currently translated at 79.0% (516 of 653 strings)

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Reportiv <reportiv@gmx.de>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/sr/
Translation: feishin/Translation
2024-10-10 03:28:31 +02:00
Hosted Weblate 427272f8c8 Translated using Weblate (French)
Currently translated at 100.0% (653 of 653 strings)

Translated using Weblate (French)

Currently translated at 100.0% (653 of 653 strings)

Co-authored-by: Benjamin <iipython@proton.me>
Co-authored-by: D.M <dylan.montigaud@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/fr/
Translation: feishin/Translation
2024-10-10 03:28:31 +02:00
Hosted Weblate 40d09404b3 Translated using Weblate (Spanish)
Currently translated at 100.0% (653 of 653 strings)

Co-authored-by: Benjamin <iipython@proton.me>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/es/
Translation: feishin/Translation
2024-10-10 03:28:31 +02:00
Hosted Weblate f3ee198833 Translated using Weblate (Czech)
Currently translated at 100.0% (653 of 653 strings)

Co-authored-by: Benjamin <iipython@proton.me>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/cs/
Translation: feishin/Translation
2024-10-10 03:28:31 +02:00
Hosted Weblate 5416d6e596 Translated using Weblate (Russian)
Currently translated at 95.7% (625 of 653 strings)

Co-authored-by: Benjamin <iipython@proton.me>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/ru/
Translation: feishin/Translation
2024-10-10 03:28:31 +02:00
Hosted Weblate a0639cbd27 Translated using Weblate (English)
Currently translated at 100.0% (653 of 653 strings)

Co-authored-by: Benjamin <iipython@proton.me>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/en/
Translation: feishin/Translation
2024-10-10 03:28:31 +02:00
Hosted Weblate 790961f29a Translated using Weblate (German)
Currently translated at 87.2% (570 of 653 strings)

Co-authored-by: Achim Walz <achim@aalso-walz.de>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/feishin/translation/de/
Translation: feishin/Translation
2024-10-10 03:28:31 +02:00
jeffvli 18027d4292 Remove current song list index animation (#783) 2024-10-09 18:27:48 -07:00
jeffvli a8b3944c66 Set row play button to switch to song on queue lists 2024-10-09 18:20:04 -07:00
Trevor a00385e78f Add "Move to next" button to queue (#781) 2024-10-09 18:00:25 -07:00
Egor 5e628d96c7 Some fixes to #772 (Add play button to song table) (#784)
* Add play button to song table album cover, like it is in grid

* Fix: play button caused error for albums and artists tables

* Fix: play button caused error for some other tables
2024-10-09 17:40:30 -07:00
Egor ad34d8553e Add play button to song table album cover, like it is in grid (#772)
* Add play button to song table album cover, like it is in grid

* Fix: play button caused error for albums and artists tables
2024-10-03 19:22:51 -07:00
Kendall Garner a89b6640a9 horizontal scroll 2024-10-01 18:15:18 -07:00
Kendall Garner b3b810c62c funkwhale bodge 2024-10-01 17:21:28 -07:00
Kendall Garner ecef9bea5e fix speed state 2024-09-29 16:16:33 -07:00
36 changed files with 535 additions and 217 deletions
+10 -2
View File
@@ -119,8 +119,16 @@ Feishin supports any music server that implements a [Navidrome](https://www.navi
- [Navidrome](https://github.com/navidrome/navidrome)
- [Jellyfin](https://github.com/jellyfin/jellyfin)
- [Funkwhale](https://funkwhale.audio/) - TBD
- Subsonic-compatible servers - TBD
- Subsonic-compatible servers
- [Airsonic-Advanced](https://github.com/airsonic-advanced/airsonic-advanced)
- [Ampache](https://ampache.org)
- [Astiga](https://asti.ga/)
- [Funkwhale](https://www.funkwhale.audio/)
- [Gonic](https://github.com/sentriz/gonic)
- [LMS](https://github.com/epoupon/lms)
- [Nextcloud Music](https://apps.nextcloud.com/apps/music)
- [Supysonic](https://github.com/spl0k/supysonic)
- More (?)
### I have the issue "The SUID sandbox helper binary was found, but is not configured correctly" on Linux
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "feishin",
"version": "0.10.1",
"version": "0.11.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "feishin",
"version": "0.10.1",
"version": "0.11.1",
"hasInstallScript": true,
"license": "GPL-3.0",
"dependencies": {
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "feishin",
"productName": "Feishin",
"description": "Feishin music server",
"version": "0.10.1",
"version": "0.11.1",
"scripts": {
"build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:remote\"",
"build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "feishin",
"version": "0.10.1",
"version": "0.11.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "feishin",
"version": "0.10.1",
"version": "0.11.1",
"hasInstallScript": true,
"license": "GPL-3.0",
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "feishin",
"version": "0.10.1",
"version": "0.11.1",
"description": "",
"main": "./dist/main/main.js",
"author": {
+8 -6
View File
@@ -222,7 +222,7 @@
"volumeWidth": "šířka posuvníku hlasitosti",
"volumeWidth_description": "horizontální velikost posuvníku hlasitosti",
"discordListening": "zobrazit stav jako „Poslouchá“",
"discordListening_description": "zobrazit stav jako „Poslouchá“ namísto „Hraje“. tato funkce v současné době není kompatibilní s lištou s časem",
"discordListening_description": "zobrazit stav jako „Poslouchá“ namísto „Hraje“",
"contextMenu": "nastavení kontextové nabídky (kliknutí pravým)",
"contextMenu_description": "umožňuje skrýt položky, které se zobrazí v nabídce po kliknutí pravým tlačítkem myši na položku. položky, které nejsou zaškrtnuté, se skryjí",
"customCssEnable": "povolit vlastní CSS",
@@ -278,7 +278,8 @@
"openIn": {
"lastfm": "Otevřít v Last.fm",
"musicbrainz": "Otevřít v MusicBrainz"
}
},
"moveToNext": "přesunout na další"
},
"common": {
"backward": "zpátky",
@@ -588,7 +589,8 @@
"shareItem": "sdílet položku",
"playSimilarSongs": "$t(player.playSimilarSongs)",
"download": "stáhnout",
"playShuffled": "$t(player.shuffle)"
"playShuffled": "$t(player.shuffle)",
"moveToNext": "$t(action.moveToNext)"
},
"home": {
"mostPlayed": "nejpřehrávanější",
@@ -776,8 +778,8 @@
"play_one": "{{count}} přehrání",
"play_few": "{{count}} přehrání",
"play_other": "{{count}} přehrání",
"song_one": " ",
"song_few": " ",
"song_other": " "
"song_one": "píseň",
"song_few": "písničky",
"song_other": "písní"
}
}
+58 -18
View File
@@ -107,7 +107,13 @@
"reload": "Neu Laden",
"mbid": "MusicBrainz ID",
"close": "schliessen",
"share": "Teilen"
"share": "Teilen",
"translation": "Übersetzung",
"trackGain": "Track-Pegelverstärkung",
"trackPeak": "Track-Spitzenpegel",
"codec": "Codec",
"albumPeak": "Album-Spitzenpegel",
"albumGain": "Album-Pegelverstärkung"
},
"error": {
"remotePortWarning": "Starten Sie den Server neu, um den neuen Port anzuwenden",
@@ -179,13 +185,13 @@
},
"form": {
"deletePlaylist": {
"title": "Lösche $t(entity.playlist_one)",
"title": "$t(entity.playlist_one) löschen",
"success": "$t(entity.playlist_one) erfolgreich gelöscht",
"input_confirm": "Geben Sie zur Bestätigung den Namen von $t(entity.playlist_one) ein"
},
"createPlaylist": {
"input_description": "$t(common.description)",
"title": "Erstellen $t(entity.playlist_one)",
"title": "$t(entity.playlist_one) erstellen",
"input_public": "öffentlich",
"success": "$t(entity.playlist_one) erfolgreich erstellt",
"input_name": "$t(common.name)",
@@ -267,7 +273,9 @@
"trackWithCount_other": "{{count}} Tracks",
"smartPlaylist": "Smart $t(entity.playlist_one)",
"play_one": "{{count}} Wiedergabe",
"play_other": "{{count}} Wiedergaben"
"play_other": "{{count}} Wiedergaben",
"song_one": "Lied",
"song_other": "Lieder"
},
"table": {
"config": {
@@ -348,11 +356,13 @@
"unsynchronized": "nicht synchronisiert",
"lyricAlignment": "Songtext-Ausrichtung",
"useImageAspectRatio": "Bildseitenverhältnis verwenden",
"lyricGap": "Songtext-Lücke"
"lyricGap": "Songtext-Lücke",
"dynamicIsImage": "Hintergrundbild aktivieren"
},
"upNext": "als nächstes",
"lyrics": "Songtexte",
"related": "Ähnliche"
"related": "Ähnliche",
"noLyrics": "Keine Liedtexte gefunden"
},
"appMenu": {
"selectServer": "Server auswählen",
@@ -375,18 +385,19 @@
},
"albumDetail": {
"moreFromArtist": "Mehr von diesem $t(entity.artist_one)",
"moreFromGeneric": "Mehr von {{item}}"
"moreFromGeneric": "Mehr von {{item}}",
"released": "erschienen"
},
"globalSearch": {
"commands": {
"serverCommands": "Serverbefehle",
"goToPage": "Gehe zur Seite",
"searchFor": "Suche nach {{query}}"
"searchFor": "Nach {{query}} suchen"
},
"title": "Befehle"
},
"contextMenu": {
"numberSelected": "{{count}} Ausgewählte",
"numberSelected": "{{count}} ausgewählt",
"addToPlaylist": "$t(action.addToPlaylist)",
"addToFavorites": "$t(action.addToFavorites)",
"setRating": "$t(action.setRating)",
@@ -401,7 +412,10 @@
"addLast": "$t(player.addLast)",
"addFavorite": "$t(action.addToFavorites)",
"play": "$t(player.play)",
"removeFromQueue": "$t(action.removeFromQueue)"
"removeFromQueue": "$t(action.removeFromQueue)",
"playShuffled": "$t(player.shuffle)",
"download": "Download",
"playSimilarSongs": "$t(player.playSimilarSongs)"
},
"sidebar": {
"nowPlaying": "läuft gerade",
@@ -414,34 +428,59 @@
"settings": "$t(common.setting_other)",
"home": "$t(common.home)",
"artists": "$t(entity.artist_other)",
"albumArtists": "$t(entity.albumArtist_other)"
"albumArtists": "$t(entity.albumArtist_other)",
"shared": "$t(entity.playlist_other) geteilt"
},
"setting": {
"playbackTab": "Wiedergabe",
"generalTab": "allgemein",
"generalTab": "Allgemein",
"hotkeysTab": "Kurzbefehle",
"windowTab": "Fenster"
"windowTab": "Fenster",
"advanced": "Erweitert"
},
"albumArtistList": {
"title": "$t(entity.albumArtist_other)"
},
"genreList": {
"title": "$t(entity.genre_other)"
"title": "$t(entity.genre_other)",
"showTracks": "$t(entity.genre_one) $t(entity.track_other) anzeigen",
"showAlbums": "$t(entity.genre_one) $t(entity.album_other) anzeigen"
},
"trackList": {
"title": "$t(entity.track_other)"
"title": "$t(entity.track_other)",
"artistTracks": "Tracks von {{artist}}",
"genreTracks": "\"{{genre}}\" $t(entity.track_other)"
},
"playlistList": {
"title": "$t(entity.playlist_other)"
},
"albumList": {
"title": "$t(entity.album_other)"
"title": "$t(entity.album_other)",
"artistAlbums": "Alben von {{artist}}",
"genreAlbums": "\"{{genre}}\" $t(entity.album_other)"
},
"albumArtistDetail": {
"about": "Über {{artist}}",
"appearsOn": "erscheint auf",
"recentReleases": "Kürzliche Veröffentlichungen",
"viewDiscography": "Diskographie ansehen"
"viewDiscography": "Diskographie ansehen",
"viewAllTracks": "Alle $t(entity.track_other) ansehen",
"topSongsFrom": "Toplieder von {{title}}",
"viewAll": "Alles ansehen",
"topSongs": "Toplieder"
},
"manageServers": {
"title": "Servers verwalten",
"editServerDetailsTooltip": "Serverdetails editieren",
"removeServer": "Server entfernen",
"url": "URL",
"serverDetails": "Serverdetails",
"username": "Benutzername"
},
"itemDetail": {
"copyPath": "Pfad in Zwischenablage kopieren",
"copiedPath": "Pfad erfolgreich kopiert",
"openFile": "Track im Dateiexplorer anzeigen"
}
},
"player": {
@@ -473,7 +512,8 @@
"pause": "Pause",
"unfavorite": "Aus Favoriten entfernen",
"skip_forward": "Vorspulen",
"skip": "Überspringen"
"skip": "Überspringen",
"playSimilarSongs": "Ähnliche Lieder abspielen"
},
"setting": {
"audioDevice_description": "Wählen Sie das Audiogerät aus, das für die Wiedergabe verwendet werden soll (nur Webplayer).",
+5 -3
View File
@@ -8,6 +8,7 @@
"deselectAll": "deselect all",
"editPlaylist": "edit $t(entity.playlist_one)",
"goToPage": "go to page",
"moveToNext": "move to next",
"moveToBottom": "move to bottom",
"moveToTop": "move to top",
"refresh": "$t(common.refresh)",
@@ -147,8 +148,8 @@
"smartPlaylist": "smart $t(entity.playlist_one)",
"track_one": "track",
"track_other": "tracks",
"song_one": "",
"song_other": "",
"song_one": "song",
"song_other": "songs",
"trackWithCount_one": "{{count}} track",
"trackWithCount_other": "{{count}} tracks"
},
@@ -335,6 +336,7 @@
"deletePlaylist": "$t(action.deletePlaylist)",
"deselectAll": "$t(action.deselectAll)",
"download": "download",
"moveToNext": "$t(action.moveToNext)",
"moveToBottom": "$t(action.moveToBottom)",
"moveToTop": "$t(action.moveToTop)",
"numberSelected": "{{count}} selected",
@@ -508,7 +510,7 @@
"discordIdleStatus": "show rich presence idle status",
"discordIdleStatus_description": "when enabled, update status while player is idle",
"discordListening": "show status as listening",
"discordListening_description": "show status as listening instead of playing. note that this currently breaks timer bar",
"discordListening_description": "show status as listening instead of playing",
"discordRichPresence": "{{discord}} rich presence",
"discordRichPresence_description": "enable playback status in {{discord}} rich presence. Image keys are: {{icon}}, {{playing}}, and {{paused}} ",
"discordUpdateInterval": "{{discord}} rich presence update interval",
+9 -4
View File
@@ -221,7 +221,7 @@
"doubleClickBehavior_description": "si es true, se pondrán en cola todas las pistas que coincidan en una búsqueda de pistas. De lo contrario, solo se pondrá en cola la pista seleccionada",
"volumeWidth": "Ancho del deslizador de volumen",
"volumeWidth_description": "La anchura del deslizador de volumen",
"discordListening_description": "Muestra el estado como escuchando en lugar de reproduciendo. Ten en cuenta que esto actualmente rompe la barra de tiempo",
"discordListening_description": "mostrar el estado como escuchando en lugar de jugando",
"discordListening": "Mostrar estado como escuchando",
"contextMenu": "Configuración del menú de contexto (clic derecho)",
"contextMenu_description": "Te permite esconder elementos que son mostrados en el menú cuando haces clic derecho en un elemento. Los elementos que no estén seleccionados serán escondidos",
@@ -278,7 +278,8 @@
"openIn": {
"lastfm": "Abrir en Last.fm",
"musicbrainz": "Abrir en MusicBrainz"
}
},
"moveToNext": "pasar al siguiente"
},
"common": {
"backward": "hacia atrás",
@@ -490,7 +491,8 @@
"showDetails": "Obtener información",
"playSimilarSongs": "$t(player.playSimilarSongs)",
"download": "descargar",
"playShuffled": "$t(player.shuffle)"
"playShuffled": "$t(player.shuffle)",
"moveToNext": "$t(action.moveToNext)"
},
"home": {
"mostPlayed": "más reproducidos",
@@ -775,6 +777,9 @@
"trackWithCount_other": "{{count}} pistas",
"play_one": "Reproducir {{count}}",
"play_many": "Reproducir {{count}}",
"play_other": "Reproducir {{count}}"
"play_other": "Reproducir {{count}}",
"song_one": "canción",
"song_many": "canciones",
"song_other": "canciones"
}
}
+61 -23
View File
@@ -11,7 +11,7 @@
"skip_back": "reculer",
"favorite": "favori",
"next": "suivant",
"shuffle": "aléatoire",
"shuffle": "lecture aléatoire",
"playbackFetchNoResults": "aucune chansons trouvées",
"playbackFetchInProgress": "chargement des chansons…",
"addNext": "ajouter ensuite",
@@ -29,13 +29,14 @@
"skip_forward": "avancer",
"pause": "pause",
"unfavorite": "retirer des favoris",
"playSimilarSongs": "jouer des chansons similaires"
"playSimilarSongs": "jouer des chansons similaires",
"viewQueue": "voir la file d'attente"
},
"action": {
"editPlaylist": "éditer $t(entity.playlist_one)",
"goToPage": "aller à la page",
"moveToTop": "déplacer en haut",
"clearQueue": "effacer la liste de lecture",
"clearQueue": "vider la file d'attente",
"addToFavorites": "ajouter aux $t(entity.favorite_other)",
"addToPlaylist": "ajouter à $t(entity.playlist_one)",
"createPlaylist": "créer $t(entity.playlist_one)",
@@ -65,7 +66,7 @@
"edit": "éditer",
"favorite": "favoris",
"left": "gauche",
"save": "sauvegarder",
"save": "enregistrer",
"right": "droite",
"currentSong": "$t(entity.track_one) actuelle",
"collapse": "réduire",
@@ -92,7 +93,7 @@
"no": "non",
"owner": "propriétaire",
"enable": "activer",
"clear": "effacer",
"clear": "vider",
"forward": "avancer",
"delete": "supprimer",
"cancel": "annuler",
@@ -106,7 +107,7 @@
"filters": "filtres",
"create": "créer",
"bitrate": "bitrate",
"saveAndReplace": "sauvegarder et remplacer",
"saveAndReplace": "enregistrer et remplacer",
"action_one": "action",
"action_many": "actions",
"action_other": "actions",
@@ -124,12 +125,12 @@
"none": "aucun",
"menu": "menu",
"restartRequired": "redémarrage requis",
"previousSong": "précédant $t(entity.track_one)",
"previousSong": "$t(entity.track_one) précédente",
"noResultsFromQuery": "la requête n'a retourné aucun résultat",
"quit": "quitter",
"expand": "étendre",
"search": "recherche",
"saveAs": "sauvegarder en tant que",
"saveAs": "enregistrer en tant que",
"disc": "disque",
"yes": "oui",
"random": "aléatoire",
@@ -152,29 +153,29 @@
"remotePortWarning": "redémarrer le serveur pour appliquer le nouveau port",
"systemFontError": "une erreur sest produite lors de la tentative dobtenir les polices système",
"playbackError": "une erreur s'est produite lors de la tentative de lecture du média",
"endpointNotImplementedError": "endpoint {{endpoint}} n'est pas implémenté pour {{serverType}}",
"endpointNotImplementedError": "l'endpoint {{endpoint}} n'est pas implémenté pour {{serverType}}",
"remotePortError": "une erreur s'est produite lors de la tentative de définir le port du serveur distant",
"serverRequired": "serveur requis",
"authenticationFailed": "l'authentification à échoué",
"authenticationFailed": "l'authentification a échoué",
"apiRouteError": "incapable dacheminer la demande",
"genericError": "une erreur s'est produite",
"credentialsRequired": "identifiants requis",
"sessionExpiredError": "votre session a expiré",
"remoteEnableError": "une erreur s'est produite lors de la tentative de $t(common.enable) le serveur distant",
"localFontAccessDenied": "accès refusé aux polices locales",
"serverNotSelectedError": "aucun serveur sélectionner",
"serverNotSelectedError": "aucun serveur sélectionné",
"remoteDisableError": "une erreur s'est produite lors de la tentative de $t(common.disable) le serveur distant",
"mpvRequired": "MPV requis",
"audioDeviceFetchError": "une erreur sest produite lors de la tentative dobtenir les périphériques audio",
"invalidServer": "serveur invalide",
"loginRateError": "trop de tentative de connexion, merci d'essayer dans quelque secondes",
"loginRateError": "trop de tentative de connexion, merci de réessayer dans quelques secondes",
"openError": "impossible d'ouvrir le fichier",
"networkError": "une erreur de réseau est survenue",
"badAlbum": "vous voyez cette page parce que cette chanson ne fait pas parti d'un album. vous rencontrez probablement cette erreur si vous avez une chanson qui n'est pas dans votre répertoire de musique. jellyfin gère les chansons uniquement si elles sont dans un sous-dossier, qui est lui-même dans un dossier \"Musique(s)\"."
},
"filter": {
"mostPlayed": "plus joués",
"playCount": "nombre d'écoutes",
"playCount": "nombre d'écoute",
"isCompilation": "est une compilation",
"recentlyPlayed": "récemment joué",
"isRated": "est noté",
@@ -191,7 +192,7 @@
"path": "chemin",
"favorited": "favoris",
"isRecentlyPlayed": "est récemment joué",
"isFavorited": "est favoris",
"isFavorited": "est favori",
"bpm": "bpm",
"releaseYear": "année de sortie",
"disc": "disque",
@@ -199,7 +200,7 @@
"songCount": "nombre de chansons",
"duration": "durée",
"random": "aléatoire",
"lastPlayed": "dernière joué",
"lastPlayed": "dernier joué",
"toYear": "à l'année",
"fromYear": "depuis l'année",
"criticRating": "note des critiques",
@@ -245,12 +246,14 @@
"lyricSize": "Taille des paroles",
"lyricGap": "espacement des lettres",
"dynamicIsImage": "activer l'image d'arrière-plan",
"dynamicImageBlur": "intensité de flou sur image d'arrière-plan"
"dynamicImageBlur": "intensité de flou sur image d'arrière-plan",
"lyricOffset": "paroles décalées (ms)"
},
"upNext": "à suivre",
"lyrics": "paroles",
"related": "similaire",
"visualizer": "visualisateur"
"visualizer": "visualisateur",
"noLyrics": "aucune parole trouvée"
},
"appMenu": {
"selectServer": "sélectionner le serveur",
@@ -273,7 +276,8 @@
},
"albumDetail": {
"moreFromArtist": "plus de $t(entity.artist_one)",
"moreFromGeneric": "plus de {{item}}"
"moreFromGeneric": "plus de {{item}}",
"released": "publié"
},
"setting": {
"generalTab": "général",
@@ -310,7 +314,8 @@
"shareItem": "partager un élément",
"playSimilarSongs": "$t(player.playSimilarSongs)",
"showDetails": "obtenir des informations",
"download": "télécharger"
"download": "télécharger",
"playShuffled": "$t(player.shuffle)"
},
"albumArtistList": {
"title": "$t(entity.albumArtist_other)"
@@ -351,6 +356,14 @@
},
"playlist": {
"reorder": "le tri n'est possible que lorsque l'on trie par identifiant"
},
"manageServers": {
"serverDetails": "détails du serveur",
"removeServer": "supprimer le serveur",
"url": "URL du serveur",
"title": "gérer les serveurs",
"username": "nom d'utilisateur",
"editServerDetailsTooltip": "modifier les détails du serveur"
}
},
"setting": {
@@ -559,7 +572,24 @@
"contextMenu_description": "permet de masquer les éléments qui s'affichent dans le menu lorsque vous cliquez avec le bouton droit de la souris sur un élément. les éléments qui ne sont pas cochés seront masqués",
"albumBackground": "image d'arrière-plan de l'album",
"albumBackground_description": "ajoute une image d'arrière-plan pour les pages de l'album contenant les illustrations de l'album",
"albumBackgroundBlur_description": "ajuste le niveau de flou appliqué à l'image d'arrière-plan de l'album"
"albumBackgroundBlur_description": "ajuste le niveau de flou appliqué à l'image d'arrière-plan de l'album",
"playButtonBehavior_optionPlayShuffled": "$t(player.shuffle)",
"playerbarOpenDrawer": "basculement plein écran de la barre de lecteur",
"playerbarOpenDrawer_description": "permet de cliquer sur la barre du lecteur pour ouvrir le lecteur plein écran",
"translationApiProvider": "fournisseur d'api de traduction",
"discordListening": "afficher le statut d'écoute",
"discordListening_description": "afficher le statut comme étant en écoute au lieu de lecture",
"translationApiKey_description": "clé api à utiliser pour traduire les paroles (ne prend en charge que les points de terminaison de service globaux)",
"translationTargetLanguage": "traduction langue cible",
"trayEnabled": "montrer le plateau",
"translationApiProvider_description": "le fournisseur d'api à utiliser pour la traduction des paroles",
"customCss_description": "contenu css personnalisé. Remarque : le contenu et les URL distantes sont des propriétés non autorisées. Un aperçu de votre contenu est affiché ci-dessous. Des champs supplémentaires que vous n'avez pas définis sont présents en raison de la vérification.",
"translationApiKey": "clé api de traduction",
"translationTargetLanguage_description": "langue cible pour la traduction des paroles",
"transcodeNote": "prend effet après 1 (web) - 2 (mpv) chansons",
"trayEnabled_description": "afficher ou masquer l'icône et le menu de la barre d'état système. si désactivé, désactive également la réduction et la sortie vers la barre d'état système",
"doubleClickBehavior_description": "si vrai, toutes les pistes correspondantes dans une recherche de piste seront mises en file d'attente. sinon, seule celle sur laquelle vous avez cliqué sera mise en file d'attente",
"albumBackgroundBlur": "taille du flou de l'image d'arrière-plan de l'album"
},
"form": {
"deletePlaylist": {
@@ -604,7 +634,8 @@
},
"editPlaylist": {
"title": "modifier $t(entity.playlist_one)",
"publicJellyfinNote": "Jellyfin n'indique pas si une playlist est publique ou non. Si vous souhaitez que cette playlist reste publique, veuillez sélectionner l'entrée suivante"
"publicJellyfinNote": "Jellyfin n'indique pas si une playlist est publique ou non. Si vous souhaitez que cette playlist reste publique, veuillez sélectionner l'entrée suivante",
"success": "$t(entity.playlist_one) mis à jour avec succès"
},
"lyricSearch": {
"title": "rechercher parole",
@@ -666,7 +697,13 @@
"genreWithCount_other": "{{count}} genres",
"trackWithCount_one": "{{count}} piste",
"trackWithCount_many": "{{count}} pistes",
"trackWithCount_other": "{{count}} pistes"
"trackWithCount_other": "{{count}} pistes",
"play_one": "{{count}} écouter",
"play_many": "{{count}} écoute",
"play_other": "{{count}} écoute",
"song_one": "chanson",
"song_many": "chansons",
"song_other": "chansons"
},
"table": {
"config": {
@@ -677,7 +714,8 @@
"gap": "$t(common.gap)",
"size": "$t(common.size)",
"itemGap": "écart entre les éléments (en pixel)",
"itemSize": "taille des élements (en pixel)"
"itemSize": "taille des élements (en pixel)",
"followCurrentSong": "suivre la chanson actuelle"
},
"view": {
"table": "liste",
+5 -2
View File
@@ -86,7 +86,8 @@
"codec": "codec",
"preview": "pré-visualizar",
"share": "compartilhar",
"close": "fechar"
"close": "fechar",
"translation": "tradução"
},
"action": {
"goToPage": "vá para página",
@@ -108,7 +109,9 @@
"openIn": {
"lastfm": "Abrir em Last.fm",
"musicbrainz": "Abrir em MusicBrainz"
}
},
"toggleSmartPlaylistEditor": "alternar editor $t(entity.smartPlaylist)",
"moveToNext": "mover para o próximo"
},
"form": {
"deletePlaylist": {
+14 -14
View File
@@ -67,7 +67,8 @@
"forceRestartRequired": "перезапустите приложение, чтобы применить изменения... закройте уведомление для перезапуска",
"setting": "настройка",
"setting_one": "настройка",
"setting_other": "настройки",
"setting_few": "",
"setting_many": "",
"version": "версия",
"title": "название",
"filter_one": "фильтр",
@@ -111,16 +112,19 @@
"preview": "просмотр",
"codec": "кодек",
"share": "поделиться",
"close": "закрыть"
"close": "закрыть",
"albumGain": "альбом усиление",
"trackGain": "усиление трека",
"translation": "перевод",
"albumPeak": "пик альбома",
"trackPeak": "пик трека"
},
"entity": {
"album_one": "альбом",
"album_few": "альбома",
"album_other": "альбомы",
"album_many": "альбомов",
"genre_one": "жанр",
"genre_few": "жанра",
"genre_other": "жанры",
"genre_many": "жанров",
"playlistWithCount_one": "{{count}} плейлист",
"playlistWithCount_few": "{{count}} плейлиста",
@@ -128,26 +132,25 @@
"playlist_one": "плейлист",
"playlist_few": "плейлиста",
"playlist_many": "плейлистов",
"playlist_other": "плейлисты",
"play": "{{count}} прослушиваний",
"play_one": "{{count}} прослушивание",
"play_other": "{{count}} прослушиваний",
"play_few": "",
"play_many": "",
"artist_one": "автор",
"artist_few": "автора",
"artist_other": "исполнители",
"artist_many": "исполнителей",
"folderWithCount_one": "{{count}} папка",
"folderWithCount_few": "{{count}} папки",
"folderWithCount_many": "{{count}} папок",
"albumArtist_one": "исполнитель альбома",
"albumArtist_few": "исполнители альбома",
"albumArtist_other": "исполнители альбомов",
"albumArtist_many": "исполнителей альбома",
"track_one": "трек",
"track_few": "трека",
"track_many": "треков",
"track_other": "треки",
"song_many": "{{ count }} композиций",
"song_one": "песня",
"song_few": "{{count}} песни",
"song_many": "{{count}} песен",
"albumArtistCount_one": "{{count}} автор альбома",
"albumArtistCount_few": "{{count}} автора альбома",
"albumArtistCount_many": "{{count}} авторов альбома",
@@ -157,22 +160,19 @@
"favorite_one": "любимый",
"favorite_few": "любимых",
"favorite_many": "любимые",
"favorite_other": "любимые",
"artistWithCount_one": "{{count}} автор",
"artistWithCount_few": "{{count}} автора",
"artistWithCount_many": "{{count}} авторов",
"folder_one": "папка",
"folder_few": "папки",
"folder_many": "папок",
"folder_other": "папки",
"smartPlaylist": "умный $t(entity.playlist_one)",
"genreWithCount_one": "{{count}} жанр",
"genreWithCount_few": "{{count}} жанра",
"genreWithCount_many": "{{count}} жанров",
"trackWithCount_one": "{{count}} трек",
"trackWithCount_few": "{{count}} трека",
"trackWithCount_many": "{{count}} треков",
"trackWithCount_other": "{{count}} треков"
"trackWithCount_many": "{{count}} треков"
},
"table": {
"config": {
+5 -1
View File
@@ -209,7 +209,11 @@
"moveToBottom": "idi na dno",
"setRating": "oceni",
"toggleSmartPlaylistEditor": "pokreni $t(entity.smartPlaylist) editor",
"removeFromFavorites": "ukloni iz $t(entity.favorite_other)"
"removeFromFavorites": "ukloni iz $t(entity.favorite_other)",
"openIn": {
"lastfm": "Otvori u Last.fm",
"musicbrainz": "Otvori u MusicBrainz"
}
},
"common": {
"backward": "nazad",
+7 -4
View File
@@ -20,7 +20,8 @@
"openIn": {
"lastfm": "在 Last.fm 中打开",
"musicbrainz": "在 MusicBrainz 中打开"
}
},
"moveToNext": "移至下一首"
},
"common": {
"increase": "增高",
@@ -127,7 +128,8 @@
"smartPlaylist": "智能$t(entity.playlist_one)",
"genreWithCount_other": "{{count}} 种流派",
"trackWithCount_other": "{{count}} 首乐曲",
"play_other": "{{count}} 次播放"
"play_other": "{{count}} 次播放",
"song_other": "歌曲"
},
"player": {
"repeat_all": "循环全部",
@@ -352,7 +354,7 @@
"volumeWidth": "音量滑块宽度",
"volumeWidth_description": "音量滑块的宽度",
"discordListening": "显示状态为正在监听",
"discordListening_description": "将状态显示为正在监听,而不是正在播放”。请注意,这当前会破坏计时器栏",
"discordListening_description": "将状态显示为正在监听,而不是正在播放",
"contextMenu_description": "允许您隐藏右键单击项目时显示在菜单中的项目。未选中的项目将被隐藏",
"customCssEnable_description": "允许编写自定义 css。",
"customCss": "自定义css",
@@ -553,7 +555,8 @@
"shareItem": "分享项目",
"playSimilarSongs": "$t(player.playSimilarSongs)",
"download": "下载",
"playShuffled": "$t(player.shuffle)"
"playShuffled": "$t(player.shuffle)",
"moveToNext": "$t(action.moveToNext)"
},
"trackList": {
"title": "$t(entity.track_other)",
@@ -450,7 +450,6 @@ export const JellyfinController: ControllerEndpoint = {
Fields: 'ChildCount, Genres, DateCreated, ParentId, Overview',
IncludeItemTypes: 'Playlist',
Limit: query.limit,
MediaTypes: 'Audio',
Recursive: true,
SearchTerm: query.searchTerm,
SortBy: playlistListSortMap.jellyfin[query.sortBy],
@@ -121,7 +121,7 @@ const normalizeSong = (
playlistItemId,
releaseDate: (item.releaseDate
? new Date(item.releaseDate)
: new Date(item.year, 0, 1)
: new Date(Date.UTC(item.year, 0, 1))
).toISOString(),
releaseYear: String(item.year),
serverId: server?.id || 'unknown',
@@ -125,7 +125,7 @@ export const SubsonicController: ControllerEndpoint = {
}
return {
id: res.body.playlist.id,
id: res.body.playlist.id.toString(),
name: res.body.playlist.name,
};
},
@@ -570,7 +570,10 @@ export const SubsonicController: ControllerEndpoint = {
}
return {
items: res.body.musicFolders.musicFolder,
items: res.body.musicFolders.musicFolder.map((folder) => ({
id: folder.id.toString(),
name: folder.name,
})),
startIndex: 0,
totalRecordCount: res.body.musicFolders.musicFolder.length,
};
@@ -902,7 +905,7 @@ export const SubsonicController: ControllerEndpoint = {
fromAlbumPromises.push(
ssApiClient(apiClientProps).getAlbum({
query: {
id: albumId,
id: albumId.toString(),
},
}),
);
+16 -14
View File
@@ -43,7 +43,7 @@ const normalizeSong = (
const imageUrl =
getCoverArtUrl({
baseUrl: server?.url,
coverArtId: item.coverArt,
coverArtId: item.coverArt?.toString(),
credential: server?.credential,
size: size || 300,
}) || null;
@@ -54,16 +54,16 @@ const normalizeSong = (
album: item.album || '',
albumArtists: [
{
id: item.artistId || '',
id: item.artistId?.toString() || '',
imageUrl: null,
name: item.artist || '',
},
],
albumId: item.albumId || '',
albumId: item.albumId?.toString() || '',
artistName: item.artist || '',
artists: [
{
id: item.artistId || '',
id: item.artistId?.toString() || '',
imageUrl: null,
name: item.artist || '',
},
@@ -95,7 +95,7 @@ const normalizeSong = (
},
]
: [],
id: item.id,
id: item.id.toString(),
imagePlaceholderUrl: null,
imageUrl,
itemType: LibraryItem.SONG,
@@ -135,7 +135,7 @@ const normalizeAlbumArtist = (
const imageUrl =
getCoverArtUrl({
baseUrl: server?.url,
coverArtId: item.coverArt,
coverArtId: item.coverArt?.toString(),
credential: server?.credential,
size: imageSize || 100,
}) || null;
@@ -146,7 +146,7 @@ const normalizeAlbumArtist = (
biography: null,
duration: null,
genres: [],
id: item.id,
id: item.id.toString(),
imageUrl,
itemType: LibraryItem.ALBUM_ARTIST,
lastPlayedAt: null,
@@ -170,7 +170,7 @@ const normalizeAlbum = (
const imageUrl =
getCoverArtUrl({
baseUrl: server?.url,
coverArtId: item.coverArt,
coverArtId: item.coverArt?.toString(),
credential: server?.credential,
size: imageSize || 300,
}) || null;
@@ -178,9 +178,11 @@ const normalizeAlbum = (
return {
albumArtist: item.artist,
albumArtists: item.artistId
? [{ id: item.artistId, imageUrl: null, name: item.artist }]
? [{ id: item.artistId.toString(), imageUrl: null, name: item.artist }]
: [],
artists: item.artistId
? [{ id: item.artistId.toString(), imageUrl: null, name: item.artist }]
: [],
artists: item.artistId ? [{ id: item.artistId, imageUrl: null, name: item.artist }] : [],
backdropImageUrl: null,
comment: null,
createdAt: item.created,
@@ -195,7 +197,7 @@ const normalizeAlbum = (
},
]
: [],
id: item.id,
id: item.id.toString(),
imagePlaceholderUrl: null,
imageUrl,
isCompilation: null,
@@ -205,7 +207,7 @@ const normalizeAlbum = (
name: item.name,
originalDate: null,
playCount: null,
releaseDate: item.year ? new Date(item.year, 0, 1).toISOString() : null,
releaseDate: item.year ? new Date(Date.UTC(item.year, 0, 1)).toISOString() : null,
releaseYear: item.year ? Number(item.year) : null,
serverId: server?.id || 'unknown',
serverType: ServerType.SUBSONIC,
@@ -232,11 +234,11 @@ const normalizePlaylist = (
description: item.comment || null,
duration: item.duration,
genres: [],
id: item.id,
id: item.id.toString(),
imagePlaceholderUrl: null,
imageUrl: getCoverArtUrl({
baseUrl: server?.url,
coverArtId: item.coverArt,
coverArtId: item.coverArt?.toString(),
credential: server?.credential,
size: 300,
}),
+10 -8
View File
@@ -19,6 +19,8 @@ const authenticateParameters = z.object({
v: z.string(),
});
const id = z.number().or(z.string());
const createFavoriteParameters = z.object({
albumId: z.array(z.string()).optional(),
artistId: z.array(z.string()).optional(),
@@ -43,7 +45,7 @@ const setRatingParameters = z.object({
const setRating = z.null();
const musicFolder = z.object({
id: z.string(),
id,
name: z.string(),
});
@@ -66,9 +68,9 @@ const genreItem = z.object({
const song = z.object({
album: z.string().optional(),
albumId: z.string().optional(),
albumId: id.optional(),
artist: z.string().optional(),
artistId: z.string().optional(),
artistId: id.optional(),
averageRating: z.number().optional(),
bitRate: z.number().optional(),
bpm: z.number().optional(),
@@ -79,7 +81,7 @@ const song = z.object({
duration: z.number().optional(),
genre: z.string().optional(),
genres: z.array(genreItem).optional(),
id: z.string(),
id,
isDir: z.boolean(),
isVideo: z.boolean(),
musicBrainzId: z.string().optional(),
@@ -100,12 +102,12 @@ const song = z.object({
const album = z.object({
album: z.string(),
artist: z.string(),
artistId: z.string(),
artistId: id,
coverArt: z.string(),
created: z.string(),
duration: z.number(),
genre: z.string().optional(),
id: z.string(),
id,
isCompilation: z.boolean().optional(),
isDir: z.boolean(),
isVideo: z.boolean(),
@@ -140,7 +142,7 @@ const albumArtist = z.object({
albumCount: z.string(),
artistImageUrl: z.string().optional(),
coverArt: z.string().optional(),
id: z.string(),
id,
name: z.string(),
starred: z.string().optional(),
});
@@ -398,7 +400,7 @@ const playlist = z.object({
created: z.string(),
duration: z.number(),
entry: z.array(song).optional(),
id: z.string(),
id,
name: z.string(),
owner: z.string(),
public: z.boolean(),
+1 -1
View File
@@ -143,7 +143,7 @@ export const App = () => {
if (!isRunning) {
const extraParameters = useSettingsStore.getState().playback.mpvExtraParameters;
const properties: Record<string, any> = {
speed: usePlayerStore.getState().current.speed,
speed: usePlayerStore.getState().speed,
...getMpvProperties(useSettingsStore.getState().playback.mpvProperties),
};
@@ -0,0 +1,97 @@
import React, { MouseEvent } from 'react';
import type { UnstyledButtonProps } from '@mantine/core';
import { RiPlayFill } from 'react-icons/ri';
import styled from 'styled-components';
import { Play } from '/@/renderer/types';
import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
import { LibraryItem } from '/@/renderer/api/types';
import { usePlayQueueAdd } from '/@/renderer/features/player';
type PlayButtonType = UnstyledButtonProps & React.ComponentPropsWithoutRef<'button'>;
const PlayButton = styled.button<PlayButtonType>`
position: absolute;
display: flex;
align-items: center;
justify-content: center;
width: 30px;
height: 30px;
background-color: rgb(255 255 255);
border: none;
border-radius: 50%;
opacity: 0.8;
transition: scale 0.1s ease-in-out;
&:hover {
opacity: 1;
scale: 1.1;
}
&:active {
opacity: 1;
scale: 1;
}
svg {
fill: rgb(0 0 0);
stroke: rgb(0 0 0);
}
`;
const ListConverControlsContainer = styled.div`
position: absolute;
z-index: 100;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
`;
export const ListCoverControls = ({
itemData,
itemType,
context,
uniqueId,
}: {
context: Record<string, any>;
itemData: any;
itemType: LibraryItem;
uniqueId?: string;
}) => {
const playButtonBehavior = usePlayButtonBehavior();
const handlePlayQueueAdd = usePlayQueueAdd();
const isQueue = Boolean(context?.isQueue);
const handlePlay = async (e: MouseEvent<HTMLButtonElement>, playType?: Play) => {
e.preventDefault();
e.stopPropagation();
handlePlayQueueAdd?.({
byItemType: {
id: [itemData.id],
type: itemType,
},
playType: playType || playButtonBehavior,
});
};
const handlePlayFromQueue = () => {
context.handleDoubleClick({
data: {
uniqueId,
},
});
};
return (
<>
<ListConverControlsContainer className="card-controls">
<PlayButton onClick={isQueue ? handlePlayFromQueue : handlePlay}>
<RiPlayFill size={20} />
</PlayButton>
</ListConverControlsContainer>
</>
);
};
@@ -7,11 +7,12 @@ import { generatePath } from 'react-router';
import { Link } from 'react-router-dom';
import { SimpleImg } from 'react-simple-img';
import styled from 'styled-components';
import type { AlbumArtist, Artist } from '/@/renderer/api/types';
import { AlbumArtist, Artist } from '/@/renderer/api/types';
import { Text } from '/@/renderer/components/text';
import { AppRoute } from '/@/renderer/router/routes';
import { Skeleton } from '/@/renderer/components/skeleton';
import { SEPARATOR_STRING } from '/@/renderer/api/utils';
import { ListCoverControls } from '/@/renderer/components/virtual-table/cells/combined-title-cell-controls';
const CellContainer = styled(motion.div)<{ height: number }>`
display: grid;
@@ -24,9 +25,20 @@ const CellContainer = styled(motion.div)<{ height: number }>`
max-width: 100%;
height: 100%;
letter-spacing: 0.5px;
.card-controls {
opacity: 0;
}
&:hover {
.card-controls {
opacity: 1;
}
}
`;
const ImageWrapper = styled.div`
position: relative;
display: flex;
grid-area: image;
align-items: center;
@@ -48,7 +60,13 @@ const StyledImage = styled(SimpleImg)`
}
`;
export const CombinedTitleCell = ({ value, rowIndex, node }: ICellRendererParams) => {
export const CombinedTitleCell = ({
value,
rowIndex,
node,
context,
data,
}: ICellRendererParams) => {
const artists = useMemo(() => {
if (!value) return null;
return value.artists?.length ? value.artists : value.albumArtists;
@@ -102,6 +120,12 @@ export const CombinedTitleCell = ({ value, rowIndex, node }: ICellRendererParams
/>
</Center>
)}
<ListCoverControls
context={context}
itemData={value}
itemType={context.itemType}
uniqueId={data?.uniqueId}
/>
</ImageWrapper>
<MetadataWrapper>
<Text
@@ -2,95 +2,95 @@ import type { ICellRendererParams } from '@ag-grid-community/core';
import { Text } from '/@/renderer/components/text';
import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
const AnimatedSvg = () => {
return (
<div style={{ height: '1rem', transform: 'rotate(180deg)', width: '1rem' }}>
<svg
viewBox="100 130 57 80"
xmlns="http://www.w3.org/2000/svg"
>
<g>
<rect
fill="var(--primary-color)"
height="80"
id="bar-1"
width="12"
x="100"
y="130"
>
<animate
attributeName="height"
begin="0.1s"
calcMode="spline"
dur="0.95s"
keySplines="0.42 0 0.58 1; 0.42 0 0.58 1"
keyTimes="0; 0.47368; 1"
repeatCount="indefinite"
values="80;15;80"
/>
</rect>
<rect
fill="var(--primary-color)"
height="80"
id="bar-2"
width="12"
x="115"
y="130"
>
<animate
attributeName="height"
begin="0.1s"
calcMode="spline"
dur="0.95s"
keySplines="0.45 0 0.55 1; 0.45 0 0.55 1"
keyTimes="0; 0.44444; 1"
repeatCount="indefinite"
values="25;80;25"
/>
</rect>
<rect
fill="var(--primary-color)"
height="80"
id="bar-3"
width="12"
x="130"
y="130"
>
<animate
attributeName="height"
begin="0.1s"
calcMode="spline"
dur="0.85s"
keySplines="0.65 0 0.35 1; 0.65 0 0.35 1"
keyTimes="0; 0.42105; 1"
repeatCount="indefinite"
values="80;10;80"
/>
</rect>
<rect
fill="var(--primary-color)"
height="80"
id="bar-4"
width="12"
x="145"
y="130"
>
<animate
attributeName="height"
begin="0.1s"
calcMode="spline"
dur="1.05s"
keySplines="0.42 0 0.58 1; 0.42 0 0.58 1"
keyTimes="0; 0.31579; 1"
repeatCount="indefinite"
values="30;80;30"
/>
</rect>
</g>
</svg>
</div>
);
};
// const AnimatedSvg = () => {
// return (
// <div style={{ height: '1rem', transform: 'rotate(180deg)', width: '1rem' }}>
// <svg
// viewBox="100 130 57 80"
// xmlns="http://www.w3.org/2000/svg"
// >
// <g>
// <rect
// fill="var(--primary-color)"
// height="80"
// id="bar-1"
// width="12"
// x="100"
// y="130"
// >
// <animate
// attributeName="height"
// begin="0.1s"
// calcMode="spline"
// dur="0.95s"
// keySplines="0.42 0 0.58 1; 0.42 0 0.58 1"
// keyTimes="0; 0.47368; 1"
// repeatCount="indefinite"
// values="80;15;80"
// />
// </rect>
// <rect
// fill="var(--primary-color)"
// height="80"
// id="bar-2"
// width="12"
// x="115"
// y="130"
// >
// <animate
// attributeName="height"
// begin="0.1s"
// calcMode="spline"
// dur="0.95s"
// keySplines="0.45 0 0.55 1; 0.45 0 0.55 1"
// keyTimes="0; 0.44444; 1"
// repeatCount="indefinite"
// values="25;80;25"
// />
// </rect>
// <rect
// fill="var(--primary-color)"
// height="80"
// id="bar-3"
// width="12"
// x="130"
// y="130"
// >
// <animate
// attributeName="height"
// begin="0.1s"
// calcMode="spline"
// dur="0.85s"
// keySplines="0.65 0 0.35 1; 0.65 0 0.35 1"
// keyTimes="0; 0.42105; 1"
// repeatCount="indefinite"
// values="80;10;80"
// />
// </rect>
// <rect
// fill="var(--primary-color)"
// height="80"
// id="bar-4"
// width="12"
// x="145"
// y="130"
// >
// <animate
// attributeName="height"
// begin="0.1s"
// calcMode="spline"
// dur="1.05s"
// keySplines="0.42 0 0.58 1; 0.42 0 0.58 1"
// keyTimes="0; 0.31579; 1"
// repeatCount="indefinite"
// values="30;80;30"
// />
// </rect>
// </g>
// </svg>
// </div>
// );
// };
const StaticSvg = () => {
return (
@@ -134,19 +134,14 @@ const StaticSvg = () => {
export const RowIndexCell = ({ value, eGridCell }: ICellRendererParams) => {
const classList = eGridCell.classList;
const isFocused = classList.contains('focused');
// const isFocused = classList.contains('focused');
const isPlaying = classList.contains('playing');
const isCurrentSong =
classList.contains('current-song-cell') || classList.contains('current-playlist-song-cell');
return (
<CellContainer $position="right">
{isPlaying &&
(isFocused && isCurrentSong ? (
<AnimatedSvg />
) : isCurrentSong ? (
<StaticSvg />
) : null)}
{isPlaying && (isCurrentSong ? <StaticSvg /> : null)}
<Text
$secondary
align="right"
@@ -334,6 +334,7 @@ export const useVirtualTable = <TFilter extends BaseQuery<any>>({
const onCellContextMenu = useHandleTableContextMenu(itemType, contextMenu);
const context = {
itemType,
onCellContextMenu,
};
@@ -361,6 +361,7 @@ const tableColumns: { [key: string]: ColDef } = {
? {
albumArtists: params.data?.albumArtists,
artists: params.data?.artists,
id: params.data?.id,
imagePlaceholderUrl: params.data?.imagePlaceholderUrl,
imageUrl: params.data?.imageUrl,
name: params.data?.name,
@@ -464,6 +464,7 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
context={{
currentSong,
isFocused,
itemType: LibraryItem.SONG,
onCellContextMenu,
status,
}}
@@ -550,6 +550,9 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
suppressLoadingOverlay
suppressRowDrag
columnDefs={topSongsColumnDefs}
context={{
itemType: LibraryItem.SONG,
}}
enableCellChangeFlash={false}
getRowId={(data) => data.data.uniqueId}
rowData={topSongs}
@@ -2,6 +2,7 @@ import { SetContextMenuItems } from '/@/renderer/features/context-menu/events';
export const QUEUE_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
{ divider: true, id: 'removeFromQueue' },
{ id: 'moveToNextOfQueue' },
{ id: 'moveToBottomOfQueue' },
{ divider: true, id: 'moveToTopOfQueue' },
{ divider: true, id: 'addToPlaylist' },
@@ -18,6 +18,7 @@ import {
RiAddBoxFill,
RiAddCircleFill,
RiArrowDownLine,
RiArrowGoForwardLine,
RiArrowRightSFill,
RiArrowUpLine,
RiDeleteBinFill,
@@ -609,7 +610,19 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
);
const playbackType = usePlaybackType();
const { moveToBottomOfQueue, moveToTopOfQueue, removeFromQueue } = useQueueControls();
const { moveToNextOfQueue, moveToBottomOfQueue, moveToTopOfQueue, removeFromQueue } =
useQueueControls();
const handleMoveToNext = useCallback(() => {
const uniqueIds = ctx.dataNodes?.map((row) => row.data.uniqueId);
if (!uniqueIds?.length) return;
const playerData = moveToNextOfQueue(uniqueIds);
if (playbackType === PlaybackType.LOCAL) {
setQueueNext(playerData);
}
}, [ctx.dataNodes, moveToNextOfQueue, playbackType]);
const handleMoveToBottom = useCallback(() => {
const uniqueIds = ctx.dataNodes?.map((row) => row.data.uniqueId);
@@ -758,6 +771,12 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
leftIcon: <RiArrowDownLine size="1.1rem" />,
onClick: handleMoveToBottom,
},
moveToNextOfQueue: {
id: 'moveToNext',
label: t('page.contextMenu.moveToNext', { postProcess: 'sentenceCase' }),
leftIcon: <RiArrowGoForwardLine size="1.1rem" />,
onClick: handleMoveToNext,
},
moveToTopOfQueue: {
id: 'moveToTopOfQueue',
label: t('page.contextMenu.moveToTop', { postProcess: 'sentenceCase' }),
@@ -904,6 +923,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
handleDeselectAll,
ctx.data,
handleDownload,
handleMoveToNext,
handleMoveToBottom,
handleMoveToTop,
handleSimilar,
@@ -32,6 +32,7 @@ export type ContextMenuItemType =
| 'shareItem'
| 'deletePlaylist'
| 'createPlaylist'
| 'moveToNextOfQueue'
| 'moveToBottomOfQueue'
| 'moveToTopOfQueue'
| 'removeFromQueue'
@@ -6,6 +6,7 @@ import isElectron from 'is-electron';
import { useTranslation } from 'react-i18next';
import {
RiArrowDownLine,
RiArrowGoForwardLine,
RiArrowUpLine,
RiShuffleLine,
RiDeleteBinLine,
@@ -30,14 +31,32 @@ interface PlayQueueListOptionsProps {
export const PlayQueueListControls = ({ type, tableRef }: PlayQueueListOptionsProps) => {
const { t } = useTranslation();
const { clearQueue, moveToBottomOfQueue, moveToTopOfQueue, shuffleQueue, removeFromQueue } =
useQueueControls();
const {
clearQueue,
moveToBottomOfQueue,
moveToNextOfQueue,
moveToTopOfQueue,
shuffleQueue,
removeFromQueue,
} = useQueueControls();
const { pause } = usePlayerControls();
const playbackType = usePlaybackType();
const setCurrentTime = useSetCurrentTime();
const handleMoveToNext = () => {
const selectedRows = tableRef?.current?.grid.api.getSelectedRows();
const uniqueIds = selectedRows?.map((row) => row.uniqueId);
if (!uniqueIds?.length) return;
const playerData = moveToNextOfQueue(uniqueIds);
if (playbackType === PlaybackType.LOCAL) {
setQueueNext(playerData);
}
};
const handleMoveToBottom = () => {
const selectedRows = tableRef?.current?.grid.api.getSelectedRows();
const uniqueIds = selectedRows?.map((row) => row.uniqueId);
@@ -124,6 +143,15 @@ export const PlayQueueListControls = ({ type, tableRef }: PlayQueueListOptionsPr
>
<RiShuffleLine size="1.1rem" />
</Button>
<Button
compact
size="md"
tooltip={{ label: t('action.moveToNext', { postProcess: 'sentenceCase' }) }}
variant="default"
onClick={handleMoveToNext}
>
<RiArrowGoForwardLine size="1.1rem" />
</Button>
<Button
compact
size="md"
@@ -256,7 +256,10 @@ export const PlayQueue = forwardRef(({ type }: QueueProps, ref: Ref<any>) => {
columnDefs={columnDefs}
context={{
currentSong,
handleDoubleClick,
isFocused,
isQueue: true,
itemType: LibraryItem.SONG,
onCellContextMenu,
status,
}}
@@ -100,7 +100,7 @@ export const useRightControls = () => {
const handleVolumeWheel = useCallback(
(e: WheelEvent<HTMLDivElement | HTMLButtonElement>) => {
let volumeToSet;
if (e.deltaY > 0) {
if (e.deltaY > 0 || e.deltaX > 0) {
volumeToSet = calculateVolumeDown(volume, volumeWheelStep);
} else {
volumeToSet = calculateVolumeUp(volume, volumeWheelStep);
@@ -301,6 +301,7 @@ export const PlaylistDetailSongListContent = ({ songs, tableRef }: PlaylistDetai
context={{
currentSong,
isFocused,
itemType: LibraryItem.SONG,
onCellContextMenu: handleContextMenu,
status,
}}
@@ -66,6 +66,7 @@ export const SimilarSongsList = ({ count, fullScreen, song }: SimilarSongsListPr
columnDefs={columnDefs}
context={{
count,
itemType: LibraryItem.SONG,
onCellContextMenu,
song,
}}
+34 -4
View File
@@ -18,7 +18,6 @@ export interface PlayerState {
seek: boolean;
shuffledIndex: number;
song?: QueueSong;
speed: number;
status: PlayerStatus;
time: number;
};
@@ -32,6 +31,7 @@ export interface PlayerState {
};
repeat: PlayerRepeat;
shuffle: PlayerShuffle;
speed: number;
volume: number;
}
@@ -72,6 +72,7 @@ export interface PlayerSlice extends PlayerState {
getQueueData: () => QueueData;
incrementPlayCount: (ids: string[]) => string[];
moveToBottomOfQueue: (uniqueIds: string[]) => PlayerData;
moveToNextOfQueue: (uniqueIds: string[]) => PlayerData;
moveToTopOfQueue: (uniqueIds: string[]) => PlayerData;
next: () => PlayerData;
pause: () => void;
@@ -536,6 +537,34 @@ export const usePlayerStore = create<PlayerSlice>()(
return get().actions.getPlayerData();
},
moveToNextOfQueue: (uniqueIds) => {
const queue = get().queue.default;
const songsToMove = queue.filter((song) =>
uniqueIds.includes(song.uniqueId),
);
const currentSong = get().current.song;
const currentPosition =
get().current.index -
queue
.slice(0, get().current.index)
.filter((song) => uniqueIds.includes(song.uniqueId)).length;
const songsToStay = queue.filter(
(song) => !uniqueIds.includes(song.uniqueId),
);
const newQueue = [
...songsToStay.slice(0, currentPosition + 1),
...songsToMove,
...songsToStay.slice(currentPosition + 1),
];
const newCurrentSongIndex = newQueue.findIndex(
(song) => song.uniqueId === currentSong?.uniqueId,
);
set((state) => {
state.queue.default = newQueue;
state.current.index = newCurrentSongIndex;
});
return get().actions.getPlayerData();
},
moveToTopOfQueue: (uniqueIds) => {
const queue = get().queue.default;
@@ -805,7 +834,7 @@ export const usePlayerStore = create<PlayerSlice>()(
},
setCurrentSpeed: (speed) => {
set((state) => {
state.current.speed = speed;
state.speed = speed;
});
},
setCurrentTime: (time, seek = false) => {
@@ -1011,7 +1040,6 @@ export const usePlayerStore = create<PlayerSlice>()(
seek: false,
shuffledIndex: 0,
song: {} as QueueSong,
speed: 1.0,
status: PlayerStatus.PAUSED,
time: 0,
},
@@ -1026,6 +1054,7 @@ export const usePlayerStore = create<PlayerSlice>()(
},
repeat: PlayerRepeat.NONE,
shuffle: PlayerShuffle.NONE,
speed: 1.0,
transcode: {
enabled: false,
},
@@ -1076,6 +1105,7 @@ export const useQueueControls = () =>
addToQueue: state.actions.addToQueue,
clearQueue: state.actions.clearQueue,
moveToBottomOfQueue: state.actions.moveToBottomOfQueue,
moveToNextOfQueue: state.actions.moveToNextOfQueue,
moveToTopOfQueue: state.actions.moveToTopOfQueue,
removeFromQueue: state.actions.removeFromQueue,
reorderQueue: state.actions.reorderQueue,
@@ -1130,7 +1160,7 @@ export const useVolume = () => usePlayerStore((state) => state.volume);
export const useMuted = () => usePlayerStore((state) => state.muted);
export const useSpeed = () => usePlayerStore((state) => state.current.speed);
export const useSpeed = () => usePlayerStore((state) => state.speed);
export const usePlayerFallback = () => usePlayerStore((state) => state.fallback);