From 32c2653b0f6b8b89d3c728017a4ea9565ef76ffc Mon Sep 17 00:00:00 2001 From: Albert S Date: Sun, 26 Mar 2023 15:43:21 +0200 Subject: [PATCH] shared: FileSaver: addFile(): Consider fillExistingContentless --- shared/filesaver.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/shared/filesaver.cpp b/shared/filesaver.cpp index 59d15ab..74a1fed 100644 --- a/shared/filesaver.cpp +++ b/shared/filesaver.cpp @@ -25,10 +25,22 @@ SaveFileResult FileSaver::addFile(QString path) QString absPath = info.absoluteFilePath(); auto mtime = info.lastModified().toSecsSinceEpoch(); - if(this->dbService->fileExistsInDatabase(absPath, mtime)) + + bool exists = false; + if(this->fileSaverOptions.fillExistingContentless) + { + exists = this->dbService->fileExistsInDatabase(absPath, mtime, 'c'); + } + else + { + exists = this->dbService->fileExistsInDatabase(absPath, mtime); + } + + if(exists) { return SKIPPED; } + return saveFile(info); } @@ -134,10 +146,7 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo) if(mustFillContent) { auto filetype = this->dbService->queryFileType(fileInfo.absolutePath()); - if(filetype) - { - mustFillContent = filetype.value() == 'c'; - } + mustFillContent = !filetype.has_value() || filetype.value() == 'c'; } }