Tagged rc9 release

Changelog

@@ -42,12 +42,12 @@
     - FEATURE: Added an option to display current transfer speeds in title bar
     - FEATURE: Torrent content is now displayed as a tree
     - FEATURE: Better media file preview (player detected automatically)
-    - FEATURE: Greatly improved ETA calculation algorithm (use GASA)
     - I18N: Added Hungarian translation
     - I18N: Added Brazilian translation
     - BUGFIX: Progress of paused torrents is now correct on restart
     - BUGFIX: clear the results of a search stops searching
     - BUGFIX: Progress column gets sorted on restart it is was during last execution
+    - BUGFIX: Made ETA more reliable using stats instead of instant values
     - BUGFIX: Remove torrent from hard drive used to delete parent folder if empty
     - BUGFIX: Fixed a crash when filtering all the files in a torrent
     - BUGFIX: Reload torrent only when necessary (properties)

TODO

@@ -50,14 +50,19 @@
   -> in download list
   -> in seeding list
 
-TODO:
-- Check search engine cpu usage
-
-rc10->rc11? changelog:
-- BUGFIX: Bypass exit confirmation on system shutdown
-- BUGFIX: Download from urls are now able to follow redirections
-- BUGFIX: Clean up for failed torrents downloaded from urls
-- BUGFIX: Fixed downloads from URLs on Windows
-- BUGFIX: Fixed search engine on Windows
-- BUGFIX: Fixed torrent creation from a directory
-- BUGFIX: Fixed save path when seeding automatically after torrent creation
+rc8->rc9 changelog:
+- FEATURE: Better media file preview (player detected automatically)
+- BUGFIX: Remember properties window size and position
+- BUGFIX: Added HTTP and SOCKS5 proxy support in downloads from urls, RSS
+- BUGFIX: Added HTTP proxy support in search engine (no SOCKS yet)
+- BUGFIX: Do no pause torrents before saving fastresume data anymore (no longer needed)
+- BUGFIX: Save fast resume data regularly (every 60 seconds) to avoid downloading from scratch if qBittorrent crashes
+- BUGFIX: Do not save fastresume data for checking torrents anymore
+- BUGFIX: Saving trackers file only when necessary
+- BUGFIX: Fixed possible segfault when unfiltering files in torrent addition dialog
+- BUGFIX: Fixed possible overflow in ETA calculation
+- BUGFIX: title bar is now reset when "Display speed in title" is disabled
+- BUGFIX: Fixed HTTP_PW and SOCKS5_PW in proxy combobox
+- BUGFIX: Fixed proxy auth disable problem when disabling proxy
+- BUGFIX: Fixed proxy layout in program preferences
+- BUGFIX: Fixed everlasting libtorrent session destruction on exit

src/GUI.cpp

@@ -392,10 +392,10 @@ void GUI::on_actionExit_triggered() {
 }
 
 void GUI::previewFile(QString filePath) {
-  QDesktopServices::openUrl(QString("file://")+filePath);
+  QDesktopServices::openUrl(filePath);
 }
 
-int GUI::getCurrentTabIndex() const{
+unsigned int GUI::getCurrentTabIndex() const{
   if(isMinimized() || isHidden())
     return -1;
   return tabs->currentIndex();
@@ -449,7 +449,7 @@ void GUI::on_actionAbout_triggered() {
 
 // Called when we close the program
 void GUI::closeEvent(QCloseEvent *e) {
-
+  qDebug("Mainwindow received closeEvent");
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool();
   if(!force_exit && systrayIntegration && goToSystrayOnExit && !this->isHidden()) {
@@ -461,16 +461,13 @@ void GUI::closeEvent(QCloseEvent *e) {
     show();
     if(!isMaximized())
       showNormal();
-    if(e->spontaneous() == true || force_exit == true) {
-      if(QMessageBox::question(this,
-        tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"),
-        tr("The download list is not empty.\nAre you sure you want to quit qBittorrent?"),
-        tr("&Yes"), tr("&No"),
-        QString(), 0, 1)) {
-          e->ignore();
-          force_exit = false;
-          return;
-      }
+    if(QMessageBox::question(this,
+       tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"),
+       tr("The download list is not empty.\nAre you sure you want to quit qBittorrent?"),
+       tr("&Yes"), tr("&No"),
+       QString(), 0, 1)) {
+         e->ignore();
+         return;
     }
   }
   hide();
@@ -488,7 +485,6 @@ void GUI::closeEvent(QCloseEvent *e) {
   qApp->exit();
 }
 
-
 // Display window to create a torrent
 void GUI::on_actionCreate_torrent_triggered() {
   createtorrent *ct = new createtorrent(this);
@@ -859,20 +855,10 @@ void GUI::configureSession(bool deleteOptions) {
     }
     if(!proxy_str.isEmpty()) {
       // We need this for urllib in search engine plugins
-#ifdef Q_WS_WIN
-      char proxystr[512];
-      snprintf(proxystr, 512, "http_proxy=%s", proxy_str.toUtf8().data());
-      putenv(proxystr);
-#else
       setenv("http_proxy", proxy_str.toUtf8().data(), 1);
-#endif
     }
   } else {
-#ifdef Q_WS_WIN
-    putenv("http_proxy=");
-#else
     unsetenv("http_proxy");
-#endif
   }
   BTSession->setProxySettings(proxySettings, options->useProxyForTrackers(), options->useProxyForPeers(), options->useProxyForWebseeds(), options->useProxyForDHT());
   // * Session settings

src/GUI.h

@@ -155,7 +155,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
     ~GUI();
     // Methods
-    int getCurrentTabIndex() const;
+    unsigned int getCurrentTabIndex() const;
     QPoint screenCenter() const;
 };
 

src/bittorrent.cpp

@@ -38,6 +38,8 @@
 #include <libtorrent/torrent_info.hpp>
 #include <boost/filesystem/exception.hpp>
 
+#define ETAS_MAX_VALUES 3
+#define ETA_REFRESH_INTERVAL 10000
 #define MAX_TRACKER_ERRORS 2
 
 // Main constructor
@@ -53,6 +55,9 @@ bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false
   timerAlerts = new QTimer();
   connect(timerAlerts, SIGNAL(timeout()), this, SLOT(readAlerts()));
   timerAlerts->start(3000);
+  ETARefresher = new QTimer();
+  connect(ETARefresher, SIGNAL(timeout()), this, SLOT(updateETAs()));
+  ETARefresher->start(ETA_REFRESH_INTERVAL);
   fastResumeSaver = new QTimer();
   connect(fastResumeSaver, SIGNAL(timeout()), this, SLOT(saveFastResumeAndRatioData()));
   fastResumeSaver->start(60000);
@@ -62,7 +67,6 @@ bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false
   connect(downloader, SIGNAL(downloadFailure(QString, QString)), this, SLOT(handleDownloadFailure(QString, QString)));
   // File deleter (thread)
   deleter = new deleteThread(this);
-  BigRatioTimer = 0;  
   qDebug("* BTSession constructed");
 }
 
@@ -74,8 +78,7 @@ bittorrent::~bittorrent() {
   delete deleter;
   delete fastResumeSaver;
   delete timerAlerts;
-  if(BigRatioTimer != 0)
-    delete BigRatioTimer;
+  delete ETARefresher;
   delete downloader;
   // Delete BT session
   delete s;
@@ -140,34 +143,57 @@ void bittorrent::startTorrentsInPause(bool b) {
   addInPause = b;
 }
 
-// Calculate the ETA using GASA
-// GASA: global Average Speed Algorithm
-qlonglong bittorrent::getETA(QString hash) const {
-  QTorrentHandle h = getTorrentHandle(hash);
-  if(!h.is_valid()) return -1;
-  switch(h.state()) {
-    case torrent_status::downloading:
-    case torrent_status::connecting_to_tracker: {
-      if(!TorrentsStartTime.contains(hash)) return -1;
-      int timeElapsed = TorrentsStartTime.value(hash).secsTo(QDateTime::currentDateTime());
-      double avg_speed;
-      if(timeElapsed) {
-        size_type data_origin = TorrentsStartData.value(hash, 0);
-        avg_speed = (double)(h.total_payload_download()-data_origin) / (double)timeElapsed;
+void bittorrent::updateETAs() {
+  QString hash;
+  foreach(hash, unfinishedTorrents) {
+    QTorrentHandle h = getTorrentHandle(hash);
+    if(h.is_valid()) {
+      if(h.is_paused()) continue;
+      QString hash = h.hash();
+      QList<qlonglong> listEtas = ETAstats.value(hash, QList<qlonglong>());
+      // XXX: We can still get an overflow if remaining file size is approximately
+      // 8.38*10^5 TiB (let's assume this can't happen)
+      if(h.download_payload_rate() > 0.1) {
+        if(listEtas.size() == ETAS_MAX_VALUES) {
+            listEtas.removeFirst();
+        }
+        listEtas << (qlonglong)((h.actual_size()-h.total_wanted_done())/(double)h.download_payload_rate());
+        ETAstats[hash] = listEtas;
+        qlonglong moy = 0;
+        qlonglong val;
+        unsigned int nbETAs = listEtas.size();
+        Q_ASSERT(nbETAs);
+        foreach(val, listEtas) {
+          moy += (qlonglong)((double)val/(double)nbETAs);
+        }
+        if(moy < 0) {
+          if(ETAstats.contains(hash)) {
+            ETAstats.remove(hash);
+          }
+          if(ETAs.contains(hash)) {
+            ETAs.remove(hash);
+          }
+        } else {
+          ETAs[hash] = moy;
+        }
       } else {
-        return -1;
+        // Speed is too low, we don't want an overflow.
+        if(ETAstats.contains(hash)) {
+          ETAstats.remove(hash);
+        }
+        if(ETAs.contains(hash)) {
+          ETAs.remove(hash);
+        }
       }
-      if(avg_speed) {
-        return (qlonglong) floor((double) (h.actual_size() - h.total_wanted_done()) / avg_speed);
-      } else {
-        return -1;
-      }
-      
     }
-    default:
-      return -1;
   }
-  
+  // Delete big ratios
+  if(max_ratio != -1)
+    deleteBigRatios();
+}
+
+long bittorrent::getETA(QString hash) const{
+  return ETAs.value(hash, -1);
 }
 
 // Return the torrent handle, given its hash
@@ -214,9 +240,9 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) {
   foreach(file, files) {
     torrentBackup.remove(file);
   }
-  // Remove it from TorrentsStartTime hash table
-  TorrentsStartTime.remove(hash);
-  TorrentsStartData.remove(hash);
+  // Remove it from ETAs hash tables
+  ETAstats.remove(hash);
+  ETAs.remove(hash);
   // Remove tracker errors
   trackersErrors.remove(hash);
   // Remove it from ratio table
@@ -264,9 +290,6 @@ void bittorrent::setUnfinishedTorrent(QString hash) {
   }
   if(!unfinishedTorrents.contains(hash)) {
     unfinishedTorrents << hash;
-    QTorrentHandle h = getTorrentHandle(hash);
-    TorrentsStartData[hash] = h.total_payload_download();
-    TorrentsStartTime[hash] = QDateTime::currentDateTime();
   }
 }
 
@@ -284,9 +307,9 @@ void bittorrent::setFinishedTorrent(QString hash) {
   if(index != -1) {
     unfinishedTorrents.removeAt(index);
   }
-  // Remove it from TorrentsStartTime hash table
-  TorrentsStartTime.remove(hash);
-  TorrentsStartData.remove(hash);
+  // Remove it from ETAs hash tables
+  ETAstats.remove(hash);
+  ETAs.remove(hash);
   // Save fast resume data
   saveFastResumeAndRatioData(hash);
 }
@@ -314,9 +337,9 @@ bool bittorrent::pauseTorrent(QString hash) {
     paused_file.open(QIODevice::WriteOnly | QIODevice::Text);
     paused_file.close();
   }
-  // Remove it from TorrentsStartTime hash table
-  TorrentsStartTime.remove(hash);
-  TorrentsStartData.remove(hash);
+  // Remove it from ETAs hash tables
+  ETAstats.remove(hash);
+  ETAs.remove(hash);
   return change;
 }
 
@@ -325,9 +348,6 @@ bool bittorrent::resumeTorrent(QString hash) {
   bool success = false;
   QTorrentHandle h = getTorrentHandle(hash);
   if(h.is_valid() && h.is_paused()) {
-    // Save Addition DateTime
-    TorrentsStartData[hash] = h.total_payload_download();
-    TorrentsStartTime[hash] = QDateTime::currentDateTime();
     h.resume();
     success = true;
   }
@@ -519,7 +539,6 @@ void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bo
     // Display warning to tell user we can't decode the torrent file
     if(!from_url.isNull()) {
       emit invalidTorrent(from_url);
-      QFile::remove(file);
     }else{
       emit invalidTorrent(file);
     }
@@ -534,8 +553,6 @@ void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bo
     // Display warning to tell user we can't decode the torrent file
     if(!from_url.isNull()) {
       emit invalidTorrent(from_url);
-      qDebug("File path is: %s", file.toUtf8().data());
-      QFile::remove(file);
     }else{
       emit invalidTorrent(file);
     }
@@ -756,7 +773,7 @@ void bittorrent::loadFilesPriorities(QTorrentHandle &h) {
     if( priority < 0 || priority > 7) {
       priority = 1;
     }
-    qDebug("Setting piece piority to %d", priority);
+    //qDebug("Setting piece piority to %d", priority);
     v.push_back(priority);
   }
   h.prioritize_files(v);
@@ -1001,22 +1018,9 @@ void bittorrent::setGlobalRatio(float ratio) {
 // be automatically deleted
 void bittorrent::setDeleteRatio(float ratio) {
   if(ratio != -1 && ratio < 1.) ratio = 1.;
-  if(max_ratio == -1 && ratio != -1) {
-    Q_ASSERT(!BigRatioTimer);
-    BigRatioTimer = new QTimer(this);
-    connect(BigRatioTimer, SIGNAL(timeout()), this, SLOT(deleteBigRatios()));
-    BigRatioTimer->start(5000);
-  } else {
-    if(max_ratio != -1 && ratio == -1) {
-      delete BigRatioTimer;
-      BigRatioTimer = 0;
-    }
-  }
-  if(max_ratio != ratio) {
-    max_ratio = ratio;
-    qDebug("* Set deleteRatio to %.1f", max_ratio);
-    deleteBigRatios();
-  }
+  max_ratio = ratio;
+  qDebug("* Set deleteRatio to %.1f", max_ratio);
+  deleteBigRatios();
 }
 
 bool bittorrent::loadTrackerFile(QString hash) {
@@ -1171,10 +1175,6 @@ void bittorrent::readAlerts() {
           // Pause torrent
           pauseTorrent(hash);
           qDebug("%s was paused after checking", hash.toUtf8().data());
-        } else {
-          // Save Addition DateTime
-          TorrentsStartTime[hash] = QDateTime::currentDateTime();
-          TorrentsStartData[hash] = h.total_payload_download();
         }
         emit torrentFinishedChecking(hash);
       }

src/bittorrent.h

@@ -25,7 +25,6 @@
 #include <QList>
 #include <QPair>
 #include <QStringList>
-#include <QDateTime>
 
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
@@ -46,14 +45,14 @@ class bittorrent : public QObject{
     QTimer *timerScan;
     QTimer *timerAlerts;
     QTimer *fastResumeSaver;
-    QTimer *BigRatioTimer;
     bool DHTEnabled;
     downloadThread *downloader;
     QString defaultSavePath;
     QStringList torrentsToPauseAfterChecking;
-    QHash<QString, QDateTime> TorrentsStartTime;
-    QHash<QString, size_type> TorrentsStartData;
+    QHash<QString, QList<qlonglong> > ETAstats;
+    QHash<QString, qlonglong> ETAs;
     QHash<QString, QPair<size_type,size_type> > ratioData;
+    QTimer *ETARefresher;
     QHash<QString, QList<QPair<QString, QString> > > trackersErrors;
     deleteThread *deleter;
     QStringList finishedTorrents;
@@ -83,7 +82,7 @@ class bittorrent : public QObject{
     session_status getSessionStatus() const;
     int getListenPort() const;
     QStringList getTorrentsToPauseAfterChecking() const;
-    qlonglong getETA(QString hash) const;
+    long getETA(QString hash) const;
     float getRealRatio(QString hash) const;
     session* getSession() const;
     QList<QPair<QString, QString> > getTrackersErrors(QString hash) const;
@@ -109,6 +108,7 @@ class bittorrent : public QObject{
     void enableIPFilter(ip_filter filter);
     void disableIPFilter();
     void resumeUnfinishedTorrents();
+    void updateETAs();
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
     void saveDownloadUploadForTorrent(QString hash);

src/createtorrent_imp.cpp

@@ -36,7 +36,6 @@
 #include <libtorrent/file_pool.hpp>
 
 #include "createtorrent_imp.h"
-#include "misc.h"
 
 using namespace libtorrent;
 using namespace boost::filesystem;
@@ -121,13 +120,11 @@ void createtorrent::on_addURLSeed_button_clicked(){
 // Subfunction to add files to a torrent_info structure
 // Written by Arvid Norberg (libtorrent Author)
 void add_files(torrent_info& t, path const& p, path const& l){
-  qDebug("p: %s, l: %s, l.leaf(): %s", p.string().c_str(), l.string().c_str(), l.leaf().c_str());
   path f(p / l);
   if (is_directory(f)){
     for (directory_iterator i(f), end; i != end; ++i)
       add_files(t, p, l / i->leaf());
   }else{
-    qDebug("Adding %s", l.string().c_str());
     t.add_file(l, file_size(f));
   }
 }
@@ -144,8 +141,6 @@ QStringList createtorrent::allItems(QListWidget *list){
 // Main function that create a .torrent file
 void createtorrent::on_createButton_clicked(){
   QString input = textInputPath->text().trimmed();
-  if (input.endsWith(QDir::separator()))
-    input.chop(1);
   if(input.isEmpty()){
     QMessageBox::critical(0, tr("No input path set"), tr("Please type an input path first"));
     return;
@@ -166,8 +161,9 @@ void createtorrent::on_createButton_clicked(){
   try {
     boost::intrusive_ptr<torrent_info> t(new torrent_info);
     ofstream out(complete(path((const char*)destination.toUtf8())), std::ios_base::binary);
+    path full_path;
     // Adding files to the torrent
-    path full_path = complete(path(input.toUtf8().data()));
+    full_path = complete(path(input.toUtf8().data()));
     add_files(*t, full_path.branch_path(), full_path.leaf());
     // Set piece size
     int piece_size = getPieceSize();
@@ -204,14 +200,8 @@ void createtorrent::on_createButton_clicked(){
     entry e = t->create_torrent();
     libtorrent::bencode(std::ostream_iterator<char>(out), e);
     out.flush();
-    if(checkStartSeeding->isChecked()) {
-      // Create save path file
-      QFile savepath_file(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+misc::toQString(t->info_hash())+QString::fromUtf8(".savepath"));
-      savepath_file.open(QIODevice::WriteOnly | QIODevice::Text);
-      savepath_file.write(full_path.branch_path().string().c_str());
-      savepath_file.close();
+    if(checkStartSeeding->isChecked())
       emit torrent_to_seed(destination);
-    }
   }
   catch (std::exception& e){
     std::cerr << e.what() << "\n";

src/downloadThread.cpp

@@ -73,7 +73,7 @@ void subDownloadThread::run(){
     filePath = tmpfile->fileName();
   }
   delete tmpfile;
-  FILE *f = fopen(filePath.toUtf8().data(), "wb");
+  FILE *f = fopen(filePath.toUtf8().data(), "w");
   if(!f) {
     std::cerr << "couldn't open destination file" << "\n";
     return;
@@ -109,17 +109,8 @@ void subDownloadThread::run(){
         curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, (username+QString(":")+password).toUtf8().data());
       }
     }
-    // We have to define CURLOPT_WRITEFUNCTION or it will crash on windows
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
+    // TODO: define CURLOPT_WRITEFUNCTION or it will crash on windows
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, f);
-    // Verbose
-    // curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-    // No progress info (we don't use it)
-    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
-    // Redirections
-    curl_easy_setopt(curl, CURLOPT_AUTOREFERER, 1);
-    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
-    curl_easy_setopt(curl, CURLOPT_MAXREDIRS, -1);
     qDebug("Downloading %s", url.toUtf8().data());
     res = curl_easy_perform(curl);
     /* always cleanup */

src/downloadingTorrents.cpp

@@ -414,7 +414,7 @@ void DownloadingTorrents::updateDlList() {
           }else{
             DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalled.png"))), Qt::DecorationRole);
             DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
-            setRowColor(row, QApplication::palette().color(QPalette::WindowText));
+            setRowColor(row, QPalette::WindowText);
           }
           DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
           DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)h.download_payload_rate()));

src/downloadingTorrents.h

@@ -82,7 +82,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
 
   public slots:
     void updateDlList();
-    void setInfoBar(QString info, QColor color=QApplication::palette().color(QPalette::WindowText));
+    void setInfoBar(QString info, QColor color=QPalette::WindowText);
     void pauseTorrent(QString hash);
     void resumeTorrent(QString hash);
     void updateRatio();

src/engineSelectDlg.cpp

@@ -250,13 +250,11 @@ void engineSelectDlg::setRowColor(int row, QString color){
 bool engineSelectDlg::checkInstalled(QString plugin_name) const {
   QProcess nova;
   QStringList params;
-  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines";
-  nova.start("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   QByteArray result = nova.readAll();
-  result = result.replace("\r", "");
   result = result.replace("\n", "");
   QList<QByteArray> plugins_list = result.split(',');
   return plugins_list.contains(plugin_name.toUtf8());
@@ -282,13 +280,11 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) {
   QStringList params;
   // Ask nova core for the supported search engines
   QProcess nova;
-  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines";
-  nova.start("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   QByteArray result = nova.readAll();
-  result = result.replace("\r", "");
   result = result.replace("\n", "");
   qDebug("read: %s", result.data());
   QByteArray e;
@@ -299,13 +295,11 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) {
     installed_engines[en] = old_engines.value(en, true);
   }
   params.clear();
-  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines_infos";
-  nova.start("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   result = nova.readAll();
-  result = result.replace("\r", "");
   result = result.replace("\n", "");
   qDebug("read: %s", result.data());
   unsigned int i = 0;

src/misc.h

@@ -298,7 +298,7 @@ class misc : public QObject{
 
     // Take a number of seconds and return an user-friendly
     // time duration like "1d 2h 10m".
-    static QString userFriendlyDuration(qlonglong seconds) {
+    static QString userFriendlyDuration(const long int seconds) {
       if(seconds < 0) {
         return tr("Unknown");
       }

src/options.ui

@@ -794,10 +794,10 @@
                  <bool>false</bool>
                 </property>
                 <property name="text" >
-                 <string/>
+                 <string>0.0.0.0</string>
                 </property>
                 <property name="maxLength" >
-                 <number>75</number>
+                 <number>15</number>
                 </property>
                 <property name="echoMode" >
                  <enum>QLineEdit::Normal</enum>

src/qgnomelook.h

@@ -42,7 +42,7 @@ class QGnomeLookStyle : public QCleanlooksStyle {
               vertical = (pb2->orientation == Qt::Vertical);
             }
             if (!vertical) {
-              QPalette::ColorRole textRole = QPalette::WindowText;/*
+              QPalette::ColorRole textRole = QPalette::Dark;/*
               if ((pb->textAlignment & Qt::AlignCenter) && pb->textVisible
                    && ((qint64(pb->progress) - qint64(pb->minimum)) * 2 >= (qint64(pb->maximum) - qint64(pb->minimum)))) {
                 textRole = QPalette::HighlightedText;

src/searchEngine.cpp

@@ -28,7 +28,6 @@
 #include <QTemporaryFile>
 #include <QSystemTrayIcon>
 #include <iostream>
-#include <QTimer>
 
 #include "SearchListDelegate.h"
 #include "searchEngine.h"
@@ -80,9 +79,6 @@ SearchEngine::SearchEngine(bittorrent *BTSession, QSystemTrayIcon *myTrayIcon, b
   connect(searchProcess, SIGNAL(started()), this, SLOT(searchStarted()));
   connect(searchProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readSearchOutput()));
   connect(searchProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(searchFinished(int,QProcess::ExitStatus)));
-  searchTimeout = new QTimer(this);
-  searchTimeout->setSingleShot(true);
-  connect(searchTimeout, SIGNAL(timeout()), this, SLOT(on_stop_search_button_clicked()));
   // Check last enabled search engines
   loadEngineSettings();
   // Update nova.py search plugin if necessary
@@ -96,7 +92,6 @@ SearchEngine::~SearchEngine(){
   saveColWidthSearchList();
   searchProcess->kill();
   searchProcess->waitForFinished();
-  delete searchTimeout;
   delete searchProcess;
   delete searchCompleter;
   delete SearchListModel;
@@ -250,9 +245,6 @@ void SearchEngine::on_search_button_clicked(){
     searchProcess->kill();
     searchProcess->waitForFinished();
   }
-  if(searchTimeout->isActive()) {
-    searchTimeout->stop();
-  }
   QString pattern = search_pattern->text().trimmed();
   // No search pattern entered
   if(pattern.isEmpty()){
@@ -277,7 +269,7 @@ void SearchEngine::on_search_button_clicked(){
   QStringList params;
   QStringList engineNames;
   search_stopped = false;
-  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
+
   params << enabled_engines.join(",");
   params << pattern.split(" ");
   // Update SearchEngine widgets
@@ -286,8 +278,7 @@ void SearchEngine::on_search_button_clicked(){
   search_result_line_truncated.clear();
   results_lbl->setText(tr("Results")+" <i>(0)</i>:");
   // Launch search
-  searchProcess->start("python", params, QIODevice::ReadOnly);
-  searchTimeout->start(180000); // 3min
+  searchProcess->start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
 }
 
 void SearchEngine::searchStarted(){
@@ -318,7 +309,6 @@ void SearchEngine::downloadSelectedItem(const QModelIndex& index){
 // line to search results calling appendSearchResult().
 void SearchEngine::readSearchOutput(){
   QByteArray output = searchProcess->readAllStandardOutput();
-  output.replace("\r", "");
   QList<QByteArray> lines_list = output.split('\n');
   QByteArray line;
   if(!search_result_line_truncated.isEmpty()){
@@ -371,7 +361,7 @@ void SearchEngine::updateNova() {
   QStringList files = shipped_subDir.entryList();
   QString file;
   foreach(file, files){
-    QString shipped_file = shipped_subDir.path()+"/"+file;
+    QString shipped_file = shipped_subDir.path()+QDir::separator()+file;
     // Copy python classes
     if(file.endsWith(".py")) {
       if(misc::getPluginVersion(shipped_file) > misc::getPluginVersion(destDir+file) ) {
@@ -458,7 +448,6 @@ void SearchEngine::on_stop_search_button_clicked(){
   // Kill process
   searchProcess->terminate();
   search_stopped = true;
-  searchTimeout->stop();
 }
 
 // Clear search results list
@@ -466,13 +455,12 @@ void SearchEngine::on_clear_button_clicked(){
   // Kill process
   searchProcess->terminate();
   search_stopped = true;
-  searchTimeout->stop();
+
   searchResultsUrls.clear();
   SearchListModel->removeRows(0, SearchListModel->rowCount());
   // Disable clear & download buttons
   clear_button->setEnabled(false);
   download_button->setEnabled(false);
-  nb_search_results = 0;
   results_lbl->setText(tr("Results")+" <i>(0)</i>:");
   // focus on search pattern
   search_pattern->clear();

src/searchEngine.h

@@ -33,7 +33,6 @@ class SearchListDelegate;
 class bittorrent;
 class QSystemTrayIcon;
 class downloadThread;
-class QTimer;
 
 class SearchEngine : public QWidget, public Ui::search_engine{
   Q_OBJECT
@@ -55,7 +54,6 @@ class SearchEngine : public QWidget, public Ui::search_engine{
     bool systrayIntegration;
     downloadThread *downloader;
     QStringList enabled_engines;
-    QTimer *searchTimeout;
 
   public:
     SearchEngine(bittorrent *BTSession, QSystemTrayIcon *myTrayIcon, bool systrayIntegration);

src/search_engine/engines/btjunkie.py

@@ -1,4 +1,4 @@
-#VERSION: 1.12
+#VERSION: 1.10
 #AUTHORS: Fabien Devaux (fab@gnux.info)
 from novaprinter import prettyPrinter
 import urllib
@@ -10,11 +10,11 @@ class btjunkie(object):
 
 	def search(self, what):
 		i = 1
-		while True and i<11:
+		while True:
 			res = 0
 			dat = urllib.urlopen(self.url+'/search?q=%s&o=52&p=%d'%(what,i)).read().decode('utf8', 'replace')
 			# I know it's not very readable, but the SGML parser feels in pain
-			section_re = re.compile('(?s)href="http://dl.btjunkie.org/torrent/.*?<tr>')
+			section_re = re.compile('(?s)href="/torrent.*?<tr>')
 			torrent_re = re.compile('(?s)href="(?P<link>.*?[^"]+).*?'
 			'class="BlckUnd">(?P<name>.*?)</a>.*?'
 			'>(?P<size>\d+MB)</font>.*?'
@@ -27,9 +27,9 @@ class btjunkie(object):
 					torrent_infos = m.groupdict()
 					torrent_infos['name'] = re.sub('</?font.*?>', '', torrent_infos['name'])
 					torrent_infos['engine_url'] = self.url
-					#torrent_infos['link'] = self.url+torrent_infos['link']
+					torrent_infos['link'] = self.url+torrent_infos['link']
 					prettyPrinter(torrent_infos)
 					res = res + 1
 			if res == 0:
 				break
-			i = i + 1
+			i = i + 1

src/search_engine/engines/isohunt.py

@@ -1,4 +1,4 @@
-#VERSION: 1.01
+#VERSION: 1.00
 #AUTHORS: Gekko Dam Beer (gekko04@users.sourceforge.net)
 from novaprinter import prettyPrinter
 import sgmllib
@@ -67,7 +67,7 @@ class isohunt(object):
 
 	def search(self, what):
 		i = 1
-		while True and i<11:
+		while True:
 			results = []
 			parser = self.SimpleSGMLParser(results, self.url)
 			dat = urllib.urlopen(self.url+'/torrents.php?ihq=%s&ihp=%s'%(what,i)).read().decode('utf-8', 'replace')
@@ -75,4 +75,4 @@ class isohunt(object):
 			parser.close()
 			if len(results) <= 0:
 				break
-			i += 1
+			i += 1

src/search_engine/engines/mininova.py

@@ -1,4 +1,4 @@
-#VERSION: 1.12
+#VERSION: 1.11
 #AUTHORS: Fabien Devaux (fab@gnux.info)
 from novaprinter import prettyPrinter
 import urllib
@@ -29,7 +29,7 @@ class mininova(object):
 			else:
 				return ''.join([ get_text(n) for n in txt.childNodes])
 		page = 1
-		while True and page<11:
+		while True:
 			res = 0
 			dat = urllib.urlopen(self.url+'/search/%s/seeds/%d'%(what, page)).read().decode('utf-8', 'replace')
 			dat = re.sub("<a href=\"http://www.boardreader.com/index.php.*\"", "<a href=\"plop\"", dat)

src/search_engine/engines/piratebay.py

@@ -1,4 +1,4 @@
-#VERSION: 1.01
+#VERSION: 1.00
 #AUTHORS: Fabien Devaux (fab@gnux.info)
 from novaprinter import prettyPrinter
 import sgmllib
@@ -68,7 +68,7 @@ class piratebay(object):
 		ret = []
 		i = 0
 		order = 'se'
-		while True and i<11:
+		while True:
 			results = []
 			parser = self.SimpleSGMLParser(results, self.url)
 			dat = urllib.urlopen(self.url+'/search/%s/%u/0/0' % (what, i)).read()
@@ -76,4 +76,4 @@ class piratebay(object):
 			parser.close()
 			if len(results) <= 0:
 				break
-			i += 1
+			i += 1

src/search_engine/engines/torrentreactor.py

@@ -1,4 +1,4 @@
-#VERSION: 1.02
+#VERSION: 1.00
 #AUTHORS: Gekko Dam Beer (gekko04@users.sourceforge.net)
 from novaprinter import prettyPrinter
 import sgmllib
@@ -22,7 +22,9 @@ class torrentreactor(object):
 			if params['href'].startswith('http://dl.torrentreactor.net/download.php'):
 				self.current_item = {}
 				self.td_counter = 0
-				self.current_item['link'] = params['href'].strip()
+				equal = params['href'].find("=")
+				amp = params['href'].find("&", equal+1)
+				self.id = str(int(params['href'][equal+1:amp]))
 
 		def handle_data(self, data):
 			if self.td_counter == 0:
@@ -45,10 +47,11 @@ class torrentreactor(object):
 		def start_td(self,attr):
 			if isinstance(self.td_counter,int):
 				self.td_counter += 1
-				if self.td_counter > 3:
+				if self.td_counter > 7:
 					self.td_counter = None
 					# add item to results
 					if self.current_item:
+						self.current_item['link']='http://download.torrentreactor.net/download.php?id=%s&name=%s'%(self.id, urllib.quote(self.current_item['name']))
 						self.current_item['engine_url'] = self.url
 						if not self.current_item['seeds'].isdigit():
 							self.current_item['seeds'] = 0
@@ -64,13 +67,12 @@ class torrentreactor(object):
 
 	def search(self, what):
 		i = 0
-		while True and i<11:
+		while True:
 			results = []
 			parser = self.SimpleSGMLParser(results, self.url)
 			dat = urllib.urlopen(self.url+'/search.php?search=&words=%s&cid=&sid=&type=2&orderby=a.seeds&asc=0&skip=%s'%(what,(i*35))).read().decode('utf-8', 'replace')
-			#print "loading page: "+self.url+'/search.php?search=&words=%s&cid=&sid=&type=2&orderby=a.seeds&asc=0&skip=%s'%(what,(i*35))
 			parser.feed(dat)
 			parser.close()
 			if len(results) <= 0:
 				break
-			i += 1
+			i += 1

src/search_engine/engines/versions.txt

@@ -1,5 +1,5 @@
-isohunt: 1.01
-torrentreactor: 1.02
-btjunkie: 1.12
-mininova: 1.12
-piratebay: 1.01
+isohunt: 1.00
+torrentreactor: 1.00
+btjunkie: 1.10
+mininova: 1.11
+piratebay: 1.00

src/src.pro

@@ -11,7 +11,7 @@ TARGET = qbittorrent
 CONFIG += qt thread x11 network
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v1.0.0rc11\\\"
+DEFINES += VERSION=\\\"v1.0.0rc9\\\"
 DEFINES += VERSION_MAJOR=1
 DEFINES += VERSION_MINOR=0
 DEFINES += VERSION_BUGFIX=0

src/torrentAddition.h

@@ -125,7 +125,6 @@ class torrentAdditionDialog : public QDialog, private Ui_addTorrentDialog{
         // Display warning to tell user we can't decode the torrent file
         if(!from_url.isNull()){
           emit setInfoBarGUI(tr("Unable to decode torrent file:")+QString::fromUtf8(" '")+from_url+QString::fromUtf8("'"), QString::fromUtf8("red"));
-          QFile::remove(filePath);
         }else{
           emit setInfoBarGUI(tr("Unable to decode torrent file:")+QString::fromUtf8(" '")+filePath+QString::fromUtf8("'"), QString::fromUtf8("red"));
         }
@@ -143,11 +142,9 @@ class torrentAdditionDialog : public QDialog, private Ui_addTorrentDialog{
         // Display warning to tell user we can't decode the torrent file
         if(!from_url.isNull()){
           emit setInfoBarGUI(tr("Unable to decode torrent file:")+QString::fromUtf8(" '")+from_url+QString::fromUtf8("'"), QString::fromUtf8("red"));
-          QFile::remove(filePath);
         }else{
           emit setInfoBarGUI(tr("Unable to decode torrent file:")+QString::fromUtf8(" '")+filePath+QString::fromUtf8("'"), QString::fromUtf8("red"));
         }
-        qDebug("path is %s", filePath.toUtf8().data());
         emit setInfoBarGUI(tr("This file is either corrupted or this isn't a torrent."), QString::fromUtf8("red"));
         if(fromScanDir){
           // Remove .corrupt file in case it already exists