owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to migrate audio files in DB instead of deleting/creating entries. fixes #308

Browse Source
This commit is contained in:
emeric
2023-02-22 20:58:06 +01:00
parent 8a69d3e309
commit 492e2d4fc6
3 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/scanner/impl/ScanStepRemoveOrphanDbFiles.cpp
+3 -3
View File
@@ -78,7 +78,7 @@ namespace Scanner
if (_abortScan)
return;
if (!checkFile(trackPath.path, _settings.mediaDirectory))
if (!checkFile(trackPath.path))
tracksToRemove.push_back(trackPath.trackId);
context.currentStepStats.processedElems++;
@@ -166,7 +166,7 @@ namespace Scanner
}
bool
ScanStepRemoveOrphanDbFiles::checkFile(const std::filesystem::path& p, const std::filesystem::path& mediaDirectory)
ScanStepRemoveOrphanDbFiles::checkFile(const std::filesystem::path& p)
{
try
{
@@ -179,7 +179,7 @@ namespace Scanner
return false;
}
if (!PathUtils::isPathInRootPath(p, mediaDirectory, &excludeDirFileName))
if (!PathUtils::isPathInRootPath(p, _settings.mediaDirectory, &excludeDirFileName))
{
LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': out of media directory";
return false;
src/libs/services/scanner/impl/ScanStepRemoveOrphanDbFiles.hpp
+1 -1
View File
@@ -39,6 +39,6 @@ namespace Scanner
void removeOrphanClusters();
void removeOrphanArtists();
void removeOrphanReleases();
bool checkFile(const std::filesystem::path& p, const std::filesystem::path& mediaDirectory);
bool checkFile(const std::filesystem::path& p);
};
}
src/libs/services/scanner/impl/ScanStepScanFiles.cpp
+42 -22
View File
@@ -283,28 +283,48 @@ namespace Scanner
Track::pointer track {Track::findByPath(dbSession, file) };
// Skip duplicate track MBID
if (trackInfo->trackMBID && _settings.skipDuplicateMBID)
if (trackInfo->trackMBID && (!track || _settings.skipDuplicateMBID))
{
for (Track::pointer otherTrack : Track::findByMBID(dbSession, *trackInfo->trackMBID))
std::vector<Track::pointer> duplicateTracks {Track::findByMBID(dbSession, *trackInfo->trackMBID)};
if (!track)
{
// Skip ourselves
if (track && track->getId() == otherTrack->getId())
continue;
// Skip if the other track found does not exists, as it may have been moved to the current scanned file
std::error_code ec;
if (!std::filesystem::exists(otherTrack->getPath(), ec))
continue;
LMS_LOG(DBUPDATER, DEBUG) << "Skipped '" << file.string() << "' (similar MBID in '" << otherTrack->getPath().string() << "')";
// As this MBID already exists, just remove what we just scanned
if (track)
// find for existing MBIDs as the file may have just been moved
const auto duplicateTracks {Track::findByMBID(dbSession, *trackInfo->trackMBID)};
if (duplicateTracks.size() == 1)
{
track.remove();
stats.deletions++;
Track::pointer otherTrack {duplicateTracks.front()};
std::error_code ec;
if (!std::filesystem::exists(otherTrack->getPath(), ec))
{
LMS_LOG(DBUPDATER, DEBUG) << "Considering track '" << file.string() << "' moved from '" << otherTrack->getPath() << "'";
track = otherTrack;
}
}
}
// Skip duplicate track MBID
if (_settings.skipDuplicateMBID)
{
for (Track::pointer otherTrack : duplicateTracks)
{
// Skip ourselves
if (track && track->getId() == otherTrack->getId())
continue;
// Skip if duplicate files no longer in media root: as it will be removed later, we will end up with no file
if (!PathUtils::isPathInRootPath(file, _settings.mediaDirectory, &excludeDirFileName))
continue;
LMS_LOG(DBUPDATER, DEBUG) << "Skipped '" << file.string() << "' (similar MBID in '" << otherTrack->getPath().string() << "')";
// As this MBID already exists, just remove what we just scanned
if (track)
{
track.remove();
stats.deletions++;
}
return;
}
return;
}
}
@@ -313,7 +333,7 @@ namespace Scanner
// - the duration is not null
if (trackInfo->audioStreams.empty())
{
LMS_LOG(DBUPDATER, INFO) << "Skipped '" << file.string() << "' (no audio stream found)";
LMS_LOG(DBUPDATER, DEBUG) << "Skipped '" << file.string() << "' (no audio stream found)";
// If Track exists here, delete it!
if (track)
@@ -326,7 +346,7 @@ namespace Scanner
}
if (trackInfo->duration == std::chrono::milliseconds::zero())
{
LMS_LOG(DBUPDATER, INFO) << "Skipped '" << file.string() << "' (duration is 0)";
LMS_LOG(DBUPDATER, DEBUG) << "Skipped '" << file.string() << "' (duration is 0)";
// If Track exists here, delete it!
if (track)
@@ -354,12 +374,12 @@ namespace Scanner
if (!track)
{
track = dbSession.create<Track>(file);
LMS_LOG(DBUPDATER, INFO) << "Adding '" << file.string() << "'";
LMS_LOG(DBUPDATER, DEBUG) << "Adding '" << file.string() << "'";
stats.additions++;
}
else
{
LMS_LOG(DBUPDATER, INFO) << "Updating '" << file.string() << "'";
LMS_LOG(DBUPDATER, DEBUG) << "Updating '" << file.string() << "'";
stats.updates++;
}