Tagged v2.4.0beta3 release

AUTHORS

@@ -12,7 +12,7 @@ Contributors:
 * Silvan Scherrer <silvan.scherrer@aroa.ch>
 
 Code from other projects:
-* files src/qtsingleapp/* src/lineedit/*
+* files src/qtsingleapp/*
   copyright: Nokia Corporation
   license: LGPL
 

Changelog

@@ -1,34 +1,9 @@
-* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.2
-    - BUGFIX: Fix display of torrent content in addition dialog
-    - BUGFIX: Really fix manual editing of save path in torrent addition dialog
-
-* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.1
-    - I18N: Updated Arabic translation
-    - I18N: Fixes to German translation
-    - BUGFIX: Save path can now be edited in torrent addition dialog
-    - BUGFIX: Fix save path encoding on non-utf8 systems
-    - BUGFIX: Fix saving to drive root on Windows
-    - BUGFIX: OGV can now be previewed
-    - BUGFIX: Maximum download limit is now 10MB/s
-    - BUGFIX: Fix 'download in scan dir' persistence
-    - BUGFIX: Add .torrent extension only when missing (torrent creator)
-    - BUGFIX: Fix possible issue with temporary download path persistence
-    - BUGFIX: Added support for | (OR) operator in RSS feed downloader
-    - BUGFIX: Fix Web UI for spanish users
-    - BUGFIX: Fix locale switching from Web UI
-    - BUGFIX: Use AND operator for torrentdownloads.net searches
-    - BUGFIX: Limit torrent addition dialog width to fit the screen
-    - COSMETIC: Fix progress bars style on Windows
-
-* Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
     - FEATURE: Added actions to "Move to top/bottom" of priority queue
     - FEATURE: Auto-Shutdown on downloads completion
     - FEATURE: Email notification on download completion
     - FEATURE: Added button to password-lock the UI
     - FEATURE: Added label-level Pause/Resume/Delete actions
-    - FEATURE: Torrents can now be filtered by name
-    - FEATURE: Run external program on torrent completion
-    - FEATURE: Detect executable updates in order to advise the user to restart
 
 * Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
     - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)

src/GUI.cpp

@@ -34,7 +34,6 @@
 #endif
 
 #include <QFileDialog>
-#include <QFileSystemWatcher>
 #include <QMessageBox>
 #include <QTimer>
 #include <QDesktopServices>
@@ -70,7 +69,6 @@
 #include "qmacapplication.h"
 void qt_mac_set_dock_menu(QMenu *menu);
 #endif
-#include "lineedit.h"
 
 using namespace libtorrent;
 
@@ -156,13 +154,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), for
   connect(transferList, SIGNAL(torrentStatusUpdate(uint,uint,uint,uint,uint)), this, SLOT(updateNbTorrents(uint,uint,uint,uint,uint)));
   vboxLayout->addWidget(tabs);
 
-  // Name filter
-  search_filter = new LineEdit();
-  QAction *separatorBFSearch = toolBar->insertSeparator(actionLock_qBittorrent);
-  toolBar->insertWidget(separatorBFSearch, search_filter);
-  search_filter->setFixedWidth(200);
-  connect(search_filter, SIGNAL(textChanged(QString)), transferList, SLOT(applyNameFilter(QString)));
-
   // Transfer list slots
   connect(actionStart, SIGNAL(triggered()), transferList, SLOT(startSelectedTorrents()));
   connect(actionStart_All, SIGNAL(triggered()), transferList, SLOT(startAllTorrents()));
@@ -221,11 +212,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), for
       showMinimized();
   }
 
-  // Start watching the executable for updates
-  executable_watcher = new QFileSystemWatcher();
-  connect(executable_watcher, SIGNAL(fileChanged(QString)), this, SLOT(notifyOfUpdate(QString)));
-  executable_watcher->addPath(qApp->applicationFilePath());
-
   // Resume unfinished torrents
   BTSession->startUpTorrents();
   // Add torrent given on command line
@@ -263,10 +249,7 @@ GUI::~GUI() {
   properties->saveSettings();
   disconnect(tabs, SIGNAL(currentChanged(int)), this, SLOT(tab_changed(int)));
   // Delete other GUI objects
-  if(executable_watcher)
-    delete executable_watcher;
   delete status_bar;
-  delete search_filter;
   delete transferList;
   delete guiUpdater;
   if(createTorrentDlg)
@@ -337,7 +320,6 @@ void GUI::on_actionLock_qBittorrent_triggered() {
   // Lock the interface
   ui_locked = true;
   Preferences::setUILocked(true);
-  myTrayIconMenu->setEnabled(false);
   hide();
 }
 
@@ -593,21 +575,12 @@ bool GUI::unlockUI() {
   if(real_pass_md5 == password_md5) {
     ui_locked = false;
     Preferences::setUILocked(false);
-    myTrayIconMenu->setEnabled(true);
     return true;
   }
   QMessageBox::warning(this, tr("Invalid password"), tr("The password is invalid"));
   return false;
 }
 
-void GUI::notifyOfUpdate(QString) {
-  // Show restart message
-  status_bar->showRestartRequired();
-  // Delete the executable watcher
-  delete executable_watcher;
-  executable_watcher = 0;
-}
-
 // Toggle Main window visibility
 void GUI::toggleVisibility(QSystemTrayIcon::ActivationReason e) {
   if(e == QSystemTrayIcon::Trigger || e == QSystemTrayIcon::DoubleClick) {
@@ -935,8 +908,6 @@ void GUI::loadPreferences(bool configure_session) {
     toolBar->setVisible(true);
     toolBar->layout()->setSpacing(7);
   } else {
-    // Clear search filter before hiding the top toolbar
-    search_filter->clear();
     toolBar->setVisible(false);
   }
   const uint new_refreshInterval = Preferences::getRefreshInterval();
@@ -1119,8 +1090,6 @@ QMenu* GUI::getTrayIconMenu() {
   myTrayIconMenu->addAction(actionPause_All);
   myTrayIconMenu->addSeparator();
   myTrayIconMenu->addAction(actionExit);
-  if(ui_locked)
-    myTrayIconMenu->setEnabled(false);
   return myTrayIconMenu;
 }
 

src/GUI.h

@@ -57,8 +57,6 @@ class about;
 class createtorrent;
 class downloadFromURL;
 class HidableTabWidget;
-class LineEdit;
-class QFileSystemWatcher;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -103,7 +101,6 @@ protected slots:
   void on_actionLock_qBittorrent_triggered();
   void defineUILockPassword();
   bool unlockUI();
-  void notifyOfUpdate(QString);
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;
@@ -137,7 +134,6 @@ protected:
   void displaySearchTab(bool enable);
 
 private:
-  QFileSystemWatcher *executable_watcher;
   // Bittorrent
   Bittorrent *BTSession;
   QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
@@ -159,7 +155,6 @@ private:
   bool displaySpeedInTitle;
   bool force_exit;
   bool ui_locked;
-  LineEdit *search_filter;
   // Keyboard shortcuts
   QShortcut *switchSearchShortcut;
   QShortcut *switchSearchShortcut2;

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.4.2
+Comment=V2.4.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[ar]=العميل Bittorrent

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.4.2</string>
+	<string>2.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/bittorrent.cpp

@@ -34,7 +34,6 @@
 #include <QNetworkInterface>
 #include <QHostAddress>
 #include <QNetworkAddressEntry>
-#include <QProcess>
 #include <stdlib.h>
 
 #include "smtp.h"
@@ -203,7 +202,7 @@ bool Bittorrent::isPexEnabled() const {
 }
 
 void Bittorrent::processBigRatios() {
-  if(ratio_limit < 0) return;
+  if(ratio_limit <= 0) return;
   qDebug("Process big ratios...");
   std::vector<torrent_handle> torrents = s->get_torrents();
   std::vector<torrent_handle>::iterator torrentIT;
@@ -833,7 +832,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
     qDebug("Resuming magnet URI: %s", qPrintable(hash));
     // Load metadata
     if(QFile::exists(torrentBackup.path()+QDir::separator()+hash+QString(".torrent")))
-      return addTorrent(torrentBackup.path()+QDir::separator()+hash+QString(".torrent"), false, QString(), true);
+      return addTorrent(torrentBackup.path()+QDir::separator()+hash+QString(".torrent"), false, false, true);
   } else {
     qDebug("Adding new magnet URI");
   }
@@ -867,13 +866,13 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
     qDebug("addMagnetURI: Temp folder is enabled.");
     qDebug("addTorrent::Temp folder is enabled.");
     QString torrent_tmp_path = defaultTempPath.replace("\\", "/");
-    p.save_path = torrent_tmp_path.toUtf8().constData();
+    p.save_path = torrent_tmp_path.toLocal8Bit().constData();
     // Check if save path exists, creating it otherwise
     if(!QDir(torrent_tmp_path).exists())
       QDir().mkpath(torrent_tmp_path);
     qDebug("addMagnetURI: using save_path: %s", qPrintable(torrent_tmp_path));
   } else {
-    p.save_path = savePath.toUtf8().constData();
+    p.save_path = savePath.toLocal8Bit().constData();
     // Check if save path exists, creating it otherwise
     if(!QDir(savePath).exists())
       QDir().mkpath(savePath);
@@ -1121,13 +1120,13 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
       if(!torrent_tmp_path.endsWith("/")) torrent_tmp_path += "/";
       torrent_tmp_path += root_folder;
     }
-    p.save_path = torrent_tmp_path.toUtf8().constData();
+    p.save_path = torrent_tmp_path.toLocal8Bit().constData();
     // Check if save path exists, creating it otherwise
     if(!QDir(torrent_tmp_path).exists())
       QDir().mkpath(torrent_tmp_path);
     qDebug("addTorrent: using save_path: %s", qPrintable(torrent_tmp_path));
   } else {
-    p.save_path = savePath.toUtf8().constData();
+    p.save_path = savePath.toLocal8Bit().constData();
     // Check if save path exists, creating it otherwise
     if(!QDir(savePath).exists())
       QDir().mkpath(savePath);
@@ -1530,7 +1529,7 @@ void Bittorrent::saveTempFastResumeData() {
   for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
     QTorrentHandle h = QTorrentHandle(*torrentIT);
     try {
-      if(!h.is_valid() || !h.has_metadata() /*|| h.is_seed() || h.is_paused()*/) continue;
+      if(!h.is_valid() || !h.has_metadata() || h.is_seed() || h.is_paused()) continue;
       if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking) continue;
       qDebug("Saving fastresume data for %s", qPrintable(h.name()));
       h.save_resume_data();
@@ -1838,7 +1837,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
   // Torrents will a ratio superior to the given value will
   // be automatically deleted
   void Bittorrent::setMaxRatio(float ratio) {
-    if(ratio < 0) ratio = -1.;
+    if(ratio <= 0) ratio = -1.;
     if(ratio_limit == -1 && ratio != -1) {
       Q_ASSERT(!BigRatioTimer);
       BigRatioTimer = new QTimer(this);
@@ -1969,32 +1968,6 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
       }
     }
   }
-
-  void Bittorrent::cleanUpAutoRunProcess(int) {
-    sender()->deleteLater();
-  }
-
-  void Bittorrent::autoRunExternalProgram(QTorrentHandle h, bool async) {
-    if(!h.is_valid()) return;
-    QString program = Preferences::getAutoRunProgram().trimmed();
-    if(program.isEmpty()) return;
-    // Replace %f by torrent path
-    QString torrent_path;
-    if(h.num_files() == 1)
-      torrent_path = h.firstFileSavePath();
-    else
-      torrent_path = h.save_path();
-    program.replace("%f", torrent_path);
-    QProcess *process = new QProcess;
-    if(async) {
-      connect(process, SIGNAL(finished(int)), this, SLOT(cleanUpAutoRunProcess(int)));
-      process->start(program);
-    } else {
-      process->execute(program);
-      delete process;
-    }
-  }
-
   void Bittorrent::sendNotificationEmail(QTorrentHandle h) {
     // Prepare mail content
     QString content = tr("Torrent name: %1").arg(h.name()) + "\n";
@@ -2067,15 +2040,11 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
           }
           qDebug("Received finished alert for %s", qPrintable(h.name()));
           if(!was_already_seeded) {
-            bool will_shutdown = Preferences::shutdownWhenDownloadsComplete() && !hasDownloadingTorrents();
-            // AutoRun program
-            if(Preferences::isAutoRunEnabled())
-              autoRunExternalProgram(h, will_shutdown);
             // Mail notification
             if(Preferences::isMailNotificationEnabled())
               sendNotificationEmail(h);
             // Auto-Shutdown
-            if(will_shutdown) {
+            if(Preferences::shutdownWhenDownloadsComplete() && !hasDownloadingTorrents()) {
               qDebug("Preparing for auto-shutdown because all downloads are complete!");
 #if LIBTORRENT_VERSION_MINOR < 15
               saveDHTEntry();
@@ -2357,13 +2326,13 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
       }
       else if (fastresume_rejected_alert* p = dynamic_cast<fastresume_rejected_alert*>(a.get())) {
         QTorrentHandle h(p->handle);
-        if(h.is_valid()) {
+        if(h.is_valid()){
           qDebug("/!\\ Fast resume failed for %s, reason: %s", qPrintable(h.name()), p->message().c_str());
 #if LIBTORRENT_VERSION_MINOR < 15
           QString msg = QString::fromLocal8Bit(p->message().c_str());
-          if(msg.contains("filesize", Qt::CaseInsensitive) && msg.contains("mismatch", Qt::CaseInsensitive) && TorrentPersistentData::isSeed(h.hash()) && h.has_missing_files()) {
+          if(msg.contains("filesize", Qt::CaseInsensitive) && msg.contains("mismatch", Qt::CaseInsensitive)) {
 #else
-            if(p->error.value() == 134 && TorrentPersistentData::isSeed(h.hash()) && h.has_missing_files()) {
+            if(p->error.value() == 134) {
 #endif
               const QString hash = h.hash();
               // Mismatching file size (files were probably moved
@@ -2490,10 +2459,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
         qDebug("getSavePath, got save_path from persistent data: %s", qPrintable(savePath));
       }
       // Clean path
-      savePath = savePath.replace("\\", "/");
       savePath = misc::expandPath(savePath);
-      if(!savePath.endsWith("/"))
-        savePath += "/";
       return savePath;
     }
 
@@ -2609,9 +2575,9 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
       filters << "*.torrent";
       const QStringList torrents_on_hd = torrentBackup.entryList(filters, QDir::Files, QDir::Unsorted);
       foreach(QString hash, torrents_on_hd) {
+        qDebug("found torrent with hash: %s on hard disk", qPrintable(hash));
         hash.chop(8); // remove trailing .torrent
         if(!known_torrents.contains(hash)) {
-          qDebug("found torrent with hash: %s on hard disk", qPrintable(hash));
           std::cerr << "ERROR Detected!!! Adding back torrent " << qPrintable(hash) << " which got lost for some reason." << std::endl;
           addTorrent(torrentBackup.path()+QDir::separator()+hash+".torrent", false, QString(), true);
         }

src/bittorrent.h

@@ -201,8 +201,6 @@ protected slots:
   void exportTorrentFiles(QString path);
   void saveTempFastResumeData();
   void sendNotificationEmail(QTorrentHandle h);
-  void autoRunExternalProgram(QTorrentHandle h, bool async=true);
-  void cleanUpAutoRunProcess(int);
 
 signals:
   void addedTorrent(QTorrentHandle& h);

src/createtorrent_imp.cpp

@@ -191,8 +191,7 @@ void createtorrent::on_createButton_clicked(){
   QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), last_path, tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
   if(!destination.isEmpty()) {
     settings.setValue("CreateTorrent/last_save_path", misc::removeLastPathPart(destination));
-    if(!destination.toUpper().endsWith(".TORRENT"))
-      destination += QString::fromUtf8(".torrent");
+    destination += QString::fromUtf8(".torrent");
   } else {
     return;
   }

src/eventmanager.cpp

@@ -38,7 +38,6 @@
 //#include "proplistdelegate.h"
 #include "torrentpersistentdata.h"
 #include <QDebug>
-#include <QTranslator>
 
 EventManager::EventManager(QObject *parent, Bittorrent *BTSession)
   : QObject(parent), BTSession(BTSession)
@@ -125,20 +124,8 @@ QList<QVariantMap> EventManager::getPropFilesInfo(QString hash) const {
 
 void EventManager::setGlobalPreferences(QVariantMap m) const {
   // UI
-  if(m.contains("locale")) {
-    QString locale = m["locale"].toString();
-    if(Preferences::getLocale() != locale) {
-      QTranslator *translator = new QTranslator;
-      if(translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)){
-        qDebug("%s locale recognized, using translation.", qPrintable(locale));
-      }else{
-        qDebug("%s locale unrecognized, using default (en_GB).", qPrintable(locale));
-      }
-      qApp->installTranslator(translator);
-    }
-
-    Preferences::setLocale(locale);
-  }
+  if(m.contains("locale"))
+    Preferences::setLocale(m["locale"].toString());
   // Downloads
   if(m.contains("save_path"))
     Preferences::setSavePath(m["save_path"].toString());
@@ -182,10 +169,6 @@ void EventManager::setGlobalPreferences(QVariantMap m) const {
     Preferences::setMailNotificationEmail(m["mail_notification_email"].toString());
   if(m.contains("mail_notification_smtp"))
     Preferences::setMailNotificationSMTP(m["mail_notification_smtp"].toString());
-  if(m.contains("autorun_enabled"))
-    Preferences::setAutoRunEnabled(m["autorun_enabled"].toBool());
-  if(m.contains("autorun_program"))
-    Preferences::setAutoRunProgram(m["autorun_program"].toString());
   if(m.contains("preallocate_all"))
     Preferences::preAllocateAllFiles(m["preallocate_all"].toBool());
   if(m.contains("queueing_enabled"))
@@ -291,8 +274,6 @@ QVariantMap EventManager::getGlobalPreferences() const {
   data["mail_notification_enabled"] = Preferences::isMailNotificationEnabled();
   data["mail_notification_email"] = Preferences::getMailNotificationEmail();
   data["mail_notification_smtp"] = Preferences::getMailNotificationSMTP();
-  data["autorun_enabled"] = Preferences::isAutoRunEnabled();
-  data["autorun_program"] = Preferences::getAutoRunProgram();
   data["preallocate_all"] = Preferences::preAllocateAllFiles();
   data["queueing_enabled"] = Preferences::isQueueingSystemEnabled();
   data["max_active_downloads"] = Preferences::getMaxActiveDownloads();

src/feeddownloader.h

@@ -105,7 +105,7 @@ public:
 
   QStringList getNotMatchingTokens() const {
     QString notmatching = this->value("not", "").toString();
-    return notmatching.split(QRegExp("[\\s|]"));
+    return notmatching.split(" ");
   }
 
   QString getNotMatchingTokens_str() const {

src/httpconnection.cpp

@@ -109,7 +109,7 @@ QString HttpConnection::translateDocument(QString data) {
   bool found = false;
   do {
     found = false;
-    QRegExp regex(QString::fromUtf8("_\\(([\\w\\s?!:\\/\\(\\),%µ&\\-\\.]+)\\)"));
+    QRegExp regex(QString::fromUtf8("_\\(([\\w\\s?!:\\/\\(\\),µ&\\-\\.]+)\\)"));
     i = regex.indexIn(data, i);
     if(i >= 0) {
       //qDebug("Found translatable string: %s", regex.cap(1).toUtf8().data());

src/json.h

@@ -132,7 +132,6 @@ namespace json {
           tmp += c;
         }
       }
-      if(!tmp.isEmpty()) couples << tmp;
       foreach(QString couple, couples) {
         QStringList parts = couple.split(":");
         if(parts.size() != 2) continue;