Scanner: removed the file discover step, as it brings an important time penalty for remote file systems, for big databases (up to several minutes)

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

@@ -47,7 +47,6 @@
 #include "steps/ScanStepCheckForRemovedFiles.hpp"
 #include "steps/ScanStepCompact.hpp"
 #include "steps/ScanStepComputeClusterStats.hpp"
-#include "steps/ScanStepDiscoverFiles.hpp"
 #include "steps/ScanStepOptimize.hpp"
 #include "steps/ScanStepRemoveOrphanedDbEntries.hpp"
 #include "steps/ScanStepScanFiles.hpp"
@@ -474,7 +473,6 @@ namespace lms::scanner
 
         // Order is important: steps are sequential
         _scanSteps.clear();
-        _scanSteps.emplace_back(std::make_unique<ScanStepDiscoverFiles>(params));
         _scanSteps.emplace_back(std::make_unique<ScanStepScanFiles>(params));
         _scanSteps.emplace_back(std::make_unique<ScanStepCheckForRemovedFiles>(params));
         _scanSteps.emplace_back(std::make_unique<ScanStepArtistReconciliation>(params));

src/libs/services/scanner/impl/steps/ScanStepDiscoverFiles.cpp

@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2023 Emeric Poupon
- *
- * This file is part of LMS.
- *
- * LMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ScanStepDiscoverFiles.hpp"
-
-#include "core/ILogger.hpp"
-#include "core/Path.hpp"
-
-#include "MediaLibraryInfo.hpp"
-#include "ScannerSettings.hpp"
-
-#include "ScanContext.hpp"
-
-namespace lms::scanner
-{
-    bool ScanStepDiscoverFiles::needProcess([[maybe_unused]] const ScanContext& context) const
-    {
-        // always discover files
-        return true;
-    }
-
-    void ScanStepDiscoverFiles::process(ScanContext& context)
-    {
-        context.stats.totalFileCount = 0;
-
-        for (const MediaLibraryInfo& mediaLibrary : _settings.mediaLibraries)
-        {
-            std::size_t currentDirectoryProcessElemsCount{};
-            core::pathUtils::exploreFilesRecursive(
-                mediaLibrary.rootDirectory, [&](std::error_code ec, const std::filesystem::path& path) {
-                    if (_abortScan)
-                        return false;
-
-                    // we don't report errors here (done in the actual scan step)
-                    if (!ec && selectFileScanner(path))
-                    {
-                        context.currentStepStats.processedElems++;
-                        currentDirectoryProcessElemsCount++;
-                        _progressCallback(context.currentStepStats);
-                    }
-
-                    return true;
-                },
-                &excludeDirFileName);
-
-            LMS_LOG(DBUPDATER, DEBUG, "Discovered " << currentDirectoryProcessElemsCount << " files in " << mediaLibrary.rootDirectory);
-        }
-
-        context.stats.totalFileCount = context.currentStepStats.processedElems;
-
-        LMS_LOG(DBUPDATER, DEBUG, "Discovered " << context.stats.totalFileCount << " files in all directories");
-    }
-} // namespace lms::scanner

src/libs/services/scanner/impl/steps/ScanStepDiscoverFiles.hpp

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2023 Emeric Poupon
- *
- * This file is part of LMS.
- *
- * LMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "ScanStepBase.hpp"
-
-namespace lms::scanner
-{
-    class ScanStepDiscoverFiles : public ScanStepBase
-    {
-    public:
-        using ScanStepBase::ScanStepBase;
-
-    private:
-        ScanStep getStep() const override { return ScanStep::DiscoverFiles; }
-        core::LiteralString getStepName() const override { return "Discover files"; }
-        bool needProcess(const ScanContext& context) const override;
-        void process(ScanContext& context) override;
-    };
-} // namespace lms::scanner

src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp

@@ -107,8 +107,6 @@ namespace lms::scanner
 
     void ScanStepScanFiles::process(ScanContext& context)
     {
-        context.currentStepStats.totalElems = context.stats.totalFileCount;
-
         for (const MediaLibraryInfo& mediaLibrary : _settings.mediaLibraries)
             process(context, mediaLibrary);
     }
@@ -165,6 +163,8 @@ namespace lms::scanner
                 return true;
             },
             &excludeDirFileName);
+
+        context.stats.totalFileCount = context.currentStepStats.totalElems;
     }
 
     void ScanStepScanFiles::processFileScanResults(ScanContext& context, std::span<std::unique_ptr<core::IJob>> scanJobs)