Better user feedback

approot/messages.xml

@@ -118,6 +118,7 @@
 <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-optimize">Optimizing database... {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">Reloading similarity engine: {1}%...</message>
+<message id="Lms.Admin.ScannerController.step-removing-orphaned-entries">Removing orphaned entries: {1} entries...</message>
 <message id="Lms.Admin.ScannerController.step-scanning-files">Scanning files: {1}/{2} ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">Step status</message>
 

approot/messages_fr.xml

@@ -118,6 +118,7 @@
 <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-optimize">Optimisation de la base de données... {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">Rechargement du moteur de recommandation : {1}%...</message>
+<message id="Lms.Admin.ScannerController.step-removing-orphaned-entries">Retrait des entrées orphelines: {1} entrées...</message>
 <message id="Lms.Admin.ScannerController.step-scanning-files">Scan des fichiers : {1}/{2} ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">Statut de l'étape</message>
 

approot/messages_it.xml

@@ -118,6 +118,7 @@
 <message id="Lms.Admin.ScannerController.step-fetching-track-features">Recupero metadati da AcousticBrainz: {1}/{2} tracce ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-optimize">Ottimizzazione del database... {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">Ricarica motore di tracce simili: {1}%...</message>
+<message id="Lms.Admin.ScannerController.step-removing-orphaned-entries">Rimozione voci orfane: {1} voci...</message>
 <message id="Lms.Admin.ScannerController.step-scanning-files">Scansione dei file: {1}/{2} ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">Stato passo</message>
 

approot/messages_pl.xml

@@ -135,6 +135,7 @@
 <message id="Lms.Admin.ScannerController.step-fetching-track-features">Pobieranie danych o ścieżce z AcousticBrainz: {1}/{2} ścieżek ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-optimize">Optymalizowanie bazy danych... {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">Przeładowywanie silnika podobieństw: {1}%...</message>
+<message id="Lms.Admin.ScannerController.step-removing-orphaned-entries">Usuwanie osieroconych wpisów: {1} wpisów...</message>
 <message id="Lms.Admin.ScannerController.step-scanning-files">Skanowanie plików: {1}/{2} ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">Obecny krok</message>
 

approot/messages_zh.xml

@@ -118,6 +118,7 @@
 <message id="Lms.Admin.ScannerController.step-fetching-track-features">从 AcousticBrainz 获取音轨特征: {1}/{2} 音轨 ({3}%)...</message>
 
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">重载相似引擎中 {1}%...</message>
+
 <message id="Lms.Admin.ScannerController.step-scanning-files">扫描文件中: {1}/{2} 个文件 ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">当前步骤状态</message>
 

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

@@ -31,95 +31,81 @@
 
 namespace lms::scanner
 {
-    using namespace db;
+    void ScanStepRemoveOrphanedDbEntries::process(ScanContext& context)
+    {
+        removeOrphanedClusters(context);
+        removeOrphanedClusterTypes(context);
+        removeOrphanedArtists(context);
+        removeOrphanedReleases(context);
+        removeOrphanedDirectories(context);
+    }
 
-    namespace
+    void ScanStepRemoveOrphanedDbEntries::removeOrphanedClusters(ScanContext& context)
+    {
+        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned clusters...");
+        removeOrphanedEntries<db::Cluster>(context);
+    }
+
+    void ScanStepRemoveOrphanedDbEntries::removeOrphanedClusterTypes(ScanContext& context)
+    {
+        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned cluster types...");
+        removeOrphanedEntries<db::ClusterType>(context);
+    }
+
+    void ScanStepRemoveOrphanedDbEntries::removeOrphanedArtists(ScanContext& context)
+    {
+        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned artists...");
+        removeOrphanedEntries<db::Artist>(context);
+    }
+
+    void ScanStepRemoveOrphanedDbEntries::removeOrphanedReleases(ScanContext& context)
+    {
+        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned releases...");
+        removeOrphanedEntries<db::Release>(context);
+    }
+
+    void ScanStepRemoveOrphanedDbEntries::removeOrphanedDirectories(ScanContext& context)
+    {
+        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned directories...");
+        removeOrphanedEntries<db::Directory>(context);
+    }
+
+    template<typename T>
+    void ScanStepRemoveOrphanedDbEntries::removeOrphanedEntries(ScanStepRemoveOrphanedDbEntries::ScanContext& context)
     {
         constexpr std::size_t batchSize = 100;
 
-        template<typename T>
+        using IdType = typename T::IdType;
-        void removeOrphanedEntries(Session& session, bool& abortScan)
+
+        db::Session& session{ _db.getTLSSession() };
+
+        db::RangeResults<IdType> entries;
+        while (!_abortScan)
         {
-            using IdType = typename T::IdType;
-
-            RangeResults<IdType> entries;
-            while (!abortScan)
             {
+                auto transaction{ session.createReadTransaction() };
+
+                entries = T::findOrphanIds(session, db::Range{ 0, batchSize });
+            };
+
+            if (entries.results.empty())
+                break;
+
+            {
+                auto transaction{ session.createWriteTransaction() };
+
+                for (const IdType objectId : entries.results)
                 {
-                    auto transaction{ session.createReadTransaction() };
+                    if (_abortScan)
+                        break;
 
-                    entries = T::findOrphanIds(session, Range{ 0, batchSize });
+                    typename T::pointer entry{ T::find(session, objectId) };
-                };
+                    entry.remove();
-
-                if (entries.results.empty())
-                    break;
-
-                {
-                    auto transaction{ session.createWriteTransaction() };
-
-                    for (const IdType objectId : entries.results)
-                    {
-                        if (abortScan)
-                            break;
-
-                        typename T::pointer entry{ T::find(session, objectId) };
-
-                        entry.remove();
-                    }
                 }
             }
+
+            context.currentStepStats.processedElems += entries.results.size();
+            _progressCallback(context.currentStepStats);
         }
-    } // namespace
-
-    void ScanStepRemoveOrphanedDbEntries::process(ScanContext& context)
-    {
-        auto& session{ _db.getTLSSession() };
-
-        {
-            auto transaction{ session.createReadTransaction() };
-            context.currentStepStats.totalElems = 0;
-            context.currentStepStats.totalElems += Cluster::getCount(session);
-            context.currentStepStats.totalElems += ClusterType::getCount(session);
-            context.currentStepStats.totalElems += Artist::getCount(session);
-            context.currentStepStats.totalElems += Release::getCount(session);
-            context.currentStepStats.totalElems += Directory::getCount(session);
-        }
-        LMS_LOG(DBUPDATER, DEBUG, context.currentStepStats.totalElems << " database entries to be checked...");
-
-        removeOrphanedClusters();
-        removeOrphanedClusterTypes();
-        removeOrphanedArtists();
-        removeOrphanedReleases();
-        removeOrphanedDirectories();
-    }
-
-    void ScanStepRemoveOrphanedDbEntries::removeOrphanedClusters()
-    {
-        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned clusters...");
-        removeOrphanedEntries<db::Cluster>(_db.getTLSSession(), _abortScan);
-    }
-
-    void ScanStepRemoveOrphanedDbEntries::removeOrphanedClusterTypes()
-    {
-        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned cluster types...");
-        removeOrphanedEntries<db::ClusterType>(_db.getTLSSession(), _abortScan);
-    }
-
-    void ScanStepRemoveOrphanedDbEntries::removeOrphanedArtists()
-    {
-        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned artists...");
-        removeOrphanedEntries<db::Artist>(_db.getTLSSession(), _abortScan);
-    }
-
-    void ScanStepRemoveOrphanedDbEntries::removeOrphanedReleases()
-    {
-        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned releases...");
-        removeOrphanedEntries<db::Release>(_db.getTLSSession(), _abortScan);
-    }
-
-    void ScanStepRemoveOrphanedDbEntries::removeOrphanedDirectories()
-    {
-        LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned directories...");
-        removeOrphanedEntries<db::Directory>(_db.getTLSSession(), _abortScan);
     }
 } // namespace lms::scanner

src/libs/services/scanner/impl/ScanStepRemoveOrphanedDbEntries.hpp

@@ -35,10 +35,13 @@ namespace lms::scanner
         ScanStep getStep() const override { return ScanStep::RemoveOrphanedDbEntries; }
         void process(ScanContext& context) override;
 
-        void removeOrphanedClusters();
+        void removeOrphanedClusters(ScanContext& context);
-        void removeOrphanedClusterTypes();
+        void removeOrphanedClusterTypes(ScanContext& context);
-        void removeOrphanedArtists();
+        void removeOrphanedArtists(ScanContext& context);
-        void removeOrphanedReleases();
+        void removeOrphanedReleases(ScanContext& context);
-        void removeOrphanedDirectories();
+        void removeOrphanedDirectories(ScanContext& context);
+
+        template<typename T>
+        void removeOrphanedEntries(ScanStepRemoveOrphanedDbEntries::ScanContext& context);
     };
 } // namespace lms::scanner

src/lms/ui/admin/ScannerController.cpp

@@ -312,7 +312,7 @@ namespace lms::ui
 
         case ScanStep::RemoveOrphanedDbEntries:
             _stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-removing-orphaned-entries")
-                                     .arg(stepStats.progress()));
+                                     .arg(stepStats.processedElems));
             break;
 
         case ScanStep::ReloadSimilarityEngine: