Merge branch 'develop' for release v3.62.1

Author: epoupon

README.md

@@ -7,19 +7,21 @@ _LMS_ is a self-hosted music streaming software: access your music collection fr
 A [demo instance](http://lms-demo.poupon.dev) is available. Note the administration settings are not available.
 
 ## Main features
-* Recommendation engine
+* [Subsonic/OpenSubsonic API](SUBSONIC.md) support
 * Multi-valued tags: `genre`, `mood`, `artists`, ...
 * Artist relationships: `composer`, `conductor`, `lyricist`, `mixer`, `performer`, `producer`, `remixer`
 * [Release types](https://musicbrainz.org/doc/Release_Group/Type): `album`, `single`, `EP`, `compilation`, `live`, ...
 * [MusicBrainz Identifier](https://musicbrainz.org/doc/MusicBrainz_Identifier) support to handle duplicated artist and release names
 * [ListenBrainz](https://listenbrainz.org) support for:
   * Scrobbling and synchronizing listens
   * Synchronizing 'love' feedbacks
-* Audio transcoding for maximum interoperability and reduced bandwith requirements
+* Recommendation engine
 * Multi-library support
 * ReplayGain support
+* Audio transcoding for compatibility and reduced bandwidth
 * User management, with several [authentication backends](INSTALL.md#authentication-backend)
-* [Subsonic/OpenSubsonic API](SUBSONIC.md) support
+* Playlists support
+* Lyrics support
 
 ## Music discovery
 _LMS_ provides several ways to help you find the music you like:
@@ -57,6 +59,12 @@ $setmulti(albumartists,%_albumartists%)
 $setmulti(albumartistssort,%_albumartists_sort%)
 ```
 
+## Playlist support
+_LMS_ supports playlist files in `m3u` and `m3u8` formats. These playlists are synced during the scan process and are available as public shared playlists.
+
+## Lyrics support
+_LMS_ supports lyrics in `lrc` files and embedded track metadata. Both synchronized and unsynchronized lyrics are supported.
+
 ## Keyboard shortcuts
 * Play/pause: <kbd>Space</kbd>
 * Previous track: <kbd>Ctrl</kbd> + <kbd>Left</kbd>

src/libs/database/impl/Track.cpp

@@ -195,7 +195,7 @@ namespace lms::db
                 break;
             case TrackSortMethod::TrackList:
                 assert(params.trackList.isValid());
-                query.orderBy("t_l.id");
+                query.orderBy("t_l_e.id");
             }
 
             return query;

src/libs/metadata/impl/PlayList.cpp

@@ -28,7 +28,7 @@ namespace lms::metadata
 {
     std::span<const std::filesystem::path> getSupportedPlayListFileExtensions()
     {
-        static const std::array<std::filesystem::path, 2> fileExtensions{ ".m3u", "m3u8" };
+        static const std::array<std::filesystem::path, 2> fileExtensions{ ".m3u", ".m3u8" };
         return fileExtensions;
     }
 

src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp

@@ -325,6 +325,7 @@ namespace lms::scanner
             AudioFileScanOperation& operator=(const AudioFileScanOperation&) = delete;
 
         private:
+            const std::filesystem::path& getFile() const override { return _file; };
             core::LiteralString getName() const override { return "ScanAudioFile"; }
             void scan() override;
             void processResult(ScanContext& context) override;
@@ -603,6 +604,11 @@ namespace lms::scanner
 
     AudioFileScanner::~AudioFileScanner() = default;
 
+    core::LiteralString AudioFileScanner::getName() const
+    {
+        return "Audio scanner";
+    }
+
     std::span<const std::filesystem::path> AudioFileScanner::getSupportedExtensions() const
     {
         return _metadataParser->getSupportedExtensions();

src/libs/services/scanner/impl/scanners/AudioFileScanner.hpp

@@ -50,6 +50,7 @@ namespace lms::scanner
         AudioFileScanner& operator=(const AudioFileScanner&) = delete;
 
     private:
+        core::LiteralString getName() const override;
         std::span<const std::filesystem::path> getSupportedExtensions() const override;
         bool needsScan(ScanContext& context, const FileToScan& file) const override;
         std::unique_ptr<IFileScanOperation> createScanOperation(const FileToScan& fileToScan) const override;

src/libs/services/scanner/impl/scanners/IFileScanOperation.hpp

@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <filesystem>
+
 #include "core/LiteralString.hpp"
 
 namespace lms::scanner
@@ -31,6 +33,8 @@ namespace lms::scanner
         virtual ~IFileScanOperation() = default;
 
         virtual core::LiteralString getName() const = 0;
+
+        virtual const std::filesystem::path& getFile() const = 0;
         virtual void scan() = 0;
         virtual void processResult(ScanContext& context) = 0;
     };

src/libs/services/scanner/impl/scanners/IFileScanner.hpp

@@ -22,6 +22,8 @@
 #include <filesystem>
 #include <span>
 
+#include "core/LiteralString.hpp"
+
 #include "MediaLibraryInfo.hpp"
 
 namespace lms::scanner
@@ -41,6 +43,7 @@ namespace lms::scanner
     public:
         virtual ~IFileScanner() = default;
 
+        virtual core::LiteralString getName() const = 0;
         virtual std::span<const std::filesystem::path> getSupportedExtensions() const = 0;
         virtual bool needsScan(ScanContext& context, const FileToScan& file) const = 0;
         virtual std::unique_ptr<IFileScanOperation> createScanOperation(const FileToScan& fileToScan) const = 0;

src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp

@@ -46,6 +46,7 @@ namespace lms::scanner
                 , _db{ db } {}
 
         private:
+            const std::filesystem::path& getFile() const override { return _file; };
             core::LiteralString getName() const override { return "ScanImageFile"; }
             void scan() override;
             void processResult(ScanContext& context) override;
@@ -134,6 +135,11 @@ namespace lms::scanner
     {
     }
 
+    core::LiteralString ImageFileScanner::getName() const
+    {
+        return "Image scanner";
+    }
+
     std::span<const std::filesystem::path> ImageFileScanner::getSupportedExtensions() const
     {
         return image::getSupportedFileExtensions();

src/libs/services/scanner/impl/scanners/ImageFileScanner.hpp

@@ -42,6 +42,7 @@ namespace lms::scanner
         ImageFileScanner& operator=(const ImageFileScanner&) = delete;
 
     private:
+        core::LiteralString getName() const override;
         std::span<const std::filesystem::path> getSupportedExtensions() const override;
         bool needsScan(ScanContext& context, const FileToScan& file) const override;
         std::unique_ptr<IFileScanOperation> createScanOperation(const FileToScan& fileToScan) const override;

src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp

@@ -46,6 +46,7 @@ namespace lms::scanner
                 , _db{ db } {}
 
         private:
+            const std::filesystem::path& getFile() const override { return _file; };
             core::LiteralString getName() const override { return "ScanLyricsFile"; }
             void scan() override;
             void processResult(ScanContext& context) override;
@@ -137,6 +138,11 @@ namespace lms::scanner
     {
     }
 
+    core::LiteralString LyricsFileScanner::getName() const
+    {
+        return "Lyrics scanner";
+    }
+
     std::span<const std::filesystem::path> LyricsFileScanner::getSupportedExtensions() const
     {
         return metadata::getSupportedLyricsFileExtensions();