Tagged v2.0.6 release

BUGFIX: Detect existing torrent data even if incomplete torrents are saved to a different folder

AUTHORS

@@ -57,7 +57,7 @@ Translations authors:
   copyright:
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
-  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
+  - Catalan: Francisco Luque Contreras (frannoe@ya.com)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)

Changelog

@@ -1,3 +1,25 @@
+* 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
+    - 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
+    - BUGFIX: Fix PeerGuardian .p2b binary filter support
+    - BUGFIX: Fix possible crash when closing a search engine tab
+    - BUGFIX: Make sure service port does not change
+    - BUGFIX: Fix possible DHT port saving issue
+    - BUGFIX: Fix communication between qBittorrent and Web UI (Qt 4.6)
+    - BUGFIX: Use Wildcard matching instead of full regex in RSS feed downloader
+    - BUGFIX: Fix code for listening on a random port whenever it failed to listen on the one defined
+    - BUGFIX: Use global maximum transfer rates as maximum values in per-torrent speed limiting dialogs
+    - BUGFIX: Fix global download rate limiting from Web UI
+    - COSMETIC: Display a disconnected icon in status bar whenever qBittorrent failed to listen on the port defined
+
 * Wed Dec 23 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.3
     - BUGFIX: Minor cosmetic fix to program preferences
     - BUGFIX: Fix "Temp path" button in program preferences

src/Icons/qBittorrent.desktop

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

src/about_imp.h

@@ -64,7 +64,7 @@ class about : public QDialog, private Ui::AboutDlg{
       te_translation->append(QString::fromUtf8(
           "<i>- <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Bulgarian:</u> Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)<br>\
-          - <u>Catalan:</u> Gekko Dam Beer (gekko04@users.sourceforge.net)<br>\
+          - <u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)<br>\
           - <u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)<br>\
           - <u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)<br>\
           - <u>Czech:</u> Jirka Vilim (web@tets.cz)<br>\

src/bittorrent.cpp

@@ -63,7 +63,7 @@
 enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4};
 
 // Main constructor
-Bittorrent::Bittorrent() : preAllocateAll(false), addInPause(false), ratio_limit(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), DHTEnabled(false), queueingEnabled(false), geoipDBLoaded(false), exiting(false) {
+Bittorrent::Bittorrent() : preAllocateAll(false), addInPause(false), ratio_limit(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), DHTEnabled(false), current_dht_port(0), queueingEnabled(false), geoipDBLoaded(false), exiting(false) {
   resolve_countries = false;
   // To avoid some exceptions
   fs::path::default_name_check(fs::no_check);
@@ -241,9 +241,9 @@ void Bittorrent::configureSession() {
   // Connection
   // * Ports binding
   unsigned short old_listenPort = getListenPort();
-  setListeningPort(Preferences::getSessionPort());
-  unsigned short new_listenPort = getListenPort();
-  if(new_listenPort != old_listenPort) {
+  unsigned short new_listenPort = Preferences::getSessionPort();
+  if(old_listenPort != new_listenPort) {
+    setListeningPort(new_listenPort);
     addConsoleMessage(tr("qBittorrent is bound to port: TCP/%1", "e.g: qBittorrent is bound to port: 6881").arg( misc::toQString(new_listenPort)));
   }
   // * Global download limit
@@ -346,10 +346,13 @@ void Bittorrent::configureSession() {
   if(Preferences::isDHTEnabled()) {
     // Set DHT Port
     if(enableDHT(true)) {
-      int dht_port = new_listenPort;
-      if(!Preferences::isDHTPortSameAsBT())
+      int dht_port;
+      if(Preferences::isDHTPortSameAsBT())
+        dht_port = 0;
+      else
         dht_port = Preferences::getDHTPort();
       setDHTPort(dht_port);
+      if(dht_port == 0) dht_port = new_listenPort;
       addConsoleMessage(tr("DHT support [ON], port: UDP/%1").arg(dht_port), QString::fromUtf8("blue"));
     } else {
       addConsoleMessage(tr("DHT support [OFF]"), QString::fromUtf8("red"));
@@ -699,11 +702,13 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
     }
   }
   QString savePath = getSavePath(hash);
-  qDebug("addMagnetURI: using save_path: %s", savePath.toLocal8Bit().data());
-  if(defaultTempPath.isEmpty() || (resumed && TorrentPersistentData::isSeed(hash))) {
-    p.save_path = savePath.toLocal8Bit().data();
-  } else {
+  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 {
+    p.save_path = savePath.toLocal8Bit().data();
+    qDebug("addMagnetURI: using save_path: %s", savePath.toLocal8Bit().data());
   }
   // Preallocate all?
   if(preAllocateAll)
@@ -727,6 +732,13 @@ 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
@@ -791,6 +803,8 @@ 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"));
@@ -849,11 +863,13 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   } else {
     savePath = getSavePath(hash);
   }
-  qDebug("addTorrent: using save_path: %s", savePath.toLocal8Bit().data());
-  if(defaultTempPath.isEmpty() || (resumed && TorrentPersistentData::isSeed(hash))) {
-    p.save_path = savePath.toLocal8Bit().data();
-  } else {
+  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 {
+    p.save_path = savePath.toLocal8Bit().data();
+    qDebug("addTorrent: using save_path: %s", savePath.toLocal8Bit().data());
   }
 
 #ifdef LIBTORRENT_0_15
@@ -894,6 +910,12 @@ 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
@@ -1363,9 +1385,11 @@ void Bittorrent::setDeleteRatio(float ratio) {
 // Set DHT port (>= 1000 or 0 if same as BT)
 void Bittorrent::setDHTPort(int dht_port) {
   if(dht_port == 0 || dht_port >= 1000) {
+    if(dht_port == current_dht_port) return;
     struct dht_settings DHTSettings;
     DHTSettings.service_port = dht_port;
     s->set_dht_settings(DHTSettings);
+    current_dht_port = dht_port;
     qDebug("Set DHT Port to %d", dht_port);
   }
 }
@@ -1488,6 +1512,11 @@ 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()) {
@@ -1512,18 +1541,6 @@ void Bittorrent::readAlerts() {
         }
       }
     }
-    else if (listen_failed_alert* p = dynamic_cast<listen_failed_alert*>(a.get())) {
-      // Level: fatal
-      int tried_port = p->endpoint.port();
-      srand(time(0));
-      int fallback_port = tried_port;
-      do {
-        fallback_port = rand() % 64512 + 1024;
-      } while(fallback_port == tried_port);
-      addConsoleMessage(tr("Couldn't listen on port %1, using %2 instead.").arg(QString::number(tried_port)).arg(QString::number(fallback_port)), QString::fromUtf8("red"));
-      setListeningPort(fallback_port);
-      //emit portListeningFailure();
-    }
     /*else if (torrent_paused_alert* p = dynamic_cast<torrent_paused_alert*>(a.get())) {
       QTorrentHandle h(p->handle);
       qDebug("Received a torrent_paused_alert for %s", h.hash().toLocal8Bit().data());
@@ -1643,6 +1660,7 @@ QHash<QString, TrackerInfos> Bittorrent::getTrackersInfo(QString hash) const{
 }
 
 int Bittorrent::getListenPort() const{
+  qDebug("LISTEN PORT: %d", s->listen_port());
   return s->listen_port();
 }
 

src/bittorrent.h

@@ -107,6 +107,7 @@ private:
   bool NATPMPEnabled;
   bool LSDEnabled;
   bool DHTEnabled;
+  int current_dht_port;
   bool queueingEnabled;
   QString defaultSavePath;
   QString defaultTempPath;

src/downloadedpiecesbar.h

@@ -36,6 +36,7 @@
 #include <QList>
 #include <QPixmap>
 #include <libtorrent/bitfield.hpp>
+#include <math.h>
 
 using namespace libtorrent;
 #define BAR_HEIGHT 18
@@ -55,19 +56,46 @@ public:
   void setProgress(bitfield pieces) {
     if(pieces.empty()) {
       // Empty bar
-      pixmap = QPixmap(1, 1);
-      QPainter painter(&pixmap);
-      painter.setPen(Qt::white);
-      painter.drawPoint(0,0);
+      QPixmap pix = QPixmap(1, 1);
+      pix.fill();
+      pixmap = pix;
     } else {
-      pixmap = QPixmap(pieces.size(), 1);
-      QPainter painter(&pixmap);
-      for(uint i=0; i<pieces.size(); ++i) {
-        if(pieces[i])
-          painter.setPen(Qt::blue);
-        else
-          painter.setPen(Qt::white);
-        painter.drawPoint(i,0);
+      int nb_pieces = pieces.size();
+      // Reduce the number of pieces before creating the pixmap
+      // otherwise it can crash when there are too many pieces
+      if(nb_pieces > width()) {
+        int ratio = floor(nb_pieces/(double)width());
+        QVector<bool> scaled_pieces;
+        for(int i=0; i<nb_pieces; i+= ratio) {
+          bool have = true;
+          for(int j=i; j<qMin(i+ratio, nb_pieces); ++j) {
+            if(!pieces[i]) { have = false; break; }
+          }
+          scaled_pieces << have;
+        }
+        QPixmap pix = QPixmap(scaled_pieces.size(), 1);
+        pix.fill();
+        QPainter painter(&pix);
+        for(int i=0; i<scaled_pieces.size(); ++i) {
+          if(scaled_pieces[i])
+            painter.setPen(Qt::blue);
+          else
+            painter.setPen(Qt::white);
+          painter.drawPoint(i,0);
+        }
+        pixmap = pix;
+      } else {
+        QPixmap pix = QPixmap(pieces.size(), 1);
+        pix.fill();
+        QPainter painter(&pix);
+        for(uint i=0; i<pieces.size(); ++i) {
+          if(pieces[i])
+            painter.setPen(Qt::blue);
+          else
+            painter.setPen(Qt::white);
+          painter.drawPoint(i,0);
+        }
+        pixmap = pix;
       }
     }
     update();

src/eventmanager.cpp

@@ -233,7 +233,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
   }
   event["name"] = QVariant(h.name());
   event["size"] = QVariant(misc::friendlyUnit(h.actual_size()));
-  event["progress"] = QVariant(h.progress());
+  event["progress"] = QVariant((double)h.progress());
   event["dlspeed"] = QVariant(tr("%1/s", "e.g. 120 KiB/s").arg(misc::friendlyUnit(h.download_payload_rate())));
   if(BTSession->isQueueingEnabled()) {
     if(h.queue_position() >= 0)

src/feeddownloader.h

@@ -67,14 +67,14 @@ public:
     foreach(const QString& token, match_tokens) {
       if(token.isEmpty() || token == "")
         continue;
-      QRegExp reg(token, Qt::CaseInsensitive);
+      QRegExp reg(token, Qt::CaseInsensitive, QRegExp::Wildcard);
       if(reg.indexIn(s) < 0) return false;
     }
     // Checking not matching
     QStringList notmatch_tokens = getNotMatchingTokens();
     foreach(const QString& token, notmatch_tokens) {
       if(token.isEmpty()) continue;
-      QRegExp reg(token, Qt::CaseInsensitive);
+      QRegExp reg(token, Qt::CaseInsensitive, QRegExp::Wildcard);
       if(reg.indexIn(s) > -1) return false;
     }
     return true;

src/filterparserthread.h

@@ -71,7 +71,7 @@ class FilterParserThread : public QThread  {
           // PeerGuardian p2p file
           parseP2PFilterFile(filePath);
         } else {
-            if(filePath.endsWith(".p2p", Qt::CaseInsensitive)) {
+            if(filePath.endsWith(".p2b", Qt::CaseInsensitive)) {
               // PeerGuardian p2b file
               parseP2BFilterFile(filePath);
             } else {

src/httpconnection.cpp

@@ -46,7 +46,7 @@
 #include <QTemporaryFile>
 
 HttpConnection::HttpConnection(QTcpSocket *socket, Bittorrent *BTSession, HttpServer *parent)
-    : QObject(parent), socket(socket), parent(parent), BTSession(BTSession)
+  : QObject(parent), socket(socket), parent(parent), BTSession(BTSession)
 {
   socket->setParent(this);
   connect(socket, SIGNAL(readyRead()), this, SLOT(read()));
@@ -370,6 +370,18 @@ void HttpConnection::respondCommand(QString command)
       h.file_priority(file_id, priority);
     }
   }
+  if(command == "getGlobalUpLimit") {
+    generator.setStatusLine(200, "OK");
+    generator.setContentTypeByExt("html");
+    generator.setMessage(QString::number(BTSession->getSession()->upload_rate_limit()));
+    write();
+  }
+  if(command == "getGlobalDlLimit") {
+    generator.setStatusLine(200, "OK");
+    generator.setContentTypeByExt("html");
+    generator.setMessage(QString::number(BTSession->getSession()->download_rate_limit()));
+    write();
+  }
   if(command == "getTorrentUpLimit") {
     QString hash = parser.post("hash");
     QTorrentHandle h = BTSession->getTorrentHandle(hash);

src/icons.qrc

@@ -60,6 +60,7 @@
   <file>Icons/skin/exit.png</file>
   <file>Icons/skin/delete_all.png</file>
   <file>Icons/skin/splash.png</file>
+  <file>Icons/skin/disconnected.png</file>
   <file>Icons/skin/decrease.png</file>
   <file>Icons/skin/uploading.png</file>
   <file>Icons/skin/filterall.png</file>

src/json.h

@@ -47,6 +47,7 @@ namespace json {
                 case QVariant::LongLong:
                 case QVariant::UInt:
                 case QVariant::ULongLong:
+                case QMetaType::Float:
       return v.value<QString>();
                 case QVariant::String:
       {