tagged v2.5.0beta6 release

AUTHORS

@@ -76,7 +76,7 @@ Translations authors:
   - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
-  - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
+  - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
   - English: Christophe Dumez (chris@qbittorrent.org)
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)

Changelog

@@ -1,4 +1,4 @@
-* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
     - FEATURE: qBittorrent can now act as a tracker
     - FEATURE: New and improved RSS feed automated downloader
     - FEATURE: Added feature to shutdown qbittorrent on torrents completion
@@ -12,20 +12,9 @@
     - FEATURE: Added "Amount downloaded/left" columns to transfer list
     - FEATURE: Simplified proxy settings
     - FEATURE: Optimized and improved the peer country resolution code
-    - FEATURE: Download first/last pieces first when sequential download is
-    enabled (Thanks Ahmad)
-    - FEATURE: Download first/last pieces first now applies to all media files
-    in the torrent (Thanks Ahmad)
-    - BUGFIX: Fix SOCKS5 proxy authentication in search engine(closes #680072)
-    - BUGFIX: Fix two advanced settings (ignore limits on LAN and protocol
-    overhead inclusion in rate limiter)
-    - BUGFIX: Fix strict super seeding (was not working)
-    - BUGFIX: Improve magnet save path handling (closes #683395)
-    - BUGFIX: Disable overwrite confirmation in torrent addition dialog (closes # 685269)
     - COSMETIC: Replaced message box by on-screen notification for download errors
     - COSMETIC: Improved the torrent creation tool appearance
     - COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)
-    - COSMETIC: Use bigger alternative speed icon
     - OTHERS: Dropped support for Qt <= 4.4
 
 * Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0

src/about_imp.h

@@ -68,7 +68,7 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)</li>\
           <li><u>Czech:</u> Jirka Vilim (web@tets.cz)</li>\
           <li><u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)</li>\
-          <li><u>Dutch:</u> Pieter Heyvaert (pieter_heyvaert@hotmail.com)</li>\
+          <li><u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net) and Peter Koeleman (peter@peerweb.nl)</li>\
           <li><u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net) and Pekka Niemi (pekka.niemi@iki.fi)</li>\
           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\
           <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)</li>\

src/console_imp.h

@@ -34,6 +34,8 @@
 #include "qbtsession.h"
 #include "ui_console.h"
 
+using namespace libtorrent;
+
 class consoleDlg : public QDialog, private Ui_ConsoleDlg{
   Q_OBJECT
   

src/downloadfromurldlg.ui

@@ -1,55 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0" >
-<ui version="4.0">
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
  <class>downloadFromURL</class>
- <widget class="QDialog" name="downloadFromURL">
+ <widget class="QDialog" name="downloadFromURL" >
-  <property name="geometry">
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>482</width>
+    <width>360</width>
     <height>220</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string>Download from urls</string>
   </property>
-  <layout class="QVBoxLayout">
+  <layout class="QVBoxLayout" >
-   <property name="spacing">
+   <property name="margin" >
-    <number>6</number>
-   </property>
-   <property name="margin">
     <number>9</number>
    </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item>
-    <layout class="QHBoxLayout">
+    <layout class="QHBoxLayout" >
-     <property name="spacing">
+     <property name="margin" >
-      <number>6</number>
-     </property>
-     <property name="margin">
       <number>0</number>
      </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
-      <widget class="QLabel" name="icon_lbl">
+      <widget class="QLabel" name="icon_lbl" >
-       <property name="minimumSize">
+       <property name="minimumSize" >
         <size>
          <width>32</width>
          <height>32</height>
         </size>
        </property>
-       <property name="maximumSize">
+       <property name="maximumSize" >
         <size>
          <width>32</width>
          <height>32</height>
         </size>
        </property>
-       <property name="text">
+       <property name="text" >
         <string/>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="downloadURL_lbl">
+      <widget class="QLabel" name="downloadURL_lbl" >
-       <property name="font">
+       <property name="font" >
         <font>
          <family>Sans Serif</family>
          <pointsize>12</pointsize>
@@ -60,7 +62,7 @@
          <strikeout>false</strikeout>
         </font>
        </property>
-       <property name="text">
+       <property name="text" >
         <string>Download Torrents from URLs</string>
        </property>
       </widget>
@@ -68,21 +70,21 @@
     </layout>
    </item>
    <item>
-    <widget class="QTextEdit" name="textUrls">
+    <widget class="QTextEdit" name="textUrls" >
-     <property name="acceptRichText">
+     <property name="acceptRichText" >
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label_infos">
+    <widget class="QLabel" name="label_infos" >
-     <property name="maximumSize">
+     <property name="maximumSize" >
       <size>
        <width>16777215</width>
        <height>17</height>
       </size>
      </property>
-     <property name="font">
+     <property name="font" >
       <font>
        <family>Sans Serif</family>
        <pointsize>9</pointsize>
@@ -93,25 +95,25 @@
        <strikeout>false</strikeout>
       </font>
      </property>
-     <property name="text">
+     <property name="text" >
       <string>Only one URL per line</string>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout">
+    <layout class="QHBoxLayout" >
-     <property name="spacing">
+     <property name="margin" >
-      <number>6</number>
-     </property>
-     <property name="margin">
       <number>0</number>
      </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <spacer>
-       <property name="orientation">
+       <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
+       <property name="sizeHint" >
         <size>
          <width>40</width>
          <height>20</height>
@@ -120,25 +122,25 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="downloadButton">
+      <widget class="QPushButton" name="downloadButton" >
-       <property name="text">
+       <property name="text" >
         <string>Download</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelButton">
+      <widget class="QPushButton" name="cancelButton" >
-       <property name="text">
+       <property name="text" >
         <string>Cancel</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation">
+       <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
+       <property name="sizeHint" >
         <size>
          <width>40</width>
          <height>20</height>
@@ -150,6 +152,7 @@
    </item>
   </layout>
  </widget>
+ <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>

src/downloadthread.cpp

@@ -45,14 +45,14 @@
 /** Download Thread **/
 
 downloadThread::downloadThread(QObject* parent) : QObject(parent) {
-  connect(&m_networkManager, SIGNAL(finished (QNetworkReply*)), this, SLOT(processDlFinished(QNetworkReply*)));
+  connect(&networkManager, SIGNAL(finished (QNetworkReply*)), this, SLOT(processDlFinished(QNetworkReply*)));
 #ifndef QT_NO_OPENSSL
-  connect(&m_networkManager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(ignoreSslErrors(QNetworkReply*,QList<QSslError>)));
+  connect(&networkManager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(ignoreSslErrors(QNetworkReply*,QList<QSslError>)));
 #endif
 }
 
 void downloadThread::processDlFinished(QNetworkReply* reply) {
-  QString url = reply->url().toString();
+  QString url = reply->url().toEncoded().data();
   qDebug("Download finished: %s", qPrintable(url));
   if(reply->error() != QNetworkReply::NoError) {
     // Failure
@@ -63,13 +63,13 @@ void downloadThread::processDlFinished(QNetworkReply* reply) {
     if(redirection.isValid()) {
       // We should redirect
       qDebug("Redirecting from %s to %s", qPrintable(url), qPrintable(redirection.toUrl().toString()));
-      m_redirectMapping.insert(redirection.toUrl().toString(), url);
+      redirect_mapping.insert(redirection.toUrl().toString(), url);
       downloadUrl(redirection.toUrl().toString());
       return;
     }
     // Checking if it was redirecting, restoring initial URL
-    if(m_redirectMapping.contains(url)) {
+    if(redirect_mapping.contains(url)) {
-      url = m_redirectMapping.take(url);
+      url = redirect_mapping.take(url);
     }
     // Success
     QString filePath;
@@ -104,7 +104,7 @@ void downloadThread::processDlFinished(QNetworkReply* reply) {
 #ifndef DISABLE_GUI
 void downloadThread::loadCookies(const QString &host_name, QString url) {
   const QList<QByteArray> raw_cookies = RssSettings().getHostNameCookies(host_name);
-  QNetworkCookieJar *cookie_jar = m_networkManager.cookieJar();
+  QNetworkCookieJar *cookie_jar = networkManager.cookieJar();
   QList<QNetworkCookie> cookies;
   qDebug("Loading cookies for host name: %s", qPrintable(host_name));
   foreach(const QByteArray& raw_cookie, raw_cookies) {
@@ -115,7 +115,7 @@ void downloadThread::loadCookies(const QString &host_name, QString url) {
     }
   }
   cookie_jar->setCookiesFromUrl(cookies, url);
-  m_networkManager.setCookieJar(cookie_jar);
+  networkManager.setCookieJar(cookie_jar);
 }
 #endif
 
@@ -148,12 +148,12 @@ QNetworkReply* downloadThread::downloadUrl(QString url){
   // Web server banning
   request.setRawHeader("User-Agent", "Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5");
   qDebug("Downloading %s...", request.url().toEncoded().data());
-  qDebug("%d cookies for this URL", m_networkManager.cookieJar()->cookiesForUrl(url).size());
+  qDebug("%d cookies for this URL", networkManager.cookieJar()->cookiesForUrl(url).size());
-  for(int i=0; i<m_networkManager.cookieJar()->cookiesForUrl(url).size(); ++i) {
+  for(int i=0; i<networkManager.cookieJar()->cookiesForUrl(url).size(); ++i) {
-    qDebug("%s=%s", m_networkManager.cookieJar()->cookiesForUrl(url).at(i).name().data(), m_networkManager.cookieJar()->cookiesForUrl(url).at(i).value().data());
+    qDebug("%s=%s", networkManager.cookieJar()->cookiesForUrl(url).at(i).name().data(), networkManager.cookieJar()->cookiesForUrl(url).at(i).value().data());
-    qDebug("Domain: %s, Path: %s", qPrintable(m_networkManager.cookieJar()->cookiesForUrl(url).at(i).domain()), qPrintable(m_networkManager.cookieJar()->cookiesForUrl(url).at(i).path()));
+    qDebug("Domain: %s, Path: %s", qPrintable(networkManager.cookieJar()->cookiesForUrl(url).at(i).domain()), qPrintable(networkManager.cookieJar()->cookiesForUrl(url).at(i).path()));
   }
-  return m_networkManager.get(request);
+  return networkManager.get(request);
 }
 
 void downloadThread::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal) {
@@ -200,7 +200,7 @@ void downloadThread::applyProxySettings() {
   } else {
     proxy.setType(QNetworkProxy::NoProxy);
   }
-  m_networkManager.setProxy(proxy);
+  networkManager.setProxy(proxy);
 }
 
 QString downloadThread::errorCodeToString(QNetworkReply::NetworkError status) {

src/downloadthread.h

@@ -41,33 +41,33 @@ class QNetworkAccessManager;
 class downloadThread : public QObject {
   Q_OBJECT
 
-public:
+private:
-  downloadThread(QObject* parent = 0);
+  QNetworkAccessManager networkManager;
-  QNetworkReply* downloadUrl(QString url);
+  QHash<QString, QString> redirect_mapping;
-  void downloadTorrentUrl(QString url);
-  //void setProxy(QString IP, int port, QString username, QString password);
 
 signals:
   void downloadFinished(QString url, QString file_path);
   void downloadFailure(QString url, QString reason);
 
-private slots:
+public:
-  void processDlFinished(QNetworkReply* reply);
+  downloadThread(QObject* parent);
-  void checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal);
+  QNetworkReply* downloadUrl(QString url);
-#ifndef QT_NO_OPENSSL
+  void downloadTorrentUrl(QString url);
-  void ignoreSslErrors(QNetworkReply*,QList<QSslError>);
+  //void setProxy(QString IP, int port, QString username, QString password);
-#endif
 
-private:
+protected:
   QString errorCodeToString(QNetworkReply::NetworkError status);
   void applyProxySettings();
 #ifndef DISABLE_GUI
   void loadCookies(const QString &host_name, QString url);
 #endif
 
-private:
+protected slots:
-  QNetworkAccessManager m_networkManager;
+  void processDlFinished(QNetworkReply* reply);
-  QHash<QString, QString> m_redirectMapping;
+  void checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal);
+#ifndef QT_NO_OPENSSL
+  void ignoreSslErrors(QNetworkReply*,QList<QSslError>);
+#endif
 
 };
 

src/filterparserthread.h

@@ -40,6 +40,7 @@
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
 
+using namespace libtorrent;
 using namespace std;
 
 // P2B Stuff
@@ -55,8 +56,8 @@ class FilterParserThread : public QThread  {
   Q_OBJECT
 
 private:
-  libtorrent::session *s;
+  session *s;
-  libtorrent::ip_filter filter;
+  ip_filter filter;
   bool abort;
   QString filePath;
 
@@ -93,7 +94,7 @@ protected:
   }
 
 public:
-  FilterParserThread(QObject* parent, libtorrent::session *s) : QThread(parent), s(s), abort(false) {
+  FilterParserThread(QObject* parent, session *s) : QThread(parent), s(s), abort(false) {
 
   }
 
@@ -176,7 +177,7 @@ public:
         }
         // Now Add to the filter
         try {
-          filter.add_rule(startAddr, endAddr, libtorrent::ip_filter::blocked);
+          filter.add_rule(startAddr, endAddr, ip_filter::blocked);
         }catch(exception){
           qDebug("Bad line in filter file, avoided crash...");
         }
@@ -245,7 +246,7 @@ public:
           continue;
         }
         try {
-          filter.add_rule(startAddr, endAddr, libtorrent::ip_filter::blocked);
+          filter.add_rule(startAddr, endAddr, ip_filter::blocked);
         } catch(std::exception&) {
           qDebug("p2p file: line %d is malformed.", nbLine);
           qDebug("Line was: %s", line.constData());
@@ -312,10 +313,10 @@ public:
           // Network byte order to Host byte order
           // asio address_v4 contructor expects it
           // that way
-          libtorrent::address_v4 first(ntohl(start));
+          address_v4 first(ntohl(start));
-          libtorrent::address_v4 last(ntohl(end));
+          address_v4 last(ntohl(end));
           // Apply to bittorrent session
-          filter.add_rule(first, last, libtorrent::ip_filter::blocked);
+          filter.add_rule(first, last, ip_filter::blocked);
         }
       }
       else if(version==3) {
@@ -357,10 +358,10 @@ public:
           // Network byte order to Host byte order
           // asio address_v4 contructor expects it
           // that way
-          libtorrent::address_v4 first(ntohl(start));
+          address_v4 first(ntohl(start));
-          libtorrent::address_v4 last(ntohl(end));
+          address_v4 last(ntohl(end));
           // Apply to bittorrent session
-          filter.add_rule(first, last, libtorrent::ip_filter::blocked);
+          filter.add_rule(first, last, ip_filter::blocked);
           if(abort) return;
         }
       } else {
@@ -390,16 +391,16 @@ public:
     start();
   }
 
-  static void processFilterList(libtorrent::session *s, QStringList IPs) {
+  static void processFilterList(session *s, QStringList IPs) {
     // First, import current filter
-    libtorrent::ip_filter filter = s->get_ip_filter();
+    ip_filter filter = s->get_ip_filter();
     foreach(const QString &ip, IPs) {
       qDebug("Manual ban of peer %s", ip.toLocal8Bit().constData());
       boost::system::error_code ec;
-      libtorrent::address_v4 addr = libtorrent::address_v4::from_string(ip.toLocal8Bit().constData(), ec);
+      address_v4 addr = address_v4::from_string(ip.toLocal8Bit().constData(), ec);
       Q_ASSERT(!ec);
       if(!ec)
-        filter.add_rule(addr, addr, libtorrent::ip_filter::blocked);
+        filter.add_rule(addr, addr, ip_filter::blocked);
     }
     s->set_ip_filter(filter);
   }

src/geoip/geoipmanager.cpp

@@ -118,7 +118,9 @@ void GeoIPManager::loadDatabase(session *s) {
 #endif
   if(QFile::exists(geoipDBpath(false))) {
     qDebug("Loading GeoIP database from %s...", qPrintable(geoipDBpath(false)));
-    s->load_country_db(geoipDBpath(false).toLocal8Bit().constData());
+    if(!s->load_country_db(geoipDBpath(false).toLocal8Bit().constData())) {
+      std::cerr << "Failed to load Geoip Database at " << qPrintable(geoipDBpath(false)) << std::endl;
+    }
   } else {
     qDebug("ERROR: Impossible to find local Geoip Database");
   }

src/headlessloader.h

@@ -40,14 +40,15 @@ class HeadlessLoader: public QObject {
   Q_OBJECT
 
 public:
-  HeadlessLoader(const QStringList &torrentCmdLine) {
+  HeadlessLoader(QStringList torrentCmdLine) {
     Preferences pref;
     // Enable Web UI
     pref.setWebUiEnabled(true);
     // Instanciate Bittorrent Object
-    connect(QBtSession::instance(), SIGNAL(newConsoleMessage(QString)), this, SLOT(displayConsoleMessage(QString)));
+    BTSession = QBtSession::instance();
+    connect(BTSession, SIGNAL(newConsoleMessage(QString)), this, SLOT(displayConsoleMessage(QString)));
     // Resume unfinished torrents
-    QBtSession::instance()->startUpTorrents();
+    BTSession->startUpTorrents();
     // Process command line parameters
     processParams(torrentCmdLine);
     // Display some information to the user
@@ -71,7 +72,7 @@ public slots:
     qApp->quit();
   }
 
-  void displayConsoleMessage(const QString &msg) {
+  void displayConsoleMessage(QString msg) {
     std::cout << qPrintable(msg) << std::endl;
   }
 
@@ -87,21 +88,24 @@ public slots:
     foreach(QString param, params) {
       param = param.trimmed();
       if(param.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
-        QBtSession::instance()->downloadFromUrl(param);
+        BTSession->downloadFromUrl(param);
       }else{
         if(param.startsWith("bc://bt/", Qt::CaseInsensitive)) {
           qDebug("Converting bc link to magnet link");
           param = misc::bcLinkToMagnet(param);
         }
         if(param.startsWith("magnet:", Qt::CaseInsensitive)) {
-          QBtSession::instance()->addMagnetUri(param);
+          BTSession->addMagnetUri(param);
         } else {
-          QBtSession::instance()->addTorrent(param);
+          BTSession->addTorrent(param);
         }
       }
     }
   }
 
+private:
+  QBtSession *BTSession;
+
 };
 
 #endif