Merge pull request #1522 from janbar/fix_resume_partial_download

try to clean up partial download on resume
Framstag · Nov 10, 2023 · b6d06f2 · b6d06f2
2 parents a9aabce + 7c1303f
commit b6d06f2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/libosmscout-client-qt/include/osmscoutclientqt/FileDownloader.h b/libosmscout-client-qt/include/osmscoutclientqt/FileDownloader.h
@@ -46,6 +46,7 @@ static constexpr std::chrono::seconds DownloadReadTimeout{60}; ///< Download rea
 static constexpr std::chrono::seconds BackOffInitial{1}; ///< Initial back-off time
 static constexpr std::chrono::seconds BackOffMax{300}; ///< Maximum back-off time
 static constexpr int MaxDownloadRetries{-1}; ///< Maximal number of download retries before cancelling download
+static constexpr char const *TemporaryFileSuffix{".download"}; ///< suffix of file being downloaded
 }
 
 /// \brief Downloads a file specified by URL

diff --git a/libosmscout-client-qt/src/osmscoutclientqt/FileDownloader.cpp b/libosmscout-client-qt/src/osmscoutclientqt/FileDownloader.cpp
@@ -62,7 +62,7 @@ FileDownloader::FileDownloader(QNetworkAccessManager *manager,
     return;
   }
 
-  file.setFileName(path + ".download");
+  file.setFileName(path + FileDownloaderConfig::TemporaryFileSuffix);
   if (!file.open(QIODevice::WriteOnly)) {
     isOk = false;
     qWarning() << "Cannot open file:" << file.fileName();

diff --git a/libosmscout-client-qt/src/osmscoutclientqt/MapManager.cpp b/libosmscout-client-qt/src/osmscoutclientqt/MapManager.cpp
@@ -62,11 +62,16 @@ void MapDownloadJob::start()
         mapDir.getCreation() == map.getCreation()) {
       // directory contains partial download
       // (contains downloader metadata, but not all required files)
-      // TODO: continue partial download
+      if (!mapDir.deleteDatabase()) {
+        qWarning() << "Failed to clean up partial download" << target.canonicalPath()<<"!";
+        onJobFailed("Directory already exists", false);
+        return;
+      }
+    } else {
+      qWarning() << "Directory already exists" << target.canonicalPath()<<"!";
+      onJobFailed("Directory already exists", false);
+      return;
     }
-    qWarning() << "Directory already exists"<<target.canonicalPath()<<"!";
-    onJobFailed("Directory already exists", false);
-    return;
   }
 
   if (!target.mkpath(target.path())) {
@@ -221,6 +226,12 @@ bool MapDirectory::deleteDatabase()
   for (const auto &fileName: fileNames) {
     if(dir.exists(fileName)){
       result&=dir.remove(fileName);
+    } else {
+      // check for partial download
+      QString tempfileName = fileName + FileDownloaderConfig::TemporaryFileSuffix;
+      if (dir.exists(tempfileName)){
+        result&=dir.remove(tempfileName);
+      }
     }
   }
   QDir parent=dir;