diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bb8957..ff6f1f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,4 +9,4 @@ set(SOURCES add_executable(picsync ${HEADERS} ${SOURCES}) -target_link_libraries(picsync Qt5::Core) +target_link_libraries(picsync Qt5::Core dbcorelib) diff --git a/main.cpp b/main.cpp index ca83c9a..9e981ee 100644 --- a/main.cpp +++ b/main.cpp @@ -11,11 +11,12 @@ #include #include #include -#include #include #include #include +#include "utils/fileutils.h" + bool writeBitmap(const QString &filename, const QByteArray &content) { qDebug() << "writeBitmap" << filename; @@ -131,45 +132,6 @@ bool readBitmap(const QString &filename, QByteArray &content) return true; } -bool emptyDirectory(const QString &path) -{ - QDir dir(path); - - if(!dir.exists()) - { - qWarning() << "tried to empty non-existant dir" << path; - return true; - } - - bool success = true; - // not empty -- we must empty it first - QDirIterator di(dir.absolutePath(), QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot); - while (di.hasNext()) { - di.next(); - const QFileInfo& fi = di.fileInfo(); - const QString &filePath = di.filePath(); - bool ok; - if (fi.isDir() && !fi.isSymLink()) { - ok = QDir(filePath).removeRecursively(); // recursive - } else { - ok = QFile::remove(filePath); - if (!ok) { // Read-only files prevent directory deletion on Windows, retry with Write permission. - const QFile::Permissions permissions = QFile::permissions(filePath); - if (!(permissions & QFile::WriteUser)) - ok = QFile::setPermissions(filePath, permissions | QFile::WriteUser) - && QFile::remove(filePath); - } - } - if (!ok) - success = false; - } - - if(!success) - qWarning() << "could not empty" << path; - - return success; -} - bool spread(const QString &sourcePath, const QString &targetPath) { qDebug() << "spread" << sourcePath << targetPath;