Skip to content

Commit 775d40d

Browse files
jamal-fumajamal-fuma
authored
Merge branch 'epoupon:master' into master
2 parents 35b3f38 + 8c3ac47 commit 775d40d

File tree

113 files changed

+2369
-952
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+2369
-952
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.12)
22

3-
project(lms)
3+
project(lms VERSION 3.69.0)
44

55
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules/)
66

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ If neither exists, it will then search for a file named `artist` (or another nam
9090
2. Scan for the image: the directory is scanned starting from this common path, moving upwards if needed, until the artist image file is found.
9191
3. Fallback search: if no image is found, _LMS_ will then search within each individual album folder.
9292

93+
## Disc image lookup
94+
_LMS_ automatically associates images with each disc in your collection. Name the image file after the disc's subtitle or another identifier configured in `lms.conf` (see the `medium-image-file-names` setting), and place it in the same directory as the disc's tracks. If no suitable image is found, LMS will also look for embedded images within the tracks of the disc.
95+
9396
## Playlist support
9497
_LMS_ supports playlist files in `m3u` and `m3u8` formats. These playlists are synced during the scan process and are available as public shared playlists.
9598

‎approot/admin-about.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<messages xmlns:if="Wt.WTemplate.conditions">
3+
4+
<message id="Lms.Admin.About.template">
5+
<div class="modal fade" tabindex="-1">
6+
<div class="modal-dialog">
7+
<div class="modal-content">
8+
<div class="modal-header">
9+
<h5 class="modal-title">${tr:Lms.Admin.About.about}</h5>
10+
</div>
11+
<div class="modal-body">
12+
<div class="container-fluid d-grid gap-2">
13+
<div class="row align-items-center">
14+
<div class="col-4">
15+
${tr:Lms.Admin.About.version}
16+
</div>
17+
<div class="col">
18+
${version}
19+
</div>
20+
</div>
21+
<div class="row align-items-center">
22+
<div class="col-4">
23+
${tr:Lms.Admin.About.homepage}
24+
</div>
25+
<div class="col">
26+
<a href="${homepage-link}" target="_blank" class="dropdown-item link-success">${homepage-link}</a>
27+
</div>
28+
</div>
29+
</div>
30+
</div>
31+
<div class="modal-footer">
32+
${ok-btn class="btn btn-primary"}
33+
</div>
34+
</div>
35+
</div>
36+
</div>
37+
</message>
38+
39+
</messages>

‎approot/main.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<li>${scan-settings class="dropdown-item"}</li>
4545
<li>${scanner class="dropdown-item"}</li>
4646
<li>${users class="dropdown-item"}</li>
47+
<li>${about class="dropdown-item"}</li>
4748
${<if-debug-tools>}
4849
<li class="dropdown-divider"></li>
4950
<li>${debug-tools class="dropdown-item"}</li>
@@ -57,7 +58,6 @@
5758
</a>
5859
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
5960
<li class="dropdown-header">${username}</li>
60-
<li class="dropdown-divider"></li>
6161
<li>${settings class="dropdown-item"}</li>
6262
<li>${logout class="dropdown-item"}</li>
6363
</ul>

‎approot/messages.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,18 @@
5252
<message id="Lms.Error.user-not-found">User not found</message>
5353

5454
<!--Administration-->
55+
<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> About</message>
5556
<message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Debug tools</message>
5657
<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Libraries</message>
5758
<message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Scan settings</message>
5859
<message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
5960
<message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Users</message>
6061

62+
<!--About-->
63+
<message id="Lms.Admin.About.about">About</message>
64+
<message id="Lms.Admin.About.homepage">Homepage</message>
65+
<message id="Lms.Admin.About.version">Version</message>
66+
6167
<!--MediaLibraries-->
6268
<message id="Lms.Admin.MediaLibraries.media-libraries">Music libraries</message>
6369
<message id="Lms.Admin.MediaLibrary.create-library">Create library</message>
@@ -101,11 +107,11 @@
101107

102108
<!--Scanner Controller-->
103109
<message id="Lms.Admin.ScannerController.bad-duration">Cannot get track duration</message>
104-
<message id="Lms.Admin.ScannerController.bad-embedded-image">Unable to read the image at index {1}</message>
110+
<message id="Lms.Admin.ScannerController.bad-embedded-image">Unable to read the image at index {1}: {2}</message>
105111
<message id="Lms.Admin.ScannerController.cannot-read-artist-info-file">Cannot parse artist info file</message>
106112
<message id="Lms.Admin.ScannerController.cannot-read-audio-file">Cannot parse audio file</message>
107113
<message id="Lms.Admin.ScannerController.cannot-read-file">Cannot read file ({1})</message>
108-
<message id="Lms.Admin.ScannerController.cannot-read-image-file">Cannot parse image file</message>
114+
<message id="Lms.Admin.ScannerController.cannot-read-image-file">Cannot parse image file: {1}</message>
109115
<message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">Cannot parse lyrics file</message>
110116
<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">Cannot parse playlist file</message>
111117
<message id="Lms.Admin.ScannerController.compact">Compact the database. <strong>Caution:</strong> this may take a while and will block the whole application during the compact step!</message>

‎approot/messages_es.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,18 @@
5252
<message id="Lms.Error.user-not-found">No existe el usuario</message>
5353

5454
<!--Administration-->
55+
<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> Acerca de</message>
5556
<message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Herramientas de depuración</message>
5657
<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Bibliotecas</message>
5758
<message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Opciones de escaneo</message>
5859
<message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Escanear</message>
5960
<message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Usuarios</message>
6061

62+
<!--About-->
63+
<message id="Lms.Admin.About.about">Acerca de</message>
64+
<message id="Lms.Admin.About.homepage">Página principal</message>
65+
<message id="Lms.Admin.About.version">Versión</message>
66+
6167
<!--MediaLibraries-->
6268
<message id="Lms.Admin.MediaLibraries.media-libraries">Bibliotecas musicales</message>
6369
<message id="Lms.Admin.MediaLibrary.create-library">Crear una biblioteca</message>
@@ -101,11 +107,11 @@
101107

102108
<!--Scanner Controller-->
103109
<message id="Lms.Admin.ScannerController.bad-duration">No ha sido posible obtener la duración de la pista</message>
104-
<message id="Lms.Admin.ScannerController.bad-embedded-image">No se puede leer la imagen en el índice {1}</message>
110+
<message id="Lms.Admin.ScannerController.bad-embedded-image">No se puede leer la imagen en el índice {1} : {2}</message>
105111
<message id="Lms.Admin.ScannerController.cannot-read-artist-info-file">No ha sido posible analizar el fichero de información sobre el artista</message>
106112
<message id="Lms.Admin.ScannerController.cannot-read-audio-file">No ha sido posible analizar el fichero de audio</message>
107113
<message id="Lms.Admin.ScannerController.cannot-read-file">No ha sido posible leer el fichero ({1})</message>
108-
<message id="Lms.Admin.ScannerController.cannot-read-image-file">No ha sido posible analizar del fichero de imagen</message>
114+
<message id="Lms.Admin.ScannerController.cannot-read-image-file">No ha sido posible analizar del fichero de imagen : {1}</message>
109115
<message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">No ha sido posible analizar el fichero de letras</message>
110116
<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">No ha sido posible analizar el fichero de la lista de distribución</message>
111117
<message id="Lms.Admin.ScannerController.compact">Compactar la base de datos. <strong>¡Atención!:</strong> esta operación puede tardar bastante tiempo y la aplicación se bloqueará mientras dura la operación de compactación</message>

‎approot/messages_fr.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,18 @@
5252
<message id="Lms.Error.user-not-found">L'utilisateur n'existe pas</message>
5353

5454
<!--Administration-->
55+
<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> À propos</message>
5556
<message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Outils de débogage</message>
5657
<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Bibliothèques</message>
5758
<message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Paramètres du scan</message>
5859
<message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
5960
<message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utilisateurs</message>
6061

62+
<!--About-->
63+
<message id="Lms.Admin.About.about">À propos</message>
64+
<message id="Lms.Admin.About.homepage">Page d’accueil</message>
65+
<message id="Lms.Admin.About.version">Version</message>
66+
6167
<!--MediaLibraries-->
6268
<message id="Lms.Admin.MediaLibraries.media-libraries">Bibliothèques musicales</message>
6369
<message id="Lms.Admin.MediaLibrary.create-library">Créer une bibliothèque</message>
@@ -101,11 +107,11 @@
101107

102108
<!--Scanner Controller-->
103109
<message id="Lms.Admin.ScannerController.bad-duration">Impossible de récupérer la durée de la piste</message>
104-
<message id="Lms.Admin.ScannerController.bad-embedded-image">Impossible de lire l'image à l'indice {1}</message>
110+
<message id="Lms.Admin.ScannerController.bad-embedded-image">Impossible de lire l'image à l'indice {1} : {2}</message>
105111
<message id="Lms.Admin.ScannerController.cannot-read-artist-info-file">Impossible d'analyser le fichier d'informations sur l'artiste</message>
106112
<message id="Lms.Admin.ScannerController.cannot-read-audio-file">Impossible d'analyser le fichier audio</message>
107113
<message id="Lms.Admin.ScannerController.cannot-read-file">Impossible de lire le fichier ({1})</message>
108-
<message id="Lms.Admin.ScannerController.cannot-read-image-file">Impossible d'analyser le fichier image</message>
114+
<message id="Lms.Admin.ScannerController.cannot-read-image-file">Impossible d'analyser le fichier image : {1}</message>
109115
<message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">Impossible d'analyser le fichier de paroles</message>
110116
<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">Impossible d'analyser le fichier de liste de lecture</message>
111117
<message id="Lms.Admin.ScannerController.compact">Compacter la base de données. <strong>Attention :</strong> cette opération peut prendre du temps et va vérouiller l'application pendant toute l'étape de compactage!</message>

‎approot/messages_it.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,18 @@
5252
<message id="Lms.Error.user-not-found">Utente non trovato</message>
5353

5454
<!--Administration-->
55+
<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> Informazioni</message>
5556
<message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Strumenti di debug</message>
5657
<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Librerie</message>
5758
<message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Impostazioni di scansione</message>
5859
<message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
5960
<message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utenti</message>
6061

62+
<!--About-->
63+
<message id="Lms.Admin.About.about">Informazioni</message>
64+
<message id="Lms.Admin.About.homepage">Pagina iniziale</message>
65+
<message id="Lms.Admin.About.version">Versione</message>
66+
6167
<!--MediaLibraries-->
6268
<message id="Lms.Admin.MediaLibraries.media-libraries">Librerie musicali</message>
6369
<message id="Lms.Admin.MediaLibrary.create-library">Crea libreria</message>
@@ -101,11 +107,11 @@
101107

102108
<!--Scanner Controller-->
103109
<message id="Lms.Admin.ScannerController.bad-duration">Non sono stato in grado di determinare la durata della traccia</message>
104-
<message id="Lms.Admin.ScannerController.bad-embedded-image">Impossibile leggere l'immagine all'indice {1}</message>
110+
<message id="Lms.Admin.ScannerController.bad-embedded-image">Impossibile leggere l'immagine all'indice {1} : {2}</message>
105111
<message id="Lms.Admin.ScannerController.cannot-read-artist-info-file">Impossibile analizzare il file delle informazioni sull'artista</message>
106112
<message id="Lms.Admin.ScannerController.cannot-read-audio-file">Impossibile analizzare il file audio</message>
107113
<message id="Lms.Admin.ScannerController.cannot-read-file">Non in grado di leggere il file ({1})</message>
108-
<message id="Lms.Admin.ScannerController.cannot-read-image-file">Impossibile analizzare il file immagine</message>
114+
<message id="Lms.Admin.ScannerController.cannot-read-image-file">Impossibile analizzare il file immagine : {1}</message>
109115
<message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">Impossibile analizzare il file dei testi</message>
110116
<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">Impossibile analizzare il file della playlist</message>
111117
<message id="Lms.Admin.ScannerController.compact">Compatta il database. <strong>Attenzione:</strong> ciò potrebbe richiedere del tempo e bloccherà l'intera applicazione durante il passaggio di compattazione!</message>

‎approot/messages_pl.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,18 @@
5353
<message id="Lms.Error.user-not-found">Użytkownik nie odnaleziony</message>
5454

5555
<!--Administration-->
56+
<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> O programie</message>
5657
<message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Narzędzia debugowania</message>
5758
<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Biblioteki</message>
5859
<message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Ustawienia skanowania</message>
5960
<message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Skaner</message>
6061
<message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Użytkownicy</message>
6162

63+
<!--About-->
64+
<message id="Lms.Admin.About.about">O programie</message>
65+
<message id="Lms.Admin.About.homepage">Strona główna</message>
66+
<message id="Lms.Admin.About.version">Wersja</message>
67+
6268
<!--MediaLibraries-->
6369
<message id="Lms.Admin.MediaLibraries.media-libraries">Biblioteki muzyczne</message>
6470
<message id="Lms.Admin.MediaLibrary.create-library">Utwórz bibliotekę</message>
@@ -102,11 +108,11 @@
102108

103109
<!--Scanner Controller-->
104110
<message id="Lms.Admin.ScannerController.bad-duration">Nie udało się ustalić długości ścieżki</message>
105-
<message id="Lms.Admin.ScannerController.bad-embedded-image">Nie można odczytać obrazu pod indeksem {1}</message>
111+
<message id="Lms.Admin.ScannerController.bad-embedded-image">Nie można odczytać obrazu pod indeksem {1} : {2}</message>
106112
<message id="Lms.Admin.ScannerController.cannot-read-artist-info-file">Nie można przetworzyć pliku z informacjami o artyście"</message>
107113
<message id="Lms.Admin.ScannerController.cannot-read-audio-file">Nie można przeanalizować pliku audio</message>
108114
<message id="Lms.Admin.ScannerController.cannot-read-file">Nie udało się odczytać pliku ({1})</message>
109-
<message id="Lms.Admin.ScannerController.cannot-read-image-file">Nie można przeanalizować pliku obrazu</message>
115+
<message id="Lms.Admin.ScannerController.cannot-read-image-file">Nie można przeanalizować pliku obrazu : {1}</message>
110116
<message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">Nie można przetworzyć pliku z tekstem</message>
111117
<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">Nie można przeanalizować pliku playlisty</message>
112118
<message id="Lms.Admin.ScannerController.compact">Sprasuj bazę danych. <strong>Uwaga:</strong> może to trochę zająć, a cała aplikacja będzie w tym czasie zablokowana!</message>

‎approot/messages_zh.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@
5858

5959

6060

61+
62+
<!--About-->
63+
64+
65+
66+
6167
<!--MediaLibraries-->
6268

6369

0 commit comments

Comments
 (0)