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

Fixed stats when checking for missing files

Browse Source
This commit is contained in:
emeric
2020-07-26 20:42:59 +02:00
parent 8f236c16ca
commit 0ca0b9e66f
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/messages.xml
+1 -1
View File
@@ -73,7 +73,7 @@
<message id="Lms.Admin.ScannerController.status-not-scheduled">Not scheduled</message> <message id="Lms.Admin.ScannerController.status-not-scheduled">Not scheduled</message>
<message id="Lms.Admin.ScannerController.status-scheduled">Scheduled on {1}</message> <message id="Lms.Admin.ScannerController.status-scheduled">Scheduled on {1}</message>
<message id="Lms.Admin.ScannerController.status-in-progress">Scanning: step {1}/{2}</message> <message id="Lms.Admin.ScannerController.status-in-progress">Scanning: step {1}/{2}</message>
<message id="Lms.Admin.ScannerController.step-checking-removed-files">Checking removed files... {1}%</message> <message id="Lms.Admin.ScannerController.step-checking-for-missing-files">Checking for missing files... {1}%</message>
<message id="Lms.Admin.ScannerController.step-discovering-files">Discovering files: {1} files</message> <message id="Lms.Admin.ScannerController.step-discovering-files">Discovering files: {1} files</message>
<message id="Lms.Admin.ScannerController.step-fetching-track-features">Fetching track features from AcousticBrainz: {1}/{2} tracks ({3}%)...</message> <message id="Lms.Admin.ScannerController.step-fetching-track-features">Fetching track features from AcousticBrainz: {1}/{2} tracks ({3}%)...</message>
<message id="Lms.Admin.ScannerController.step-scanning-files">Scanning files: {1}/{2} files ({3}%)...</message> <message id="Lms.Admin.ScannerController.step-scanning-files">Scanning files: {1}/{2} files ({3}%)...</message>
approot/messages_fr.xml
+1 -1
View File
@@ -73,7 +73,7 @@
<message id="Lms.Admin.ScannerController.status-not-scheduled">Non planifié</message> <message id="Lms.Admin.ScannerController.status-not-scheduled">Non planifié</message>
<message id="Lms.Admin.ScannerController.status-scheduled">Planifié le {1}</message> <message id="Lms.Admin.ScannerController.status-scheduled">Planifié le {1}</message>
<message id="Lms.Admin.ScannerController.status-in-progress">En cours de scan : étape {1}/{2}</message> <message id="Lms.Admin.ScannerController.status-in-progress">En cours de scan : étape {1}/{2}</message>
<message id="Lms.Admin.ScannerController.step-checking-removed-files">Vérification des fichiers... {1}%</message> <message id="Lms.Admin.ScannerController.step-checking-for-missing-files">Vérification des fichiers supprimés... {1}%</message>
<message id="Lms.Admin.ScannerController.step-discovering-files">Découverte des fichiers: {1} fichiers</message> <message id="Lms.Admin.ScannerController.step-discovering-files">Découverte des fichiers: {1} fichiers</message>
<message id="Lms.Admin.ScannerController.step-fetching-track-features">Récupération des métadonnées AcousticBrainz: {1}/{2} fichiers ({3}%)...</message> <message id="Lms.Admin.ScannerController.step-fetching-track-features">Récupération des métadonnées AcousticBrainz: {1}/{2} fichiers ({3}%)...</message>
<message id="Lms.Admin.ScannerController.step-scanning-files">Scan des fichiers: {1}/{2} fichiers ({3}%)...</message> <message id="Lms.Admin.ScannerController.step-scanning-files">Scan des fichiers: {1}/{2} fichiers ({3}%)...</message>
src/libs/scanner/impl/MediaScanner.cpp
+3 -3
View File
@@ -865,7 +865,7 @@ MediaScanner::removeMissingTracks(ScanStats& stats)
{ {
static constexpr std::size_t batchSize {50}; 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..."; LMS_LOG(DBUPDATER, DEBUG) << "Checking tracks to be removed...";
std::size_t trackCount {}; std::size_t trackCount {};
@@ -887,8 +887,6 @@ MediaScanner::removeMissingTracks(ScanStats& stats)
trackPaths.clear(); trackPaths.clear();
tracksToRemove.clear(); tracksToRemove.clear();
stepStats.processedFiles++;
{ {
auto transaction {_dbSession.createSharedTransaction()}; auto transaction {_dbSession.createSharedTransaction()};
trackPaths = Track::getAllPaths(_dbSession, i, batchSize); trackPaths = Track::getAllPaths(_dbSession, i, batchSize);
@@ -901,6 +899,8 @@ MediaScanner::removeMissingTracks(ScanStats& stats)
if (!checkFile(trackPath, _mediaDirectory, _fileExtensions)) if (!checkFile(trackPath, _mediaDirectory, _fileExtensions))
tracksToRemove.push_back(trackId); tracksToRemove.push_back(trackId);
stepStats.processedFiles++;
} }
if (!tracksToRemove.empty()) if (!tracksToRemove.empty())
src/libs/scanner/include/scanner/MediaScannerStats.hpp
+1 -1
View File
@@ -58,7 +58,7 @@ namespace Scanner {
enum class ScanProgressStep : unsigned enum class ScanProgressStep : unsigned
{ {
CheckingRemovedFiles = 0, ChekingForMissingFiles = 0,
DiscoveringFiles, DiscoveringFiles,
ScanningFiles, ScanningFiles,
FetchingTrackFeatures, FetchingTrackFeatures,
src/lms/ui/admin/ScannerController.cpp
+2 -2
View File
@@ -199,8 +199,8 @@ ScannerController::refreshContents()
switch (status.currentScanStepStats->currentStep) switch (status.currentScanStepStats->currentStep)
{ {
case Scanner::ScanProgressStep::CheckingRemovedFiles: case Scanner::ScanProgressStep::ChekingForMissingFiles:
bindString("step-status", Wt::WString::tr("Lms.Admin.ScannerController.step-checking-removed-files") bindString("step-status", Wt::WString::tr("Lms.Admin.ScannerController.step-checking-for-missing-files")
.arg(status.currentScanStepStats->progress())); .arg(status.currentScanStepStats->progress()));
break; break;