diff --git a/approot/messages.xml b/approot/messages.xml index e155a61e..88354bf4 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -73,7 +73,7 @@ Not scheduled Scheduled on {1} Scanning: step {1}/{2} -Checking removed files... {1}% +Checking for missing files... {1}% Discovering files: {1} files Fetching track features from AcousticBrainz: {1}/{2} tracks ({3}%)... Scanning files: {1}/{2} files ({3}%)... diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 4182355f..88b5c4d6 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -73,7 +73,7 @@ Non planifié Planifié le {1} En cours de scan : étape {1}/{2} -Vérification des fichiers... {1}% +Vérification des fichiers supprimés... {1}% Découverte des fichiers: {1} fichiers Récupération des métadonnées AcousticBrainz: {1}/{2} fichiers ({3}%)... Scan des fichiers: {1}/{2} fichiers ({3}%)... diff --git a/src/libs/scanner/impl/MediaScanner.cpp b/src/libs/scanner/impl/MediaScanner.cpp index 70e478dc..e463f518 100644 --- a/src/libs/scanner/impl/MediaScanner.cpp +++ b/src/libs/scanner/impl/MediaScanner.cpp @@ -865,7 +865,7 @@ MediaScanner::removeMissingTracks(ScanStats& stats) { static constexpr std::size_t batchSize {50}; - ScanStepStats stepStats{stats.startTime, ScanProgressStep::CheckingRemovedFiles}; + ScanStepStats stepStats{stats.startTime, ScanProgressStep::ChekingForMissingFiles}; LMS_LOG(DBUPDATER, DEBUG) << "Checking tracks to be removed..."; std::size_t trackCount {}; @@ -887,8 +887,6 @@ MediaScanner::removeMissingTracks(ScanStats& stats) trackPaths.clear(); tracksToRemove.clear(); - stepStats.processedFiles++; - { auto transaction {_dbSession.createSharedTransaction()}; trackPaths = Track::getAllPaths(_dbSession, i, batchSize); @@ -901,6 +899,8 @@ MediaScanner::removeMissingTracks(ScanStats& stats) if (!checkFile(trackPath, _mediaDirectory, _fileExtensions)) tracksToRemove.push_back(trackId); + + stepStats.processedFiles++; } if (!tracksToRemove.empty()) diff --git a/src/libs/scanner/include/scanner/MediaScannerStats.hpp b/src/libs/scanner/include/scanner/MediaScannerStats.hpp index 6b05bd95..f5eb67f7 100644 --- a/src/libs/scanner/include/scanner/MediaScannerStats.hpp +++ b/src/libs/scanner/include/scanner/MediaScannerStats.hpp @@ -58,7 +58,7 @@ namespace Scanner { enum class ScanProgressStep : unsigned { - CheckingRemovedFiles = 0, + ChekingForMissingFiles = 0, DiscoveringFiles, ScanningFiles, FetchingTrackFeatures, diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp index 77b9ffb3..2e971064 100644 --- a/src/lms/ui/admin/ScannerController.cpp +++ b/src/lms/ui/admin/ScannerController.cpp @@ -199,8 +199,8 @@ ScannerController::refreshContents() switch (status.currentScanStepStats->currentStep) { - case Scanner::ScanProgressStep::CheckingRemovedFiles: - bindString("step-status", Wt::WString::tr("Lms.Admin.ScannerController.step-checking-removed-files") + case Scanner::ScanProgressStep::ChekingForMissingFiles: + bindString("step-status", Wt::WString::tr("Lms.Admin.ScannerController.step-checking-for-missing-files") .arg(status.currentScanStepStats->progress())); break;