Tagged v2.0.5 release

Changelog

@@ -1,11 +1,4 @@
-* Tue Jan 5 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.6
-    - BUGFIX: Fix detection of invalid torrent files
-    - BUGFIX: Stop catching signals once one has been caught to avoid possible infinite loop
-    - BUGFIX: Force data recheck whenever a torrent is moved
-    - BUGFIX: Detect existing torrent data even if incomplete torrents are saved to a different folder
-    - COSMETIC: Improve torrent deletion confirmation dialog so that the text that not get truncated
-
-* Thu Dec 31 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.5
+* Web Dec 31 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.5
     - BUGFIX: Fix crash with downloaded/availability bars when the torrent has too many pieces
 
 * Wed Dec 30 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.4

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.0.6
+Comment=V2.0.5
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент

src/bittorrent.cpp

@@ -702,13 +702,11 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
     }
   }
   QString savePath = getSavePath(hash);
-  if(!defaultTempPath.isEmpty() && resumed && !TorrentPersistentData::isSeed(hash)) {
-    qDebug("addMagnetURI: Temp folder is enabled.");
-    p.save_path = defaultTempPath.toLocal8Bit().data();
-    qDebug("addMagnetURI: using save_path: %s", defaultTempPath.toLocal8Bit().data());
-  } else {
+  qDebug("addMagnetURI: using save_path: %s", savePath.toLocal8Bit().data());
+  if(defaultTempPath.isEmpty() || (resumed && TorrentPersistentData::isSeed(hash))) {
     p.save_path = savePath.toLocal8Bit().data();
-    qDebug("addMagnetURI: using save_path: %s", savePath.toLocal8Bit().data());
+  } else {
+    p.save_path = defaultTempPath.toLocal8Bit().data();
   }
   // Preallocate all?
   if(preAllocateAll)
@@ -732,13 +730,6 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
     return h;
   }
   Q_ASSERT(h.hash() == hash);
-
-  // If temp path is enabled, move torrent
-  if(!defaultTempPath.isEmpty() && !resumed) {
-    qDebug("Temp folder is enabled, moving new torrent to temp folder");
-    h.move_storage(defaultTempPath);
-  }
-
   // Connections limit per torrent
   h.set_max_connections(Preferences::getMaxConnecsPerTorrent());
   // Uploads limit per torrent
@@ -803,8 +794,6 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   try {
     // Getting torrent file informations
     t = new torrent_info(file.toLocal8Bit().data());
-    if(!t->is_valid())
-      throw std::exception();
   } catch(std::exception&) {
     if(!from_url.isNull()) {
       addConsoleMessage(tr("Unable to decode torrent file: '%1'", "e.g: Unable to decode torrent file: '/home/y/xxx.torrent'").arg(from_url), QString::fromUtf8("red"));
@@ -863,13 +852,11 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   } else {
     savePath = getSavePath(hash);
   }
-  if(!defaultTempPath.isEmpty() && resumed && !TorrentPersistentData::isSeed(hash)) {
-    qDebug("addTorrent::Temp folder is enabled.");
-    p.save_path = defaultTempPath.toLocal8Bit().data();
-    qDebug("addTorrent: using save_path: %s", defaultTempPath.toLocal8Bit().data());
-  } else {
+  qDebug("addTorrent: using save_path: %s", savePath.toLocal8Bit().data());
+  if(defaultTempPath.isEmpty() || (resumed && TorrentPersistentData::isSeed(hash))) {
     p.save_path = savePath.toLocal8Bit().data();
-    qDebug("addTorrent: using save_path: %s", savePath.toLocal8Bit().data());
+  } else {
+    p.save_path = defaultTempPath.toLocal8Bit().data();
   }
 
 #ifdef LIBTORRENT_0_15
@@ -910,12 +897,6 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
     return h;
   }
 
-  // If temp path is enabled, move torrent
-  if(!defaultTempPath.isEmpty() && !resumed) {
-    qDebug("Temp folder is enabled, moving new torrent to temp folder");
-    h.move_storage(defaultTempPath);
-  }
-
   // Connections limit per torrent
   h.set_max_connections(Preferences::getMaxConnecsPerTorrent());
   // Uploads limit per torrent
@@ -1512,11 +1493,6 @@ void Bittorrent::readAlerts() {
         }
       }
     }
-    else if (storage_moved_alert* p = dynamic_cast<storage_moved_alert*>(a.get())) {
-      QTorrentHandle h(p->handle);
-      if(h.is_valid())
-        h.force_recheck(); //XXX: Required by libtorrent for now
-    }
     else if (metadata_received_alert* p = dynamic_cast<metadata_received_alert*>(a.get())) {
       QTorrentHandle h(p->handle);
       if(h.is_valid()) {

src/main.cpp

@@ -62,13 +62,10 @@ QApplication *app;
 
 #ifndef Q_WS_WIN
 void sigtermHandler(int) {
-  signal(SIGTERM, 0);
   qDebug("Catching SIGTERM, exiting cleanly");
   app->exit();
 }
 void sigsegvHandler(int) {
-  signal(SIGABRT, 0);
-  signal(SIGSEGV, 0);
   std::cerr << "\n\n*************************************************************\n";
   std::cerr << "Catching SIGSEGV, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
   print_stacktrace();
@@ -76,8 +73,6 @@ void sigsegvHandler(int) {
   std::abort();
 }
 void sigabrtHandler(int) {
-  signal(SIGABRT, 0);
-  signal(SIGSEGV, 0);
   std::cerr << "\n\n*************************************************************\n";
   std::cerr << "Catching SIGABRT, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
   print_stacktrace();
@@ -215,7 +210,6 @@ int main(int argc, char *argv[]){
     delete splash;
   }
   int ret =  app->exec();
-  signal(SIGTERM, 0);
   delete window;
   qDebug("GUI was deleted!");
   qDebug("Deleting app...");

src/src.pro

@@ -12,10 +12,10 @@ CONFIG += qt \
     thread
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v2.0.6\\\"
+DEFINES += VERSION=\\\"v2.0.5\\\"
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=0
-DEFINES += VERSION_BUGFIX=6
+DEFINES += VERSION_BUGFIX=5
 
 # !mac:QMAKE_LFLAGS += -Wl,--as-needed
 contains(DEBUG_MODE, 1) { 

src/torrentadditiondlg.h

@@ -160,8 +160,6 @@ QPoint screenCenter() const{
     // Getting torrent file informations
     try {
       t = new torrent_info(filePath.toLocal8Bit().data());
-      if(!t->is_valid())
-        throw std::exception();
     } catch(std::exception&) {
       qDebug("Caught error loading torrent");
       if(!from_url.isNull()){

src/torrentfilesmodel.h

@@ -475,7 +475,7 @@ public:
       current_parent = root_folder;
       QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
       // Iterate of parts of the path to create necessary folders
-      QStringList pathFolders = path.split(QDir::separator());
+      QStringList pathFolders = path.split('/');
       Q_ASSERT(pathFolders.size() >= 2);
       QString fileName = pathFolders.takeLast();
       QString currentFolderName = pathFolders.takeFirst();

src/torrentpersistentdata.h

@@ -249,7 +249,7 @@ public:
     QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent-resume"));
     QHash<QString, QVariant> all_data = settings.value("torrents", QHash<QString, QVariant>()).toHash();
     QHash<QString, QVariant> data = all_data[hash].toHash();
-    return data.value("seed", false).toBool();
+    return data["seed"].toBool();
   }
 
   static bool isMagnet(QString hash) {

src/ui/confirmdeletiondlg.ui

@@ -6,97 +6,84 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>399</width>
-    <height>143</height>
+    <width>377</width>
+    <height>138</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="windowTitle">
    <string>Deletion confirmation - qBittorrent</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="../icons.qrc">:/Icons/oxygen/dialog-warning.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Are you sure you want to delete the selected torrents from the transfer list?</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkPermDelete">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <italic>true</italic>
-      </font>
-     </property>
-     <property name="text">
-      <string>Delete the files on the hard disk as well</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
+  <widget class="QDialogButtonBox" name="buttonBox">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>100</y>
+     <width>341</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>90</x>
+     <y>0</y>
+     <width>281</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Are you sure you want to delete the selected torrents from the transfer list?</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+   </property>
+   <property name="wordWrap">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QCheckBox" name="checkPermDelete">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>70</y>
+     <width>351</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <italic>true</italic>
+    </font>
+   </property>
+   <property name="text">
+    <string>Delete the files on the hard disk as well</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_2">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>0</y>
+     <width>61</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="icons.qrc">:/Icons/oxygen/dialog-warning.png</pixmap>
+   </property>
+  </widget>
  </widget>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="icons.qrc"/>
  </resources>
  <connections>