Added barcode tag parsing in releases, and take it into account to avoid merging unrelated albums, fixes #550

src/libs/database/impl/Migration.cpp

@@ -35,7 +35,7 @@ namespace lms::db
 {
     namespace
     {
-        static constexpr Version LMS_DATABASE_VERSION{ 72 };
+        static constexpr Version LMS_DATABASE_VERSION{ 73 };
     }
 
     VersionInfo::VersionInfo()
@@ -932,6 +932,15 @@ SELECT
         utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "playqueue_track_track" on "playqueue_track" ("track_id"))");
     }
 
+    void migrateFromV72(Session& session)
+    {
+        // Add catalog number
+        utils::executeCommand(*session.getDboSession(), "ALTER TABLE release ADD barcode TEXT NOT NULL DEFAULT ''");
+
+        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+        utils::executeCommand(*session.getDboSession(), "UPDATE scan_settings SET scan_version = scan_version + 1");
+    }
+
     bool doDbMigration(Session& session)
     {
         constexpr std::string_view outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
@@ -980,6 +989,7 @@ SELECT
             { 69, migrateFromV69 },
             { 70, migrateFromV70 },
             { 71, migrateFromV71 },
+            { 72, migrateFromV72 },
         };
 
         bool migrationPerformed{};

src/libs/database/include/database/Release.hpp

@@ -252,6 +252,7 @@ namespace lms::db
         std::vector<std::string> getLabelNames() const;
         std::vector<std::string> getReleaseTypeNames() const;
         void visitLabels(const std::function<void(const Label::pointer& label)>& _func) const;
+        std::string_view getBarcode() const { return _barcode; }
         ObjectPtr<Image> getImage() const;
 
         // Setters
@@ -266,6 +267,7 @@ namespace lms::db
         void clearReleaseTypes();
         void addLabel(ObjectPtr<Label> releaseType);
         void addReleaseType(ObjectPtr<ReleaseType> releaseType);
+        void setBarcode(std::string_view barcode) { _barcode = barcode; }
         void setImage(ObjectPtr<Image> image);
 
         // Get the artists of this release
@@ -286,6 +288,7 @@ namespace lms::db
             Wt::Dbo::field(a, _totalDisc, "total_disc");
             Wt::Dbo::field(a, _artistDisplayName, "artist_display_name");
             Wt::Dbo::field(a, _isCompilation, "is_compilation");
+            Wt::Dbo::field(a, _barcode, "barcode");
             Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToOne, "release");
 
             Wt::Dbo::belongsTo(a, _image, "image", Wt::Dbo::OnDeleteSetNull);
@@ -310,6 +313,7 @@ namespace lms::db
         std::optional<int> _totalDisc{};
         std::string _artistDisplayName;
         bool _isCompilation{}; // See https://picard-docs.musicbrainz.org/en/appendices/tag_mapping.html#compilation-itunes-5
+        std::string _barcode;
 
         Wt::Dbo::ptr<Image> _image;
         Wt::Dbo::collection<Wt::Dbo::ptr<Track>> _tracks;

src/libs/metadata/impl/Parser.cpp

@@ -434,6 +434,7 @@ namespace lms::metadata
         release->groupMBID = getTagValueAs<core::UUID>(tagReader, TagType::MusicBrainzReleaseGroupID);
         release->mediumCount = getTagValueAs<std::size_t>(tagReader, TagType::TotalDiscs);
         release->isCompilation = getTagValueAs<bool>(tagReader, TagType::Compilation).value_or(false);
+        release->barcode = getTagValueAs<std::string>(tagReader, TagType::Barcode).value_or("");
         release->labels = getTagValuesAs<std::string>(tagReader, TagType::RecordLabel, _defaultTagDelimiters);
         if (!release->mediumCount)
         {

src/libs/metadata/include/metadata/Types.hpp

@@ -68,6 +68,7 @@ namespace lms::metadata
         std::vector<std::string> labels;
         std::vector<std::string> releaseTypes;
         bool isCompilation{};
+        std::string barcode;
 
         auto operator<=>(const Release&) const = default;
     };

src/libs/metadata/test/Parser.cpp

@@ -41,6 +41,7 @@ namespace lms::metadata
                 { TagType::AlbumArtist, { "MyAlbumArtist1 & MyAlbumArtist2" } },
                 { TagType::AlbumArtists, { "MyAlbumArtist1", "MyAlbumArtist2" } },
                 { TagType::AlbumArtistsSortOrder, { "MyAlbumArtist1SortName", "MyAlbumArtist2SortName" } },
+                { TagType::Barcode, { "MyBarcode" } },
                 { TagType::Comment, { "Comment1", "Comment2" } },
                 { TagType::Compilation, { "1" } },
                 { TagType::Composer, { "MyComposer1", "MyComposer2" } },
@@ -208,6 +209,7 @@ namespace lms::metadata
         EXPECT_EQ(track->medium->release->artists[1].sortName, "MyAlbumArtist2SortName");
         EXPECT_EQ(track->medium->release->artists[1].mbid, core::UUID::fromString("5ed3d6b3-2aed-4a03-828c-3c4d4f7406e1"));
         EXPECT_TRUE(track->medium->release->isCompilation);
+        EXPECT_EQ(track->medium->release->barcode, "MyBarcode");
         ASSERT_EQ(track->medium->release->labels.size(), 2);
         EXPECT_EQ(track->medium->release->labels[0], "Label1");
         EXPECT_EQ(track->medium->release->labels[1], "Label2");

src/libs/services/scanner/impl/ScanStepScanFiles.cpp

@@ -254,6 +254,8 @@ namespace lms::scanner
                 release.modify()->setArtistDisplayName(releaseInfo.artistDisplayName);
             if (release->isCompilation() != releaseInfo.isCompilation)
                 release.modify()->setCompilation(releaseInfo.isCompilation);
+            if (release->getBarcode() != releaseInfo.barcode)
+                release.modify()->setBarcode(releaseInfo.barcode);
             if (release->getReleaseTypeNames() != releaseInfo.releaseTypes)
             {
                 release.modify()->clearReleaseTypes();
@@ -277,7 +279,8 @@ namespace lms::scanner
                 && candidateRelease->getSortName() == releaseInfo.sortName
                 && candidateRelease->getTotalDisc() == releaseInfo.mediumCount
                 && candidateRelease->isCompilation() == releaseInfo.isCompilation
-                && candidateRelease->getLabelNames() == releaseInfo.labels;
+                && candidateRelease->getLabelNames() == releaseInfo.labels
+                && candidateRelease->getBarcode() == releaseInfo.barcode;
         }
 
         Release::pointer getOrCreateRelease(Session& session, const metadata::Release& releaseInfo, const Directory::pointer& currentDirectory)

src/tools/metadata/LmsMetadata.cpp

@@ -100,6 +100,9 @@ namespace lms::metadata
 
         std::cout << "\tIsCompilation: " << std::boolalpha << release.isCompilation << std::endl;
 
+        if (!release.barcode.empty())
+            std::cout << "\tBarcode: " << release.barcode << std::endl;
+
         for (const Artist& artist : release.artists)
             std::cout << "\tRelease artist: " << artist << std::endl;