Fix locking not working caused by changes required for unit tests.

Signed-off-by: alex-z <[email protected]>

src/libsync/filesystem.cpp

@@ -38,13 +38,20 @@ namespace
 constexpr std::array<const char *, 2> lockFilePatterns = {{".~lock.", "~$"}};
 constexpr std::array<std::string_view, 8> officeFileExtensions = {"doc", "docx", "xls", "xlsx", "ppt", "pptx", "odt", "odp"};
 // iterates through the dirPath to find the matching fileName
-QString findMatchingUnlockedFileInDir(const QString &dirPath, const QString &fileName)
+QString findMatchingUnlockedFileInDir(const QString &dirPath, const QString &lockFileName)
 {
     QString foundFilePath;
     const QDir dir(dirPath);
     const auto entryList = dir.entryInfoList(QDir::Files);
     for (const auto &candidateUnlockedFileInfo : entryList) {
-        if (candidateUnlockedFileInfo.fileName() == fileName) {
+        const auto candidateUnlockFileName = candidateUnlockedFileInfo.fileName();
+        const auto lockFilePatternFoundIt = std::find_if(std::cbegin(lockFilePatterns), std::cend(lockFilePatterns), [&candidateUnlockFileName](std::string_view pattern) {
+            return candidateUnlockFileName.contains(QString::fromStdString(std::string(pattern)));
+        });
+        if (lockFilePatternFoundIt != std::cend(lockFilePatterns)) {
+            continue;
+        }
+        if (candidateUnlockFileName.contains(lockFileName)) {
             foundFilePath = candidateUnlockedFileInfo.absoluteFilePath();
             break;
         }