Tagged v2.1.0 release

Changelog

@@ -1,30 +1,3 @@
-* Sun Jan 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.2
-    - FEATURE: Added back file prioritizing in a torrent
-    - BUGFIX: Fix issue causing torrents not to be displayed in the list
-    - BUGFIX: Make sure invalid torrent are removed from the transfer list
-    - BUGFIX: Fix overwrite check when renaming a folder in a torrent
-    - BUGFIX: Force a recheck after renaming files to avoid overwriting
-    - BUGFIX: Improve "Open destination folder" behavior
-    - BUGFIX: Fix race condition in RSS that could cause a crash on startup
-    - BUGFIX: Improved user friendlyness of size units
-    - BUGFIX: Optimized transfer list repainting
-    - COSMETIC: Improved transfer speed display in peers list
-
-* Wed Jan 20 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.1
-    - BUGFIX: Fix compilation with Qt4.4
-    - BUGFIX: Save torrent metadata so that it does not have to be re-downloaded on restart (Magnet links)
-    - BUGFIX: Fix folder renaming in a torrent (would rename children under certain conditions)
-    - BUGFIX: Nox version no longer requires libQtXml
-    - BUGFIX: Configure file now checks for pkg-config executable which is required
-    - BUGFIX: Torrents added from magnet links were not remembered on restart
-    - BUGFIX: "Add in pause" setting can be ignored from torrent addition dialog
-    - BUGFIX: Fix renaming of files with unicode characters in their name
-    - BUGFIX: Fix typo in legal notice (startup)
-    - BUGFIX: Can listen on ports < 1024 (must be root)
-    - BUGFIX: Paused torrents can now be rechecked
-    - BUGFIX: Fix "open torrent destination" feature when path contains spaces
-    - I18N: Updated translations (Hungarian, Chinese, Russian)
-
 * Mon Jan 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.0
     - FEATURE: Graphical User Interface can be disabled at compilation time (headless running)
     - FEATURE: Torrents can be labeled/categorized

INSTALL

@@ -12,8 +12,6 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   Dependencies:
     - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
-    - pkg-config executable
-
     - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
@@ -40,11 +38,9 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork)
+    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork, libqtxml)
 
-    - pkg-config executable
-
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.0 REQUIRED, >= v0.15.0 ADVISED)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 

configure

@@ -319,23 +319,6 @@ public:
 		
 	}
 };
-#line 1 "pkg-config.qcm"
-/*
------BEGIN QCMOD-----
-name: pkg-config
------END QCMOD-----
-*/
-#include <QProcess>
-class qc_pkg_config : public ConfObj
-{
-public:
-	qc_pkg_config(Conf *c) : ConfObj(c) {}
-	QString name() const { return "pkg-config executable"; }
-	QString shortname() const { return "pkg-config"; }
-	bool exec(){
-		return !conf->findProgram("pkg-config").isEmpty();
-	}
-};
 #line 1 "libtorrent-rasterbar.qcm"
 /*
 -----BEGIN QCMOD-----
@@ -362,7 +345,7 @@ public:
 		if(!libs.isEmpty())
 			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-                        printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nSome feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
 		else
 			conf->addDefine("LIBTORRENT_0_15");
 		return true;
@@ -438,14 +421,10 @@ public:
 	qc_libnotify(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec(){
-		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			return false;
+		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+			printf("\nNot Required");
+			return true;
 		}
 		QStringList incs;
 		QString req_ver = "0.4.2";
@@ -489,14 +468,10 @@ public:
 	qc_geoip_database(Conf *c) : ConfObj(c) {}
 	QString name() const { return "GeoIP Database (optional)"; }
 	QString shortname() const { return "GeoIP Database"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec() {
-	if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-		return false;
+	if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+		printf("\nNot Required");
+		return true;
 	}
 #ifdef Q_WS_X11
 		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
@@ -519,9 +494,6 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_qt4(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_pkg_config(conf);
-    o->required = true;
-    o->disabled = false;
     o = new qc_libtorrent_rasterbar(conf);
     o->required = true;
     o->disabled = false;

qbittorrent.pro

@@ -1,4 +1,6 @@
 TEMPLATE = subdirs
 
+include(conf.pri)
+
 SUBDIRS += src
 

qbittorrent.qc

@@ -6,9 +6,6 @@
   <dep type='qt4'>
     <required/>
   </dep>
-  <dep type='pkg-config'>
-    <required/>
-  </dep>
   <dep type='libtorrent-rasterbar'>
     <required/>
   </dep>

qcm/geoip-database.qcm

@@ -11,14 +11,10 @@ public:
 	qc_geoip_database(Conf *c) : ConfObj(c) {}
 	QString name() const { return "GeoIP Database (optional)"; }
 	QString shortname() const { return "GeoIP Database"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec() {
-	if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-		return false;
+	if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+		printf("\nNot Required");
+		return true;
 	}
 #ifdef Q_WS_X11
 		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {

qcm/libnotify.qcm

@@ -10,14 +10,10 @@ public:
 	qc_libnotify(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec(){
-		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			return false;
+		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+			printf("\nNot Required");
+			return true;
 		}
 		QStringList incs;
 		QString req_ver = "0.4.2";

qcm/libtorrent-rasterbar.qcm

@@ -23,7 +23,7 @@ public:
 		if(!libs.isEmpty())
 			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-                        printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nSome feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
 		else
 			conf->addDefine("LIBTORRENT_0_15");
 		return true;

qcm/pkg-config.qcm

@@ -1,16 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: pkg-config
------END QCMOD-----
-*/
-#include <QProcess>
-class qc_pkg_config : public ConfObj
-{
-public:
-	qc_pkg_config(Conf *c) : ConfObj(c) {}
-	QString name() const { return "pkg-config executable"; }
-	QString shortname() const { return "pkg-config"; }
-	bool exec(){
-		return !conf->findProgram("pkg-config").isEmpty();
-	}
-};

src/GUI.cpp

@@ -35,6 +35,7 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QDesktopWidget>
 #include <QTimer>
 #include <QDesktopServices>
 #include <QStatusBar>
@@ -355,7 +356,7 @@ void GUI::readSettings() {
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   settings.beginGroup(QString::fromUtf8("MainWindow"));
   resize(settings.value(QString::fromUtf8("size"), size()).toSize());
-  move(settings.value(QString::fromUtf8("pos"), misc::screenCenter(this)).toPoint());
+  move(settings.value(QString::fromUtf8("pos"), screenCenter()).toPoint());
   QStringList sizes_str = settings.value("vSplitterSizes", QStringList()).toStringList();
   // Splitter size
   QList<int> sizes;
@@ -474,6 +475,22 @@ void GUI::toggleVisibility(QSystemTrayIcon::ActivationReason e) {
   }
 }
 
+// Center window
+QPoint GUI::screenCenter() const{
+  int scrn = 0;
+  QWidget *w = this->topLevelWidget();
+
+  if(w)
+    scrn = QApplication::desktop()->screenNumber(w);
+  else if(QApplication::desktop()->isVirtualDesktop())
+    scrn = QApplication::desktop()->screenNumber(QCursor::pos());
+  else
+    scrn = QApplication::desktop()->screenNumber(this);
+
+  QRect desk(QApplication::desktop()->availableGeometry(scrn));
+  return QPoint((desk.width() - this->frameGeometry().width()) / 2, (desk.height() - this->frameGeometry().height()) / 2);
+}
+
 // Display About Dialog
 void GUI::on_actionAbout_triggered() {
   //About dialog

src/GUI.h

@@ -156,6 +156,7 @@ public:
   ~GUI();
   // Methods
   int getCurrentTabIndex() const;
+  QPoint screenCenter() const;
   TransferListWidget* getTransferList() const { return transferList; }
 };
 

src/Icons/qBittorrent.desktop

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

src/bittorrent.cpp

@@ -746,18 +746,15 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
     addConsoleMessage(tr("'%1' is not a valid magnet URI.").arg(magnet_uri));
     return h;
   }
-  QDir torrentBackup(misc::BTBackupLocation());
   if(resumed) {
     qDebug("Resuming magnet URI: %s", hash.toLocal8Bit().data());
-    // Load metadata
-    if(QFile::exists(torrentBackup.path()+QDir::separator()+hash+QString(".torrent")))
-      return addTorrent(torrentBackup.path()+QDir::separator()+hash+QString(".torrent"), false, false, true);
   } else {
     qDebug("Adding new magnet URI");
   }
 
   bool fastResume=false;
   Q_ASSERT(magnet_uri.startsWith("magnet:"));
+  QDir torrentBackup(misc::BTBackupLocation());
 
   // Check if torrent is already in download list
   if(s->find_torrent(sha1_hash(hash.toLocal8Bit().data())).is_valid()) {
@@ -802,7 +799,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
   else
     p.storage_mode = storage_mode_sparse;
   // Start in pause
-  p.paused = true;
+  p.paused = false;
   p.duplicate_is_error = false; // Already checked
   p.auto_managed = false; // Because it is added in paused state
   // Adding torrent to Bittorrent session
@@ -842,7 +839,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
     }
     QString label = TorrentTempData::getLabel(hash);
     // Save persistent data for new torrent
-    TorrentPersistentData::saveTorrentPersistentData(h, true);
+    TorrentPersistentData::saveTorrentPersistentData(h);
     // Save Label
     if(!label.isEmpty()) {
       TorrentPersistentData::saveLabel(hash, label);
@@ -853,7 +850,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
       TorrentPersistentData::saveSavePath(hash, savePath);
     }
   }
-  if(!fastResume && (!addInPause || (Preferences::useAdditionDialog()))) {
+  if(!addInPause && !fastResume) {
     // Start torrent because it was added in paused state
     h.resume();
   }
@@ -1023,16 +1020,11 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
       h.set_sequential_download(TorrentTempData::isSequential(hash));
       // Import Files names from torrent addition dialog
       QStringList files_path = TorrentTempData::getFilesPath(hash);
-      bool force_recheck = false;
       if(files_path.size() == h.num_files()) {
         for(int i=0; i<h.num_files(); ++i) {
           QString path = files_path.at(i);
-          if(!force_recheck && QFile::exists(h.save_path()+QDir::separator()+path))
-            force_recheck = true;
           h.rename_file(i, path);
         }
-        // Force recheck
-        if(force_recheck) h.force_recheck();
       }
     }
     QString label = TorrentTempData::getLabel(hash);
@@ -1061,7 +1053,7 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
     // Copy it to torrentBackup directory
     QFile::copy(file, newFile);
   }
-  if(!fastResume && (!addInPause || (Preferences::useAdditionDialog() && !fromScanDir))) {
+  if(!addInPause && !fastResume) {
     // Start torrent because it was added in paused state
     h.resume();
   }
@@ -1607,9 +1599,9 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
     }
   }
 
-  // Set DHT port (>= 1 or 0 if same as BT)
+  // Set DHT port (>= 1000 or 0 if same as BT)
   void Bittorrent::setDHTPort(int dht_port) {
-    if(dht_port >= 0) {
+    if(dht_port == 0 || dht_port >= 1000) {
       if(dht_port == current_dht_port) return;
       struct dht_settings DHTSettings;
       DHTSettings.service_port = dht_port;
@@ -1675,7 +1667,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
       qDebug("Disabling HTTP communications proxy");
 #ifdef Q_WS_WIN
       putenv("http_proxy=");
-      putenv("sock_proxy=");
+      putenv("sock_proxy=")
 #else
       unsetenv("http_proxy");
       unsetenv("sock_proxy");
@@ -1775,10 +1767,6 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
             appendqBextensionToTorrent(h, true);
 #endif
           emit metadataReceived(h);
-          // Save metadata
-          QDir torrentBackup(misc::BTBackupLocation());
-          if(!QFile::exists(torrentBackup.path()+QDir::separator()+h.hash()+QString(".torrent")))
-            h.save_torrent_file(torrentBackup.path()+QDir::separator()+h.hash()+QString(".torrent"));
           if(h.is_paused()) {
             // XXX: Unfortunately libtorrent-rasterbar does not send a torrent_paused_alert
             // and the torrent can be paused when metadata is received
@@ -1920,30 +1908,12 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
           }
           emit torrentFinishedChecking(h);
           emit metadataReceived(h);
-          if(torrentsToPausedAfterChecking.contains(hash)) {
-            torrentsToPausedAfterChecking.removeOne(hash);
-            h.pause();
-            emit pausedTorrent(h);
-          }
         }
       }
       a = s->pop_alert();
     }
   }
 
-  void Bittorrent::recheckTorrent(QString hash) {
-    QTorrentHandle h = getTorrentHandle(hash);
-    if(h.is_valid() && h.has_metadata()) {
-      if(h.is_paused()) {
-        if(!torrentsToPausedAfterChecking.contains(h.hash())) {
-          torrentsToPausedAfterChecking << h.hash();
-          h.resume();
-        }
-      }
-      h.force_recheck();
-    }
-  }
-
   QHash<QString, TrackerInfos> Bittorrent::getTrackersInfo(QString hash) const{
     return trackersInfos.value(hash, QHash<QString, TrackerInfos>());
   }

src/bittorrent.h

@@ -94,7 +94,6 @@ private:
   QPointer<QTimer> timerAlerts;
   QMap<QUrl, QString> savepath_fromurl;
   QHash<QString, QHash<QString, TrackerInfos> > trackersInfos;
-  QStringList torrentsToPausedAfterChecking;
   // Ratio
   QPointer<QTimer> BigRatioTimer;
   // HTTP
@@ -181,7 +180,6 @@ public slots:
   void deleteTorrent(QString hash, bool delete_local_files = false);
   void startUpTorrents();
   session_proxy asyncDeletion();
-  void recheckTorrent(QString hash);
   /* Needed by Web UI */
   void pauseAllTorrents();
   void pauseTorrent(QString hash);

src/deletionconfirmationdlg.h

@@ -33,7 +33,6 @@
 
 #include <QDialog>
 #include "ui_confirmdeletiondlg.h"
-#include "misc.h"
 
 class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
   Q_OBJECT
@@ -41,7 +40,6 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
   public:
   DeletionConfirmationDlg(QWidget *parent=0): QDialog(parent) {
     setupUi(this);
-    move(misc::screenCenter(this));
   }
 
   bool shouldDeleteLocalFiles() const {

src/feedList.h

@@ -154,9 +154,7 @@ signals:
 
 protected slots:
   void updateCurrentFeed(QTreeWidgetItem* new_item) {
-    if(!new_item) return;
-    if(!mapping.contains(new_item)) return;
-    if((getItemType(new_item) == RssFile::STREAM) || new_item == unread_item)
+    if((new_item && getItemType(new_item) == RssFile::STREAM) || new_item == unread_item)
       current_feed = new_item;
   }
 

src/httpconnection.cpp

@@ -456,8 +456,8 @@ void HttpConnection::respondCommand(QString command)
 
 void HttpConnection::recheckTorrent(QString hash) {
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  if(h.is_valid()){
-    BTSession->recheckTorrent(h.hash());
+  if(h.is_valid() && !h.is_paused()){
+    h.force_recheck();
   }
 }
 
@@ -466,7 +466,7 @@ void HttpConnection::recheckAllTorrents() {
   std::vector<torrent_handle>::iterator torrentIT;
   for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
     QTorrentHandle h = QTorrentHandle(*torrentIT);
-    if(h.is_valid())
-      BTSession->recheckTorrent(h.hash());
+    if(h.is_valid() && !h.is_paused())
+      h.force_recheck();
   }
 }