rename FileSystemEventDb::resolveNameXXX() methods

fxdeniz · Nov 26, 2023 · 8c6363a · 8c6363a
1 parent d8a9516
commit 8c6363a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Server/FileMonitorSubSystem/FileMonitoringManager.cpp b/Server/FileMonitorSubSystem/FileMonitoringManager.cpp
@@ -175,8 +175,8 @@ void FileMonitoringManager::handleFolderDeleteEvent(const QString &parentDirPath
 
     auto fsm = FileStorageManager::instance();
 
-    if(!eventDb->resolveFolderRenaming(currentPath).isEmpty())
-        currentPath = eventDb->resolveFolderRenaming(currentPath);
+    if(!eventDb->getOriginalFolderNameByNewName(currentPath).isEmpty())
+        currentPath = eventDb->getOriginalFolderNameByNewName(currentPath);
 
     QJsonObject folderJson = fsm->getFolderJsonByUserPath(currentPath);
 
@@ -204,8 +204,8 @@ void FileMonitoringManager::handleFileDeleteEvent(const QString &parentDirPath,
 
     auto fsm = FileStorageManager::instance();
 
-    if(!eventDb->resolveFileRenaming(_parentDirPath, fileName).isEmpty())
-        currentPath = eventDb->resolveFileRenaming(_parentDirPath, fileName);
+    if(!eventDb->getOriginalFileNameByNewName(_parentDirPath, fileName).isEmpty())
+        currentPath = eventDb->getOriginalFileNameByNewName(_parentDirPath, fileName);
 
     QJsonObject fileJson = fsm->getFileJsonByUserPath(currentPath);
 

diff --git a/Server/FileMonitorSubSystem/FileSystemEventDb.cpp b/Server/FileMonitorSubSystem/FileSystemEventDb.cpp
@@ -173,7 +173,7 @@ void FileSystemEventDb::addFolderRenamingEntry(const QString &oldUserFolderPath,
     }
 }
 
-QString FileSystemEventDb::resolveFolderRenaming(const QString &userFolderPath) const
+QString FileSystemEventDb::getOriginalFolderNameByNewName(const QString &userFolderPath) const
 {
     QReadLocker readLocker(lock);
 
@@ -212,7 +212,7 @@ void FileSystemEventDb::addFileRenamingEntry(const QString &userFolderPath, cons
     }
 }
 
-QString FileSystemEventDb::resolveFileRenaming(const QString &userFolderPath, const QString &fileName) const
+QString FileSystemEventDb::getOriginalFileNameByNewName(const QString &userFolderPath, const QString &fileName) const
 {
     QReadLocker readLocker(lock);
 

diff --git a/Server/FileMonitorSubSystem/FileSystemEventDb.h b/Server/FileMonitorSubSystem/FileSystemEventDb.h
@@ -37,11 +37,11 @@ class FileSystemEventDb
     QHash<FileSystemEventDb::ItemStatus, QStringList> getEventsOnMonitoredFiles() const;
 
     void addFolderRenamingEntry(const QString &oldUserFolderPath, const QString &newUserFolderPath);
-    QString resolveFolderRenaming(const QString &userFolderPath) const;
+    QString getOriginalFolderNameByNewName(const QString &userFolderPath) const;
     void removeFolderRenamingEntry(const QString &newUserFolderPath);
 
     void addFileRenamingEntry(const QString &userFolderPath, const QString &oldFileName, const QString &newFileName);
-    QString resolveFileRenaming(const QString &userFolderPath, const QString &fileName) const;
+    QString getOriginalFileNameByNewName(const QString &userFolderPath, const QString &fileName) const;
     void removeFileRenamingEntry(const QString &userFolderPath, const QString &newFileName);
 
     void addNewAddedFolder(const QString &userFolderPath, efsw::WatchID watchID);