dev: Rename ImportFoldersLogic to ImportFoldersService.

cosmin42 · Sep 24, 2024 · d2e2f03 · d2e2f03
1 parent 1a5b3e3
commit d2e2f03
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/PB/.clang-uml b/PB/.clang-uml
@@ -21,7 +21,7 @@ diagrams:
     type: class
     generate_packages: true
     glob:
-      - src/ImportFoldersLogic.cpp
+      - src/ImportFoldersService.cpp
     include:
       namespaces:
         - PB
@@ -153,12 +153,12 @@ diagrams:
   top_level_class_diagram:
     type: class
     glob:
-      - src/ImportFoldersLogic.cpp
+      - src/ImportFoldersService.cpp
     include:
       context:
         - match:
             radius: 1
-            pattern: PB::ImportFoldersLogic
+            pattern: PB::ImportFoldersService
       access:
         - public
     exclude:

diff --git a/PB/CMakeLists.txt b/PB/CMakeLists.txt
@@ -98,7 +98,7 @@ add_library(${PBLIB_LIBRARY_NAME} STATIC
     include/pb/ImportImageTask.h
     include/pb/ImageMonitor.h
     include/pb/ImageProcessingData.h
-    include/pb/ImportFoldersLogic.h
+    include/pb/ImportFoldersService.h
     include/pb/ImageToPaperService.h
     include/pb/ImageToPaperTask.h
     include/pb/image/ImageFactory.h
@@ -173,7 +173,7 @@ add_library(${PBLIB_LIBRARY_NAME} STATIC
     src/ImageToPaperService.cpp
     src/ImageToPaperTask.cpp
     src/ImportImageTask.cpp
-    src/ImportFoldersLogic.cpp
+    src/ImportFoldersService.cpp
     src/Jpg.cpp
     src/LutService.cpp
     src/LutIconsPreprocessingJob.cpp

diff --git a/PB/include/pb/ImportFoldersLogic.h → PB/include/pb/ImportFoldersService.h b/PB/include/pb/ImportFoldersLogic.h → PB/include/pb/ImportFoldersService.h
@@ -13,21 +13,21 @@
 
 namespace PB {
 
-class ImportFoldersLogicListener {
+class ImportFoldersServiceListener {
 public:
-  virtual ~ImportFoldersLogicListener() = default;
+  virtual ~ImportFoldersServiceListener() = default;
 
   virtual void onMappingFinished(Path root, std::vector<Path> newFolders) = 0;
   virtual void onImageProcessed(Path key, Path root,
                                 ImageResources imageResources) = 0;
 };
 
-class ImportFoldersLogic final : public PicturesSearchConfigListener,
+class ImportFoldersService final : public PicturesSearchConfigListener,
                                  public ThumbnailsJobListener {
 public:
-  ~ImportFoldersLogic() = default;
+  ~ImportFoldersService() = default;
 
-  void configureListener(ImportFoldersLogicListener *listener)
+  void configureListener(ImportFoldersServiceListener *listener)
   {
     mListener = listener;
   }
@@ -64,7 +64,7 @@ class ImportFoldersLogic final : public PicturesSearchConfigListener,
                       std::tuple<Path, Path, Path> thumbnailPaths) override;
 
 private:
-  ImportFoldersLogicListener              *mListener = nullptr;
+  ImportFoldersServiceListener              *mListener = nullptr;
   PBDev::ThreadScheduler                  *mScheduler = nullptr;
   std::shared_ptr<TaskCruncher>            mTaskCruncher = nullptr;
   std::shared_ptr<PlatformInfo>            mPlatformInfo = nullptr;

diff --git a/PB/include/pb/PhotoBook.h b/PB/include/pb/PhotoBook.h
@@ -13,7 +13,7 @@
 #include <pb/DirectoryInspectionService.h>
 #include <pb/DurableHashService.h>
 #include <pb/ImageToPaperService.h>
-#include <pb/ImportFoldersLogic.h>
+#include <pb/ImportFoldersService.h>
 #include <pb/LutService.h>
 #include <pb/OGLEngine.h>
 #include <pb/PhotobookListener.h>
@@ -32,7 +32,7 @@
 
 namespace PB {
 
-class Photobook final : public ImportFoldersLogicListener,
+class Photobook final : public ImportFoldersServiceListener,
                         public PBDev::ThreadScheduler,
                         public ProgressManagerListener,
                         public ExportListener,
@@ -131,7 +131,7 @@ class Photobook final : public ImportFoldersLogicListener,
   std::shared_ptr<ProjectManagementSystem>  mProjectManagementSystem = nullptr;
   std::shared_ptr<ImageFactory>             mImageFactory = nullptr;
 
-  std::shared_ptr<ImportFoldersLogic>         mImportLogic = nullptr;
+  std::shared_ptr<ImportFoldersService>         mImportLogic = nullptr;
   CommandStack                                mCommandStack;
   bool                                        mMarkProjectForDeletion = false;
   ExportLogic                                 mExportLogic;

diff --git a/PB/src/ImportFoldersLogic.cpp → PB/src/ImportFoldersService.cpp b/PB/src/ImportFoldersLogic.cpp → PB/src/ImportFoldersService.cpp
@@ -1,10 +1,10 @@
-#include <pb/ImportFoldersLogic.h>
+#include <pb/ImportFoldersService.h>
 
 #include <pb/util/FileInfo.h>
 
 namespace PB {
 
-std::optional<PBDev::Error> ImportFoldersLogic::addImportFolder(Path path)
+std::optional<PBDev::Error> ImportFoldersService::addImportFolder(Path path)
 {
   auto errorOrPath = PBDev::FileInfo::validInputRootPath(path);
   if (std::holds_alternative<PBDev::Error>(errorOrPath)) {
@@ -30,7 +30,7 @@ std::optional<PBDev::Error> ImportFoldersLogic::addImportFolder(Path path)
   return std::nullopt;
 }
 
-void ImportFoldersLogic::startThumbnailsCreation(
+void ImportFoldersService::startThumbnailsCreation(
     PBDev::ThumbnailsJobId jobId, std::vector<Path> searchResults)
 {
   mThumbnailsJobs.emplace(jobId, ThumbnailsJob(jobId, searchResults));
@@ -44,7 +44,7 @@ void ImportFoldersLogic::startThumbnailsCreation(
                         PBDev::ProgressJobName{"thumbnails"});
 }
 
-void ImportFoldersLogic::onPicturesSearchFinished(
+void ImportFoldersService::onPicturesSearchFinished(
     PBDev::ThumbnailsJobId jobId, Path root, std::vector<Path> searchResults)
 {
   mScheduler->post(
@@ -56,9 +56,9 @@ void ImportFoldersLogic::onPicturesSearchFinished(
       });
 }
 
-void ImportFoldersLogic::onPicturesSearchAborted(Path root) {}
+void ImportFoldersService::onPicturesSearchAborted(Path root) {}
 
-void ImportFoldersLogic::imageProcessed(
+void ImportFoldersService::imageProcessed(
     PBDev::ThumbnailsJobId jobId, std::tuple<Path, Path, Path> thumbnailPaths)
 {
   auto root = mRootPaths.at(jobId);

diff --git a/PB/src/PhotoBook.cpp b/PB/src/PhotoBook.cpp
@@ -29,9 +29,9 @@ Photobook::Photobook(Path localStatePath, Path installationPath,
 
   initLogger();
 
-  auto importFoldersLogicListener =
-      dynamic_cast<ImportFoldersLogicListener *>(this);
-  PBDev::basicAssert(importFoldersLogicListener != nullptr);
+  auto importFoldersServiceListener =
+      dynamic_cast<ImportFoldersServiceListener *>(this);
+  PBDev::basicAssert(importFoldersServiceListener != nullptr);
 
   auto threadScheduler = dynamic_cast<PBDev::ThreadScheduler *>(this);
   PBDev::basicAssert(threadScheduler != nullptr);
@@ -90,7 +90,7 @@ Photobook::Photobook(Path localStatePath, Path installationPath,
   mImportLogic->configureTaskCruncher(mTaskCruncher);
   mImportLogic->configurePlatformInfo(mPlatformInfo);
   mImportLogic->configureProjectManagementSystem(mProjectManagementSystem);
-  mImportLogic->configureListener(importFoldersLogicListener);
+  mImportLogic->configureListener(importFoldersServiceListener);
 
   mExportLogic.setTaskCruncher(mTaskCruncher);
   mCollageTemplateManager->setTaskCruncher(mTaskCruncher);