Added playlist import (and sync)from m3u files, ref #391

epoupon · Dec 18, 2024 · 3661eac · 3661eac
1 parent ec20c9b
commit 3661eac
Show file tree

Hide file tree

Showing 95 changed files with 3,455 additions and 1,650 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -12,7 +12,7 @@ CheckOptions:
   - key:             cppcoreguidelines-avoid-do-while.IgnoreMacros
     value:           '1'
   - key:             performance-unnecessary-value-param.AllowedTypes
-    value:           "shared_ptr;ObjectPtr"
+    value:           "shared_ptr;ObjectPtr;.*::pointer"
   - key:             cppcoreguidelines-special-member-functions.AllowMissingMoveFunctionsWhenCopyIsDeleted
     value:           '1'
   - key:             cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor 

diff --git a/approot/messages.xml b/approot/messages.xml
@@ -95,9 +95,10 @@
 <!--Scanner Controller-->
 <message id="Lms.Admin.ScannerController.bad-duration">Cannot get track duration</message>
 <message id="Lms.Admin.ScannerController.cannot-read-audio-file">Cannot parse audio file</message>
+<message id="Lms.Admin.ScannerController.cannot-read-file">Cannot read file</message>
 <message id="Lms.Admin.ScannerController.cannot-read-image-file">Cannot parse image file</message>
 <message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">Cannot parse lyrics file</message>
-<message id="Lms.Admin.ScannerController.cannot-read-file">Cannot read file</message>
+<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">Cannot parse playlist file</message>
 <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>
 <message id="Lms.Admin.ScannerController.duplicates-header">{1} duplicate files:</message>
 <message id="Lms.Admin.ScannerController.errors-header">{1} errors:</message>
@@ -119,6 +120,7 @@
 <message id="Lms.Admin.ScannerController.status-in-progress">Scanning: step {1}/{2}</message>
 <message id="Lms.Admin.ScannerController.step-associating-artist-images">Associating artist images: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-associating-external-lyrics">Associating external lyrics: {1}%...</message>
+<message id="Lms.Admin.ScannerController.step-associating-playlist-tracks">Associating playlist tracks: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-associating-release-images">Associating release images: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-duplicate-files">Checking for duplicate files... {1} files</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-removed-files">Checking for removed files... {1}%</message>

diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml
@@ -95,9 +95,10 @@
 <!--Scanner Controller-->
 <message id="Lms.Admin.ScannerController.bad-duration">Impossible de récupérer la durée de la piste</message>
 <message id="Lms.Admin.ScannerController.cannot-read-audio-file">Impossible d'analyser le fichier audio</message>
+<message id="Lms.Admin.ScannerController.cannot-read-file">Impossible de lire le fichier</message>
 <message id="Lms.Admin.ScannerController.cannot-read-image-file">Impossible d'analyser le fichier image</message>
 <message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">Impossible d'analyser le fichier de paroles</message>
-<message id="Lms.Admin.ScannerController.cannot-read-file">Impossible de lire le fichier</message>
+<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">Impossible d'analyser le fichier de liste de lecture</message>
 <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>
 <message id="Lms.Admin.ScannerController.duplicates-header">{1} fichiers dupliqués :</message>
 <message id="Lms.Admin.ScannerController.errors-header">{1} erreurs :</message>
@@ -119,6 +120,7 @@
 <message id="Lms.Admin.ScannerController.status-in-progress">En cours de scan : étape {1}/{2}</message>
 <message id="Lms.Admin.ScannerController.step-associating-artist-images">Association des images des artistes: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-associating-external-lyrics">Association des paroles externes: {1}%...</message>
+<message id="Lms.Admin.ScannerController.step-associating-playlist-tracks">Association des pistes des listes de lectures: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-associating-release-images">Association des images des albums: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-duplicate-files">Vérification des fichiers dupliqués... {1} fichiers</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-removed-files">Vérification des fichiers supprimés... {1}%</message>

diff --git a/approot/messages_it.xml b/approot/messages_it.xml
@@ -95,9 +95,10 @@
 <!--Scanner Controller-->
 <message id="Lms.Admin.ScannerController.bad-duration">Non sono stato in grado di determinare la durata della traccia</message>
 <message id="Lms.Admin.ScannerController.cannot-read-audio-file">Impossibile analizzare il file audio</message>
+<message id="Lms.Admin.ScannerController.cannot-read-file">Non in grado di leggere il file</message>
 <message id="Lms.Admin.ScannerController.cannot-read-image-file">Impossibile analizzare il file immagine</message>
 <message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">Impossibile analizzare il file dei testi</message>
-<message id="Lms.Admin.ScannerController.cannot-read-file">Non in grado di leggere il file</message>
+<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">Impossibile analizzare il file della playlist</message>
 <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>
 <message id="Lms.Admin.ScannerController.duplicates-header">{1} file duplicati:</message>
 <message id="Lms.Admin.ScannerController.errors-header">{1} errori:</message>
@@ -119,6 +120,7 @@
 <message id="Lms.Admin.ScannerController.status-in-progress">Scansione: passo {1}/{2}</message>
 <message id="Lms.Admin.ScannerController.step-associating-artist-images">Associando immagini degli artisti: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-associating-external-lyrics">Associazione dei testi esterni: {1}%...</message>
+<message id="Lms.Admin.ScannerController.step-associating-playlist-tracks">Associando brani della playlist: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-associating-release-images">Associando immagini degli album: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-duplicate-files">Controllo duplicati... {1} files</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-removed-files">Controllo file... {1}%</message>

diff --git a/approot/messages_pl.xml b/approot/messages_pl.xml
@@ -96,9 +96,10 @@
 <!--Scanner Controller-->
 <message id="Lms.Admin.ScannerController.bad-duration">Nie udało się ustalić długości ścieżki</message>
 <message id="Lms.Admin.ScannerController.cannot-read-audio-file">Nie można przeanalizować pliku audio</message>
+<message id="Lms.Admin.ScannerController.cannot-read-file">Nie udało się odczytać pliku</message>
 <message id="Lms.Admin.ScannerController.cannot-read-image-file">Nie można przeanalizować pliku obrazu</message>
 <message id="Lms.Admin.ScannerController.cannot-read-lyrics-file">Nie można przetworzyć pliku z tekstem</message>
-<message id="Lms.Admin.ScannerController.cannot-read-file">Nie udało się odczytać pliku</message>
+<message id="Lms.Admin.ScannerController.cannot-read-playlist-file">Nie można przeanalizować pliku playlisty</message>
 <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>
 <message id="Lms.Admin.ScannerController.duplicates-header">
 	<plural case="0">{1} zduplikowany plik:</plural>
@@ -128,6 +129,7 @@
 <message id="Lms.Admin.ScannerController.status-in-progress">Skanowanie: krok {1}/{2}</message>
 <message id="Lms.Admin.ScannerController.step-associating-artist-images">Kojarzenie obrazów artystów: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-associating-external-lyrics">Kojarzenie zewnętrznych tekstów: {1}%...</message>
+<message id="Lms.Admin.ScannerController.step-associating-playlist-tracks">Kojarzenie utworów z playlisty: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-associating-release-images">Kojarzenie obrazów albumów: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-duplicate-files">
 	<plural case="0">Sprawdzanie duplikatów... {1} plik</plural>

diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml
@@ -99,6 +99,7 @@
 <message id="Lms.Admin.ScannerController.cannot-read-file">无法读取文件</message>
 
 
+
 <message id="Lms.Admin.ScannerController.duplicates-header">{1} 个重复文件：</message>
 <message id="Lms.Admin.ScannerController.errors-header">{1} 个错误：</message>
 
@@ -121,6 +122,7 @@
 
 
 
+
 <message id="Lms.Admin.ScannerController.step-checking-for-removed-files">检查文件中... {1}%</message>
 
 

diff --git a/src/libs/core/impl/IOContextRunner.cpp b/src/libs/core/impl/IOContextRunner.cpp
@@ -26,9 +26,9 @@
 
 namespace lms::core
 {
-    IOContextRunner::IOContextRunner(boost::asio::io_service& ioService, std::size_t threadCount, std::string_view name)
-        : _ioService{ ioService }
-        , _work{ ioService }
+    IOContextRunner::IOContextRunner(boost::asio::io_context& ioContext, std::size_t threadCount, std::string_view name)
+        : _ioContext{ ioContext }
+        , _work{ ioContext }
     {
         LMS_LOG(UTILS, INFO, "Starting IO context with " << threadCount << " threads...");
 
@@ -50,7 +50,7 @@ namespace lms::core
 
                 try
                 {
-                    _ioService.run();
+                    _ioContext.run();
                 }
                 catch (const std::exception& e)
                 {
@@ -65,7 +65,7 @@ namespace lms::core
     {
         LMS_LOG(UTILS, DEBUG, "Stopping IO context...");
         _work.reset();
-        _ioService.stop();
+        _ioContext.stop();
         LMS_LOG(UTILS, DEBUG, "IO context stopped!");
     }
 

diff --git a/src/libs/core/include/core/IOContextRunner.hpp b/src/libs/core/include/core/IOContextRunner.hpp
@@ -22,25 +22,24 @@
 #include <optional>
 #include <thread>
 
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
 
 namespace lms::core
 {
     class IOContextRunner
     {
     public:
-        IOContextRunner(boost::asio::io_service& ioService, std::size_t threadCount, std::string_view name);
+        IOContextRunner(boost::asio::io_context& ioContext, std::size_t threadCount, std::string_view name);
         ~IOContextRunner();
+        IOContextRunner(const IOContextRunner&) = delete;
+        IOContextRunner& operator=(const IOContextRunner&) = delete;
 
         void stop();
         std::size_t getThreadCount() const;
 
     private:
-        IOContextRunner(const IOContextRunner&) = delete;
-        IOContextRunner& operator=(const IOContextRunner&) = delete;
-
-        boost::asio::io_service& _ioService;
-        std::optional<boost::asio::io_service::work> _work;
+        boost::asio::io_context& _ioContext;
+        std::optional<boost::asio::io_context::work> _work;
         std::vector<std::thread> _threads;
     };
 } // namespace lms::core
diff --git a/src/libs/database/CMakeLists.txt b/src/libs/database/CMakeLists.txt
@@ -8,6 +8,7 @@ add_library(lmsdatabase SHARED
 	impl/Listen.cpp
 	impl/MediaLibrary.cpp
 	impl/Migration.cpp
+	impl/PlayListFile.cpp
 	impl/PlayQueue.cpp
 	impl/TrackArtistLink.cpp
 	impl/TrackFeatures.cpp

diff --git a/src/libs/database/impl/Directory.cpp b/src/libs/database/impl/Directory.cpp
@@ -170,10 +170,12 @@ namespace lms::db
         query.leftJoin("track t ON d.id = t.directory_id");
         query.leftJoin("image i ON d.id = i.directory_id");
         query.leftJoin("track_lyrics l_lrc ON d.id = l_lrc.directory_id");
+        query.leftJoin("playlist_file pl_f ON d.id = pl_f.directory_id");
         query.where("d_child.id IS NULL");
         query.where("t.directory_id IS NULL");
         query.where("i.directory_id IS NULL");
         query.where("l_lrc.directory_id IS NULL");
+        query.where("pl_f.directory_id IS NULL");
 
         return utils::execRangeQuery<DirectoryId>(query, range);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,6 +99,7 @@ @@
     <message id="Lms.Admin.ScannerController.cannot-read-file">无法读取文件</message>
     <message id="Lms.Admin.ScannerController.duplicates-header">{1} 个重复文件：</message>
     <message id="Lms.Admin.ScannerController.errors-header">{1} 个错误：</message>
@@ Expand All / @@ -121,6 +122,7 @@ @@
     <message id="Lms.Admin.ScannerController.step-checking-for-removed-files">检查文件中... {1}%</message>
@@ Expand Down @@