From cb1b33593f813b1b117a0f7ff8a0002b867e9ebb Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 9 Dec 2022 23:56:13 +0100 Subject: [PATCH 1/5] Add CodeQL workflow for GitHub code scanning --- .github/workflows/codeql.yml | 56 ++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..b67055d1 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,56 @@ +name: "CodeQL" + +on: + push: + branches: [ "master", "develop" ] + pull_request: + branches: [ "master", "develop" ] + schedule: + - cron: "48 10 * * 4" + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ javascript, cpp ] + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Install Packages (cpp) + if: ${{ matrix.language == 'cpp' }} + run: | + sudo apt-get update + sudo apt-get install --yes build-essential cmake libboost-all-dev libconfig++-dev libavcodec-dev libavutil-dev libavformat-dev libstb-dev libtag1-dev libpam0g-dev libgtest-dev + export WT_VERSION=4.7.2 + export WT_INSTALL_PREFIX=/usr + git clone https://github.com/emweb/wt.git wt + pushd wt + git checkout ${WT_VERSION} + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${WT_INSTALL_PREFIX} -DBUILD_EXAMPLES=OFF -DENABLE_LIBWTTEST=OFF -DCONNECTOR_FCGI=OFF + make + sudo make install + popd + + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + queries: +security-and-quality + + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{ matrix.language }}" From 495005357c432bdb31ba340c0166620673b868ba Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 11 Dec 2022 11:33:44 +0100 Subject: [PATCH 2/5] Small cleanup --- src/libs/subsonic/impl/SubsonicResponse.cpp | 2 +- src/libs/subsonic/impl/SubsonicResponse.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/subsonic/impl/SubsonicResponse.cpp b/src/libs/subsonic/impl/SubsonicResponse.cpp index da67c15a..8d9c640a 100644 --- a/src/libs/subsonic/impl/SubsonicResponse.cpp +++ b/src/libs/subsonic/impl/SubsonicResponse.cpp @@ -232,7 +232,7 @@ Response::writeJSON(std::ostream& os) { Json::Object res; - auto valueToJsonValue {[](const Node::Value& value) -> Json::Value + auto valueToJsonValue {[](const Node::ValueType& value) -> Json::Value { if (std::holds_alternative(value)) return Json::Value {std::get(value)}; diff --git a/src/libs/subsonic/impl/SubsonicResponse.hpp b/src/libs/subsonic/impl/SubsonicResponse.hpp index dc6a94f1..321d7c76 100644 --- a/src/libs/subsonic/impl/SubsonicResponse.hpp +++ b/src/libs/subsonic/impl/SubsonicResponse.hpp @@ -206,9 +206,9 @@ class Response void setVersionAttribute(ProtocolVersion version); friend class Response; - using Value = std::variant; - std::map _attributes; - std::optional _value; + using ValueType = std::variant; + std::map _attributes; + std::optional _value; std::map> _children; std::map> _childrenArrays; }; From 998def846d55ccffc0797bfae0a08c35ae874668 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 14 Dec 2022 20:07:54 +0100 Subject: [PATCH 3/5] Added performers. fixes #278 --- approot/artist.xml | 6 +- approot/explore.xml | 2 +- approot/messages.xml | 4 + approot/messages_fr.xml | 4 + approot/messages_it.xml | 4 + approot/messages_zh.xml | 4 + approot/release.xml | 6 +- approot/tracks.xml | 10 +- src/libs/metadata/impl/TagLibParser.cpp | 64 ++++++++--- src/libs/metadata/impl/Utils.cpp | 46 ++++++++ src/libs/metadata/impl/Utils.hpp | 10 ++ .../metadata/include/metadata/IParser.hpp | 4 + src/libs/metadata/test/Utils.cpp | 45 +++++++- src/libs/services/database/impl/Migration.cpp | 12 +++ src/libs/services/database/impl/Migration.hpp | 2 +- .../database/impl/TrackArtistLink.cpp | 100 +++++++++++++----- .../include/services/database/Artist.hpp | 1 - .../services/database/TrackArtistLink.hpp | 40 +++++-- .../services/scanner/impl/ScannerService.cpp | 6 ++ src/libs/utils/impl/String.cpp | 31 ++++-- src/libs/utils/include/utils/String.hpp | 5 +- src/libs/utils/test/String.cpp | 29 +++++ src/lms/ui/explore/ArtistView.cpp | 15 +-- src/lms/ui/explore/ArtistsView.cpp | 2 + src/lms/ui/explore/ReleaseView.cpp | 41 ++++++- src/lms/ui/explore/TrackListHelpers.cpp | 42 ++++++-- src/tools/metadata/LmsMetadata.cpp | 12 ++- 27 files changed, 451 insertions(+), 96 deletions(-) diff --git a/approot/artist.xml b/approot/artist.xml index 67d65f0a..add9a9e7 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -21,15 +21,15 @@ ${} - ${}

${tr:Lms.Explore.releases}

${} + ${}

${tr:Lms.Explore.releases}

${} ${releases class="mb-3"} ${} ${} - ${}

${tr:Lms.Explore.Artist.appears-on}

${} +

${tr:Lms.Explore.Artist.appears-on}

${appears-on-releases class="mb-3"} ${} ${} - ${}

${tr:Lms.Explore.tracks}

${} +

${tr:Lms.Explore.tracks}

${tracks class="mb-3"} ${} ${} diff --git a/approot/explore.xml b/approot/explore.xml index 38d64d00..342621dc 100644 --- a/approot/explore.xml +++ b/approot/explore.xml @@ -43,7 +43,7 @@
-
+
${type}
diff --git a/approot/messages.xml b/approot/messages.xml index f805b9fa..241caf7a 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -175,6 +175,10 @@ Mixer Mixers + + Performer + Performers + Producer Producers diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 1c32c26b..0439a9e5 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -175,6 +175,10 @@ Mixeur Mixeurs + + Interprète + Interprètes + Producteur Producteurs diff --git a/approot/messages_it.xml b/approot/messages_it.xml index 0f000814..57d57209 100644 --- a/approot/messages_it.xml +++ b/approot/messages_it.xml @@ -183,6 +183,10 @@ + + + + diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml index 9472f65a..e685897f 100644 --- a/approot/messages_zh.xml +++ b/approot/messages_zh.xml @@ -183,6 +183,10 @@ + + + + diff --git a/approot/release.xml b/approot/release.xml index 16545709..79e3c0d1 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -87,7 +87,7 @@
-
+
${tr:Lms.Explore.release-info}
@@ -98,7 +98,7 @@ ${artist-table class="d-grid gap-2"} ${}
-
+
${tr:Lms.Explore.codec}
@@ -108,7 +108,7 @@ ${} ${}
-
+
${tr:Lms.Explore.bitrate}
diff --git a/approot/tracks.xml b/approot/tracks.xml index 731fb8a2..44992ebb 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -70,7 +70,7 @@
-
+
${tr:Lms.Explore.track-info}
@@ -80,7 +80,7 @@
${}
-
+
${tr:Lms.clusters}
@@ -90,7 +90,7 @@ ${} ${artist-table class="d-grid gap-2"}
-
+
${tr:Lms.Explore.duration}
@@ -99,7 +99,7 @@
${}
-
+
${tr:Lms.Explore.codec}
@@ -109,7 +109,7 @@ ${} ${}
-
+
${tr:Lms.Explore.bitrate}
diff --git a/src/libs/metadata/impl/TagLibParser.cpp b/src/libs/metadata/impl/TagLibParser.cpp index d5c9ba6c..d2e21215 100644 --- a/src/libs/metadata/impl/TagLibParser.cpp +++ b/src/libs/metadata/impl/TagLibParser.cpp @@ -132,6 +132,48 @@ getArtists(const TagLib::PropertyMap& properties, return artists; } +static +PerformerContainer +getPerformerArtists(const TagLib::PropertyMap& properties, + const std::vector& artistTagNames) +{ + PerformerContainer performers; + + // picard stores like this: (see https://picard-docs.musicbrainz.org/en/appendices/tag_mapping.html#performer) + // PERFORMER: artist (role) + if (const std::vector artistNames {getPropertyValuesFirstMatchAs(properties, artistTagNames)}; !artistNames.empty()) + { + for (std::string_view entry : artistNames) + { + Utils::PerformerArtist performer {Utils::extractPerformerAndRole(entry)}; + StringUtils::capitalize(performer.role); + performers[performer.role].push_back(std::move(performer.artist)); + } + } + // PERFORMER:role (MP3) + else + { + for (const auto& [key, values] : properties) + { + if (key.startsWith("PERFORMER")) + { + std::string performerStr {key.to8Bit(true)}; + std::string role; + if (const std::size_t rolePos {performerStr.find(':')}; rolePos != std::string::npos) + { + role = StringUtils::stringToLower(performerStr.substr(rolePos + 1, performerStr.size() - rolePos + 1)); + StringUtils::capitalize(role); + } + + for (const auto& value : values) + performers[role].push_back(Artist {value.to8Bit(true)}); + } + } + } + + return performers; +} + static std::optional getAlbum(const TagLib::PropertyMap& properties) @@ -140,7 +182,7 @@ getAlbum(const TagLib::PropertyMap& properties) if (albumName.empty()) return std::nullopt; - const std::vector albumMBID {getPropertyValuesFirstMatchAs(properties, {"MUSICBRAINZ_ALBUMID", "MUSICBRAINZ ALBUM ID"})}; + const std::vector albumMBID {getPropertyValuesFirstMatchAs(properties, {"MUSICBRAINZ_ALBUMID", "MUSICBRAINZ ALBUM ID", "MUSICBRAINZ/ALBUM ID"})}; if (albumMBID.empty()) return Album {std::move(albumName.front()), {}}; @@ -187,12 +229,14 @@ TagLibParser::processTag(Track& track, const std::string& tag, const TagLib::Str if (tag == "TITLE") track.title = value; else if (tag == "MUSICBRAINZ_RELEASETRACKID" - || tag == "MUSICBRAINZ RELEASE TRACK ID") + || tag == "MUSICBRAINZ RELEASE TRACK ID" + || tag == "MUSICBRAINZ/RELEASE TRACK ID") { track.trackMBID = UUID::fromString(value); } else if (tag == "MUSICBRAINZ_TRACKID" - || tag == "MUSICBRAINZ TRACK ID") + || tag == "MUSICBRAINZ TRACK ID" + || tag == "MUSICBRAINZ/TRACK ID") track.recordingMBID = UUID::fromString(value); else if (tag == "ACOUSTID_ID") track.acoustID = UUID::fromString(value); @@ -416,23 +460,19 @@ TagLibParser::parse(const std::filesystem::path& p, bool debug) track.hasCover = true; } - for (const auto& property : properties) - { - const std::string tag {property.first.upper().to8Bit(true)}; - const TagLib::StringList& values {property.second}; - - processTag(track, tag, values, debug); - } + for (const auto& [tag, values] : properties) + processTag(track, tag.upper().to8Bit(true), values, debug); track.album = getAlbum(properties); - track.artists = getArtists(properties, {"ARTISTS", "ARTIST"}, {"ARTISTSORT"}, {"MUSICBRAINZ_ARTISTID", "MUSICBRAINZ ARTIST ID"}); - track.albumArtists = getArtists(properties, {"ALBUMARTISTS", "ALBUMARTIST"}, {"ALBUMARTISTSSORT", "ALBUMARTISTSORT"}, {"MUSICBRAINZ_ALBUMARTISTID", "MUSICBRAINZ ALBUM ARTIST ID"}); + track.artists = getArtists(properties, {"ARTISTS", "ARTIST"}, {"ARTISTSORT"}, {"MUSICBRAINZ_ARTISTID", "MUSICBRAINZ ARTIST ID", "MUSICBRAINZ/ARTIST ID"}); + track.albumArtists = getArtists(properties, {"ALBUMARTISTS", "ALBUMARTIST"}, {"ALBUMARTISTSSORT", "ALBUMARTISTSORT"}, {"MUSICBRAINZ_ALBUMARTISTID", "MUSICBRAINZ ALBUM ARTIST ID", "MUSICBRAINZ/ALBUM ARTIST ID"}); track.conductorArtists = getArtists(properties, {"CONDUCTORS", "CONDUCTOR"}, {"CONDUCTORSSORT", "CONDUCTORSORT"}, {}); track.composerArtists = getArtists(properties, {"COMPOSERS", "COMPOSER"}, {"COMPOSERSSORT", "COMPOSERSORT"}, {}); track.lyricistArtists = getArtists(properties, {"LYRICISTS", "LYRICIST"}, {"LYRICISTSSORT", "LYRICISTSORT"}, {}); track.mixerArtists = getArtists(properties, {"MIXERS", "MIXER"}, {"MIXERSSORT", "MIXERSORT"}, {}); track.producerArtists = getArtists(properties, {"PRODUCERS", "PRODUCER"}, {"PRODUCERSSORT", "PRODUCERSORT"}, {}); track.remixerArtists = getArtists(properties, {"REMIXERS", "REMIXER", "ModifiedBy"}, {"REMIXERSSORT", "REMIXERSORT"}, {}); + track.performerArtists = getPerformerArtists(properties, {"PERFORMERS", "PERFORMER"}); return track; } diff --git a/src/libs/metadata/impl/Utils.cpp b/src/libs/metadata/impl/Utils.cpp index 7919ca8a..40923964 100644 --- a/src/libs/metadata/impl/Utils.cpp +++ b/src/libs/metadata/impl/Utils.cpp @@ -71,5 +71,51 @@ namespace MetaData::Utils throw LmsException {"Unknown read style"}; } + + PerformerArtist + extractPerformerAndRole(std::string_view entry) + { + std::string_view artistName; + std::string_view role; + + std::size_t roleBegin {}; + std::size_t roleEnd {}; + std::size_t count {}; + + for (std::size_t i {}; i < entry.size(); ++i) + { + std::size_t currentIndex {entry.size() - i - 1}; + const char c {entry[currentIndex]}; + + if (std::isspace(c)) + continue; + + if (c == ')') + { + if (count++ == 0) + roleEnd = currentIndex; + } + else if (c == '(') + { + if (count == 0) + break; + + if (--count == 0) + { + roleBegin = currentIndex + 1; + role = StringUtils::stringTrim(entry.substr(roleBegin, roleEnd - roleBegin)); + artistName = StringUtils::stringTrim(entry.substr(0, currentIndex)); + break; + } + } + else if (count == 0) + break; + } + + if (!roleEnd || !roleBegin) + artistName = StringUtils::stringTrim(entry); + + return PerformerArtist {Artist {artistName}, std::string {role}}; + } } diff --git a/src/libs/metadata/impl/Utils.hpp b/src/libs/metadata/impl/Utils.hpp index 0bbd4485..20caf73c 100644 --- a/src/libs/metadata/impl/Utils.hpp +++ b/src/libs/metadata/impl/Utils.hpp @@ -18,6 +18,7 @@ * along with LMS. If not, see . */ +#include #include #include "metadata/IParser.hpp" @@ -26,5 +27,14 @@ namespace MetaData::Utils { Wt::WDate parseDate(const std::string& dateStr); std::string_view readStyleToString(ParserReadStyle readStyle); + + struct PerformerArtist + { + Artist artist; + std::string role; + }; + + // format is "artist name (role)" + PerformerArtist extractPerformerAndRole(std::string_view entry); } diff --git a/src/libs/metadata/include/metadata/IParser.hpp b/src/libs/metadata/include/metadata/IParser.hpp index b4555d31..4a49cef0 100644 --- a/src/libs/metadata/include/metadata/IParser.hpp +++ b/src/libs/metadata/include/metadata/IParser.hpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -44,6 +45,8 @@ namespace MetaData Artist(std::string_view _name, std::optional _sortName, std::optional _musicBrainzArtistID) : name {_name}, sortName {_sortName}, musicBrainzArtistID {_musicBrainzArtistID} {} }; + using PerformerContainer = std::map>; + struct Album { std::string name; @@ -83,6 +86,7 @@ namespace MetaData std::vector composerArtists; std::vector lyricistArtists; std::vector mixerArtists; + PerformerContainer performerArtists; std::vector producerArtists; std::vector remixerArtists; }; diff --git a/src/libs/metadata/test/Utils.cpp b/src/libs/metadata/test/Utils.cpp index 97ff5b17..41b9ee9e 100644 --- a/src/libs/metadata/test/Utils.cpp +++ b/src/libs/metadata/test/Utils.cpp @@ -62,7 +62,6 @@ TEST(MetaData, parseDate) { "1995-05/09", Wt::WDate {} }, // invalid mixup separators }; - for (const TestCase& testCase : testCases) { const Wt::WDate parsed {parseDate(testCase.str)}; @@ -72,3 +71,47 @@ TEST(MetaData, parseDate) EXPECT_EQ(parsed.day(), testCase.result.day()) << " str was '" << testCase.str << "'"; } } + +TEST(MetaData, extractPerformerAndRole) +{ + using namespace MetaData::Utils; + + struct TestCase + { + std::string str; + std::string expectedArtistName; + std::string expectedRole; + } testCases [] + { + { "", "", "" }, + { "(myrole)", "", "myrole" }, + { "(my role)", "", "my role" }, + { " ( my role ) ", "", "my role" }, + { " (()) ", "", "()" }, + { ")", ")", "" }, + { "(", "(", "" }, + { "artist name (my role)", "artist name", "my role" }, + { "artist name ()", "artist name", "" }, + { "artist name ( )", "artist name", "" }, + { "artist (subname) name", "artist (subname) name", "" }, + { " artist name ( my role )", "artist name", "my role" }, + { "artist name (artist subname) (my role)", "artist name (artist subname)", "my role" }, + { "artist name", "artist name", "" }, + { " artist name ", "artist name", "" }, + { "artist name (", "artist name (", "" }, + { "artist name )", "artist name )", "" }, + { "artist name (()", "artist name (", "" }, + { "artist name (())", "artist name", "()" }, + { "artist name ( () )", "artist name", "()" }, + { "artist name (drums (drum set))", "artist name", "drums (drum set)" }, + { "artist name ( drums (drum set) )", "artist name", "drums (drum set)" }, + }; + + for (const TestCase& testCase : testCases) + { + PerformerArtist performer {extractPerformerAndRole(testCase.str)}; + + EXPECT_EQ(performer.artist.name, testCase.expectedArtistName) << " str was '" << testCase.str << "'"; + EXPECT_EQ(performer.role, testCase.expectedRole) << " str was '" << testCase.str << "'"; + } +} diff --git a/src/libs/services/database/impl/Migration.cpp b/src/libs/services/database/impl/Migration.cpp index b78a5138..d9300fc2 100644 --- a/src/libs/services/database/impl/Migration.cpp +++ b/src/libs/services/database/impl/Migration.cpp @@ -600,6 +600,17 @@ CREATE TABLE IF NOT EXISTS "track_artist_link_backup" ( ScanSettings::get(session).modify()->incScanVersion(); } + static + void + migrateFromV37(Session& session) + { + // Support Performer tags (via subtypes) + session.getDboSession().execute("ALTER TABLE track_artist_link ADD subtype TEXT"); + + // Just increment the scan version of the settings to make the next scheduled scan rescan everything + ScanSettings::get(session).modify()->incScanVersion(); + } + void doDbMigration(Session& session) { @@ -643,6 +654,7 @@ CREATE TABLE IF NOT EXISTS "track_artist_link_backup" ( {34, migrateFromV34}, {35, migrateFromV35}, {36, migrateFromV36}, + {37, migrateFromV37}, }; while (1) diff --git a/src/libs/services/database/impl/Migration.hpp b/src/libs/services/database/impl/Migration.hpp index 9a84c0b4..682dc197 100644 --- a/src/libs/services/database/impl/Migration.hpp +++ b/src/libs/services/database/impl/Migration.hpp @@ -26,7 +26,7 @@ namespace Database class Session; using Version = std::size_t; - static constexpr Version LMS_DATABASE_VERSION {37}; + static constexpr Version LMS_DATABASE_VERSION {38}; class VersionInfo { public: diff --git a/src/libs/services/database/impl/TrackArtistLink.cpp b/src/libs/services/database/impl/TrackArtistLink.cpp index d54339e8..bffd8d4d 100644 --- a/src/libs/services/database/impl/TrackArtistLink.cpp +++ b/src/libs/services/database/impl/TrackArtistLink.cpp @@ -24,36 +24,78 @@ #include "services/database/Track.hpp" #include "IdTypeTraits.hpp" +#include "Utils.hpp" -namespace Database { - -TrackArtistLink::TrackArtistLink(ObjectPtr track, ObjectPtr artist, TrackArtistLinkType type) -: _type {type}, -_track {getDboPtr(track)}, -_artist {getDboPtr(artist)} +namespace Database { -} - -TrackArtistLink::pointer -TrackArtistLink::create(Session& session, ObjectPtr track, ObjectPtr artist, TrackArtistLinkType type) -{ - session.checkUniqueLocked(); - - TrackArtistLink::pointer res {session.getDboSession().add(std::make_unique(track, artist, type))}; - session.getDboSession().flush(); - - return res; -} - -EnumSet -TrackArtistLink::findUsedTypes(Session& session) -{ - session.checkSharedLocked(); - - auto res {session.getDboSession().query("SELECT DISTINCT type from track_artist_link").resultList()}; - - return EnumSet(std::begin(res), std::end(res)); -} - + + static + Wt::Dbo::Query + createQuery(Session& session, const TrackArtistLink::FindParameters& params) + { + session.checkSharedLocked(); + + auto query {session.getDboSession().query("SELECT DISTINCT t_a_l.id FROM track_artist_link t_a_l")}; + + if (params.linkType) + query.where("t_a_l.type = ?").bind(*params.linkType); + + if (params.track.isValid() || params.release.isValid()) + query.join("track t ON t.id = t_a_l.track_id"); + + if (params.track.isValid()) + query.where("t.id = ?").bind(params.track); + + if (params.release.isValid()) + query.where("t.release_id = ?").bind(params.release); + + return query; + } + + TrackArtistLink::TrackArtistLink(ObjectPtr track, ObjectPtr artist, TrackArtistLinkType type, std::string_view subType) + : _type {type} + , _subType {subType} + , _track {getDboPtr(track)} + , _artist {getDboPtr(artist)} + { + } + + TrackArtistLink::pointer + TrackArtistLink::create(Session& session, ObjectPtr track, ObjectPtr artist, TrackArtistLinkType type, std::string_view subType) + { + session.checkUniqueLocked(); + + TrackArtistLink::pointer res {session.getDboSession().add(std::make_unique(track, artist, type, subType))}; + session.getDboSession().flush(); + + return res; + } + + TrackArtistLink::pointer + TrackArtistLink::find(Session& session, TrackArtistLinkId id) + { + session.checkSharedLocked(); + return session.getDboSession().find().where("id = ?").bind(id).resultValue(); + } + + RangeResults + TrackArtistLink::find(Session& session, const FindParameters& params) + { + session.checkSharedLocked(); + + auto query {createQuery(session, params)}; + return Utils::execQuery(query, params.range); + } + + + EnumSet + TrackArtistLink::findUsedTypes(Session& session) + { + session.checkSharedLocked(); + + auto res {session.getDboSession().query("SELECT DISTINCT type from track_artist_link").resultList()}; + + return EnumSet(std::begin(res), std::end(res)); + } } diff --git a/src/libs/services/database/include/services/database/Artist.hpp b/src/libs/services/database/include/services/database/Artist.hpp index dd032a60..968a9dfc 100644 --- a/src/libs/services/database/include/services/database/Artist.hpp +++ b/src/libs/services/database/include/services/database/Artist.hpp @@ -87,7 +87,6 @@ class Artist : public Object static RangeResults findAllOrphans(Session& session, Range range); // No track related static bool exists(Session& session, ArtistId id); - // Accessors const std::string& getName() const { return _name; } const std::string& getSortName() const { return _sortName; } diff --git a/src/libs/services/database/include/services/database/TrackArtistLink.hpp b/src/libs/services/database/include/services/database/TrackArtistLink.hpp index 5d565da5..4b14a6a3 100644 --- a/src/libs/services/database/include/services/database/TrackArtistLink.hpp +++ b/src/libs/services/database/include/services/database/TrackArtistLink.hpp @@ -20,11 +20,14 @@ #pragma once #include +#include #include #include "services/database/IdType.hpp" #include "services/database/Object.hpp" +#include "services/database/ReleaseId.hpp" +#include "services/database/TrackId.hpp" #include "services/database/Types.hpp" #include "utils/EnumSet.hpp" @@ -40,31 +43,48 @@ namespace Database class TrackArtistLink : public Object { public: - TrackArtistLink() = default; - TrackArtistLink(ObjectPtr track, ObjectPtr artist, TrackArtistLinkType type); + struct FindParameters + { + Range range; + std::optional linkType; // if set, only artists that have produced at least one track with this link type + TrackId track; // artists involved in this track + ReleaseId release; // artists involved in this release - static pointer create(Session& session, ObjectPtr track, ObjectPtr artist, TrackArtistLinkType type); + FindParameters& setRange(Range _range) {range = _range; return *this; } + FindParameters& setLinkType(std::optional _linkType) { linkType = _linkType; return *this; } + FindParameters& setTrack(TrackId _track) { track = _track; return *this; } + FindParameters& setRelease(ReleaseId _release) { release = _release; return *this; } + }; + + TrackArtistLink() = default; + TrackArtistLink(ObjectPtr track, ObjectPtr artist, TrackArtistLinkType type, std::string_view subType); + + static RangeResults find(Session& session, const FindParameters& parameters); + static pointer find(Session& session, TrackArtistLinkId linkId); + static pointer create(Session& session, ObjectPtr track, ObjectPtr artist, TrackArtistLinkType type, std::string_view subType = {}); static EnumSet findUsedTypes(Session& session); ObjectPtr getTrack() const { return _track; } ObjectPtr getArtist() const { return _artist; } TrackArtistLinkType getType() const { return _type; } + std::string_view getSubType() const { return _subType; } template - void persist(Action& a) - { - Wt::Dbo::field(a, _type, "type"); + void persist(Action& a) + { + Wt::Dbo::field(a, _type, "type"); + Wt::Dbo::field(a, _subType, "subtype"); - Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade); - Wt::Dbo::belongsTo(a, _artist, "artist", Wt::Dbo::OnDeleteCascade); - } + Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::belongsTo(a, _artist, "artist", Wt::Dbo::OnDeleteCascade); + } private: TrackArtistLinkType _type; + std::string _subType; Wt::Dbo::ptr _track; Wt::Dbo::ptr _artist; }; - } diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp index dea3c796..2a170fa6 100644 --- a/src/libs/services/scanner/impl/ScannerService.cpp +++ b/src/libs/services/scanner/impl/ScannerService.cpp @@ -837,6 +837,12 @@ ScannerService::scanAudioFile(const std::filesystem::path& file, bool forceScan, for (const Artist::pointer& mixer : getOrCreateArtists(_dbSession, trackInfo->mixerArtists, true)) track.modify()->addArtistLink(TrackArtistLink::create(_dbSession, track, mixer, TrackArtistLinkType::Mixer)); + for (const auto& [role, performers] : trackInfo->performerArtists) + { + for (const Artist::pointer& performer : getOrCreateArtists(_dbSession, performers, true)) + track.modify()->addArtistLink(TrackArtistLink::create(_dbSession, track, performer, TrackArtistLinkType::Performer, role)); + } + for (const Artist::pointer& producer : getOrCreateArtists(_dbSession, trackInfo->producerArtists, true)) track.modify()->addArtistLink(TrackArtistLink::create(_dbSession, track, producer, TrackArtistLinkType::Producer)); diff --git a/src/libs/utils/impl/String.cpp b/src/libs/utils/impl/String.cpp index 47adbd85..72005454 100644 --- a/src/libs/utils/impl/String.cpp +++ b/src/libs/utils/impl/String.cpp @@ -115,17 +115,21 @@ joinStrings(const std::vector& strings, const std::string& delimite return boost::algorithm::join(strings, delimiter); } -std::string +std::string_view stringTrim(std::string_view str, std::string_view whitespaces) { + std::string_view res; + const auto strBegin = str.find_first_not_of(whitespaces); - if (strBegin == std::string_view::npos) - return ""; // no content + if (strBegin != std::string_view::npos) + { + const auto strEnd {str.find_last_not_of(whitespaces)}; + const auto strRange {strEnd - strBegin + 1}; - const auto strEnd = str.find_last_not_of(whitespaces); - const auto strRange = strEnd - strBegin + 1; + res = str.substr(strBegin, strRange); + } - return std::string {str.substr(strBegin, strRange)}; + return res; } std::string @@ -175,6 +179,21 @@ bufferToString(const std::vector& data) return oss.str(); } +void +capitalize(std::string& str) +{ + for (auto it {std::begin(str)}; it != std::end(str); ++it) + { + if (std::isspace(*it)) + continue; + + if (std::isalpha(*it)) + *it = std::toupper(*it); + + break; + } +} + std::string replaceInString(std::string_view str, const std::string& from, const std::string& to) { diff --git a/src/libs/utils/include/utils/String.hpp b/src/libs/utils/include/utils/String.hpp index 9dfe8742..73d11d03 100644 --- a/src/libs/utils/include/utils/String.hpp +++ b/src/libs/utils/include/utils/String.hpp @@ -44,7 +44,7 @@ std::string joinStrings(const std::vector& strings, const std::string& delimiter); [[nodiscard]] -std::string +std::string_view stringTrim(std::string_view str, std::string_view whitespaces = " \t"); [[nodiscard]] @@ -66,6 +66,9 @@ stringToUpper(const std::string& str); std::string bufferToString(const std::vector& data); +void +capitalize(std::string& str); + template [[nodiscard]] std::optional readAs(std::string_view str) diff --git a/src/libs/utils/test/String.cpp b/src/libs/utils/test/String.cpp index 87d67ee3..52f4a562 100644 --- a/src/libs/utils/test/String.cpp +++ b/src/libs/utils/test/String.cpp @@ -118,3 +118,32 @@ TEST(StringUtils, readAs) EXPECT_EQ(StringUtils::readAs("foo"), std::nullopt); EXPECT_EQ(StringUtils::readAs(""), std::nullopt); } + +TEST(StrinUtils, capitalize) +{ + struct TestCase + { + std::string input; + std::string expectedOutput; + }; + + TestCase tests[] + { + {"", ""}, + {"C", "C"}, + {"c", "C"}, + {" c", " C"}, + {" cc", " Cc"}, + {"(c", "(c"}, + {"1c", "1c"}, + {"&c", "&c"}, + {"c c", "C c"} + }; + + for (const TestCase& test : tests) + { + std::string str {test.input}; + StringUtils::capitalize(str); + EXPECT_EQ(str, test.expectedOutput) << " str was '" << test.input << "'"; + } +} diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index 885ec56b..a8ce5f74 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -114,19 +114,14 @@ Artist::refreshView() LmsApp->setTitle(artist->getName()); _artistId = *artistId; - std::size_t sectionCount{}; - - if (refreshReleases()) - sectionCount++; - if (refreshAppearsOnReleases()) - sectionCount++; - if (refreshNonReleaseTracks()) - sectionCount++; + bool setReleaseTitle {}; + refreshReleases(); + setReleaseTitle |= refreshAppearsOnReleases(); + setReleaseTitle |= refreshNonReleaseTracks(); refreshLinks(artist); refreshSimilarArtists(similarArtistIds); - if (sectionCount > 1) - setCondition("if-section-titles", true); + setCondition("if-release-title", setReleaseTitle); Wt::WContainerWidget* clusterContainers {bindNew("clusters")}; diff --git a/src/lms/ui/explore/ArtistsView.cpp b/src/lms/ui/explore/ArtistsView.cpp index 760c727b..36af77ae 100644 --- a/src/lms/ui/explore/ArtistsView.cpp +++ b/src/lms/ui/explore/ArtistsView.cpp @@ -145,12 +145,14 @@ Artists::refreshArtistLinkTypes() // add default one first (none) linkTypeModel->add(Wt::WString::tr("Lms.Explore.Artists.linktype-all"), std::nullopt); + // TODO: sort by translated strings addTypeIfUsed(TrackArtistLinkType::Artist, "Lms.Explore.Artists.linktype-artist"); addTypeIfUsed(TrackArtistLinkType::ReleaseArtist, "Lms.Explore.Artists.linktype-releaseartist"); addTypeIfUsed(TrackArtistLinkType::Composer, "Lms.Explore.Artists.linktype-composer"); addTypeIfUsed(TrackArtistLinkType::Conductor, "Lms.Explore.Artists.linktype-conductor"); addTypeIfUsed(TrackArtistLinkType::Lyricist, "Lms.Explore.Artists.linktype-lyricist"); addTypeIfUsed(TrackArtistLinkType::Mixer, "Lms.Explore.Artists.linktype-mixer"); + addTypeIfUsed(TrackArtistLinkType::Performer, "Lms.Explore.Artists.linktype-performer"); addTypeIfUsed(TrackArtistLinkType::Producer, "Lms.Explore.Artists.linktype-producer"); addTypeIfUsed(TrackArtistLinkType::Remixer, "Lms.Explore.Artists.linktype-remixer"); } diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index 257db1f7..3c1d4176 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -19,6 +19,7 @@ #include "ReleaseView.hpp" +#include #include #include #include @@ -30,6 +31,7 @@ #include "services/database/ScanSettings.hpp" #include "services/database/Session.hpp" #include "services/database/Track.hpp" +#include "services/database/TrackArtistLink.hpp" #include "services/recommendation/IRecommendationService.hpp" #include "services/scrobbling/IScrobblingService.hpp" #include "utils/Logger.hpp" @@ -64,6 +66,7 @@ showReleaseInfoModal(Database::ReleaseId releaseId) releaseInfo->addFunction("tr", &Wt::WTemplate::Functions::tr); Wt::WContainerWidget* artistTable {releaseInfo->bindNew("artist-table")}; + std::map> artistMap; auto addArtists = [&](TrackArtistLinkType linkType, const char* type) { @@ -74,11 +77,28 @@ showReleaseInfoModal(Database::ReleaseId releaseId) if (artistIds.results.empty()) return; - std::unique_ptr artistContainer {Utils::createArtistContainer(artistIds.results)}; - auto artistsEntry {std::make_unique