${tr:Lms.Explore.duration}
diff --git a/src/libs/metadata/impl/TagLibParser.cpp b/src/libs/metadata/impl/TagLibParser.cpp
index 4e0553ad..dad243ed 100644
--- a/src/libs/metadata/impl/TagLibParser.cpp
+++ b/src/libs/metadata/impl/TagLibParser.cpp
@@ -50,7 +50,7 @@ using TagMap = std::map
>;
template
std::vector
-getPropertyValuesFirstMatchAs(const TagMap& tags, const std::vector& keys)
+getPropertyValuesFirstMatchAs(const TagMap& tags, std::initializer_list keys)
{
std::vector res;
@@ -83,7 +83,7 @@ getPropertyValuesFirstMatchAs(const TagMap& tags, const std::vector
std::optional
-getPropertyValueFirstMatchAs(const TagMap& tags, const std::vector& keys)
+getPropertyValueFirstMatchAs(const TagMap& tags, std::initializer_list keys)
{
std::optional res;
std::vector values {getPropertyValuesFirstMatchAs(tags, keys)};
@@ -95,14 +95,14 @@ getPropertyValueFirstMatchAs(const TagMap& tags, const std::vector
std::vector
-getPropertyValuesAs(const TagMap& tags, const std::string& key)
+getPropertyValuesAs(const TagMap& tags, std::string_view key)
{
return getPropertyValuesFirstMatchAs(tags, {key});
}
template
std::optional
-getPropertyValueAs(const TagMap& tags, const std::string& key)
+getPropertyValueAs(const TagMap& tags, std::string_view key)
{
return getPropertyValueFirstMatchAs(tags, {key});
}
@@ -121,22 +121,22 @@ splitAndTrimString(std::string_view str, std::string_view delimiters)
static
std::vector
getArtists(const TagMap& tags,
- const std::vector& artistTagNames,
- const std::vector& artistSortTagNames,
- const std::vector& artistMBIDTagNames
+ std::initializer_list artistTagNames,
+ std::initializer_list artistSortTagNames,
+ std::initializer_list artistMBIDTagNames
)
{
- const std::vector artistNames {getPropertyValuesFirstMatchAs(tags, artistTagNames)};
+ const std::vector artistNames {getPropertyValuesFirstMatchAs(tags, artistTagNames)};
if (artistNames.empty())
return {};
std::vector artists;
artists.reserve(artistNames.size());
std::transform(std::cbegin(artistNames), std::cend(artistNames), std::back_inserter(artists),
- [&](const std::string& name) { return Artist {name}; });
+ [&](std::string_view name) { return Artist {name}; });
{
- const std::vector artistSortNames {getPropertyValuesFirstMatchAs(tags, artistSortTagNames)};
+ const std::vector artistSortNames {getPropertyValuesFirstMatchAs(tags, artistSortTagNames)};
if (artistSortNames.size() == artists.size())
{
for (std::size_t i {}; i < artistSortNames.size(); ++i)
@@ -161,14 +161,14 @@ getArtists(const TagMap& tags,
static
PerformerContainer
getPerformerArtists(const TagMap& tags,
- const std::vector& artistTagNames)
+ std::initializer_list artistTagNames)
{
PerformerContainer performers;
// picard stores like this: (see https://picard-docs.musicbrainz.org/en/appendices/tag_mapping.html#performer)
// We may hit both styles for the same track
// PERFORMER: artist (role)
- if (const std::vector artistNames {getPropertyValuesFirstMatchAs(tags, artistTagNames)}; !artistNames.empty())
+ if (const std::vector artistNames {getPropertyValuesFirstMatchAs(tags, artistTagNames)}; !artistNames.empty())
{
for (std::string_view entry : artistNames)
{
@@ -216,7 +216,7 @@ getRelease(const TagMap& tags)
if (!release->mediumCount)
{
// mediumCount may be encoded as "position/count"
- if (const auto value {getPropertyValueAs(tags, "DISCNUMBER")})
+ if (const auto value {getPropertyValueAs(tags, "DISCNUMBER")})
{
// Expecting 'Number/Total'
const std::vector strings {StringUtils::splitString(*value, "/") };
@@ -225,6 +225,13 @@ getRelease(const TagMap& tags)
}
}
+ release->primaryType = getPropertyValueFirstMatchAs(tags, {"MUSICBRAINZ_ALBUMTYPE", "RELEASETYPE", "MUSICBRAINZ ALBUM TYPE", "MUSICBRAINZ/ALBUM TYPE"});
+ if (release->primaryType)
+ {
+ const auto secondaryTypes {getPropertyValuesFirstMatchAs(tags, {"MUSICBRAINZ_ALBUMTYPE", "RELEASETYPE", "MUSICBRAINZ ALBUM TYPE", "MUSICBRAINZ/ALBUM TYPE"})};
+ release->secondaryTypes.assign(std::cbegin(secondaryTypes), std::cend(secondaryTypes));
+ }
+
return release;
}
@@ -241,7 +248,7 @@ getMedium(const TagMap& tags)
if (!medium->trackCount)
{
// totalTracks may be encoded as "position/count"
- if (const auto value {getPropertyValueAs(tags, "TRACKNUMBER")})
+ if (const auto value {getPropertyValueAs(tags, "TRACKNUMBER")})
{
// Expecting 'Number/Total'
const std::vector strings {StringUtils::splitString(*value, "/") };
@@ -445,7 +452,7 @@ TagLibParser::parse(const std::filesystem::path& p, bool debug)
for (const auto& [name, attributeList] : tag->attributeListMap())
{
- std::string strName {name.to8Bit(true)};
+ std::string strName {StringUtils::stringToUpper(name.to8Bit(true))};
if (strName.find("WM/") == 0 || tags.find(strName) != std::cend(tags))
continue;
@@ -461,7 +468,7 @@ TagLibParser::parse(const std::filesystem::path& p, bool debug)
if (debug)
std::cout << "ASF property: '" << name << "'" << std::endl;
- tags[strName] = std::move(attributes);
+ tags.emplace(strName, std::move(attributes));
}
}
}
diff --git a/src/libs/metadata/impl/Utils.cpp b/src/libs/metadata/impl/Utils.cpp
index b8ae6810..c821959e 100644
--- a/src/libs/metadata/impl/Utils.cpp
+++ b/src/libs/metadata/impl/Utils.cpp
@@ -119,3 +119,50 @@ namespace MetaData::Utils
}
}
+namespace StringUtils
+{
+ static bool iequals(std::string_view a, std::string_view b)
+ {
+ return std::equal(std::cbegin(a), std::cend(a),
+ std::cbegin(b), std::cend(b),
+ [](char a, char b) { return tolower(a) == tolower(b);}
+ );
+ }
+
+ template<>
+ std::optional readAs(std::string_view str)
+ {
+ str = stringTrim(str);
+
+ if (iequals(str, "album"))
+ return MetaData::Release::PrimaryType::Album;
+ else if (iequals(str, "single"))
+ return MetaData::Release::PrimaryType::Single;
+ else if (iequals(str, "EP"))
+ return MetaData::Release::PrimaryType::EP;
+ else if (iequals(str, "broadcast"))
+ return MetaData::Release::PrimaryType::Broadcast;
+ else if (iequals(str, "other"))
+ return MetaData::Release::PrimaryType::Other;
+
+ return std::nullopt;
+ }
+
+ template<>
+ std::optional readAs(std::string_view str)
+ {
+ str = stringTrim(str);
+
+ if (iequals(str, "compilation"))
+ return MetaData::Release::SecondaryType::Compilation;
+ else if (iequals(str, "soundtrack"))
+ return MetaData::Release::SecondaryType::Soundtrack;
+ else if (iequals(str, "live"))
+ return MetaData::Release::SecondaryType::Live;
+ else if (iequals(str, "demo"))
+ return MetaData::Release::SecondaryType::Demo;
+
+ return std::nullopt;
+ }
+}
+
diff --git a/src/libs/metadata/impl/Utils.hpp b/src/libs/metadata/impl/Utils.hpp
index 5d89e2d9..8c80cc14 100644
--- a/src/libs/metadata/impl/Utils.hpp
+++ b/src/libs/metadata/impl/Utils.hpp
@@ -38,6 +38,14 @@ namespace MetaData::Utils
// format is "artist name (role)"
PerformerArtist extractPerformerAndRole(std::string_view entry);
-
+}
+
+namespace StringUtils
+{
+ template<>
+ std::optional readAs(std::string_view str);
+
+ template<>
+ std::optional readAs(std::string_view str);
}
diff --git a/src/libs/metadata/include/metadata/IParser.hpp b/src/libs/metadata/include/metadata/IParser.hpp
index 765d8ac6..15b72282 100644
--- a/src/libs/metadata/include/metadata/IParser.hpp
+++ b/src/libs/metadata/include/metadata/IParser.hpp
@@ -29,6 +29,7 @@
#include
#include
+#include "utils/EnumSet.hpp"
#include "utils/UUID.hpp"
namespace MetaData
@@ -51,10 +52,37 @@ namespace MetaData
struct Release
{
+ // see https://musicbrainz.org/doc/Release_Group/Type
+ enum class PrimaryType
+ {
+ Album,
+ Single,
+ EP,
+ Broadcast,
+ Other
+ };
+
+ enum class SecondaryType
+ {
+ Compilation,
+ Soundtrack,
+ Spokenword,
+ Interview,
+ Audiobook,
+ AudioDrama,
+ Live,
+ Remix,
+ DJMix,
+ Mixtape_Street,
+ Demo,
+ };
+
std::optional mbid;
std::string name;
std::vector artists;
std::optional mediumCount;
+ std::optional primaryType;
+ EnumSet secondaryTypes;
};
struct Medium
diff --git a/src/libs/metadata/test/Utils.cpp b/src/libs/metadata/test/Utils.cpp
index 41b9ee9e..1cc0e69c 100644
--- a/src/libs/metadata/test/Utils.cpp
+++ b/src/libs/metadata/test/Utils.cpp
@@ -115,3 +115,60 @@ TEST(MetaData, extractPerformerAndRole)
EXPECT_EQ(performer.role, testCase.expectedRole) << " str was '" << testCase.str << "'";
}
}
+
+TEST(MetaData, primaryReleaseTypes)
+{
+ using namespace MetaData;
+
+ struct TestCase
+ {
+ std::string str;
+ std::optional result;
+ } testCases []
+ {
+ { "", std::nullopt },
+ { "album", Release::PrimaryType::Album },
+ { "Album", Release::PrimaryType::Album },
+ { " Album", Release::PrimaryType::Album },
+ { "Album ", Release::PrimaryType::Album },
+ { "ep", Release::PrimaryType::EP },
+ { " ep ", Release::PrimaryType::EP },
+ { "broadcast", Release::PrimaryType::Broadcast },
+ { "single", Release::PrimaryType::Single },
+ { "other", Release::PrimaryType::Other },
+ };
+
+ for (const TestCase& testCase : testCases)
+ {
+ std::optional parsed {StringUtils::readAs(testCase.str)};
+
+ EXPECT_EQ(parsed, testCase.result) << " str was '" << testCase.str << "'";
+ }
+}
+
+TEST(MetaData, secondaryReleaseTypes)
+{
+ using namespace MetaData;
+
+ struct TestCase
+ {
+ std::string str;
+ std::optional result;
+ } testCases []
+ {
+ { "", std::nullopt },
+ { "compilation", Release::SecondaryType::Compilation },
+ { " compilation ", Release::SecondaryType::Compilation },
+ { "soundtrack", Release::SecondaryType::Soundtrack },
+ { "live", Release::SecondaryType::Live },
+ { "demo", Release::SecondaryType::Demo },
+ };
+
+ for (const TestCase& testCase : testCases)
+ {
+ std::optional parsed {StringUtils::readAs(testCase.str)};
+
+ EXPECT_EQ(parsed, testCase.result) << " str was '" << testCase.str << "'";
+ }
+}
+
diff --git a/src/libs/services/database/impl/Artist.cpp b/src/libs/services/database/impl/Artist.cpp
index b3588fb5..1bbfbfeb 100644
--- a/src/libs/services/database/impl/Artist.cpp
+++ b/src/libs/services/database/impl/Artist.cpp
@@ -28,6 +28,7 @@
#include "utils/Logger.hpp"
#include "SqlQuery.hpp"
#include "Utils.hpp"
+#include "EnumSetTraits.hpp"
#include "IdTypeTraits.hpp"
namespace Database
diff --git a/src/libs/services/database/impl/EnumSetTraits.hpp b/src/libs/services/database/impl/EnumSetTraits.hpp
new file mode 100644
index 00000000..7aef83af
--- /dev/null
+++ b/src/libs/services/database/impl/EnumSetTraits.hpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2023 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS. If not, see .
+ */
+
+#pragma once
+
+#include
+#include
+
+#include "utils/EnumSet.hpp"
+
+namespace Wt::Dbo
+{
+
+ template
+ struct sql_value_traits, void> : public sql_value_traits
+ {
+ using ValueType = typename EnumSet::ValueType;
+ static_assert(sizeof(long long) > sizeof(ValueType));
+
+ static void bind(EnumSet v, SqlStatement *statement, int column, int size)
+ {
+ sql_value_traits::bind(static_cast(v.getBitfield()), statement, column, size);
+ }
+
+ static bool read(EnumSet& v, SqlStatement *statement, int column, int size)
+ {
+ long long val;
+ if (sql_value_traits::read(val, statement, column, size))
+ {
+ v.setBitfield(val);
+ return true;
+ }
+ v.clear();
+ return false;
+ }
+ };
+}
+
diff --git a/src/libs/services/database/impl/Migration.cpp b/src/libs/services/database/impl/Migration.cpp
index 45561592..28b22dd8 100644
--- a/src/libs/services/database/impl/Migration.cpp
+++ b/src/libs/services/database/impl/Migration.cpp
@@ -653,6 +653,18 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
ScanSettings::get(session).modify()->incScanVersion();
}
+ static
+ void
+ migrateFromV39(Session& session)
+ {
+ // add release type
+ session.getDboSession().execute("ALTER TABLE release ADD primary_type INTEGER");
+ session.getDboSession().execute("ALTER TABLE release ADD secondary_types INTEGER");
+
+ // 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)
{
@@ -698,6 +710,7 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
{36, migrateFromV36},
{37, migrateFromV37},
{38, migrateFromV38},
+ {39, migrateFromV39},
};
while (1)
diff --git a/src/libs/services/database/impl/Migration.hpp b/src/libs/services/database/impl/Migration.hpp
index ed87913b..2c4f1896 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 {39};
+ static constexpr Version LMS_DATABASE_VERSION {40};
class VersionInfo
{
public:
diff --git a/src/libs/services/database/impl/Release.cpp b/src/libs/services/database/impl/Release.cpp
index fb09c963..d26bfc40 100644
--- a/src/libs/services/database/impl/Release.cpp
+++ b/src/libs/services/database/impl/Release.cpp
@@ -28,6 +28,7 @@
#include "services/database/User.hpp"
#include "utils/Logger.hpp"
#include "SqlQuery.hpp"
+#include "EnumSetTraits.hpp"
#include "IdTypeTraits.hpp"
#include "Utils.hpp"
@@ -138,6 +139,11 @@ createQuery(Session& session, const Release::FindParameters& params)
query.where(oss.str());
}
+ if (params.primaryType)
+ query.where("primary_type = ?").bind(*params.primaryType);
+ if (!params.secondaryTypes.empty())
+ query.where("secondary_type = ?").bind(params.secondaryTypes);
+
switch (params.sortMethod)
{
case ReleaseSortMethod::None:
diff --git a/src/libs/services/database/impl/Session.cpp b/src/libs/services/database/impl/Session.cpp
index a1ff5149..0aa5d551 100644
--- a/src/libs/services/database/impl/Session.cpp
+++ b/src/libs/services/database/impl/Session.cpp
@@ -40,6 +40,7 @@
#include "services/database/TrackList.hpp"
#include "services/database/TrackFeatures.hpp"
#include "services/database/User.hpp"
+#include "EnumSetTraits.hpp"
#include "Migration.hpp"
namespace Database
diff --git a/src/libs/services/database/include/services/database/Release.hpp b/src/libs/services/database/include/services/database/Release.hpp
index 27932db0..3f2957d4 100644
--- a/src/libs/services/database/include/services/database/Release.hpp
+++ b/src/libs/services/database/include/services/database/Release.hpp
@@ -61,6 +61,8 @@ class Release : public Object
ArtistId artist; // only releases that involved this user
EnumSet trackArtistLinkTypes; // and for these link types
EnumSet excludedTrackArtistLinkTypes; // but not for these link types
+ std::optional primaryType; // if, set, matching this primary type
+ EnumSet secondaryTypes; // Matching all this (if any)
FindParameters& setClusters(const std::vector& _clusters) { clusters = _clusters; return *this; }
FindParameters& setKeywords(const std::vector& _keywords) { keywords = _keywords; return *this; }
@@ -109,11 +111,15 @@ class Release : public Object
std::size_t getDiscCount() const; // may not be total disc (if incomplete for example)
std::chrono::milliseconds getDuration() const;
Wt::WDateTime getLastWritten() const;
+ std::optional getPrimaryType() const { return _primaryType; }
+ EnumSet getSecondaryTypes() const { return _secondaryTypes; }
// Setters
void setName(std::string_view name) { _name = name; }
void setMBID(const std::optional& mbid) { _MBID = mbid ? mbid->getAsString() : ""; }
void setTotalDisc(std::optional totalDisc) { _totalDisc = totalDisc; }
+ void setPrimaryType(std::optional type) { _primaryType = type; }
+ void setSecondaryTypes(EnumSet types) { _secondaryTypes = types; }
// Get the artists of this release
std::vector> getArtists(TrackArtistLinkType type = TrackArtistLinkType::Artist) const;
@@ -128,6 +134,8 @@ class Release : public Object
Wt::Dbo::field(a, _name, "name");
Wt::Dbo::field(a, _MBID, "mbid");
Wt::Dbo::field(a, _totalDisc, "total_disc");
+ Wt::Dbo::field(a, _primaryType, "primary_type");
+ Wt::Dbo::field(a, _secondaryTypes, "secondary_types");
Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToOne, "release");
}
@@ -139,9 +147,11 @@ class Release : public Object
static constexpr std::size_t _maxNameLength {128};
- std::string _name;
- std::string _MBID;
- std::optional _totalDisc {};
+ std::string _name;
+ std::string _MBID;
+ std::optional _totalDisc {};
+ std::optional _primaryType;
+ EnumSet _secondaryTypes;
Wt::Dbo::collection> _tracks; // Tracks in the release
};
diff --git a/src/libs/services/database/include/services/database/Types.hpp b/src/libs/services/database/include/services/database/Types.hpp
index 691d040c..57085732 100644
--- a/src/libs/services/database/include/services/database/Types.hpp
+++ b/src/libs/services/database/include/services/database/Types.hpp
@@ -191,5 +191,30 @@ namespace Database
Playlist, // user controlled playlists
Internal, // internal usage (current playqueue, history, ...)
};
+
+ // as defined in https://musicbrainz.org/doc/Release_Group/Type
+ enum class ReleaseTypePrimary
+ {
+ Album,
+ Single,
+ EP,
+ Broadcast,
+ Other,
+ };
+
+ enum class ReleaseTypeSecondary
+ {
+ Compilation,
+ Soundtrack,
+ Spokenword,
+ Interview,
+ Audiobook,
+ AudioDrama,
+ Live,
+ Remix,
+ DJMix,
+ Mixtape_Street,
+ Demo,
+ };
}
diff --git a/src/libs/services/database/test/Release.cpp b/src/libs/services/database/test/Release.cpp
index f9697eea..f0d90f70 100644
--- a/src/libs/services/database/test/Release.cpp
+++ b/src/libs/services/database/test/Release.cpp
@@ -507,3 +507,26 @@ TEST_F(DatabaseFixture, Release_getDiscCount)
EXPECT_EQ(release.get()->getDiscCount(), 2);
}
}
+
+TEST_F(DatabaseFixture, Release_releaseType)
+{
+ ScopedRelease release {session, "MyRelease"};
+
+ {
+ auto transaction {session.createSharedTransaction()};
+ EXPECT_EQ(release.get()->getPrimaryType(), std::nullopt);
+ EXPECT_EQ(release.get()->getSecondaryTypes(), EnumSet {});
+ }
+
+ {
+ auto transaction {session.createUniqueTransaction()};
+ release.get().modify()->setPrimaryType({ ReleaseTypePrimary::Album });
+ release.get().modify()->setSecondaryTypes({ ReleaseTypeSecondary::Compilation });
+ }
+
+ {
+ auto transaction {session.createSharedTransaction()};
+ EXPECT_EQ(release.get()->getPrimaryType(), ReleaseTypePrimary::Album);
+ EXPECT_TRUE(release.get()->getSecondaryTypes().contains(ReleaseTypeSecondary::Compilation));
+ }
+}
diff --git a/src/libs/services/scanner/impl/ScanStepScanFiles.cpp b/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
index 011fea52..f1b9b5d9 100644
--- a/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
+++ b/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
@@ -115,6 +115,67 @@ namespace
return artists;
}
+ ReleaseTypePrimary convertReleaseTypePrimary(MetaData::Release::PrimaryType type)
+ {
+ switch (type)
+ {
+ case MetaData::Release::PrimaryType::Album: return ReleaseTypePrimary::Album;
+ case MetaData::Release::PrimaryType::Single: return ReleaseTypePrimary::Single;
+ case MetaData::Release::PrimaryType::EP: return ReleaseTypePrimary::EP;
+ case MetaData::Release::PrimaryType::Broadcast: return ReleaseTypePrimary::Broadcast;
+ case MetaData::Release::PrimaryType::Other: return ReleaseTypePrimary::Other;
+ }
+
+ return ReleaseTypePrimary::Other;
+ }
+
+ EnumSet convertReleaseTypesSecondary(EnumSet types)
+ {
+ EnumSet res;
+
+ for (MetaData::Release::SecondaryType type : types)
+ {
+ switch (type)
+ {
+ case MetaData::Release::SecondaryType::Compilation:
+ res.insert(ReleaseTypeSecondary::Compilation);
+ break;
+ case MetaData::Release::SecondaryType::Soundtrack:
+ res.insert(ReleaseTypeSecondary::Soundtrack);
+ break;
+ case MetaData::Release::SecondaryType::Spokenword:
+ res.insert(ReleaseTypeSecondary::Spokenword);
+ break;
+ case MetaData::Release::SecondaryType::Interview:
+ res.insert(ReleaseTypeSecondary::Interview);
+ break;
+ case MetaData::Release::SecondaryType::Audiobook:
+ res.insert(ReleaseTypeSecondary::Audiobook);
+ break;
+ case MetaData::Release::SecondaryType::AudioDrama:
+ res.insert(ReleaseTypeSecondary::AudioDrama);
+ break;
+ case MetaData::Release::SecondaryType::Live:
+ res.insert(ReleaseTypeSecondary::Live);
+ break;
+ case MetaData::Release::SecondaryType::Remix:
+ res.insert(ReleaseTypeSecondary::Remix);
+ break;
+ case MetaData::Release::SecondaryType::DJMix:
+ res.insert(ReleaseTypeSecondary::DJMix);
+ break;
+ case MetaData::Release::SecondaryType::Mixtape_Street:
+ res.insert(ReleaseTypeSecondary::Mixtape_Street);
+ break;
+ case MetaData::Release::SecondaryType::Demo:
+ res.insert(ReleaseTypeSecondary::Demo);
+ break;
+ }
+ }
+
+ return res;
+ }
+
void
updateReleaseIfNeeded(Release::pointer release, const MetaData::Release& releaseInfo)
{
@@ -122,6 +183,15 @@ namespace
release.modify()->setName(releaseInfo.name);
if (release->getTotalDisc() != releaseInfo.mediumCount)
release.modify()->setTotalDisc(releaseInfo.mediumCount);
+ if (releaseInfo.primaryType)
+ {
+ const ReleaseTypePrimary primaryType {convertReleaseTypePrimary(*releaseInfo.primaryType)};
+ if (release->getPrimaryType() != primaryType)
+ release.modify()->setPrimaryType(primaryType);
+ }
+ const EnumSet secondaryTypes {convertReleaseTypesSecondary(releaseInfo.secondaryTypes)};
+ if (release->getSecondaryTypes() != secondaryTypes)
+ release.modify()->setSecondaryTypes(secondaryTypes);
}
Release::pointer
diff --git a/src/libs/subsonic/impl/SubsonicResponse.cpp b/src/libs/subsonic/impl/SubsonicResponse.cpp
index 8d9c640a..2958291c 100644
--- a/src/libs/subsonic/impl/SubsonicResponse.cpp
+++ b/src/libs/subsonic/impl/SubsonicResponse.cpp
@@ -133,7 +133,7 @@ Response::createFailedResponse(ProtocolVersion protocolVersion, const Error& err
responseNode.setAttribute("type", "lms"); // non standard field to ease client hacks
Node& errorNode {responseNode.createChild("error")};
- errorNode.setAttribute("code", std::to_string(static_cast(error.getCode())));
+ errorNode.setAttribute("code", static_cast(error.getCode()));
errorNode.setAttribute("message", error.getMessage());
return response;
diff --git a/src/libs/utils/impl/String.cpp b/src/libs/utils/impl/String.cpp
index 344e3eeb..89c58edf 100644
--- a/src/libs/utils/impl/String.cpp
+++ b/src/libs/utils/impl/String.cpp
@@ -63,6 +63,13 @@ readAs(std::string_view str)
return std::string {str};
}
+template<>
+std::optional
+readAs(std::string_view str)
+{
+ return str;
+}
+
template<>
std::optional
readAs(std::string_view str)
diff --git a/src/libs/utils/include/utils/EnumSet.hpp b/src/libs/utils/include/utils/EnumSet.hpp
index 2d4361c6..997d81bd 100644
--- a/src/libs/utils/include/utils/EnumSet.hpp
+++ b/src/libs/utils/include/utils/EnumSet.hpp
@@ -31,9 +31,11 @@ class EnumSet
static_assert(std::is_enum::value);
static_assert(std::is_same::value || std::is_same::value);
- using index_type = std::uint_fast8_t;
+ using IndexType = std::uint_fast8_t;
public:
+ using ValueType = underlying_type;
+
EnumSet() = default;
constexpr EnumSet(std::initializer_list values)
{
@@ -44,6 +46,13 @@ class EnumSet
template
constexpr EnumSet(It begin, It end)
{
+ assign(begin, end);
+ }
+
+ template
+ constexpr void assign(It begin, It end)
+ {
+ clear();
for (It it {begin}; it != end; ++it)
insert(*it);
}
@@ -71,6 +80,11 @@ class EnumSet
return _bitfield & (underlying_type{ 1 } << static_cast(value));
}
+ constexpr void clear()
+ {
+ _bitfield = 0;
+ }
+
class iterator
{
public:
@@ -100,14 +114,14 @@ class EnumSet
private:
friend class EnumSet;
- constexpr iterator(const EnumSet& _container, index_type _index)
+ constexpr iterator(const EnumSet& _container, IndexType _index)
: _container {_container}
, _index {_index}
{
}
const EnumSet& _container;
- index_type _index;
+ IndexType _index;
};
constexpr iterator begin() const
@@ -120,25 +134,45 @@ class EnumSet
return iterator {*this, npos};
}
- private:
- static_assert(std::numeric_limits::max() >= sizeof(underlying_type) * 8);
- enum : index_type { npos = sizeof(underlying_type) * 8 };
+ constexpr underlying_type getBitfield() const
+ {
+ return _bitfield;
+ }
- constexpr index_type getFirstBitSetIndex(index_type start = {}) const
+ constexpr void setBitfield(underlying_type bitfield)
+ {
+ _bitfield = bitfield;
+ }
+
+ constexpr bool operator==(const EnumSet other) const
+ {
+ return _bitfield == other._bitfield;
+ }
+
+ constexpr bool operator!=(const EnumSet other) const
+ {
+ return _bitfield != other._bitfield;
+ }
+
+ private:
+ static_assert(std::numeric_limits::max() >= sizeof(underlying_type) * 8);
+ enum : IndexType { npos = sizeof(underlying_type) * 8 };
+
+ constexpr IndexType getFirstBitSetIndex(IndexType start = {}) const
{
assert(start < npos);
// return npos if no bit found
- index_type res {countTrailingZero(_bitfield >> start)};
+ IndexType res {countTrailingZero(_bitfield >> start)};
if (res == npos)
return res;
return res + start;
}
- static constexpr index_type countTrailingZero(underlying_type bitField)
+ static constexpr IndexType countTrailingZero(underlying_type bitField)
{
- index_type res {};
+ IndexType res {};
while (res < (sizeof(underlying_type) * 8) && (bitField & 1) == 0)
{
@@ -154,5 +188,3 @@ class EnumSet
underlying_type _bitfield{};
};
-
-
diff --git a/src/libs/utils/include/utils/String.hpp b/src/libs/utils/include/utils/String.hpp
index 95e97c60..dff67ca0 100644
--- a/src/libs/utils/include/utils/String.hpp
+++ b/src/libs/utils/include/utils/String.hpp
@@ -88,6 +88,11 @@ template<>
std::optional
readAs(std::string_view str);
+template<>
+[[nodiscard]]
+std::optional
+readAs(std::string_view str);
+
template<>
[[nodiscard]]
std::optional
diff --git a/src/libs/utils/test/CMakeLists.txt b/src/libs/utils/test/CMakeLists.txt
index 9f33170b..48da8343 100644
--- a/src/libs/utils/test/CMakeLists.txt
+++ b/src/libs/utils/test/CMakeLists.txt
@@ -1,8 +1,9 @@
include(GoogleTest)
add_executable(test-utils
- String.cpp
+ EnumSet.cpp
RecursiveSharedMutex.cpp
+ String.cpp
Utils.cpp
)
diff --git a/src/libs/utils/test/EnumSet.cpp b/src/libs/utils/test/EnumSet.cpp
new file mode 100644
index 00000000..b5902aa8
--- /dev/null
+++ b/src/libs/utils/test/EnumSet.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2019 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS. If not, see .
+ */
+
+#include
+
+#include "utils/EnumSet.hpp"
+
+TEST(EnumSet, ctr)
+{
+ enum class Foo
+ {
+ One,
+ Two,
+ };
+
+ {
+ constexpr EnumSet test {Foo::One};
+
+ static_assert(!test.empty());
+ static_assert(test.contains(Foo::One));
+ static_assert(!test.contains(Foo::Two));
+
+ EXPECT_TRUE(!test.empty());
+ EXPECT_TRUE(test.contains(Foo::One));
+ EXPECT_FALSE(test.contains(Foo::Two));
+
+ static_assert(test.getBitfield() != 0);
+ }
+
+ {
+ constexpr EnumSet test {Foo::One, Foo::Two};
+ constexpr auto bitfield {test.getBitfield()};
+
+ EnumSet test2;
+ EXPECT_FALSE(test2.contains(Foo::One));
+ EXPECT_FALSE(test2.contains(Foo::Two));
+
+ test2.setBitfield(bitfield);
+
+ EXPECT_TRUE(test2.contains(Foo::One));
+ EXPECT_TRUE(test2.contains(Foo::Two));
+ EXPECT_EQ(test, test2);
+ }
+}
diff --git a/src/lms/CMakeLists.txt b/src/lms/CMakeLists.txt
index 7929bd44..482247fa 100644
--- a/src/lms/CMakeLists.txt
+++ b/src/lms/CMakeLists.txt
@@ -34,7 +34,7 @@ add_executable(lms
ui/explore/Filters.cpp
ui/explore/PlayQueueController.cpp
ui/explore/ReleaseCollector.cpp
- ui/explore/ReleaseListHelpers.cpp
+ ui/explore/ReleaseHelpers.cpp
ui/explore/ReleasesView.cpp
ui/explore/ReleaseView.cpp
ui/explore/SearchView.cpp
diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp
index a8ce5f74..1d776ada 100644
--- a/src/lms/ui/explore/ArtistView.cpp
+++ b/src/lms/ui/explore/ArtistView.cpp
@@ -40,7 +40,7 @@
#include "LmsApplication.hpp"
#include "LmsApplicationException.hpp"
#include "PlayQueueController.hpp"
-#include "ReleaseListHelpers.hpp"
+#include "ReleaseHelpers.hpp"
#include "TrackListHelpers.hpp"
#include "Utils.hpp"
@@ -48,6 +48,19 @@ using namespace Database;
namespace UserInterface {
+bool
+Artist::ReleaseType::operator<(const ReleaseType& other) const
+{
+ if (!primaryType && other.primaryType)
+ return false;
+ else if (primaryType && !other.primaryType)
+ return true;
+ else if (*primaryType == *other.primaryType)
+ return secondaryTypes.getBitfield() < other.secondaryTypes.getBitfield();
+ else
+ return static_cast(*primaryType) < static_cast(*other.primaryType);
+}
+
Artist::Artist(Filters& filters, PlayQueueController& controller)
: Template {Wt::WString::tr("Lms.Explore.Artist.template")}
, _filters {filters}
@@ -114,15 +127,12 @@ Artist::refreshView()
LmsApp->setTitle(artist->getName());
_artistId = *artistId;
- bool setReleaseTitle {};
refreshReleases();
- setReleaseTitle |= refreshAppearsOnReleases();
- setReleaseTitle |= refreshNonReleaseTracks();
+ refreshAppearsOnReleases();
+ refreshNonReleaseTracks();
refreshLinks(artist);
refreshSimilarArtists(similarArtistIds);
- setCondition("if-release-title", setReleaseTitle);
-
Wt::WContainerWidget* clusterContainers {bindNew("clusters")};
{
@@ -184,25 +194,57 @@ Artist::refreshView()
}
}
-bool
+void
Artist::refreshReleases()
{
- _releaseContainer = bindNew("releases", Wt::WString::tr("Lms.Explore.Releases.template.container"));
- _releaseContainer->onRequestElements.connect(this, [this]
+ _releaseContainers.clear();
+
+ Release::FindParameters params;
+ params.setClusters(_filters.getClusterIds());
+ params.setArtist(_artistId, {TrackArtistLinkType::ReleaseArtist}, {});
+ params.setSortMethod(ReleaseSortMethod::DateDesc);
+
+ const auto releases {Release::find(LmsApp->getDbSession(), params)};
+ if (!releases.results.empty())
{
- addSomeReleases(*_releaseContainer, {TrackArtistLinkType::ReleaseArtist}, {});
- });
+ // first pass: gather all ids and sort by type
+ for (const ReleaseId releaseId : releases.results)
+ {
+ const Database::Release::pointer release {Database::Release::find(LmsApp->getDbSession(), releaseId)};
- const bool added {addSomeReleases(*_releaseContainer, {TrackArtistLinkType::ReleaseArtist}, {})};
- setCondition("if-has-releases", added);
+ ReleaseType releaseType {release->getPrimaryType(), release->getSecondaryTypes()};
+ _releaseContainers[releaseType].releases.push_back(releaseId);
+ }
- return added;
+ // second pass: construct widgets
+ Wt::WContainerWidget* releaseContainers {bindNew("release-containers")};
+ for (auto& [releaseType, releases] : _releaseContainers)
+ {
+ Wt::WTemplate* releaseContainer {releaseContainers->addNew(Wt::WString::tr("Lms.Explore.Artist.template.release-container"))};
+
+ if (releaseType.primaryType)
+ releaseContainer->bindString("release-type", ReleaseHelpers::buildReleaseTypeString(*releaseType.primaryType, releaseType.secondaryTypes));
+ else
+ releaseContainer->bindString("release-type", Wt::WString::tr("Lms.Explore.releases")); // fallback when not tagged with MB
+
+ releases.container = releaseContainer->bindNew("releases", Wt::WString::tr("Lms.Explore.Releases.template.container"));
+ releases.container->onRequestElements.connect(this, [this, &releases = releases]
+ {
+ addSomeReleases(releases);
+ });
+ releases.container->setHasMore(true);
+ }
+ }
+ else
+ {
+ bindEmpty("release-containers");
+ }
}
-bool
+void
Artist::refreshAppearsOnReleases()
{
- const EnumSet types
+ constexpr EnumSet types
{
TrackArtistLinkType::Artist,
TrackArtistLinkType::Arranger,
@@ -216,18 +258,33 @@ Artist::refreshAppearsOnReleases()
TrackArtistLinkType::Writer,
};
- _appearsOnReleaseContainer = bindNew("appears-on-releases", Wt::WString::tr("Lms.Explore.Releases.template.container"));
- _appearsOnReleaseContainer->onRequestElements.connect(this, [=]
- {
- addSomeReleases(*_appearsOnReleaseContainer, types, {TrackArtistLinkType::ReleaseArtist});
- });
+ _appearsOnReleaseContainer = {};
- const bool added {addSomeReleases(*_appearsOnReleaseContainer, types, {TrackArtistLinkType::ReleaseArtist})};
- setCondition("if-has-appears-on-releases", added);
- return added;
+ Release::FindParameters params;
+ params.setClusters(_filters.getClusterIds());
+ params.setArtist(_artistId, types, {TrackArtistLinkType::ReleaseArtist});
+ params.setSortMethod(ReleaseSortMethod::DateDesc);
+
+ const auto releases {Release::find(LmsApp->getDbSession(), params)};
+ if (!releases.results.empty())
+ {
+ Wt::WTemplate* releaseContainer {bindNew("appears-on-releases", Wt::WString::tr("Lms.Explore.Artist.template.release-container"))};
+ releaseContainer->bindString("release-type", Wt::WString::tr("Lms.Explore.Artist.appears-on"));
+ _appearsOnReleaseContainer.releases = releases.results;
+ _appearsOnReleaseContainer.container = releaseContainer->bindNew("releases", Wt::WString::tr("Lms.Explore.Releases.template.container"));
+ _appearsOnReleaseContainer.container->onRequestElements.connect(this, [this, &releases]
+ {
+ addSomeReleases(_appearsOnReleaseContainer);
+ });
+ _appearsOnReleaseContainer.container->setHasMore(true);
+ }
+ else
+ {
+ bindEmpty("appears-on-releases");
+ }
}
-bool
+void
Artist::refreshNonReleaseTracks()
{
setCondition("if-has-non-release-tracks", true);
@@ -239,7 +296,6 @@ Artist::refreshNonReleaseTracks()
const bool added {addSomeNonReleaseTracks()};
setCondition("if-has-non-release-tracks", added);
- return added;
}
void
@@ -272,35 +328,24 @@ Artist::refreshLinks(const Database::Artist::pointer& artist)
}
}
-bool
-Artist::addSomeReleases(InfiniteScrollingContainer& releaseContainer, EnumSet linkTypes, EnumSet excludedLinkTypes)
+void
+Artist::addSomeReleases(ReleaseContainer& releaseContainer)
{
- bool areArtistsAdded{};
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
- const Database::Artist::pointer artist {Database::Artist::find(LmsApp->getDbSession(), _artistId)};
- if (!artist)
- return areArtistsAdded;
-
- const Range range {static_cast(releaseContainer.getCount()), _releasesBatchSize};
-
- Release::FindParameters params;
- params.setClusters(_filters.getClusterIds());
- params.setArtist(_artistId, linkTypes, excludedLinkTypes);
- params.setRange(range);
- params.setSortMethod(ReleaseSortMethod::DateDesc);
-
- const auto releases {Release::find(LmsApp->getDbSession(), params)};
- for (const ReleaseId releaseId : releases.results)
+ if (const Database::Artist::pointer artist {Database::Artist::find(LmsApp->getDbSession(), _artistId)})
{
- const Database::Release::pointer release {Database::Release::find(LmsApp->getDbSession(), releaseId)};
- releaseContainer.add(ReleaseListHelpers::createEntryForArtist(release, artist));
- areArtistsAdded = true;
+ for (std::size_t i {static_cast(releaseContainer.container->getCount())}; i < releaseContainer.releases.size(); ++i)
+ {
+ const Database::Release::pointer release {Database::Release::find(LmsApp->getDbSession(), releaseContainer.releases[i])};
+ releaseContainer.container->add(ReleaseListHelpers::createEntryForArtist(release, artist));
+ }
+ releaseContainer.container->setHasMore(releaseContainer.container->getCount() < releaseContainer.releases.size());
+ }
+ else
+ {
+ releaseContainer.container->setHasMore(false);
}
-
- releaseContainer.setHasMore(releases.moreResults);
-
- return areArtistsAdded;
}
bool
diff --git a/src/lms/ui/explore/ArtistView.hpp b/src/lms/ui/explore/ArtistView.hpp
index d583a893..a08a197f 100644
--- a/src/lms/ui/explore/ArtistView.hpp
+++ b/src/lms/ui/explore/ArtistView.hpp
@@ -19,8 +19,11 @@
#pragma once
+#include