- BUGFIX: Added safety mecanism which adds the torrents back to the list in case qbittorrent-resume.conf gets deleted or corrupted.

src/bittorrent.cpp

@@ -1529,14 +1529,31 @@ void bittorrent::applyEncryptionSettings(pe_settings se) {
 // backup directory
 void bittorrent::startUpTorrents() {
   qDebug("Resuming unfinished torrents");
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
   QStringList fileNames;
   QStringList known_torrents = TorrentPersistentData::knownTorrents();
-  if(known_torrents.empty()) {
+
+  if(known_torrents.empty() && !settings.value("v1_4_x_torrent_imported", false).toBool()) {
     qDebug("No known torrent, importing old torrents");
     importOldTorrents();
     return;
   }
+
+  // Safety measure because some people reported torrent loss since
+  // we switch the v1.5 way of resuming torrents on startup
+  QStringList filters;
+  filters << "*.torrent";
+  QStringList torrents_on_hd = torrentBackup.entryList(filters, QDir::Files, QDir::Unsorted);
+  foreach(QString hash, torrents_on_hd) {
+    hash.chop(8); // remove trailing .torrent
+    if(!known_torrents.contains(hash)) {
+      std::cerr << "ERROR Detected!!! Adding back torrent " << hash.toLocal8Bit().data() << " which got lost for some reason." << std::endl;
+      addTorrent(torrentBackup.path()+QDir::separator()+hash+".torrent", false, QString(), true);
+    }
+  }
+  // End of safety measure
+
   qDebug("Starting up torrents");
   if(isQueueingEnabled()) {
     QList<QPair<int, QString> > hashes;
@@ -1697,79 +1714,78 @@ void bittorrent::applyFormerAttributeFiles(QTorrentHandle h) {
 // TODO: Remove in qBittorrent v1.6.0
 void bittorrent::importOldTorrents() {
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  if(!settings.value("v1_4_x_torrent_imported", false).toBool()) {
-    // Import old torrent
-    QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
-    QStringList fileNames;
-    QStringList filters;
-    filters << "*.torrent";
-    fileNames = torrentBackup.entryList(filters, QDir::Files, QDir::Unsorted);
-    if(isQueueingEnabled()) {
-      QList<QPair<int, QString> > filePaths;
-      foreach(const QString &fileName, fileNames) {
-        QString filePath = torrentBackup.path()+QDir::separator()+fileName;
-        int prio = 99999;
-        // Get priority
-        QString prioPath = filePath;
-        prioPath.replace(".torrent", ".prio");
-        if(QFile::exists(prioPath)) {
-          QFile prio_file(prioPath);
-          if(prio_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            bool ok = false;
-            prio = prio_file.readAll().toInt(&ok);
-            if(!ok)
-              prio = 99999;
-            prio_file.close();
-          }
+  Q_ASSERT(!settings.value("v1_4_x_torrent_imported", false).toBool());
+  // Import old torrent
+  QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
+  QStringList fileNames;
+  QStringList filters;
+  filters << "*.torrent";
+  fileNames = torrentBackup.entryList(filters, QDir::Files, QDir::Unsorted);
+  if(isQueueingEnabled()) {
+    QList<QPair<int, QString> > filePaths;
+    foreach(const QString &fileName, fileNames) {
+      QString filePath = torrentBackup.path()+QDir::separator()+fileName;
+      int prio = 99999;
+      // Get priority
+      QString prioPath = filePath;
+      prioPath.replace(".torrent", ".prio");
+      if(QFile::exists(prioPath)) {
+        QFile prio_file(prioPath);
+        if(prio_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+          bool ok = false;
+          prio = prio_file.readAll().toInt(&ok);
+          if(!ok)
+            prio = 99999;
+          prio_file.close();
         }
-        misc::insertSort2<QString>(filePaths, qMakePair(prio, filePath));
       }
-      // Resume downloads
-      QPair<int, QString> fileName;
-      foreach(fileName, filePaths) {
-        importOldTempData(fileName.second);
-        QTorrentHandle h = addTorrent(fileName.second, false, QString(), true);
-        // Sequential download
-        if(TorrentTempData::hasTempData(h.hash())) {
-          qDebug("addTorrent: Setting download as sequential (from tmp data)");
-          h.set_sequential_download(TorrentTempData::isSequential(h.hash()));
-        }
-        applyFormerAttributeFiles(h);
-        QString savePath = TorrentTempData::getSavePath(h.hash());
-        // Save persistent data for new torrent
-        TorrentPersistentData::saveTorrentPersistentData(h);
-        // Save save_path
-        if(!defaultTempPath.isEmpty() && !savePath.isNull()) {
-          qDebug("addTorrent: Saving save_path in persistent data: %s", savePath.toLocal8Bit().data());
-          TorrentPersistentData::saveSavePath(h.hash(), savePath);
-        }
+      misc::insertSort2<QString>(filePaths, qMakePair(prio, filePath));
+    }
+    // Resume downloads
+    QPair<int, QString> fileName;
+    foreach(fileName, filePaths) {
+      importOldTempData(fileName.second);
+      QTorrentHandle h = addTorrent(fileName.second, false, QString(), true);
+      // Sequential download
+      if(TorrentTempData::hasTempData(h.hash())) {
+        qDebug("addTorrent: Setting download as sequential (from tmp data)");
+        h.set_sequential_download(TorrentTempData::isSequential(h.hash()));
       }
-    } else {
-      QStringList filePaths;
-      foreach(const QString &fileName, fileNames) {
-        filePaths.append(torrentBackup.path()+QDir::separator()+fileName);
+      applyFormerAttributeFiles(h);
+      QString savePath = TorrentTempData::getSavePath(h.hash());
+      // Save persistent data for new torrent
+      TorrentPersistentData::saveTorrentPersistentData(h);
+      // Save save_path
+      if(!defaultTempPath.isEmpty() && !savePath.isNull()) {
+        qDebug("addTorrent: Saving save_path in persistent data: %s", savePath.toLocal8Bit().data());
+        TorrentPersistentData::saveSavePath(h.hash(), savePath);
       }
-      // Resume downloads
-      foreach(const QString &fileName, filePaths) {
-        importOldTempData(fileName);
-        QTorrentHandle h = addTorrent(fileName, false, QString(), true);
-        // Sequential download
-        if(TorrentTempData::hasTempData(h.hash())) {
-          qDebug("addTorrent: Setting download as sequential (from tmp data)");
-          h.set_sequential_download(TorrentTempData::isSequential(h.hash()));
-        }
-        applyFormerAttributeFiles(h);
-        QString savePath = TorrentTempData::getSavePath(h.hash());
-        // Save persistent data for new torrent
-        TorrentPersistentData::saveTorrentPersistentData(h);
-        // Save save_path
-        if(!defaultTempPath.isEmpty() && !savePath.isNull()) {
-          qDebug("addTorrent: Saving save_path in persistent data: %s", savePath.toLocal8Bit().data());
-          TorrentPersistentData::saveSavePath(h.hash(), savePath);
-        }
+    }
+  } else {
+    QStringList filePaths;
+    foreach(const QString &fileName, fileNames) {
+      filePaths.append(torrentBackup.path()+QDir::separator()+fileName);
+    }
+    // Resume downloads
+    foreach(const QString &fileName, filePaths) {
+      importOldTempData(fileName);
+      QTorrentHandle h = addTorrent(fileName, false, QString(), true);
+      // Sequential download
+      if(TorrentTempData::hasTempData(h.hash())) {
+        qDebug("addTorrent: Setting download as sequential (from tmp data)");
+        h.set_sequential_download(TorrentTempData::isSequential(h.hash()));
+      }
+      applyFormerAttributeFiles(h);
+      QString savePath = TorrentTempData::getSavePath(h.hash());
+      // Save persistent data for new torrent
+      TorrentPersistentData::saveTorrentPersistentData(h);
+      // Save save_path
+      if(!defaultTempPath.isEmpty() && !savePath.isNull()) {
+        qDebug("addTorrent: Saving save_path in persistent data: %s", savePath.toLocal8Bit().data());
+        TorrentPersistentData::saveSavePath(h.hash(), savePath);
       }
     }
-    settings.setValue("v1_4_x_torrent_imported", true);
-    std::cout << "Successfully imported torrents from v1.4.x (or previous) instance" << std::endl;
   }
+  settings.setValue("v1_4_x_torrent_imported", true);
+  std::cout << "Successfully imported torrents from v1.4.x (or previous) instance" << std::endl;
 }