Revamp .torrent files backup management

Author: glassez

WebAPI_Changelog.md

@@ -29,6 +29,14 @@
 * [#24135](https://github.com/qbittorrent/qBittorrent/pull/24135)
   * Add `torrents/downloadFile` endpoint with `hash` and `file` as parameters allowing to download a completed file from torrent content
     * `file` accepts either file index or path relative to content root
+* [#24641](https://github.com/qbittorrent/qBittorrent/pull/24641)
+  * `app/preferences` and `app/setPreferences` endpoints no longer include `export_dir` and `export_dir_fin` options as they are no longer supported by the core
+  * `app/preferences` and `app/setPreferences` endpoints include the following new options:
+    * `torrent_files_backup_enabled` (bool) - enable/disable saving backup copies of .torrent files
+    * `torrent_files_backup_dir` (string) - the folder path for saving backup copies of .torrent files
+    * `torrent_files_finished_backup_dir` (bool) - enable/disable moving backup copies of .torrent files to another folder when torrent is finished
+    * `torrent_files_finished_backup_dir` (string) - the folder path for moving backup copies of .torrent files when torrent is finished
+    * `remove_torrent_file_backup` (bool) - whether .torrent file backup should be removed when removing the torrent
 
 ## 2.15.4
 

src/app/upgrade.cpp

@@ -48,7 +48,7 @@ using namespace Qt::Literals::StringLiterals;
 
 namespace
 {
-    const int MIGRATION_VERSION = 10;
+    const int MIGRATION_VERSION = 11;
     const QString MIGRATION_VERSION_KEY = u"Meta/MigrationVersion"_s;
 
     void exportWebUIHttpsFiles()
@@ -557,6 +557,22 @@ namespace
         if (!settingsStorage->hasKey(key))
             SettingsStorage::instance()->storeValue(key, true);
     }
+
+    void migrateTorrentExportFolderSettings()
+    {
+        const auto doMigrate = [](const QString &oldKey, const QString &newKey)
+        {
+            auto *settingsStorage = SettingsStorage::instance();
+            if (settingsStorage->hasKey(oldKey))
+            {
+                settingsStorage->storeValue(newKey, settingsStorage->loadValue<Path>(oldKey));
+                settingsStorage->removeValue(oldKey);
+            }
+        };
+
+        doMigrate(u"BitTorrent/Session/TorrentExportDirectory"_s, u"BitTorrent/Session/TorrentBackupDirectory"_s);
+        doMigrate(u"BitTorrent/Session/FinishedTorrentExportDirectory"_s, u"BitTorrent/Session/FinishedTorrentBackupDirectory"_s);
+    }
 }
 
 bool upgrade()
@@ -609,6 +625,9 @@ bool upgrade()
             setResolvePeerCountriesSetting();
         }
 
+        if (version < 11)
+            migrateTorrentExportFolderSettings();
+
         version = MIGRATION_VERSION;
     }
 

src/base/CMakeLists.txt

@@ -71,6 +71,7 @@ add_library(qbt_base STATIC
     http/server.h
     indexrange.h
     interfaces/iapplication.h
+    keyvaluedatastorage.h
     logger.h
     net/dnsupdater.h
     net/downloadhandlerimpl.h
@@ -174,6 +175,7 @@ add_library(qbt_base STATIC
     http/requestparser.cpp
     http/responsewriterimpl.cpp
     http/server.cpp
+    keyvaluedatastorage.cpp
     logger.cpp
     net/dnsupdater.cpp
     net/downloadhandlerimpl.cpp

src/base/bittorrent/session.h

@@ -230,10 +230,17 @@ namespace BitTorrent
         virtual void setRefreshInterval(int value) = 0;
         virtual bool isPreallocationEnabled() const = 0;
         virtual void setPreallocationEnabled(bool enabled) = 0;
-        virtual Path torrentExportDirectory() const = 0;
-        virtual void setTorrentExportDirectory(const Path &path) = 0;
-        virtual Path finishedTorrentExportDirectory() const = 0;
-        virtual void setFinishedTorrentExportDirectory(const Path &path) = 0;
+
+        virtual bool isTorrentFileBackupEnabled() const = 0;
+        virtual void setTorrentFileBackupEnabled(bool enabled) = 0;
+        virtual Path torrentBackupDirectory() const = 0;
+        virtual void setTorrentBackupDirectory(const Path &path) = 0;
+        virtual bool isFinishedTorrentBackupDirectoryEnabled() const = 0;
+        virtual void setFinishedTorrentBackupDirectoryEnabled(bool enabled) = 0;
+        virtual Path finishedTorrentBackupDirectory() const = 0;
+        virtual void setFinishedTorrentBackupDirectory(const Path &path) = 0;
+        virtual bool removeTorrentFileBackup() const = 0;
+        virtual void setRemoveTorrentFileBackup(bool remove) = 0;
 
         virtual bool isAddTrackersFromURLEnabled() const = 0;
         virtual void setAddTrackersFromURLEnabled(bool enabled) = 0;