Update submodule QtUtils to v1.1.0

oclero · Dec 27, 2022 · cdcc2ed · cdcc2ed
1 parent 54c2a50
commit cdcc2ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/lib/src/oclero/QtUpdater.cpp b/lib/src/oclero/QtUpdater.cpp
@@ -4,6 +4,7 @@
 
 #include <oclero/QtEnumUtils.hpp>
 #include <oclero/QtSettingsUtils.hpp>
+#include <oclero/QtFileUtils.hpp>
 
 #include <QLoggingCategory>
 #include <QFile>
@@ -27,26 +28,6 @@ Q_LOGGING_CATEGORY(CATEGORY_UPDATER, "oclero.qtupdater")
 #endif
 
 namespace utils {
-void clearDirectoryContent(const QString& dirPath, const QStringList& extensionFilter = {}) {
-  QDir dir(dirPath);
-  if (!dir.exists()) {
-    return;
-  }
-
-  const auto& entryInfoList = extensionFilter.isEmpty()
-                                ? dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden)
-                                : dir.entryInfoList(extensionFilter, QDir::Files | QDir::Hidden);
-  for (const auto& entryInfo : entryInfoList) {
-    const auto entryAbsPath = entryInfo.absoluteFilePath();
-    if (entryInfo.isDir()) {
-      QDir subDir(entryAbsPath);
-      subDir.removeRecursively();
-    } else {
-      dir.remove(entryAbsPath);
-    }
-  }
-}
-
 QString getDefaultTemporaryDirectoryPath() {
   QString result;
 
@@ -470,7 +451,7 @@ struct QtUpdater::Impl {
     const auto allFilesExist =
       localChangelog.exists() && localChangelog.isFile() && localInstaller.exists() && localInstaller.isFile();
     if (!allFilesExist) {
-      utils::clearDirectoryContent(downloadsDir);
+      oclero::clearDirectoryContent(downloadsDir);
       return UpdateInfo{};
     }
 
@@ -523,7 +504,7 @@ struct QtUpdater::Impl {
     // If the most recent is the one from the server,
     // wipe existing files because there are obsolete.
     if (update == &onlineUpdateInfo) {
-      utils::clearDirectoryContent(downloadsDir);
+      oclero::clearDirectoryContent(downloadsDir);
 
       // Write downloaded JSON to disk.
       const auto [success, saveJSONFilePath] = update->json.saveToFile(downloadsDir);

diff --git a/submodules/qtutils b/submodules/qtutils
+4 −0		CHANGELOG.md
+1 −1		CMakeLists.txt
+2 −0		lib/CMakeLists.txt
+12 −0		lib/include/oclero/QtFileUtils.hpp
+34 −0		lib/src/oclero/QtFileUtils.cpp