Try to reuse the db track entry if the track file just moved, fixes #612

2025-02-16 15:52:05 +01:00
parent e978dcbedf
commit a3dfc082ea
4 changed files with 60 additions and 0 deletions
@@ -345,6 +345,45 @@ namespace lms::scanner
            return db::Advisory::UnSet;
        }

+        db::Track::pointer findMovedTrackBySizeAndMetaData(db::Session& session, const metadata::Track& parsedTrack, const FileInfo& fileInfo)
+        {
+            db::Track::FindParameters params;
+            // Add as many fields as possible to limit errors
+            params.setName(parsedTrack.title);
+            if (parsedTrack.medium)
+            {
+                if (parsedTrack.medium->position)
+                    params.setDiscNumber(*parsedTrack.medium->position);
+                if (parsedTrack.medium->release)
+                    params.setReleaseName(parsedTrack.medium->release->name);
+            }
+            if (parsedTrack.position)
+                params.setTrackNumber(*parsedTrack.position);
+            params.setHasEmbeddedImage(parsedTrack.hasCover);
+            params.setFileSize(fileInfo.fileSize);
+
+            bool error{};
+            db::Track::pointer res;
+            db::Track::find(session, params, [&](const db::Track::pointer& track) {
+                // Check that the track is truly no longer where it was during the last scan
+                std::error_code ec;
+                if (std::filesystem::exists(track->getAbsoluteFilePath(), ec))
+                    return;
+
+                if (res)
+                {
+                    LMS_LOG(DBUPDATER, DEBUG, "Found too many candidates for file move. New file = " << fileInfo.relativePath << ", candidate = " << track->getAbsoluteFilePath() << ", previous candidate = " << res->getAbsoluteFilePath());
+                    error = true;
+                }
+                res = track;
+            });
+
+            if (error)
+                res = db::Track::pointer{};
+
+            return res;
+        }
+
        class AudioFileScanOperation : public IFileScanOperation
        {
        public:
@@ -463,6 +502,17 @@ namespace lms::scanner
                }
            }

+            if (!track)
+            {
+                // maybe the file just moved?
+                track = findMovedTrackBySizeAndMetaData(dbSession, *_parsedTrack, *fileInfo);
+                if (track)
+                {
+                    LMS_LOG(DBUPDATER, DEBUG, "Considering track " << _file << " moved from " << track->getAbsoluteFilePath());
+                    track.modify()->setAbsoluteFilePath(_file);
+                }
+            }
+
            // We estimate this is an audio file if the duration is not null
            if (_parsedTrack->audioProperties.duration == std::chrono::milliseconds::zero())
            {