tagged v1.5.0beta3 release

- Updated search icon

AUTHORS

@@ -17,6 +17,11 @@ Images Authors:
   license: GPLv2
   url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
 
+* files: src/oxygen/*.png
+  copyright: Oxygen Icon Theme (KDE)
+  license: LGPL
+  url: http://www.oxygen-icons.org
+
 * files: src/Icons/flags/*.png
   copyright: Open Clip Art Library
   license: Creative Commons Public Domain Dedication

COPYING

@@ -1,3 +1,17 @@
+qBittorrent is licensed under the GNU General Public License version 2 with the
+addition of the following special exception:
+
+In addition, as a special exception, the copyright holders give permission to
+link this program with the OpenSSL project's "OpenSSL" library (or with
+modified versions of it that use the same license as the "OpenSSL" library),
+and distribute the linked executables. You must obey the GNU General Public
+License in all respects for all of the code used other than "OpenSSL".  If you
+modify file(s), you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+----------
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 

Changelog

@@ -1,3 +1,72 @@
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.5.0
+    - FEATURE: Added Magnet URI support
+    - FEATURE: Make use of torrent enclosure in RSS feeds for direct download
+    - FEATURE: Implemented a RSS feed downloader with filter support
+    - FEATURE: Save old RSS item to hard disk to remember them on start up
+    - FEATURE: Display free disk space in torrent addition dialog
+    - FEATURE: In torrent addition from URL, paste clipboard content if it contains an URL
+    - FEATURE: RSS feeds URLs can now be copied to clipboard
+    - FEATURE: RSS feeds can now be grouped into folders
+    - FEATURE: Added "Unread" item to RSS feed list to display all unread news
+    - FEATURE: If a torrent contains a torrent file, process downloaded torrent file too
+    - BUGFIX: torrent resume code rewrited
+    - COSMETIC: Redesigned RSS tab to improve usability
+
+* Sun Aug 21 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.1
+    - BUGFIX: Fix problems when changing save path (if using temporary download folder)
+    - BUGFIX: Display real save path instead of the temporary one in torrent properties
+    - BUGFIX: Catching invalid_handle exception to avoid rare crashes
+    - BUGFIX: Fixed popup menu position in RSS feeds list
+    - BUGFIX: Don't save RSS feed state if it could not be updated
+
+* Thu Aug 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
+    - FEATURE: Display swarm information in lists
+    - FEATURE: Allow to define temporary download folder
+    - FEATURE: Display total amount of uploaded data in finished list
+    - FEATURE: Resizing a column in a search results tab affects all tabs
+    - FEATURE: Search results tab columns are now remembered upon startup
+    - FEATURE: Added right click menu in search engine to clear completion history
+    - FEATURE: Allow to set a different port for DHT (UDP) than the one used for Bittorrent
+    - FEATURE: Updated spoofing code to avoid trackers ban
+    - BUGFIX: Provide more helpful explanation when an I/O error occured
+    - BUGFIX: Stop enforcing UTF-8 and use system locale instead
+    - COSMETIC: Redesigned program preferences
+    - COSMETIC: Updated icons set
+
+* Fri Jul 24 2009 - Christophe DUMEZ <chris@qbittorrent.org> - 1.3.5
+    - BUGFIX: Made IP filter parser more robust
+    - BUGFIX: Fixed torrent creation tool
+    - BUGFIX: Fixed possible overflow in progress calculation in arborescence.h
+    - BUGFIX: Save properties window size, position, columns width and restore them
+    - BUGFIX: Set a minimum default width for NAME column in properties
+    - BUGFIX: Remember visual indexes of columns in transfer lists
+
+* Sun Jul 12 2009 - Christophe DUMEZ <chris@qbittorrent.org> - v1.3.4
+    - BUGFIX: Fixed IP filter file parsing on 64bits
+    - BUGFIX: Suppressed QLayout: Attempting to add QLayout "" to properties "properties" warning message when opening a properties dialog
+    - BUGFIX: Fixed a little bug in search engine plugins helper file
+    - BUGFIX: Fixed compilation problems with Qt 4.3
+    - BUGFIX: Percentages no longer disapear with default cleanlooks style
+    - BUGFIX: Cleanly fixed popup menus position in lists (no more workarounds)
+    - BUGFIX: Fixed memory leak in search engine
+    - BUGFIX: Torrents with an infinite ratio are no longer affected by ratio_limit set in program preferences
+    - BUGFIX: Display a ratio of 0.0 if total_upload and total_download are both 0
+    - BUGFIX: Remove last separator in top tool bar
+    - BUGFIX: Tuned lists properties to make sure display is correct
+    - COSMETIC: Display date as well as time in log window
+
+* Sun Apr 5 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.3
+    - BUGFIX: Fixed Web UI torrent upload form
+    - BUGFIX: Fixed unicode support in search engine
+    - BUGFIX: Fixed search engine bug that prevented a torrent from appearing more than once among all tabs
+    - LICENSE: Added an exception to the license regarding OpenSSL.
+    - I18N: Updated Finnish translation
+
+* Sat Mar 7 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.2
+    - BUGFIX: Fix top toolbar disabling
+    - BUGFIX: Fix building with Qt 4.5
+    - BUGFIX: RSS items read status is now remembered upon restart
+
 * Mon Jan 26 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.1
     - BUGFIX: Torrents paused due to an I/O error were displayed as queued
     - BUGFIX: qBittorrent now prints backtrace in terminal when segfaulting

TODO

@@ -1,21 +1,2 @@
 See https://blueprints.launchpad.net/qbittorrent/
 
-// translations done in v1.3.0
-- Romanian
-- Russian
-- Hungarian
-- German
-- Chinese (traditional)
-- Chinese (simplified)
-- Italian
-- Swedish
-- Turkish
-- French
-- Slovak
-- Czech
-- Korean
-- Portuguese
-- Brazilian
-- Greek
-- Bulgarian
-- Finnish

configure

@@ -18,11 +18,6 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --with-libtorrent-inc=[path]            Path to libtorrent-rasterbar include
-                                         files
-  --with-libtorrent-lib=[path]            Path to libtorrent-rasterbar library
-                                         files
-  --with-libtorrent-static-lib=[path]     Path to libtorrent-rasterbar .a file
   --with-libboost-inc=[path]     Path to libboost include files
   --with-libcurl-inc=[path]      Path to libcurl include files
   --with-libcurl-lib=[path]      Path to libcurl library files
@@ -145,21 +140,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--with-libtorrent-inc=*)
-			QC_WITH_LIBTORRENT_INC=$optarg
-			shift
-			;;
-
-		--with-libtorrent-lib=*)
-			QC_WITH_LIBTORRENT_LIB=$optarg
-			shift
-			;;
-
-		--with-libtorrent-static-lib=*)
-			QC_WITH_LIBTORRENT_STATIC_LIB=$optarg
-			shift
-			;;
-
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -211,9 +191,6 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_WITH_LIBTORRENT_INC=$QC_WITH_LIBTORRENT_INC
-echo QC_WITH_LIBTORRENT_LIB=$QC_WITH_LIBTORRENT_LIB
-echo QC_WITH_LIBTORRENT_STATIC_LIB=$QC_WITH_LIBTORRENT_STATIC_LIB
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBCURL_INC=$QC_WITH_LIBCURL_INC
 echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB
@@ -346,70 +323,29 @@ public:
 /*
 -----BEGIN QCMOD-----
 name: libtorrent-rasterbar
-arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files
-arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files
-arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file
 -----END QCMOD-----
 */
+// see  Conf::findPkgConfig
 class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
-        	QString s;
+		QStringList incs;
-		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
+		QString req_ver = "0.14.0";
-		if(!s.isEmpty()) {
+		QString adv_ver = "0.14.4";
-			if(!conf->checkHeader(s, "libtorrent/magnet_uri.hpp")) {
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
-      			}
+		for(int n = 0; n < incs.count(); ++n)
-		}else{
+			conf->addIncludePath(incs[n]);
-			QStringList sl;
+		if(!libs.isEmpty())
-			sl << "/usr/include";
+			conf->addLib(libs);
-			sl << "/usr/local/include";
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-			bool found = false;
+			printf("\nWarning: libtorrent-rasterbar v%s was detected. Although it will compile and run, you will probably experience some bugs. Please consider updating to v%s!\n", version.toUtf8().data(), adv_ver.toUtf8().data());
-			foreach(s, sl){
-				if(conf->checkHeader(s, "libtorrent/magnet_uri.hpp")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) {
-				return false;
-          		}
-		}
-		conf->addIncludePath(s);
-		conf->addIncludePath(s+QDir::separator()+"libtorrent");
-
-		s = conf->getenv("QC_WITH_LIBTORRENT_STATIC_LIB");
-		if(!s.isEmpty() && QFile::exists(s) && s.endsWith(".a")){
-			conf->addLib(s);
-			return true;
-		}
-
-		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
-		if(!s.isEmpty()) {
-      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
-			        return false;
-			}
-      			conf->addLib(QString("-L") + s);
-		}else{
-			QStringList sl;
-			sl << "/usr/lib/";
-			sl << "/usr/lib64/";
-			sl << "/usr/local/lib/";
-			sl << "/usr/local/lib64/";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkLibrary(s, "torrent-rasterbar")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) return false;
-			conf->addLib(QString("-L") + s);
-		}
 		return true;
 	}
 };
@@ -1567,9 +1503,6 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_WITH_LIBTORRENT_INC
-export QC_WITH_LIBTORRENT_LIB
-export QC_WITH_LIBTORRENT_STATIC_LIB
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBCURL_INC
 export QC_WITH_LIBCURL_LIB

qcm/libmagick.qcm

@@ -64,14 +64,11 @@ public:
                          	return false;
 		}
 		conf->addLib(QString("-L") + s);
-		QProcess magickConfig;
+		QString out = "";
 		QStringList params;
                 params << "--libs";
-		magickConfig.start("Magick++-config", params, QIODevice::ReadOnly);
+		qconf->doCommand("Magick++-config", params, &out);
-		magickConfig.waitForStarted();
+		out = out.replace("\n", "");
-		magickConfig.waitForFinished();
-		QByteArray result = magickConfig.readAll();
-		result = result.replace("\n", "");
 		conf->addLib(result.data());
 		conf->addDefine("HAVE_MAGICK");
 		return true;

qcm/libtorrent-rasterbar.qcm

@@ -1,9 +1,6 @@
 /*
 -----BEGIN QCMOD-----
 name: libtorrent-rasterbar
-arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files
-arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files
-arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file
 -----END QCMOD-----
 */
 // see  Conf::findPkgConfig
@@ -11,61 +8,22 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
-        	QString s;
+		QStringList incs;
-		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
+		QString req_ver = "0.14.0";
-		if(!s.isEmpty()) {
+		QString adv_ver = "0.14.4";
-			if(!conf->checkHeader(s, "libtorrent/magnet_uri.hpp")) {
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
-      			}
+		for(int n = 0; n < incs.count(); ++n)
-		}else{
+			conf->addIncludePath(incs[n]);
-			QStringList sl;
+		if(!libs.isEmpty())
-			sl << "/usr/include";
+			conf->addLib(libs);
-			sl << "/usr/local/include";
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-			bool found = false;
+			printf("\nWarning: libtorrent-rasterbar v%s was detected. Although it will compile and run, you will probably experience some bugs. Please consider updating to v%s!\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
-			foreach(s, sl){
-				if(conf->checkHeader(s, "libtorrent/magnet_uri.hpp")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) {
-				return false;
-          		}
-		}
-		conf->addIncludePath(s);
-		conf->addIncludePath(s+QDir::separator()+"libtorrent");
-
-		s = conf->getenv("QC_WITH_LIBTORRENT_STATIC_LIB");
-		if(!s.isEmpty() && QFile::exists(s) && s.endsWith(".a")){
-			conf->addLib(s);
-			return true;
-		}
-
-		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
-		if(!s.isEmpty()) {
-      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
-			        return false;
-			}
-      			conf->addLib(QString("-L") + s);
-		}else{
-			QStringList sl;
-			sl << "/usr/lib/";
-			sl << "/usr/lib64/";
-			sl << "/usr/local/lib/";
-			sl << "/usr/local/lib64/";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkLibrary(s, "torrent-rasterbar")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) return false;
-			conf->addLib(QString("-L") + s);
-		}
 		return true;
 	}
 };

src/DLListDelegate.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 

src/FeedDownloader.h

@@ -0,0 +1,480 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#ifndef FEEDDOWNLOADER_H
+#define FEEDDOWNLOADER_H
+
+#include <QString>
+#include <QHash>
+#include <QSettings>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QRegExp>
+#include <QMenu>
+#include <QFile>
+#include <QDataStream>
+#include <QFileDialog>
+
+#include "bittorrent.h"
+#include "ui_FeedDownloader.h"
+
+class FeedFilter: public QHash<QString, QVariant> {
+private:
+  bool valid;
+public:
+  FeedFilter():valid(true) {}
+  FeedFilter(bool valid): valid(valid) {}
+  FeedFilter(QHash<QString, QVariant> filter): QHash<QString, QVariant>(filter), valid(true) {}
+
+  bool matches(QString s) {
+    QStringList match_tokens = getMatchingTokens();
+    foreach(const QString& token, match_tokens) {
+      if(token.isEmpty() || token == "")
+        continue;
+      QRegExp reg(token, Qt::CaseInsensitive);
+      if(reg.indexIn(s) < 0) return false;
+    }
+    // Checking not matching
+    QStringList notmatch_tokens = getNotMatchingTokens();
+    foreach(const QString& token, notmatch_tokens) {
+      if(token.isEmpty()) continue;
+      QRegExp reg(token, Qt::CaseInsensitive);
+      if(reg.indexIn(s) > -1) return false;
+    }
+    return true;
+  }
+
+  bool isValid() const {
+    return valid;
+  }
+
+  QStringList getMatchingTokens() const {
+    QString matches = this->value("matches", "").toString();
+    return matches.split(" ");
+  }
+
+  QString getMatchingTokens_str() const {
+    return this->value("matches", "").toString();
+  }
+
+  void setMatchingTokens(QString tokens) {
+    tokens = tokens.trimmed();
+    if(tokens.isEmpty())
+      (*this)["matches"] = "";
+    else
+      (*this)["matches"] = tokens;
+  }
+
+  QStringList getNotMatchingTokens() const {
+    QString notmatching = this->value("not", "").toString();
+    return notmatching.split(" ");
+  }
+
+  QString getNotMatchingTokens_str() const {
+    return this->value("not", "").toString();
+  }
+
+  void setNotMatchingTokens(QString tokens) {
+    (*this)["not"] = tokens.trimmed();
+  }
+
+  QString getSavePath() const {
+    return this->value("save_path", "").toString();
+  }
+
+  void setSavePath(QString save_path) {
+    (*this)["save_path"] = save_path;
+  }
+
+};
+
+class FeedFilters : public QHash<QString, QVariant> {
+
+private:
+  QString feed_url;
+
+public:
+  FeedFilters() {}
+  FeedFilters(QString feed_url, QHash<QString, QVariant> filters): QHash<QString, QVariant>(filters), feed_url(feed_url) {}
+
+  bool hasFilter(QString name) const {
+    return this->contains(name);
+  }
+
+  FeedFilter* matches(QString s) {
+    if(!isDownloadingEnabled()) return 0;
+    if(this->size() == 0) return new FeedFilter(false);
+    foreach(QVariant var_hash_filter, this->values()) {
+      QHash<QString, QVariant> hash_filter = var_hash_filter.toHash();
+      FeedFilter *filter = new FeedFilter(hash_filter);
+      if(filter->matches(s))
+        return filter;
+      else
+        delete filter;
+    }
+    return 0;
+  }
+
+  QStringList names() const {
+    return this->keys();
+  }
+
+  FeedFilter getFilter(QString name) const {
+    if(this->contains(name))
+      return FeedFilter(this->value(name).toHash());
+    return FeedFilter();
+  }
+
+  void setFilter(QString name, FeedFilter f) {
+    (*this)[name] = f;
+  }
+
+  bool isDownloadingEnabled() const {
+    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
+    QHash<QString, QVariant> feeds_w_downloader = qBTRSS.value("downloader_on", QHash<QString, QVariant>()).toHash();
+    return feeds_w_downloader.value(feed_url, false).toBool();
+  }
+
+  void setDownloadingEnabled(bool enabled) {
+    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
+    QHash<QString, QVariant> feeds_w_downloader = qBTRSS.value("downloader_on", QHash<QString, QVariant>()).toHash();
+    feeds_w_downloader[feed_url] = enabled;
+    qBTRSS.setValue("downloader_on", feeds_w_downloader);
+  }
+
+  static FeedFilters getFeedFilters(QString url) {
+    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
+    QHash<QString, QVariant> all_feeds_filters = qBTRSS.value("feed_filters", QHash<QString, QVariant>()).toHash();
+    return FeedFilters(url, all_feeds_filters.value(url, QHash<QString, QVariant>()).toHash());
+  }
+
+  void rename(QString old_name, QString new_name) {
+    Q_ASSERT(this->contains(old_name));
+    (*this)[new_name] = this->take(old_name);
+  }
+
+  bool serialize(QString path) {
+    QFile f(path);
+    if(f.open(QIODevice::WriteOnly)) {
+      QDataStream out(&f);
+      out.setVersion(QDataStream::Qt_4_3);
+      out << (QHash<QString, QVariant>)(*this);
+      f.close();
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  bool unserialize(QString path) {
+    QFile f(path);
+    if(f.open(QIODevice::ReadOnly)) {
+      QDataStream in(&f);
+      in.setVersion(QDataStream::Qt_4_3);
+      QHash<QString, QVariant> tmp;
+      in >> tmp;
+      qDebug("Unserialized %d filters", tmp.size());
+      foreach(const QString& key, tmp.keys()) {
+        (*this)[key] = tmp[key];
+      }
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  void save() {
+    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
+    QHash<QString, QVariant> all_feeds_filters = qBTRSS.value("feed_filters", QHash<QString, QVariant>()).toHash();
+    qDebug("Saving filters for feed: %s (%d filters)", feed_url.toLocal8Bit().data(), (*this).size());
+    all_feeds_filters[feed_url] = *this;
+    qBTRSS.setValue("feed_filters", all_feeds_filters);
+  }
+};
+
+class FeedDownloaderDlg : public QDialog, private Ui_FeedDownloader{
+  Q_OBJECT
+
+private:
+  QString feed_url;
+  QString feed_name;
+  FeedFilters filters;
+  bittorrent *BTSession;
+  QString selected_filter; // name
+
+public:
+  FeedDownloaderDlg(QWidget *parent, QString feed_url, QString feed_name, bittorrent* BTSession): QDialog(parent), feed_url(feed_url), feed_name(feed_name), BTSession(BTSession), selected_filter(QString::null){
+    setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    Q_ASSERT(!feed_name.isEmpty());
+    rssfeed_lbl->setText(feed_name);
+    filters = FeedFilters::getFeedFilters(feed_url);
+    // Connect Signals/Slots
+    connect(filtersList, SIGNAL(currentItemChanged(QListWidgetItem* , QListWidgetItem *)), this, SLOT(showFilterSettings(QListWidgetItem *)));
+    connect(filtersList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFiltersListMenu(const QPoint&)));
+    connect(actionAdd_filter, SIGNAL(triggered()), this, SLOT(addFilter()));
+    connect(actionRemove_filter, SIGNAL(triggered()), this, SLOT(deleteFilter()));
+    connect(actionRename_filter, SIGNAL(triggered()), this, SLOT(renameFilter()));
+    connect(del_button, SIGNAL(clicked(bool)), this, SLOT(deleteFilter()));
+    connect(add_button, SIGNAL(clicked(bool)), this, SLOT(addFilter()));
+    connect(enableDl_cb, SIGNAL(stateChanged(int)), this, SLOT(enableFilterBox(int)));
+    // Restore saved info
+    enableDl_cb->setChecked(filters.isDownloadingEnabled());
+    fillFiltersList();
+    if(filters.size() > 0) {
+      // Select first filter
+      filtersList->setCurrentItem(filtersList->item(0));
+      //showFilterSettings(filtersList->item(0));
+    }
+    // Show
+    show();
+  }
+
+  ~FeedDownloaderDlg() {
+    // Make sure we save everything
+    saveCurrentFilterSettings();
+    filters.save();
+  }
+
+protected slots:
+  void saveCurrentFilterSettings() {
+    if(!selected_filter.isEmpty()) {
+      FeedFilter filter = filters.getFilter(selected_filter);
+      filter.setMatchingTokens(match_line->text());
+      filter.setNotMatchingTokens(notmatch_line->text());
+      QString save_path = savepath_line->text().trimmed();
+      if(save_path.isEmpty())
+        save_path = BTSession->getDefaultSavePath();
+      filter.setSavePath(save_path);
+      // Save updated filter
+      filters.setFilter(selected_filter, filter);
+    }
+  }
+
+  void fillFiltersList() {
+    // Fill filter list
+    foreach(QString filter_name, filters.names()) {
+      new QListWidgetItem(filter_name, filtersList);
+    }
+  }
+
+  void displayFiltersListMenu(const QPoint&) {
+    QMenu myFiltersListMenu(this);
+    if(filtersList->selectedItems().size() > 0) {
+      myFiltersListMenu.addAction(actionRename_filter);
+      myFiltersListMenu.addAction(actionRemove_filter);
+    } else {
+      myFiltersListMenu.addAction(actionAdd_filter);
+    }
+    // Call menu
+    myFiltersListMenu.exec(QCursor::pos());
+  }
+
+  void showFilterSettings(QListWidgetItem *item) {
+    // First, save current filter settings
+    saveCurrentFilterSettings();
+    // Clear all fields
+    clearFields();
+    if(!item) {
+      qDebug("No new selected item");
+      return;
+    }
+    // Actually show filter settings
+    QString filter_name = item->text();
+    FeedFilter filter = filters.getFilter(filter_name);
+    filterSettingsBox->setEnabled(true);
+    match_line->setText(filter.getMatchingTokens_str());
+    if(match_line->text().trimmed().isEmpty()) {
+      match_line->setText(filter_name);
+    }
+    notmatch_line->setText(filter.getNotMatchingTokens_str());
+    QString save_path = filter.getSavePath();
+    if(save_path.isEmpty())
+      save_path = BTSession->getDefaultSavePath();
+    savepath_line->setText(save_path);
+    // Update selected filter
+    selected_filter = filter_name;
+  }
+
+  void deleteFilter() {
+    QList<QListWidgetItem *> items = filtersList->selectedItems();
+    if(items.size() == 1) {
+      QListWidgetItem * item = items.first();
+      filters.remove(item->text());
+      selected_filter = QString::null;
+      delete item;
+      // Reset Filter settings view
+      if(filters.size() == 0) {
+        clearFields();
+        filterSettingsBox->setEnabled(false);
+      }
+    }
+  }
+
+  void renameFilter() {
+    QList<QListWidgetItem *> items = filtersList->selectedItems();
+    if(items.size() == 1) {
+      QListWidgetItem *item = items.first();
+      QString current_name = item->text();
+      QString new_name;
+      bool validated = false;
+      do {
+        new_name = askFilterName(current_name);
+        if(new_name.isNull() || new_name == current_name) return;
+        if(!filters.hasFilter(new_name)) {
+          validated = true;
+        } else {
+          QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
+        }
+      }while(!validated);
+      // Rename the filter
+      filters.rename(current_name, new_name);
+      if(selected_filter == current_name)
+        selected_filter = new_name;
+      item->setText(new_name);
+    }
+  }
+
+  void enableFilterBox(int state) {
+    if(state == Qt::Checked) {
+      filtersBox->setEnabled(true);
+      filters.setDownloadingEnabled(true);
+    } else {
+      filtersBox->setEnabled(false);
+      filters.setDownloadingEnabled(false);
+    }
+  }
+
+  QString askFilterName(QString name=QString::null) {
+    QString name_prop;
+    if(name.isEmpty())
+      name_prop = tr("New filter");
+    else
+      name_prop = name;
+    QString new_name;
+    bool validated = false;
+    do {
+      bool ok;
+      new_name = QInputDialog::getText(this, tr("Please choose a name for this filter"), tr("Filter name:"), QLineEdit::Normal, name_prop, &ok);
+      if(!ok) {
+        return QString::null;
+      }
+      // Validate filter name
+      new_name = new_name.trimmed();
+      if(new_name.isEmpty()) {
+        // Cannot be left empty
+        QMessageBox::warning(0, tr("Invalid filter name"), tr("The filter name cannot be left empty."));
+      } else {
+        validated = true;
+      }
+    } while(!validated);
+    return new_name;
+  }
+
+  void addFilter() {
+    QString filter_name = QString::null;
+    bool validated = false;
+    do {
+      filter_name = askFilterName();
+      if(filter_name.isNull()) return;
+      if(filters.hasFilter(filter_name)) {
+        // Filter alread exists
+        QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
+      } else {
+        validated = true;
+      }
+    }while(!validated);
+    QListWidgetItem *it = new QListWidgetItem(filter_name, filtersList);
+    filtersList->setCurrentItem(it);
+    //showFilterSettings(it);
+  }
+
+  void clearFields() {
+    match_line->clear();
+    notmatch_line->clear();
+    savepath_line->clear();
+    test_res_lbl->setText("");
+    test_line->clear();
+  }
+
+  void on_testButton_clicked(bool) {
+    if(selected_filter.isEmpty()) return;
+    QString s = test_line->text().trimmed();
+    if(s.isEmpty()) {
+      QMessageBox::warning(0, tr("Filter testing error"), tr("Please specify a test torrent name."));
+      return;
+    }
+    // Get current filter
+    saveCurrentFilterSettings();
+    FeedFilter f = filters.getFilter(selected_filter);
+    if(f.matches(s))
+      test_res_lbl->setText("<b><font color=\"green\">"+tr("matches")+"</font></b>");
+    else
+      test_res_lbl->setText("<b><font color=\"red\">"+tr("does not match")+"</font></b>");
+  }
+
+  void on_importButton_clicked(bool) {
+    QString source = QFileDialog::getOpenFileName(0, tr("Select file to import"), QDir::homePath(),  tr("Filters Files")+QString::fromUtf8(" (*.filters)"));
+    if(source.isEmpty()) return;
+    if(filters.unserialize(source)) {
+      // Clean up first
+      clearFields();
+      filtersList->clear();
+      selected_filter = QString::null;
+      fillFiltersList();
+      if(filters.size() > 0)
+        filtersList->setCurrentItem(filtersList->item(0));
+      QMessageBox::information(0, tr("Import successful"), tr("Filters import was successful."));
+    } else {
+      QMessageBox::warning(0, tr("Import failure"), tr("Filters could not be imported due to an I/O error."));
+    }
+  }
+
+  void on_exportButton_clicked(bool) {
+    QString destination = QFileDialog::getSaveFileName(this, tr("Select destination file"), QDir::homePath(), tr("Filters Files")+QString::fromUtf8(" (*.filters)"));
+    if(destination.isEmpty()) return;
+    // Append file extension
+    if(!destination.endsWith(".filters"))
+      destination += ".filters";
+    if(QFile::exists(destination)) {
+      int ret = QMessageBox::question(0, tr("Overwriting confirmation"), tr("Are you sure you want to overwrite existing file?"), QMessageBox::Yes|QMessageBox::No);
+      if(ret != QMessageBox::Yes) return;
+    }
+    if(filters.serialize(destination))
+      QMessageBox::information(0, tr("Export successful"), tr("Filters export was successful."));
+    else
+      QMessageBox::warning(0, tr("Export failure"), tr("Filters could not be exported due to an I/O error."));
+  }
+
+};
+
+#endif // FEEDDOWNLOADER_H

src/FeedDownloader.ui

@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FeedDownloader</class>
+ <widget class="QDialog" name="FeedDownloader">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>737</width>
+    <height>415</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>RSS Feed downloader</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_7">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="font">
+        <font>
+         <pointsize>16</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>RSS feed:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="rssfeed_lbl">
+       <property name="font">
+        <font>
+         <pointsize>16</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Feed name</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="enableDl_cb">
+     <property name="text">
+      <string>Automatically download torrents from this feed</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="filtersBox">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Download filters</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLabel" name="label">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Filters:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QListWidget" name="filtersList">
+            <property name="contextMenuPolicy">
+             <enum>Qt::CustomContextMenu</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_5">
+            <item>
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="del_button">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="icon">
+               <iconset resource="icons.qrc">
+                <normaloff>:/Icons/oxygen/list-remove.png</normaloff>:/Icons/oxygen/list-remove.png</iconset>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_4">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>10</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="add_button">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="icon">
+               <iconset resource="icons.qrc">
+                <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="filterSettingsBox">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="autoFillBackground">
+           <bool>false</bool>
+          </property>
+          <property name="styleSheet">
+           <string/>
+          </property>
+          <property name="title">
+           <string>Filter settings</string>
+          </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_9">
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
+             <item>
+              <layout class="QVBoxLayout" name="verticalLayout_2">
+               <item>
+                <widget class="QLabel" name="label_3">
+                 <property name="font">
+                  <font>
+                   <weight>50</weight>
+                   <bold>false</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Matches:</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="label_4">
+                 <property name="font">
+                  <font>
+                   <weight>50</weight>
+                   <bold>false</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Does not match:</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="label_5">
+                 <property name="font">
+                  <font>
+                   <weight>50</weight>
+                   <bold>false</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Destination folder:</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QVBoxLayout" name="verticalLayout_4">
+               <item>
+                <widget class="QLineEdit" name="match_line">
+                 <property name="text">
+                  <string/>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLineEdit" name="notmatch_line"/>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="horizontalLayout_2">
+                 <item>
+                  <widget class="QLineEdit" name="savepath_line">
+                   <property name="minimumSize">
+                    <size>
+                     <width>300</width>
+                     <height>0</height>
+                    </size>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QToolButton" name="browse_button">
+                   <property name="font">
+                    <font>
+                     <weight>50</weight>
+                     <bold>false</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>...</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="testerBox">
+             <property name="title">
+              <string>Filter testing</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_8">
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_9">
+                <item>
+                 <layout class="QVBoxLayout" name="verticalLayout_5">
+                  <item>
+                   <widget class="QLabel" name="label_6">
+                    <property name="minimumSize">
+                     <size>
+                      <width>0</width>
+                      <height>28</height>
+                     </size>
+                    </property>
+                    <property name="font">
+                     <font>
+                      <weight>50</weight>
+                      <bold>false</bold>
+                     </font>
+                    </property>
+                    <property name="text">
+                     <string>Torrent title:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="label_7">
+                    <property name="font">
+                     <font>
+                      <weight>50</weight>
+                      <bold>false</bold>
+                     </font>
+                    </property>
+                    <property name="text">
+                     <string>Result:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QVBoxLayout" name="verticalLayout_6">
+                  <item>
+                   <layout class="QHBoxLayout" name="horizontalLayout_8">
+                    <item>
+                     <widget class="QLineEdit" name="test_line"/>
+                    </item>
+                    <item>
+                     <widget class="QPushButton" name="testButton">
+                      <property name="font">
+                       <font>
+                        <weight>50</weight>
+                        <bold>false</bold>
+                       </font>
+                      </property>
+                      <property name="text">
+                       <string>Test</string>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </item>
+                  <item>
+                   <layout class="QHBoxLayout" name="horizontalLayout_7">
+                    <item>
+                     <widget class="QLabel" name="test_res_lbl">
+                      <property name="font">
+                       <font>
+                        <weight>50</weight>
+                        <bold>false</bold>
+                       </font>
+                      </property>
+                      <property name="text">
+                       <string>      </string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <spacer name="horizontalSpacer_6">
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
+                      </property>
+                      <property name="sizeHint" stdset="0">
+                       <size>
+                        <width>40</width>
+                        <height>20</height>
+                       </size>
+                      </property>
+                     </spacer>
+                    </item>
+                   </layout>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>9</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_10">
+     <item>
+      <widget class="QPushButton" name="importButton">
+       <property name="text">
+        <string>Import...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="exportButton">
+       <property name="text">
+        <string>Export...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+  <action name="actionRename_filter">
+   <property name="icon">
+    <iconset resource="icons.qrc">
+     <normaloff>:/Icons/oxygen/edit_clear.png</normaloff>:/Icons/oxygen/edit_clear.png</iconset>
+   </property>
+   <property name="text">
+    <string>Rename filter</string>
+   </property>
+   <property name="toolTip">
+    <string>Rename filter</string>
+   </property>
+  </action>
+  <action name="actionRemove_filter">
+   <property name="icon">
+    <iconset resource="icons.qrc">
+     <normaloff>:/Icons/oxygen/list-remove.png</normaloff>:/Icons/oxygen/list-remove.png</iconset>
+   </property>
+   <property name="text">
+    <string>Remove filter</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove filter</string>
+   </property>
+  </action>
+  <action name="actionAdd_filter">
+   <property name="icon">
+    <iconset resource="icons.qrc">
+     <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
+   </property>
+   <property name="text">
+    <string>Add filter</string>
+   </property>
+  </action>
+ </widget>
+ <resources>
+  <include location="icons.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>FeedDownloader</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>FeedDownloader</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/FinishedListDelegate.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 
@@ -35,9 +44,13 @@
 #define F_NAME 0
 #define F_SIZE 1
 #define F_UPSPEED 2
-#define F_LEECH 3
+#define F_SWARM 3
-#define F_RATIO 4
+#define F_PEERS 4
-#define F_HASH 5
+#define F_UPLOAD 5
+#define F_RATIO 6
+#define F_HASH 7
+
+#define MAX_RATIO 100.
 
 class FinishedListDelegate: public QItemDelegate {
   Q_OBJECT
@@ -51,6 +64,7 @@ class FinishedListDelegate: public QItemDelegate {
       QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
       switch(index.column()){
         case F_SIZE:
+        case F_UPLOAD:
           QItemDelegate::drawBackground(painter, opt, index);
           QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
           break;
@@ -63,7 +77,7 @@ class FinishedListDelegate: public QItemDelegate {
         case F_RATIO:{
           QItemDelegate::drawBackground(painter, opt, index);
           double ratio = index.data().toDouble();
-          if(ratio > 100.)
+          if(ratio > MAX_RATIO)
             QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::fromUtf8("∞"));
           else
             QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));

src/FinishedTorrents.cpp

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 #include "FinishedTorrents.h"
@@ -37,13 +46,17 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   setupUi(this);
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
-  finishedListModel = new QStandardItemModel(0,6);
+  finishedListModel = new QStandardItemModel(0,8);
   finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
   finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
   finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed"));
-  finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
+  finishedListModel->setHeaderData(F_SWARM, Qt::Horizontal, tr("Seeds / Leechers"));
+  finishedListModel->setHeaderData(F_PEERS, Qt::Horizontal, tr("Connected peers"));
+  finishedListModel->setHeaderData(F_UPLOAD, Qt::Horizontal, tr("Total uploaded", "i.e: Total amount of uploaded data"));
   finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
   finishedList->setModel(finishedListModel);
+  finishedList->setRootIsDecorated(false);
+  finishedList->setAllColumnsShowFocus(true);
   loadHiddenColumns();
   // Hide hash column
   finishedList->hideColumn(F_HASH);
@@ -51,6 +64,8 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   if(!loadColWidthFinishedList()){
     finishedList->header()->resizeSection(0, 200);
   }
+  // Connect BTSession signals
+  connect(BTSession, SIGNAL(metadataReceived(QTorrentHandle&)), this, SLOT(updateMetadata(QTorrentHandle&)));
   // Make download list header clickable for sorting
   finishedList->header()->setClickable(true);
   finishedList->header()->setSortIndicatorShown(true);
@@ -66,6 +81,8 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
   actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
   actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
+  actionCopy_magnet_link->setIcon(QIcon(QString::fromUtf8(":/Icons/magnet.png")));
+
   connect(actionPause, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPause_triggered()));
   connect(actionStart, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionStart_triggered()));
   connect(actionDelete, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_triggered()));
@@ -75,11 +92,14 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   connect(actionBuy_it, SIGNAL(triggered()), (GUI*)parent, SLOT(goBuyPage()));
   connect(actionTorrent_Properties, SIGNAL(triggered()), this, SLOT(propertiesSelection()));
   connect(actionForce_recheck, SIGNAL(triggered()), this, SLOT(forceRecheck()));
+  connect(actionCopy_magnet_link, SIGNAL(triggered()), (GUI*)parent, SLOT(copyMagnetURI()));
 
   connect(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
   connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
   connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
-  connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
+  connect(actionHOSColSwarm, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSwarm()));
+  connect(actionHOSColPeers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPeers()));
+  connect(actionHOSColUpload, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpload()));
   connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
 }
 
@@ -106,7 +126,9 @@ void FinishedTorrents::addTorrent(QString hash){
   finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(h.name()));
   finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
   finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.));
-  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant("0"));
+  finishedListModel->setData(finishedListModel->index(row, F_SWARM), QVariant("-1/-1"));
+  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant("0"));
+  finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((qlonglong)h.all_time_upload()));
   finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
   finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
   if(h.is_paused()) {
@@ -165,6 +187,23 @@ bool FinishedTorrents::loadColWidthFinishedList(){
         finishedList->header()->resizeSection(i, width_list.at(i).toInt());
   }
   loadLastSortedColumn();
+  QVariantList visualIndexes = settings.value(QString::fromUtf8("FinishedListVisualIndexes"), QVariantList()).toList();
+  if(visualIndexes.size() != finishedListModel->columnCount()-1) {
+    qDebug("Corrupted values for download list columns sizes");
+    return false;
+  }
+  bool change = false;
+  do {
+    change = false;
+    for(int i=0;i<visualIndexes.size(); ++i) {
+      int new_visual_index = visualIndexes.at(finishedList->header()->logicalIndex(i)).toInt();
+      if(i != new_visual_index) {
+        qDebug("Moving column from %d to %d", finishedList->header()->logicalIndex(i), new_visual_index);
+        finishedList->header()->moveSection(i, new_visual_index);
+        change = true;
+      }
+    }
+  }while(change);
   qDebug("Finished list columns width loaded");
   return true;
 }
@@ -199,7 +238,7 @@ void FinishedTorrents::saveColWidthFinishedList() const{
     width_list = line.split(' ');
   }
   for(short i=0; i<nbColumns; ++i){
-    if(finishedList->columnWidth(i)<1 && width_list.size() == finishedListModel->columnCount()-1 && width_list.at(i).toInt()>=1) {
+    if(finishedList->columnWidth(i)<1 && width_list.size() == nbColumns && width_list.at(i).toInt()>=1) {
       // load the former width
       new_width_list << width_list.at(i);
     } else if(finishedList->columnWidth(i)>=1) { 
@@ -212,6 +251,11 @@ void FinishedTorrents::saveColWidthFinishedList() const{
     }
   }
   settings.setValue("FinishedListColsWidth", new_width_list.join(" "));
+  QVariantList visualIndexes;
+  for(int i=0; i<nbColumns; ++i) {
+    visualIndexes.append(finishedList->header()->visualIndex(i));
+  }
+  settings.setValue(QString::fromUtf8("FinishedListVisualIndexes"), visualIndexes);
   qDebug("Finished list columns width saved");
 }
 
@@ -227,7 +271,18 @@ void FinishedTorrents::on_actionSet_upload_limit_triggered(){
   new BandwidthAllocationDialog(this, true, BTSession, hashes);
 }
 
+void FinishedTorrents::updateMetadata(QTorrentHandle &h) {
+  QString hash = h.hash();
+  int row = getRowFromHash(hash);
+  if(row != -1) {
+    qDebug("Updating torrent metadata in download list");
+    finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(h.name()));
+    finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
+  }
+}
+
 void FinishedTorrents::updateTorrent(QTorrentHandle h) {
+    if(!h.is_valid()) return;
     QString hash = h.hash();
     int row = getRowFromHash(hash);
     if(row == -1){
@@ -236,22 +291,25 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
       row = getRowFromHash(hash);
     }
     Q_ASSERT(row != -1);
+    if(!finishedList->isColumnHidden(F_SWARM)) {
+      finishedListModel->setData(finishedListModel->index(row, F_SWARM), misc::toQString(h.num_complete())+QString("/")+misc::toQString(h.num_incomplete()));
+    }
     if(h.is_paused()) return;
     // Update queued torrent
     if(BTSession->isQueueingEnabled() && h.is_queued()) {
         if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
         } else {
             finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
         }
         // Reset upload speed and seeds/leech
         finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), 0.);
-        finishedListModel->setData(finishedListModel->index(row, F_LEECH), "0");
+        finishedListModel->setData(finishedListModel->index(row, F_PEERS), "0");
         setRowColor(row, QString::fromUtf8("grey"));
         return;
     }
     if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
       setRowColor(row, QString::fromUtf8("grey"));
       return;
     }
@@ -260,8 +318,11 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
     if(!finishedList->isColumnHidden(F_UPSPEED)) {
       finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)h.upload_payload_rate()));
     }
-    if(!finishedList->isColumnHidden(F_LEECH)) {
+    if(!finishedList->isColumnHidden(F_PEERS)) {
-      finishedListModel->setData(finishedListModel->index(row, F_LEECH), misc::toQString(h.num_peers() - h.num_seeds(), true));
+      finishedListModel->setData(finishedListModel->index(row, F_PEERS), misc::toQString(h.num_peers() - h.num_seeds(), true));
+    }
+    if(!finishedList->isColumnHidden(F_UPLOAD)) {
+      finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((double)h.all_time_upload()));
     }
     if(!finishedList->isColumnHidden(F_RATIO)) {
       finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
@@ -285,7 +346,7 @@ void FinishedTorrents::pauseTorrent(QString hash) {
     return;
   finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.0));
   finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
-  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant(QString::fromUtf8("0")));
+  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant(QString::fromUtf8("0")));
   setRowColor(row, QString::fromUtf8("red"));
 }
 
@@ -341,12 +402,13 @@ void FinishedTorrents::forceRecheck(){
       if(index.column() == F_NAME){
           QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
           QTorrentHandle h = BTSession->getTorrentHandle(hash);
+          qDebug("Forcing recheck for torrent %s", hash.toLocal8Bit().data());
           h.force_recheck();
       }
   }
 }
 
-void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
+void FinishedTorrents::displayFinishedListMenu(const QPoint&){
   QMenu myFinishedListMenu(this);
   // Enable/disable pause/start action given the DL state
   QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
@@ -387,11 +449,11 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
   myFinishedListMenu.addAction(actionOpen_destination_folder);
   myFinishedListMenu.addAction(actionTorrent_Properties);
   myFinishedListMenu.addSeparator();
+  myFinishedListMenu.addAction(actionCopy_magnet_link);
   myFinishedListMenu.addAction(actionBuy_it);
 
   // Call menu
-  // XXX: why mapToGlobal() is not enough?
+  myFinishedListMenu.exec(QCursor::pos());
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
 }
 
 
@@ -426,12 +488,12 @@ void FinishedTorrents::hideOrShowColumn(int index) {
     if(nbVisibleColumns <= 1) return;
     // User can hide the column, do it.
     finishedList->setColumnHidden(index, true);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
     --nbVisibleColumns;
   } else {
     // User want to display the column
     finishedList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
     ++nbVisibleColumns;
   }
   //resize all others non-hidden columns
@@ -454,8 +516,16 @@ void FinishedTorrents::hideOrShowColumnUpSpeed() {
   hideOrShowColumn(F_UPSPEED);
 }
 
-void FinishedTorrents::hideOrShowColumnLeechers() {
+void FinishedTorrents::hideOrShowColumnSwarm() {
-  hideOrShowColumn(F_LEECH);
+  hideOrShowColumn(F_SWARM);
+}
+
+void FinishedTorrents::hideOrShowColumnPeers() {
+  hideOrShowColumn(F_PEERS);
+}
+
+void FinishedTorrents::hideOrShowColumnUpload() {
+  hideOrShowColumn(F_UPLOAD);
 }
 
 void FinishedTorrents::hideOrShowColumnRatio() {
@@ -481,9 +551,9 @@ bool FinishedTorrents::loadHiddenColumns() {
   for(int i=0; i<finishedListModel->columnCount()-1; i++) {
     if(loaded && ishidden_list.at(i) == "0") {
       finishedList->setColumnHidden(i, true);
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
     } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
     }
   }
   return loaded;
@@ -517,8 +587,14 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
     case F_UPSPEED :
       return actionHOSColUpSpeed;
       break;
-    case F_LEECH :
+    case F_SWARM :
-      return actionHOSColLeechers;
+      return actionHOSColSwarm;
+      break;
+    case F_PEERS :
+      return actionHOSColPeers;
+      break;
+    case F_UPLOAD :
+      return actionHOSColUpload;
       break;
     case F_RATIO :
       return actionHOSColRatio;
@@ -542,6 +618,7 @@ void FinishedTorrents::toggleFinishedListSortOrder(int index) {
     case F_SIZE:
     case F_UPSPEED:
     case F_RATIO:
+    case F_UPLOAD:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:
@@ -566,6 +643,8 @@ void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
   switch(index) {
     case F_SIZE:
     case F_UPSPEED:
+    case F_UPLOAD:
+    case F_RATIO:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:

src/FinishedTorrents.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 
@@ -70,7 +79,9 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void hideOrShowColumnName();
     void hideOrShowColumnSize();
     void hideOrShowColumnUpSpeed();
-    void hideOrShowColumnLeechers();
+    void hideOrShowColumnSwarm();
+    void hideOrShowColumnPeers();
+    void hideOrShowColumnUpload();
     void hideOrShowColumnRatio();
     void forceRecheck();
 
@@ -82,6 +93,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void deleteTorrent(QString hash);
     void showPropertiesFromHash(QString hash);
     void loadLastSortedColumn();
+    void updateMetadata(QTorrentHandle &h);
 
   signals:
     void torrentMovedFromFinishedList(QString);

src/GUI.cpp

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 #include <QFileDialog>
@@ -25,6 +34,7 @@
 #include <QDesktopServices>
 #include <QStatusBar>
 #include <QFrame>
+#include <QClipboard>
 #ifdef QT_4_4
 #include <QLocalServer>
 #include <QLocalSocket>
@@ -58,6 +68,7 @@
 #include <stdlib.h>
 #include "console_imp.h"
 #include "httpserver.h"
+#include "torrentPersistentData.h"
 
 using namespace libtorrent;
 
@@ -90,14 +101,14 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
     qDebug("Info: System tray unavailable");
   }
   // Setting icons
-  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent32.png")));
+  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
   actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png")));
   actionExit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/exit.png")));
   actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png")));
   actionOptions->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/settings.png")));
   actionAbout->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/info.png")));
-  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent32.png")));
+  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
-  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/newmsg.png")));
+  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/bug.png")));
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
   actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
@@ -123,7 +134,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   options = new options_imp(this);
   connect(options, SIGNAL(status_changed(bool)), this, SLOT(OptionsSaved(bool)));
   BTSession = new bittorrent();
-  connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&)), this, SLOT(fullDiskError(QTorrentHandle&)));
+  connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&, QString)), this, SLOT(fullDiskError(QTorrentHandle&, QString)));
   connect(BTSession, SIGNAL(finishedTorrent(QTorrentHandle&)), this, SLOT(finishedTorrent(QTorrentHandle&)));
   connect(BTSession, SIGNAL(addedTorrent(QTorrentHandle&)), this, SLOT(addedTorrent(QTorrentHandle&)));
   connect(BTSession, SIGNAL(pausedTorrent(QTorrentHandle&)), this, SLOT(pausedTorrent(QTorrentHandle&)));
@@ -133,6 +144,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   connect(BTSession, SIGNAL(newDownloadedTorrent(QString, QString)), this, SLOT(processDownloadedFiles(QString, QString)));
   connect(BTSession, SIGNAL(downloadFromUrlFailure(QString, QString)), this, SLOT(handleDownloadFromUrlFailure(QString, QString)));
   connect(BTSession, SIGNAL(deletedTorrent(QString)), this, SLOT(deleteTorrent(QString)));
+  connect(BTSession, SIGNAL(torrentPaused(QTorrentHandle&)), this, SLOT(setPaused(QTorrentHandle&)));
   qDebug("create tabWidget");
   tabs = new QTabWidget();
   // Download torrents tab
@@ -151,7 +163,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   // Search engine tab
   searchEngine = new SearchEngine(BTSession, myTrayIcon, systrayIntegration);
   tabs->addTab(searchEngine, tr("Search"));
-  tabs->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/skin/search.png")));
+  tabs->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/oxygen/edit-find.png")));
   readSettings();
   // RSS Tab
   rssWidget = 0;
@@ -162,7 +174,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   // Configure BT session according to options
   configureSession(true);
   // Resume unfinished torrents
-  BTSession->resumeUnfinishedTorrents();
+  BTSession->startUpTorrents();
   downloadingTorrentTab->loadLastSortedColumn();
   finishedTorrentTab->loadLastSortedColumn();
   // Add torrent given on command line
@@ -240,6 +252,9 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
     if(!settings.value(QString::fromUtf8("Preferences/General/StartMinimized"), false).toBool()) {
       show();
     }
+    scrapeTimer = new QTimer(this);
+    connect(scrapeTimer, SIGNAL(timeout()), this, SLOT(scrapeTrackers()));
+    scrapeTimer->start(20000);
     qDebug("GUI Built");
   }
   
@@ -251,6 +266,8 @@ GUI::~GUI() {
     BTSession->saveDHTEntry();
     BTSession->saveSessionState();
     BTSession->saveFastResumeData();
+    scrapeTimer->stop();
+    delete scrapeTimer;
     delete dlSpeedLbl;
     delete upSpeedLbl;
     delete ratioLbl;
@@ -298,7 +315,7 @@ void GUI::displayRSSTab(bool enable) {
     if(enable) {
       // RSS tab
       if(rssWidget == 0) {
-      rssWidget = new RSSImp();
+        rssWidget = new RSSImp(BTSession);
         tabs->addTab(rssWidget, tr("RSS"));
         tabs->setTabIcon(3, QIcon(QString::fromUtf8(":/Icons/rss32.png")));
       }
@@ -310,6 +327,16 @@ void GUI::displayRSSTab(bool enable) {
     }
   }
   
+  void GUI::scrapeTrackers() {
+    std::vector<torrent_handle> torrents = BTSession->getTorrents();
+    std::vector<torrent_handle>::iterator torrentIT;
+    for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
+      QTorrentHandle h = QTorrentHandle(*torrentIT);
+      if(!h.is_valid()) continue;
+      h.scrape_tracker();
+    }
+  }
+  
   void GUI::updateRatio() {
     // Update ratio info
     float ratio = 1.;
@@ -354,7 +381,7 @@ void GUI::finishedTorrent(QTorrentHandle& h) const {
     qDebug("In GUI, a torrent has finished");
     QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
     bool show_msg = true;
-  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+h.hash()+".finished"))
+    if(TorrentPersistentData::isSeed(h.hash()))
       show_msg = false;
     QString fileName = h.name();
     bool useNotificationBalloons = settings.value(QString::fromUtf8("Preferences/General/NotificationBaloons"), true).toBool();
@@ -400,8 +427,8 @@ void GUI::checkedTorrent(QTorrentHandle& h) const {
       finishedTorrentTab->addTorrent(h.hash());
     } else {
       // Move torrent back to download list (if necessary)
-        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+h.hash()+".finished")) {
+      if(TorrentPersistentData::isSeed(h.hash())) {
-            QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+h.hash()+".finished");
+        TorrentPersistentData::saveSeedStatus(h);
         finishedTorrentTab->deleteTorrent(h.hash());
         downloadingTorrentTab->addTorrent(h.hash());
       }
@@ -409,23 +436,29 @@ void GUI::checkedTorrent(QTorrentHandle& h) const {
   }
   
   // Notification when disk is full
-void GUI::fullDiskError(QTorrentHandle& h) const {
+  void GUI::fullDiskError(QTorrentHandle& h, QString msg) const {
     QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
     bool useNotificationBalloons = settings.value(QString::fromUtf8("Preferences/General/NotificationBaloons"), true).toBool();
     if(systrayIntegration && useNotificationBalloons) {
-    myTrayIcon->showMessage(tr("I/O Error", "i.e: Input/Output Error"), tr("An error occured when trying to read or write %1. The disk is probably full, download has been paused", "e.g: An error occured when trying to read or write xxx.avi. The disk is probably full, download has been paused").arg(h.name()), QSystemTrayIcon::Critical, TIME_TRAY_BALLOON);
+      myTrayIcon->showMessage(tr("I/O Error", "i.e: Input/Output Error"), tr("An I/O error occured for torrent %1.\n Reason: %2", "e.g: An error occured for torrent xxx.avi.\n Reason: disk is full.").arg(h.name()).arg(msg), QSystemTrayIcon::Critical, TIME_TRAY_BALLOON);
     }
     // Download will be paused by libtorrent. Updating GUI information accordingly
     QString hash = h.hash();
-  qDebug("Full disk error, pausing torrent %s", hash.toUtf8().data());
+    qDebug("Full disk error, pausing torrent %s", hash.toLocal8Bit().data());
+    setPaused(h);
+    BTSession->addConsoleMessage(tr("An error occured (full disk?), '%1' paused.", "e.g: An error occured (full disk?), 'xxx.avi' paused.").arg(h.name()));
+  }
+  
+  void GUI::setPaused(QTorrentHandle &h) const {
+    if(!h.is_paused()) return;
+    qDebug("Marking torrent %s as paused", h.hash().toLocal8Bit().data());
     if(h.is_seed()) {
       // In finished list
       qDebug("Automatically paused torrent was in finished list");
-    finishedTorrentTab->pauseTorrent(hash);
+      finishedTorrentTab->pauseTorrent(h.hash());
     }else{
-    downloadingTorrentTab->pauseTorrent(hash);
+      downloadingTorrentTab->pauseTorrent(h.hash());
     }
-  BTSession->addConsoleMessage(tr("An error occured (full disk?), '%1' paused.", "e.g: An error occured (full disk?), 'xxx.avi' paused.").arg(h.name()));
   }
   
   void GUI::createKeyboardShortcuts() {
@@ -566,6 +599,28 @@ void GUI::openDestinationFolder() const {
     }
   }
 
+  void GUI::copyMagnetURI() const {
+    QStringList hashes;
+    switch(tabs->currentIndex()){
+    case 0:
+      hashes = downloadingTorrentTab->getSelectedTorrents();
+      break;
+    case 1:
+      hashes = finishedTorrentTab->getSelectedTorrents();
+      break;
+    default:
+      return;
+    }
+    QStringList magnet_uris;
+    foreach(QString hash, hashes) {
+      QTorrentHandle h = BTSession->getTorrentHandle(hash);
+      if(h.is_valid()) {
+        magnet_uris << misc::toQString(make_magnet_uri(h.get_torrent_info()));
+      }
+    }
+    qApp->clipboard()->setText(magnet_uris.join("\n"));
+  }
+  
   void GUI::goBuyPage() const {
     QStringList hashes;
     switch(tabs->currentIndex()){
@@ -661,7 +716,8 @@ void GUI::closeEvent(QCloseEvent *e) {
     bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool();
     if(!force_exit && systrayIntegration && goToSystrayOnExit && !this->isHidden()) {
       hide();
-    e->ignore();
+      //e->ignore();
+      e->accept();
       return;
     }
     if(settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool() && downloadingTorrentTab->getNbTorrentsInList()) {
@@ -720,8 +776,7 @@ void GUI::dropEvent(QDropEvent *event) {
     if(event->mimeData()->hasUrls()) {
       QList<QUrl> urls = event->mimeData()->urls();
       foreach(const QUrl &url, urls) {
-      QString tmp = url.toString();
+        QString tmp = url.toString().trimmed();
-      tmp.trimmed();
         if(!tmp.isEmpty())
           files << url.toString();
       }
@@ -733,11 +788,16 @@ void GUI::dropEvent(QDropEvent *event) {
     bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
     foreach(QString file, files) {
       file = file.trimmed().replace(QString::fromUtf8("file://"), QString::fromUtf8(""), Qt::CaseInsensitive);
-    qDebug("Dropped file %s on download list", file.toUtf8().data());
+      qDebug("Dropped file %s on download list", file.toLocal8Bit().data());
       if(file.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
         BTSession->downloadFromUrl(file);
         continue;
       }
+      if(file.startsWith("magnet:", Qt::CaseInsensitive)) {
+        // FIXME: Possibly skipped torrent addition dialog
+        BTSession->addMagnetUri(file);
+        continue;
+      }
       if(useTorrentAdditionDialog) {
         torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
         dialog->showLoad(file);
@@ -750,7 +810,7 @@ void GUI::dropEvent(QDropEvent *event) {
   // Decode if we accept drag 'n drop or not
   void GUI::dragEnterEvent(QDragEnterEvent *event) {
     foreach(const QString &mime, event->mimeData()->formats()){
-    qDebug("mimeData: %s", mime.toUtf8().data());
+      qDebug("mimeData: %s", mime.toLocal8Bit().data());
     }
     if (event->mimeData()->hasFormat(QString::fromUtf8("text/plain")) || event->mimeData()->hasFormat(QString::fromUtf8("text/uri-list"))) {
       event->acceptProposedAction();
@@ -851,7 +911,7 @@ void GUI::on_actionDelete_triggered() {
       inDownloadList = false;
       break;
     case 3: //RSSImp
-      rssWidget->on_delStream_button_clicked();
+      rssWidget->deleteSelectedItems();
       return;
     default:
       return;
@@ -895,6 +955,10 @@ void GUI::processParams(const QStringList& 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)) {
         BTSession->downloadFromUrl(param);
+      }else{
+        if(param.startsWith("magnet:", Qt::CaseInsensitive)) {
+          // FIXME: Possibily skipped torrent addition dialog
+          BTSession->addMagnetUri(param);
         } else {
           if(useTorrentAdditionDialog) {
             torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
@@ -905,6 +969,7 @@ void GUI::processParams(const QStringList& params) {
         }
       }
     }
+  }
   
   void GUI::addTorrent(QString path) {
     BTSession->addTorrent(path);
@@ -931,14 +996,12 @@ void GUI::configureSession(bool deleteOptions) {
       setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
     }
     displaySpeedInTitle = new_displaySpeedInTitle;
-  if(options->isToolbarDisplayed() != toolBar->isVisible()) {
     if(options->isToolbarDisplayed()) {
       toolBar->setVisible(true);
       toolBar->layout()->setSpacing(7);
     } else {
       toolBar->setVisible(false);
     }
-  }
     unsigned int new_refreshInterval = options->getRefreshInterval();
     if(refreshInterval != new_refreshInterval) {
       refreshInterval = new_refreshInterval;
@@ -947,6 +1010,11 @@ void GUI::configureSession(bool deleteOptions) {
     // Downloads
     // * Save path
     BTSession->setDefaultSavePath(options->getSavePath());
+    if(options->isTempPathEnabled()) {
+      BTSession->setDefaultTempPath(options->getTempPath());
+    } else {
+      BTSession->setDefaultTempPath(QString::null);
+    }
     BTSession->preAllocateAllFiles(options->preAllocateAllFiles());
     BTSession->startTorrentsInPause(options->addTorrentsInPause());
     // * Scan dir
@@ -962,7 +1030,7 @@ void GUI::configureSession(bool deleteOptions) {
     BTSession->setListeningPortsRange(options->getPorts());
     unsigned short new_listenPort = BTSession->getListenPort();
     if(new_listenPort != old_listenPort) {
-    BTSession->addConsoleMessage(tr("qBittorrent is bind to port: %1", "e.g: qBittorrent is bind to port: 1666").arg( misc::toQString(new_listenPort)));
+      BTSession->addConsoleMessage(tr("qBittorrent is bound to port: TCP/%1", "e.g: qBittorrent is bound to port: 6881").arg( misc::toQString(new_listenPort)));
     }
     // * Global download limit
     QPair<int, int> limits = options->getGlobalBandwidthLimits();
@@ -1051,9 +1119,12 @@ void GUI::configureSession(bool deleteOptions) {
     // * DHT
     if(options->isDHTEnabled()) {
       // Set DHT Port
-    BTSession->setDHTPort(new_listenPort);
+      BTSession->setDHTPort(options->getDHTPort());
       if(BTSession->enableDHT(true)) {
-      BTSession->addConsoleMessage(tr("DHT support [ON], port: %1").arg(new_listenPort), QString::fromUtf8("blue"));
+        int dht_port = new_listenPort;
+        if(options->getDHTPort())
+          dht_port = options->getDHTPort();
+        BTSession->addConsoleMessage(tr("DHT support [ON], port: UDP/%1").arg(dht_port), QString::fromUtf8("blue"));
       } else {
         BTSession->addConsoleMessage(tr("DHT support [OFF]"), QString::fromUtf8("red"));
       }
@@ -1163,11 +1234,11 @@ void GUI::configureSession(bool deleteOptions) {
       // 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());
+      snprintf(proxystr, 512, "http_proxy=%s", proxy_str.toLocal8Bit().data());
       putenv(proxystr);
 #else
-    qDebug("HTTP: proxy string: %s", proxy_str.toUtf8().data());
+      qDebug("HTTP: proxy string: %s", proxy_str.toLocal8Bit().data());
-    setenv("http_proxy", proxy_str.toUtf8().data(), 1);
+      setenv("http_proxy", proxy_str.toLocal8Bit().data(), 1);
 #endif
     } else {
       qDebug("Disabling search proxy");
@@ -1280,6 +1351,9 @@ void GUI::on_actionIncreasePriority_triggered() {
       BTSession->increaseDlTorrentPriority(hash);
     }
     updateLists();
+    // Update sorting if necessary
+    if(downloadingTorrentTab->isPriorityColumnSorted())
+      downloadingTorrentTab->sortDownloadList();
   }
   
   void GUI::on_actionDecreasePriority_triggered() {
@@ -1289,6 +1363,9 @@ void GUI::on_actionDecreasePriority_triggered() {
       BTSession->decreaseDlTorrentPriority(hash);
     }
     updateLists();
+    // Update sorting if necessary
+    if(downloadingTorrentTab->isPriorityColumnSorted())
+      downloadingTorrentTab->sortDownloadList();
   }
   
   // pause selected items in the list
@@ -1303,6 +1380,7 @@ void GUI::on_actionPause_triggered() {
     } else {
       hashes = finishedTorrentTab->getSelectedTorrents();
     }
+    qDebug("nb hashes: %d", hashes.size());
     foreach(const QString &hash, hashes) {
       QTorrentHandle h = BTSession->getTorrentHandle(hash);
       if(!h.is_paused()){
@@ -1390,6 +1468,7 @@ void GUI::updateLists(bool force) {
       for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
         QTorrentHandle h = QTorrentHandle(*torrentIT);
         if(!h.is_valid()) continue;
+        try {
           if(h.is_seed()) {
             // Update in finished list
             finishedTorrentTab->updateTorrent(h);
@@ -1398,9 +1477,12 @@ void GUI::updateLists(bool force) {
             if(downloadingTorrentTab->updateTorrent(h)) {
               // Torrent was added, we may need to remove it from finished tab
               finishedTorrentTab->deleteTorrent(h.hash());
-                    QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+h.hash()+".finished");
+              TorrentPersistentData::saveSeedStatus(h);
             }
           }
+        } catch(invalid_handle e) {
+          qDebug("Caught Invalid handle exception, lucky us.");
+        }
       }
     }
     if(displaySpeedInTitle) {
@@ -1460,8 +1542,14 @@ void GUI::checkConnectionStatus() {
  *                                                   *
  *****************************************************/
   
-void GUI::downloadFromURLList(const QStringList& urls) {
+  void GUI::downloadFromURLList(const QStringList& url_list) {
-  BTSession->downloadFromURLList(urls);
+    foreach(const QString url, url_list) {
+      if(url.startsWith("magnet:", Qt::CaseInsensitive)) {
+        BTSession->addMagnetUri(url);
+      } else {
+        BTSession->downloadFromUrl(url);
+      }
+    }
   }
   
   /*****************************************************
@@ -1494,10 +1582,10 @@ void GUI::createSystrayDelayed() {
   void GUI::createTrayIcon() {
     // Tray icon
 #ifdef Q_WS_WIN
-  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent16.png")), this);
+    myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent16.png")), this);
 #endif
 #ifndef Q_WS_WIN
-  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent22.png")), this);
+    myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")), this);
 #endif
     // Tray icon Menu
     myTrayIconMenu = new QMenu(this);
@@ -1579,3 +1667,4 @@ void GUI::on_actionDownload_from_URL_triggered() {
     downloadFromURL *downloadFromURLDialog = new downloadFromURL(this);
     connect(downloadFromURLDialog, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), BTSession, SLOT(downloadFromURLList(const QStringList&)));
   }
+  

src/GUI.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 
@@ -61,6 +70,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     // Bittorrent
     bittorrent *BTSession;
     QTimer *checkConnect;
+    QTimer *scrapeTimer;
     QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers;
     // GUI related
     QTabWidget *tabs;
@@ -130,9 +140,10 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void createTrayIcon();
     void updateUnfinishedTorrentNumber(unsigned int nb);
     void updateFinishedTorrentNumber(unsigned int nb);
-    void fullDiskError(QTorrentHandle& h) const;
+    void fullDiskError(QTorrentHandle& h, QString msg) const;
     void handleDownloadFromUrlFailure(QString, QString) const;
     void createSystrayDelayed();
+    void setPaused(QTorrentHandle &h) const;
     // Keyboard shortcuts
     void createKeyboardShortcuts();
     void displayDownTab() const;
@@ -168,6 +179,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     bool initWebUi(QString username, QString password, int port);
     void on_actionIncreasePriority_triggered();
     void on_actionDecreasePriority_triggered();
+    void scrapeTrackers();
     // Options slots
     void on_actionOptions_triggered();
     void OptionsSaved(bool deleteOptions);
@@ -180,6 +192,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void setTabText(int index, QString text) const;
     void openDestinationFolder() const;
     void goBuyPage() const;
+    void copyMagnetURI() const;
     void updateRatio();
 
   protected:

src/Icons/qBittorrent.desktop

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

src/MainWindow.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
@@ -24,7 +25,7 @@
      <x>0</x>
      <y>0</y>
      <width>914</width>
-     <height>26</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_Edit">
@@ -121,7 +122,6 @@
    <addaction name="actionIncreasePriority"/>
    <addaction name="separator"/>
    <addaction name="actionExit"/>
-   <addaction name="separator" />
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionOpen">
@@ -236,7 +236,8 @@
   </action>
   <action name="actionDecreasePriority">
    <property name="icon">
-    <iconset resource="icons.qrc" >:/Icons/skin/decrease.png</iconset>
+    <iconset resource="icons.qrc">
+     <normaloff>:/Icons/skin/decrease.png</normaloff>:/Icons/skin/decrease.png</iconset>
    </property>
    <property name="text">
     <string>Decrease priority</string>
@@ -247,7 +248,8 @@
   </action>
   <action name="actionIncreasePriority">
    <property name="icon">
-    <iconset resource="icons.qrc" >:/Icons/skin/increase.png</iconset>
+    <iconset resource="icons.qrc">
+     <normaloff>:/Icons/skin/increase.png</normaloff>:/Icons/skin/increase.png</iconset>
    </property>
    <property name="text">
     <string>Increase priority</string>
@@ -258,7 +260,8 @@
   </action>
   <action name="actionShow_console">
    <property name="icon">
-    <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+    <iconset resource="icons.qrc">
+     <normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
    </property>
    <property name="text">
     <string>Console</string>

src/PreviewListDelegate.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 

src/PropListDelegate.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 

src/SearchListDelegate.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 

src/SearchTab.cpp

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 
@@ -47,13 +56,14 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget()
     
     setLayout(box);
     // Set Search results list model
-    SearchListModel = new QStandardItemModel(0,5);
+    SearchListModel = new QStandardItemModel(0,6);
     SearchListModel->setHeaderData(SEARCH_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
     SearchListModel->setHeaderData(SEARCH_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
     SearchListModel->setHeaderData(SEARCH_SEEDERS, Qt::Horizontal, tr("Seeders", "i.e: Number of full sources"));
     SearchListModel->setHeaderData(SEARCH_LEECHERS, Qt::Horizontal, tr("Leechers", "i.e: Number of partial sources"));
     SearchListModel->setHeaderData(SEARCH_ENGINE, Qt::Horizontal, tr("Search engine"));
     resultsBrowser->setModel(SearchListModel);
+    resultsBrowser->hideColumn(URL_COLUMN); // Hide url column
     SearchDelegate = new SearchListDelegate();
     resultsBrowser->setItemDelegate(SearchDelegate);
     // Make search list header clickable for sorting
@@ -65,19 +75,36 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget()
     connect(resultsBrowser->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortSearchList(int)));
     
     // Load last columns width for search results list
-    if(!loadColWidthSearchList()){
+    if(!loadColWidthResultsList()){
       resultsBrowser->header()->resizeSection(0, 275);
     }
 }
 
-SearchTab::~SearchTab()
+SearchTab::~SearchTab() {
-{
-    saveColWidthSearchList();
     delete resultsBrowser;
     delete SearchListModel;
     delete SearchDelegate;
 }
 
+QHeaderView* SearchTab::header() const {
+  return resultsBrowser->header();
+}
+
+bool SearchTab::loadColWidthResultsList() {
+  QSettings settings("qBittorrent", "qBittorrent");
+  QString line = settings.value("SearchResultsColsWidth", QString()).toString();
+  if(line.isEmpty())
+    return false;
+  QStringList width_list = line.split(' ');
+  if(width_list.size() < SearchListModel->columnCount())
+    return false;
+  unsigned int listSize = width_list.size();
+  for(unsigned int i=0; i<listSize; ++i){
+        resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
+  }
+  return true;
+}
+
 QLabel* SearchTab::getCurrentLabel()
 {
     return results_lbl;
@@ -128,7 +155,7 @@ void SearchTab::sortSearchListInt(int index, Qt::SortOrder sortOrder){
   for(int row=0; row<lines.size(); ++row){
     SearchListModel->insertRow(SearchListModel->rowCount());
     int sourceRow = lines[row].first;
-    for(int col=0; col<5; ++col){
+    for(int col=0; col<6; ++col){
       SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col)));
       SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
     }
@@ -148,7 +175,7 @@ void SearchTab::sortSearchListString(int index, Qt::SortOrder sortOrder){
   for(int row=0; row<nbRows_old; ++row){
     SearchListModel->insertRow(SearchListModel->rowCount());
     int sourceRow = lines[row].first;
-    for(int col=0; col<5; ++col){
+    for(int col=0; col<6; ++col){
       SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col)));
       SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
     }
@@ -157,33 +184,3 @@ void SearchTab::sortSearchListString(int index, Qt::SortOrder sortOrder){
   SearchListModel->removeRows(0, nbRows_old);
 }
 
-// Save columns width in a file to remember them
-// (download list)
-void SearchTab::saveColWidthSearchList() const{
-  qDebug("Saving columns width in search list");
-  QSettings settings("qBittorrent", "qBittorrent");
-  QStringList width_list;
-  for(int i=0; i<SearchListModel->columnCount(); ++i){
-    width_list << misc::toQString(resultsBrowser->columnWidth(i));
-  }
-  settings.setValue("SearchListColsWidth", width_list.join(" "));
-  qDebug("Search list columns width saved");
-}
-
-// Load columns width in a file that were saved previously
-// (search list)
-bool SearchTab::loadColWidthSearchList(){
-  qDebug("Loading columns width for search list");
-  QSettings settings("qBittorrent", "qBittorrent");
-  QString line = settings.value("SearchListColsWidth", QString()).toString();
-  if(line.isEmpty())
-    return false;
-  QStringList width_list = line.split(' ');
-  if(width_list.size() != SearchListModel->columnCount())
-    return false;
-  for(int i=0; i<width_list.size(); ++i){
-        resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
-  }
-  qDebug("Search list columns width loaded");
-  return true;
-}

src/SearchTab.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 
@@ -24,9 +33,13 @@
 
 #include "ui_search.h"
 
+#define ENGINE_URL_COLUMN 4
+#define URL_COLUMN 5
+
 class SearchListDelegate;
 class SearchEngine;
 class QTreeView;
+class QHeaderView;
 class QStandardItemModel;
 
 class SearchTab : public QWidget, public Ui::search_engine
@@ -42,16 +55,17 @@ class SearchTab : public QWidget, public Ui::search_engine
     public:
         SearchTab(SearchEngine *parent);
         ~SearchTab();
-        bool loadColWidthSearchList();
+        bool loadColWidthResultsList();
         QLabel * getCurrentLabel();
         QStandardItemModel * getCurrentSearchListModel();
         QTreeView * getCurrentTreeView();
         void setRowColor(int row, QString color);
+        QHeaderView* header() const;
+
     protected slots:
         void sortSearchList(int index);
         void sortSearchListInt(int index, Qt::SortOrder sortOrder);
         void sortSearchListString(int index, Qt::SortOrder sortOrder);
-        void saveColWidthSearchList() const;
         
 };
 

src/TrackersAdditionDlg.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 

src/about.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <author>Christophe Dumez</author>
  <class>AboutDlg</class>
@@ -50,13 +51,13 @@
      <item>
       <widget class="QLabel" name="lb_name">
        <property name="sizePolicy">
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>&lt;h3>&lt;b>qBittorrent&lt;/b>&lt;/h3></string>
+        <string>&lt;h3&gt;&lt;b&gt;qBittorrent&lt;/b&gt;&lt;/h3&gt;</string>
        </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
@@ -68,7 +69,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -91,7 +92,7 @@
        <property name="geometry">
         <rect>
          <x>380</x>
-         <y>50</y>
+         <y>70</y>
          <width>94</width>
          <height>162</height>
         </rect>
@@ -104,29 +105,40 @@
        <property name="geometry">
         <rect>
          <x>0</x>
-         <y>40</y>
+         <y>30</y>
          <width>481</width>
          <height>102</height>
         </rect>
        </property>
        <property name="sizePolicy">
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>A bittorrent client using Qt4 and libtorrent, programmed in C++.&lt;br>
+        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;br>
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-Copyright © 2006 by Christophe Dumez&lt;br>
+p, li { white-space: pre-wrap; }
-&lt;br> &lt;u>Home Page:&lt;/u> &lt;i>http://www.qbittorrent.org&lt;/i>&lt;br></string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;A Bittorrent client programmed in C++, based on Qt4 toolkit &lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;and libtorrent-rasterbar. &lt;br /&gt;&lt;br /&gt;Copyright ©2006-2009 Christophe Dumez&lt;br /&gt;&lt;br /&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Home Page:&lt;/span&gt; &lt;a href=&quot;http://www.qbittorrent.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;http://www.qbittorrent.org&lt;/span&gt;&lt;/a&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
+       <property name="scaledContents">
+        <bool>true</bool>
+       </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
       </widget>
      </widget>
      <widget class="QWidget" name="tab3">
@@ -151,7 +163,7 @@ Copyright © 2006 by Christophe Dumez&lt;br>
             <property name="sizeType">
              <enum>QSizePolicy::Preferred</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>20</height>
@@ -282,7 +294,7 @@ Copyright © 2006 by Christophe Dumez&lt;br>
             <property name="sizeType">
              <enum>QSizePolicy::Preferred</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>20</height>
@@ -344,7 +356,7 @@ Copyright © 2006 by Christophe Dumez&lt;br>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>

src/about_imp.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 
@@ -37,8 +46,8 @@ class about : public QDialog, private Ui::AboutDlg{
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
-      logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/qbittorrent22.png")));
+      logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
-      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/mascot.png")));
+      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png")));
       //Title
       lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks
@@ -82,7 +91,19 @@ class about : public QDialog, private Ui::AboutDlg{
       te_translation->scrollToAnchor(QString::fromUtf8("top"));
       // License
       te_license->append(QString::fromUtf8("<a name='top'></a>"));
-      te_license->append(QString::fromUtf8("<center><b>GNU GENERAL PUBLIC LICENSE</b></center><br>\
+      te_license->append(QString::fromUtf8("qBittorrent is licensed under the GNU General Public License version 2 with the\
+addition of the following special exception:\
+<br><br>\
+<i>In addition, as a special exception, the copyright holders give permission to\
+link this program with the OpenSSL project\'s \"OpenSSL\" library (or with\
+modified versions of it that use the same license as the \"OpenSSL\" library),\
+and distribute the linked executables. You must obey the GNU General Public\
+License in all respects for all of the code used other than \"OpenSSL\".  If you\
+modify file(s), you may extend this exception to your version of the file(s),\
+but you are not obligated to do so. If you do not wish to do so, delete this\
+exception statement from your version.</i>\
+<br><br>\
+          <center><b>GNU GENERAL PUBLIC LICENSE</b></center><br>\
           <center>Version 2, June 1991</center><br>\
           Copyright (C) 1989, 1991 Free Software Foundation, Inc.<br>\
           51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA<br>\

src/addTorrentDialog.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>addTorrentDialog</class>
  <widget class="QDialog" name="addTorrentDialog">
@@ -6,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>511</width>
-    <height>441</height>
+    <height>461</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Torrent addition dialog</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="fileNameLbl">
      <property name="text">
@@ -45,16 +46,7 @@
      <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
+     <property name="margin">
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
       <number>0</number>
      </property>
      <item>
@@ -69,6 +61,75 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Torrent size:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lbl_torrent_size">
+       <property name="text">
+        <string>Unknown</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Free disk space:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lbl_disk_space">
+       <property name="text">
+        <string>Unknown</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_space_msg">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="QLabel" name="torrentContentLbl">
      <property name="font">
@@ -102,7 +163,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -129,7 +190,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -142,7 +203,7 @@
    <item>
     <widget class="QCheckBox" name="checkIncrementalDL">
      <property name="text">
-      <string>Download in correct order (slower but good for previewing)</string>
+      <string>Download in sequential order (slower but good for previewing)</string>
      </property>
     </widget>
    </item>
@@ -158,16 +219,7 @@
      <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
+     <property name="margin">
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
       <number>0</number>
      </property>
      <item>
@@ -175,7 +227,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -202,7 +254,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>

src/allocationDlg.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 

src/arborescence.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 
@@ -42,6 +51,8 @@ class torrent_file {
   torrent_file(torrent_file *parent, QString path, bool dir, size_type size=0, int index=-1, float progress=0., int priority=1): parent(parent), is_dir(dir), size(size), progress(progress), priority(priority), index(index){
     qDebug("created a file with index %d", index);
     rel_path = QDir::cleanPath(path);
+    Q_ASSERT(progress >= 0.);
+    Q_ASSERT(progress <= 1.);
     if(parent) {
       parent->updateProgress();
       parent->updatePriority(priority);
@@ -66,8 +77,8 @@ class torrent_file {
       progress = 0.;
       return;
     }
-      float wanted = 0.;
+    double wanted = 0.;
-      float done = 0.;
+    double done = 0.;
     foreach(const torrent_file *child, children) {
       wanted += child->getSize();
       done += child->getSize()*child->getProgress();
@@ -141,7 +152,7 @@ class torrent_file {
   bool removeFromFS(QString saveDir) const {
     QString full_path = saveDir + QDir::separator() + rel_path;
     if(!QFile::exists(full_path)) {
-        qDebug("%s does not exist, no need to remove it", full_path.toUtf8().data());
+      qDebug("%s does not exist, no need to remove it", full_path.toLocal8Bit().data());
       return true;
     }
     bool success = true;
@@ -151,11 +162,11 @@ class torrent_file {
       success = s && success;
     }
     if(is_dir) {
-        qDebug("trying to remove directory: %s", full_path.toUtf8().data());
+      qDebug("trying to remove directory: %s", full_path.toLocal8Bit().data());
       QDir dir(full_path);
       dir.rmdir(full_path);
     } else {
-        qDebug("trying to remove file: %s", full_path.toUtf8().data());
+      qDebug("trying to remove file: %s", full_path.toLocal8Bit().data());
       bool s = QFile::remove(full_path);
       success = s && success;
     }
@@ -188,7 +199,7 @@ class arborescence {
     Q_ASSERT(root->getSize() == t->total_size());
   }
 
-    arborescence(torrent_info const& t, std::vector<size_type> fp, int *prioritiesTab) {
+  arborescence(torrent_info const& t, std::vector<size_type> fp, std::vector<int> files_priority) {
     torrent_info::file_iterator fi = t.begin_files();
     if(t.num_files() > 1) {
       qDebug("More than one file in the torrent, setting a folder as root");
@@ -196,13 +207,13 @@ class arborescence {
     } else {
       // XXX: Will crash if there is no file in torrent
       qDebug("one file in the torrent, setting it as root with index 0");
-        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, ((float)fp[0])/t.file_at(0).size, prioritiesTab[0]);
+      root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, ((double)fp[0])/t.file_at(0).size, files_priority.at(0));
       return;
     }
     int i = 0;
     while(fi != t.end_files()) {
       QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
-        addFile(path, fi->size, i, ((float)fp[i])/t.file_at(i).size, prioritiesTab[i]);
+      addFile(path, fi->size, i, ((double)fp[i])/t.file_at(i).size, files_priority.at(i));
       fi++;
       ++i;
     }

src/bittorrent.cpp

@@ -16,11 +16,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 
 #include <QDir>
-#include <QTime>
+#include <QDateTime>
 #include <QString>
 #include <QTimer>
 #include <QFileSystemWatcher>
@@ -31,6 +40,7 @@
 #include "misc.h"
 #include "downloadThread.h"
 #include "filterParserThread.h"
+#include "torrentPersistentData.h"
 #include <libtorrent/extensions/ut_metadata.hpp>
 #include <libtorrent/extensions/ut_pex.hpp>
 #include <libtorrent/extensions/smart_ban.hpp>
@@ -43,16 +53,17 @@
 #include <boost/filesystem/exception.hpp>
 
 #define MAX_TRACKER_ERRORS 2
+#define MAX_RATIO 100.
 
 // Main constructor
-bittorrent::bittorrent() : DHTEnabled(false), preAllocateAll(false), addInPause(false), maxConnecsPerTorrent(500), maxUploadsPerTorrent(4), max_ratio(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), queueingEnabled(false) {
+bittorrent::bittorrent() : DHTEnabled(false), preAllocateAll(false), addInPause(false), maxConnecsPerTorrent(500), maxUploadsPerTorrent(4), ratio_limit(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), queueingEnabled(false) {
   // To avoid some exceptions
   fs::path::default_name_check(fs::no_check);
   // Creating bittorrent session
   // Check if we should spoof azureus
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   if(settings.value(QString::fromUtf8("AzureusSpoof"), false).toBool()) {
-    s = new session(fingerprint("AZ", 3, 0, 5, 2), 0);
+    s = new session(fingerprint("UT", 1, 8, 3, 0), 0);
   } else {
     s = new session(fingerprint("qB", VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, 0), 0);
   }
@@ -115,7 +126,7 @@ void bittorrent::preAllocateAllFiles(bool b) {
 }
 
 void bittorrent::deleteBigRatios() {
-  if(max_ratio == -1) return;
+  if(ratio_limit == -1) return;
   std::vector<torrent_handle> torrents = getTorrents();
   std::vector<torrent_handle>::iterator torrentIT;
   for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
@@ -123,7 +134,8 @@ void bittorrent::deleteBigRatios() {
     if(!h.is_valid()) continue;
     if(h.is_seed()) {
       QString hash = h.hash();
-            if(getRealRatio(hash) > max_ratio) {
+      float ratio = getRealRatio(hash);
+      if(ratio <= MAX_RATIO && ratio > ratio_limit) {
         QString fileName = h.name();
         addConsoleMessage(tr("%1 reached the maximum ratio you set.").arg(fileName));
         deleteTorrent(hash);
@@ -167,6 +179,12 @@ void bittorrent::setUploadLimit(QString hash, long val) {
 
 void bittorrent::handleDownloadFailure(QString url, QString reason) {
   emit downloadFromUrlFailure(url, reason);
+  // Clean up
+  int index = url_skippingDlg.indexOf(url);
+  if(index >= 0)
+    url_skippingDlg.removeAt(index);
+  if(savepath_fromurl.contains(url))
+    savepath_fromurl.remove(url);
 }
 
 void bittorrent::startTorrentsInPause(bool b) {
@@ -249,7 +267,7 @@ unsigned int bittorrent::getUnfinishedPausedTorrentsNb() const {
 // Delete a torrent from the session, given its hash
 // permanent = true means that the torrent will be removed from the hard-drive too
 void bittorrent::deleteTorrent(QString hash, bool permanent) {
-  qDebug("Deleting torrent with hash: %s", hash.toUtf8().data());
+  qDebug("Deleting torrent with hash: %s", hash.toLocal8Bit().data());
   QTorrentHandle h = getTorrentHandle(hash);
   if(!h.is_valid()) {
     qDebug("/!\\ Error: Invalid handle");
@@ -270,6 +288,7 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) {
   foreach(const QString &file, files) {
     torrentBackup.remove(file);
   }
+  TorrentPersistentData::deletePersistentData(hash);
   // Remove tracker errors
   trackersErrors.remove(hash);
   if(permanent)
@@ -322,18 +341,14 @@ void bittorrent::resumeTorrent(QString hash) {
 }
 
 void bittorrent::loadWebSeeds(QString hash) {
-  QFile urlseeds_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".urlseeds");
+  QVariantList url_seeds = TorrentPersistentData::getUrlSeeds(hash);
-  if(!urlseeds_file.open(QIODevice::ReadOnly | QIODevice::Text)) return;
-  QByteArray urlseeds_lines = urlseeds_file.readAll();
-  urlseeds_file.close();
-  QList<QByteArray> url_seeds = urlseeds_lines.split('\n');
   QTorrentHandle h = getTorrentHandle(hash);
   // First remove from the torrent the url seeds that were deleted
   // in a previous session
   QStringList seeds_to_delete;
   QStringList existing_seeds = h.url_seeds();
   foreach(const QString &existing_seed, existing_seeds) {
-    if(!url_seeds.contains(existing_seed.toUtf8())) {
+    if(!url_seeds.contains(existing_seed.toLocal8Bit())) {
       seeds_to_delete << existing_seed;
     }
   }
@@ -341,7 +356,8 @@ void bittorrent::loadWebSeeds(QString hash) {
     h.remove_url_seed(existing_seed);
   }
   // Add the ones that were added in a previous session
-  foreach(const QByteArray &url_seed, url_seeds) {
+  foreach(const QVariant &var_url_seed, url_seeds) {
+    QString url_seed = var_url_seed.toString();
     if(!url_seed.isEmpty()) {
       // XXX: Should we check if it is already in the list before adding it
       // or is libtorrent clever enough to know
@@ -350,18 +366,136 @@ void bittorrent::loadWebSeeds(QString hash) {
   }
 }
 
+QTorrentHandle bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
+  QTorrentHandle h;
+  QString hash = misc::magnetUriToHash(magnet_uri);
+  if(hash.isEmpty()) {
+    addConsoleMessage(tr("'%1' is not a valid magnet URI.").arg(magnet_uri));
+    return h;
+  }
+  if(resumed) {
+    qDebug("Resuming magnet URI: %s", hash.toLocal8Bit().data());
+  } else {
+    qDebug("Adding new magnet URI");
+  }
+
+  bool fastResume=false;
+  Q_ASSERT(magnet_uri.startsWith("magnet:"));
+  QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
+  // Checking if BT_backup Dir exists
+  // create it if it is not
+  if(! torrentBackup.exists()) {
+    if(! torrentBackup.mkpath(torrentBackup.path())) {
+      std::cerr << "Couldn't create the directory: '" << torrentBackup.path().toLocal8Bit().data() << "'\n";
+      exit(1);
+    }
+  }
+
+  // Check if torrent is already in download list
+  if(s->find_torrent(sha1_hash(hash.toLocal8Bit().data())).is_valid()) {
+    qDebug("/!\\ Torrent is already in download list");
+    // Update info Bar
+    addConsoleMessage(tr("'%1' is already in download list.", "e.g: 'xxx.avi' is already in download list.").arg(magnet_uri));
+    return h;
+  }
+
+  add_torrent_params p;
+  //Getting fast resume data if existing
+  std::vector<char> buf;
+  if(resumed) {
+    qDebug("Trying to load fastresume data: %s", (torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toLocal8Bit().data());
+    if (load_file((torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toLocal8Bit().data(), buf) == 0) {
+      fastResume = true;
+      p.resume_data = &buf;
+      qDebug("Successfuly loaded");
+    }
+  }
+  QString savePath = getSavePath(hash);
+  qDebug("addMagnetURI: using save_path: %s", savePath.toLocal8Bit().data());
+  if(defaultTempPath.isEmpty() || (resumed && TorrentPersistentData::isSeed(hash))) {
+    p.save_path = savePath.toLocal8Bit().data();
+  } else {
+    p.save_path = defaultTempPath.toLocal8Bit().data();
+  }
+  // Preallocate all?
+  if(preAllocateAll)
+    p.storage_mode = storage_mode_allocate;
+  else
+    p.storage_mode = storage_mode_sparse;
+  // Start in pause
+  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
+  try {
+    h =  QTorrentHandle(add_magnet_uri(*s, magnet_uri.toStdString(), p));
+  }catch(std::exception e){
+    qDebug("Error: %s", e.what());
+  }
+  // Check if it worked
+  if(!h.is_valid()) {
+    // No need to keep on, it failed.
+    qDebug("/!\\ Error: Invalid handle");
+    return h;
+  }
+  Q_ASSERT(h.hash() == hash);
+  // Connections limit per torrent
+  h.set_max_connections(maxConnecsPerTorrent);
+  // Uploads limit per torrent
+  h.set_max_uploads(maxUploadsPerTorrent);
+  // Load filtered files
+  if(resumed) {
+    // Load custom url seeds
+    loadWebSeeds(hash);
+    // Load speed limit from hard drive
+    loadTorrentSpeedLimits(hash);
+    // Load trackers
+    loadTrackerFile(hash);
+    // XXX: only when resuming because torrentAddition dialog is not supported yet
+    loadFilesPriorities(h);
+  } else {
+    // Sequential download
+    if(TorrentTempData::hasTempData(hash)) {
+      qDebug("addMagnetUri: Setting download as sequential (from tmp data)");
+      h.set_sequential_download(TorrentTempData::isSequential(hash));
+    }
+    // Save persistent data for new torrent
+    Q_ASSERT(h.is_valid());
+    qDebug("addMagnetUri: hash: %s", h.hash().toLocal8Bit().data());
+    TorrentPersistentData::saveTorrentPersistentData(h, true);
+    qDebug("Persistent data saved");
+    // Save save_path
+    if(!defaultTempPath.isEmpty()) {
+      qDebug("addMagnetUri: Saving save_path in persistent data: %s", savePath.toLocal8Bit().data());
+      TorrentPersistentData::saveSavePath(hash, savePath);
+    }
+  }
+  if(!addInPause && !fastResume) {
+    // Start torrent because it was added in paused state
+    h.resume();
+  }
+  // Send torrent addition signal
+  if(fastResume)
+    addConsoleMessage(tr("'%1' resumed. (fast resume)", "'/home/y/xxx.torrent' was resumed. (fast resume)").arg(magnet_uri));
+  else
+    addConsoleMessage(tr("'%1' added to download list.", "'/home/y/xxx.torrent' was added to download list.").arg(magnet_uri));
+  emit addedTorrent(h);
+  return h;
+}
+
 // Add a torrent to the bittorrent session
-QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bool) {
+QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bool resumed) {
   QTorrentHandle h;
   bool fastResume=false;
   QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
-  QString file, dest_file;
+  QString file, dest_file, hash;
+  boost::intrusive_ptr<torrent_info> t;
 
   // Checking if BT_backup Dir exists
   // create it if it is not
   if(! torrentBackup.exists()) {
     if(! torrentBackup.mkpath(torrentBackup.path())) {
-      std::cerr << "Couldn't create the directory: '" << torrentBackup.path().toUtf8().data() << "'\n";
+      std::cerr << "Couldn't create the directory: '" << torrentBackup.path().toLocal8Bit().data() << "'\n";
       exit(1);
     }
   }
@@ -371,11 +505,11 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
     return h;
   }
   Q_ASSERT(!file.startsWith("http://", Qt::CaseInsensitive) && !file.startsWith("https://", Qt::CaseInsensitive) && !file.startsWith("ftp://", Qt::CaseInsensitive));
-  qDebug("Adding %s to download list", file.toUtf8().data());
+
-  boost::intrusive_ptr<torrent_info> t;
+  qDebug("Adding %s to download list", file.toLocal8Bit().data());
   try {
     // Getting torrent file informations
-      t = new torrent_info(file.toUtf8().data());
+    t = new torrent_info(file.toLocal8Bit().data());
   } catch(std::exception&) {
     if(!from_url.isNull()) {
       addConsoleMessage(tr("Unable to decode torrent file: '%1'", "e.g: Unable to decode torrent file: '/home/y/xxx.torrent'").arg(from_url), QString::fromUtf8("red"));
@@ -394,14 +528,8 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   }
   qDebug(" -> Hash: %s", misc::toString(t->info_hash()).c_str());
   qDebug(" -> Name: %s", t->name().c_str());
-  QString hash = misc::toQString(t->info_hash());
+  hash = misc::toQString(t->info_hash());
-  if(file.startsWith(torrentBackup.path())) {
+
-      QFileInfo fi(file);
-      QString old_hash = fi.baseName();
-      if(old_hash != hash){
-          qDebug("* ERROR: Strange, hash changed from %s to %s", old_hash.toUtf8().data(), hash.toUtf8().data());
-      }
-  }
   // Check if torrent is already in download list
   if(s->find_torrent(t->info_hash()).is_valid()) {
     qDebug("/!\\ Torrent is already in download list");
@@ -425,21 +553,27 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   add_torrent_params p;
   //Getting fast resume data if existing
   std::vector<char> buf;
-  qDebug("Trying to load fastresume data: %s", (torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toUtf8().data());
+  if(resumed) {
-  if (load_file((torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toUtf8().data(), buf) == 0) {
+    qDebug("Trying to load fastresume data: %s", (torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toLocal8Bit().data());
+    if (load_file((torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toLocal8Bit().data(), buf) == 0) {
       fastResume = true;
       p.resume_data = &buf;
       qDebug("Successfuly loaded");
     }
-  QString savePath = getSavePath(hash);
-  // Save save_path to hard drive
-  QFile savepath_file(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+hash+QString::fromUtf8(".savepath"));
-  if(!savepath_file.exists()) {
-      savepath_file.open(QIODevice::WriteOnly | QIODevice::Text);
-      savepath_file.write(savePath.toUtf8());
-      savepath_file.close();
   }
-  p.save_path = savePath.toUtf8().data();
+  QString savePath;
+  if(!from_url.isEmpty() && savepath_fromurl.contains(from_url)) {
+    // Enforcing the save path defined before URL download (from RSS for example)
+    savePath = savepath_fromurl.take(from_url);
+  } else {
+    savePath = getSavePath(hash);
+  }
+  qDebug("addTorrent: using save_path: %s", savePath.toLocal8Bit().data());
+  if(defaultTempPath.isEmpty() || (resumed && TorrentPersistentData::isSeed(hash))) {
+    p.save_path = savePath.toLocal8Bit().data();
+  } else {
+    p.save_path = defaultTempPath.toLocal8Bit().data();
+  }
   p.ti = t;
   // Preallocate all?
   if(preAllocateAll)
@@ -470,16 +604,26 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   h.set_max_uploads(maxUploadsPerTorrent);
   // Load filtered files
   loadFilesPriorities(h);
+  if(resumed) {
     // Load custom url seeds
     loadWebSeeds(hash);
     // Load speed limit from hard drive
     loadTorrentSpeedLimits(hash);
     // Load trackers
-  bool loaded_trackers = loadTrackerFile(hash);
-  // Doing this to order trackers well
-  if(!loaded_trackers) {
-      saveTrackerFile(hash);
     loadTrackerFile(hash);
+  } else {
+    // Sequential download
+    if(TorrentTempData::hasTempData(hash)) {
+      qDebug("addTorrent: Setting download as sequential (from tmp data)");
+      h.set_sequential_download(TorrentTempData::isSequential(hash));
+    }
+    // Save persistent data for new torrent
+    TorrentPersistentData::saveTorrentPersistentData(h);
+    // Save save_path
+    if(!defaultTempPath.isEmpty()) {
+      qDebug("addTorrent: Saving save_path in persistent data: %s", savePath.toLocal8Bit().data());
+      TorrentPersistentData::saveSavePath(hash, savePath);
+    }
   }
   QString newFile = torrentBackup.path() + QDir::separator() + hash + ".torrent";
   if(file != newFile) {
@@ -489,11 +633,6 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
     // Copy it to torrentBackup directory
     QFile::copy(file, newFile);
   }
-  // Incremental download
-  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".incremental")) {
-      qDebug("Incremental download enabled for %s", t->name().c_str());
-      h.set_sequential_download(true);
-  }
   if(!addInPause && !fastResume) {
     // Start torrent because it was added in paused state
     h.resume();
@@ -520,27 +659,17 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   return h;
 }
 
-// Check in .priorities file if the user filtered files
+// Check if the user filtered files in this torrent.
-// in this torrent.
 bool bittorrent::has_filtered_files(QString hash) const{
-  QFile pieces_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".priorities");
+  QVariantList files_priority = TorrentPersistentData::getFilesPriority(hash);
-  // Read saved file
+  foreach(QVariant var_prio, files_priority) {
-  if(!pieces_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    int priority = var_prio.toInt();
-    return false;
-  }
-  QByteArray pieces_text = pieces_file.readAll();
-  pieces_file.close();
-  QList<QByteArray> pieces_priorities_list = pieces_text.split('\n');
-  unsigned int listSize = pieces_priorities_list.size();
-  for(unsigned int i=0; i<listSize-1; ++i) {
-    int priority = pieces_priorities_list.at(i).toInt();
     if( priority < 0 || priority > 7) {
       priority = 1;
     }
-    if(!priority) {
+    if(!priority)
       return true;
   }
-  }
   return false;
 }
 
@@ -633,7 +762,7 @@ void bittorrent::enableLSD(bool b) {
 }
 
 void bittorrent::loadSessionState() {
-    boost::filesystem::ifstream ses_state_file((misc::qBittorrentPath()+QString::fromUtf8("ses_state")).toUtf8().data()
+  boost::filesystem::ifstream ses_state_file((misc::qBittorrentPath()+QString::fromUtf8("ses_state")).toLocal8Bit().data()
                                              , std::ios_base::binary);
   ses_state_file.unsetf(std::ios_base::skipws);
   s->load_state(bdecode(
@@ -644,7 +773,7 @@ void bittorrent::loadSessionState() {
 void bittorrent::saveSessionState() {
   qDebug("Saving session state to disk...");
   entry session_state = s->state();
-    boost::filesystem::ofstream out((misc::qBittorrentPath()+QString::fromUtf8("ses_state")).toUtf8().data()
+  boost::filesystem::ofstream out((misc::qBittorrentPath()+QString::fromUtf8("ses_state")).toLocal8Bit().data()
                                   , std::ios_base::binary);
   out.unsetf(std::ios_base::skipws);
   bencode(std::ostream_iterator<char>(out), session_state);
@@ -657,7 +786,7 @@ bool bittorrent::enableDHT(bool b) {
       entry dht_state;
       QString dht_state_path = misc::qBittorrentPath()+QString::fromUtf8("dht_state");
       if(QFile::exists(dht_state_path)) {
-        boost::filesystem::ifstream dht_state_file(dht_state_path.toUtf8().data(), std::ios_base::binary);
+        boost::filesystem::ifstream dht_state_file(dht_state_path.toLocal8Bit().data(), std::ios_base::binary);
         dht_state_file.unsetf(std::ios_base::skipws);
         try{
           dht_state = bdecode(std::istream_iterator<char>(dht_state_file), std::istream_iterator<char>());
@@ -686,13 +815,13 @@ bool bittorrent::enableDHT(bool b) {
 }
 
 void bittorrent::saveTorrentSpeedLimits(QString hash) {
-  qDebug("Saving speedLimits file for %s", hash.toUtf8().data());
+  qDebug("Saving speedLimits file for %s", hash.toLocal8Bit().data());
   QTorrentHandle h = getTorrentHandle(hash);
   int download_limit = h.download_limit();
   int upload_limit = h.upload_limit();
   QFile speeds_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".speedLimits");
   if(!speeds_file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-    qDebug("* Error: Couldn't open speed limits file for torrent: %s", hash.toUtf8().data());
+    qDebug("* Error: Couldn't open speed limits file for torrent: %s", hash.toLocal8Bit().data());
     return;
   }
   speeds_file.write(misc::toQByteArray(download_limit)+QByteArray(" ")+misc::toQByteArray(upload_limit));
@@ -700,7 +829,7 @@ void bittorrent::saveTorrentSpeedLimits(QString hash) {
 }
 
 void bittorrent::loadTorrentSpeedLimits(QString hash) {
-//   qDebug("Loading speedLimits file for %s", hash.toUtf8().data());
+  //   qDebug("Loading speedLimits file for %s", hash.toLocal8Bit().data());
   QTorrentHandle h = getTorrentHandle(hash);
   QFile speeds_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".speedLimits");
   if(!speeds_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -717,39 +846,27 @@ void bittorrent::loadTorrentSpeedLimits(QString hash) {
   h.set_upload_limit(speeds.at(1).toInt());
 }
 
-// Read pieces priorities from .priorities file
+// Read pieces priorities from hard disk
 // and ask QTorrentHandle to consider them
 void bittorrent::loadFilesPriorities(QTorrentHandle &h) {
-  qDebug("Applying pieces priorities");
+  qDebug("Applying files priority");
   if(!h.is_valid()) {
     qDebug("/!\\ Error: Invalid handle");
     return;
   }
-  unsigned int nbFiles = h.num_files();
-  QString hash = h.hash();
-  QFile pieces_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".priorities");
-  if(!pieces_file.exists()){
-    return;
-  }
-  // Read saved file
-  if(!pieces_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    qDebug("* Error: Couldn't open priorities file: %s", hash.toUtf8().data());
-    return;
-  }
-  QByteArray pieces_priorities = pieces_file.readAll();
-  pieces_file.close();
-  QList<QByteArray> pieces_priorities_list = pieces_priorities.split('\n');
-  if((unsigned int)pieces_priorities_list.size() != nbFiles+1) {
-    std::cerr << "* Error: Corrupted priorities file\n";
-    return;
-  }
   std::vector<int> v;
-  for(unsigned int i=0; i<nbFiles; ++i) {
+  QVariantList files_priority;
-    int priority = pieces_priorities_list.at(i).toInt();
+  if(TorrentTempData::hasTempData(h.hash())) {
+    files_priority = TorrentTempData::getFilesPriority(h.hash());
+  } else {
+    files_priority = TorrentPersistentData::getFilesPriority(h.hash());
+  }
+  foreach(const QVariant &var_prio, files_priority) {
+    int priority = var_prio.toInt();
     if( priority < 0 || priority > 7) {
       priority = 1;
     }
-    qDebug("Setting piece piority to %d", priority);
+    qDebug("Setting file piority to %d", priority);
     v.push_back(priority);
   }
   h.prioritize_files(v);
@@ -760,6 +877,8 @@ float bittorrent::getRealRatio(QString hash) const{
   Q_ASSERT(h.all_time_download() >= 0);
   Q_ASSERT(h.all_time_upload() >= 0);
   if(h.all_time_download() == 0) {
+    if(h.all_time_upload() == 0)
+      return 0;
     return 101;
   }
   float ratio = (float)h.all_time_upload()/(float)h.all_time_download();
@@ -783,7 +902,7 @@ void bittorrent::saveFastResumeData() {
     QTorrentHandle h = QTorrentHandle(*torrentIT);
     if(!h.is_valid() || !h.has_metadata()) continue;
     if(isQueueingEnabled())
-        saveTorrentPriority(h.hash(), h.queue_position());
+      TorrentPersistentData::savePriority(h);
     if(h.is_paused()) continue;
     if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking) continue;
     h.save_resume_data();
@@ -818,7 +937,7 @@ void bittorrent::saveFastResumeData() {
     // Remove old fastresume file if it exists
     QFile::remove(torrentBackup.path()+QDir::separator()+ h.hash() + ".fastresume");
     QString file = h.hash()+".fastresume";
-      boost::filesystem::ofstream out(fs::path(torrentBackup.path().toUtf8().data()) / file.toUtf8().data(), std::ios_base::binary);
+    boost::filesystem::ofstream out(fs::path(torrentBackup.path().toLocal8Bit().data()) / file.toLocal8Bit().data(), std::ios_base::binary);
     out.unsetf(std::ios_base::skipws);
     bencode(std::ostream_iterator<char>(out), *rd->resume_data);
     // Remove torrent from session
@@ -839,7 +958,7 @@ void bittorrent::addConsoleMessage(QString msg, QColor color) {
   if(consoleMessages.size() > 100) {
     consoleMessages.removeFirst(); 
   }
-  consoleMessages.append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - <font color='") + color.name() +QString::fromUtf8("'><i>") + msg + QString::fromUtf8("</i></font>"));
+  consoleMessages.append(QString::fromUtf8("<font color='grey'>")+ QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + QString::fromUtf8("</font> - <font color='") + color.name() +QString::fromUtf8("'><i>") + msg + QString::fromUtf8("</i></font>"));
 }
 
 void bittorrent::addPeerBanMessage(QString ip, bool from_ipfilter) {
@@ -847,9 +966,9 @@ void bittorrent::addPeerBanMessage(QString ip, bool from_ipfilter) {
     peerBanMessages.removeFirst(); 
   }
   if(from_ipfilter)
-    peerBanMessages.append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was blocked due to your IP filter</i>", "x.y.z.w was blocked").arg(ip));
+    peerBanMessages.append(QString::fromUtf8("<font color='grey'>")+ QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was blocked due to your IP filter</i>", "x.y.z.w was blocked").arg(ip));
   else
-    peerBanMessages.append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was banned due to corrupt pieces</i>", "x.y.z.w was banned").arg(ip));
+    peerBanMessages.append(QString::fromUtf8("<font color='grey'>")+ QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was banned due to corrupt pieces</i>", "x.y.z.w was banned").arg(ip));
 }
 
 bool bittorrent::isFilePreviewPossible(QString hash) const{
@@ -873,7 +992,7 @@ bool bittorrent::isFilePreviewPossible(QString hash) const{
 // and add them to download list
 void bittorrent::scanDirectory(QString scan_dir) {
   FSMutex->lock();
-  qDebug("Scanning directory: %s", scan_dir.toUtf8().data());
+  qDebug("Scanning directory: %s", scan_dir.toLocal8Bit().data());
   QDir dir(scan_dir);
   QStringList filters;
   filters << "*.torrent";
@@ -882,10 +1001,10 @@ void bittorrent::scanDirectory(QString scan_dir) {
     QString fullPath = dir.path()+QDir::separator()+file;
     QFile torrent(fullPath);
     if(torrent.size() != 0) {
-        qDebug("Adding for scan_dir: %s", fullPath.toUtf8().data());
+      qDebug("Adding for scan_dir: %s", fullPath.toLocal8Bit().data());
       addTorrent(fullPath, true);
     } else {
-          qDebug("Ignoring empty file: %s", fullPath.toUtf8().data());
+      qDebug("Ignoring empty file: %s", fullPath.toLocal8Bit().data());
     }
   }
   FSMutex->unlock();
@@ -895,6 +1014,45 @@ void bittorrent::setDefaultSavePath(QString savepath) {
   defaultSavePath = savepath;
 }
 
+QString bittorrent::getDefaultSavePath() const {
+  return defaultSavePath;
+}
+
+bool bittorrent::useTemporaryFolder() const {
+  return !defaultTempPath.isEmpty();
+}
+
+void bittorrent::setDefaultTempPath(QString temppath) {
+  if(defaultTempPath == temppath)
+    return;
+  if(temppath.isEmpty()) {
+    // Disabling temp dir
+    // Moving all torrents to their destination folder
+    std::vector<torrent_handle> torrents = getTorrents();
+    std::vector<torrent_handle>::iterator torrentIT;
+    for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
+      QTorrentHandle h = QTorrentHandle(*torrentIT);
+      if(!h.is_valid()) continue;
+      h.move_storage(getSavePath(h.hash()));
+    }
+  } else {
+    std::vector<torrent_handle> torrents = getTorrents();
+    std::vector<torrent_handle>::iterator torrentIT;
+    for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
+      QTorrentHandle h = QTorrentHandle(*torrentIT);
+      if(!h.is_valid()) continue;
+      if(!h.is_seed())
+        h.move_storage(temppath);
+    }
+  }
+  defaultTempPath = temppath;
+}
+
+void bittorrent::saveTrackerFile(QString hash) {
+  QTorrentHandle h = getTorrentHandle(hash);
+  TorrentPersistentData::saveTrackers(h);
+}
+
 // Enable directory scanning
 void bittorrent::enableDirectoryScanning(QString scan_dir) {
   if(!scan_dir.isEmpty()) {
@@ -972,66 +1130,41 @@ 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) {
+  if(ratio_limit == -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) {
+    if(ratio_limit != -1 && ratio == -1) {
       delete BigRatioTimer;
     }
   }
-  if(max_ratio != ratio) {
+  if(ratio_limit != ratio) {
-    max_ratio = ratio;
+    ratio_limit = ratio;
-    qDebug("* Set deleteRatio to %.1f", max_ratio);
+    qDebug("* Set deleteRatio to %.1f", ratio_limit);
     deleteBigRatios();
   }
 }
 
-bool bittorrent::loadTrackerFile(QString hash) {
+void bittorrent::loadTrackerFile(QString hash) {
-  QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
+  QHash<QString, QVariant> tiers = TorrentPersistentData::getTrackers(hash);
-  QFile tracker_file(torrentBackup.path()+QDir::separator()+ hash + ".trackers");
-  if(!tracker_file.exists()) return false;
-  tracker_file.open(QIODevice::ReadOnly | QIODevice::Text);
-  QStringList lines = QString::fromUtf8(tracker_file.readAll().data()).split("\n");
   std::vector<announce_entry> trackers;
-  foreach(const QString &line, lines) {
+  foreach(const QString tracker_url, tiers.keys()) {
-    QStringList parts = line.split("|");
+    announce_entry t(tracker_url.toStdString());
-    if(parts.size() != 2) continue;
+    t.tier = tiers[tracker_url].toInt();
-    announce_entry t(parts[0].toStdString());
-    t.tier = parts[1].toInt();
     trackers.push_back(t);
   }
   if(!trackers.empty()) {
     QTorrentHandle h = getTorrentHandle(hash);
     h.replace_trackers(trackers);
     h.force_reannounce();
-    return true;
-  }else{
-    return false;
   }
 }
 
-void bittorrent::saveTrackerFile(QString hash) {
+// Set DHT port (>= 1000 or 0 if same as BT)
-  qDebug("Saving tracker file for %s", hash.toUtf8().data());
-  QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
-  QFile tracker_file(torrentBackup.path()+QDir::separator()+ hash + ".trackers");
-  if(tracker_file.exists()) {
-    tracker_file.remove();
-  }
-  tracker_file.open(QIODevice::WriteOnly | QIODevice::Text);
-  QTorrentHandle h = getTorrentHandle(hash);
-  std::vector<announce_entry> trackers = h.trackers();
-  for(unsigned int i=0; i<trackers.size(); ++i) {
-    tracker_file.write(QByteArray(trackers[i].url.c_str())+QByteArray("|")+QByteArray(misc::toString(i).c_str())+QByteArray("\n"));
-  }
-  tracker_file.close();
-}
-
-// Set DHT port (>= 1000)
 void bittorrent::setDHTPort(int dht_port) {
-  if(dht_port >= 1000) {
+  if(dht_port == 0 or dht_port >= 1000) {
     struct dht_settings DHTSettings;
     DHTSettings.service_port = dht_port;
     s->set_dht_settings(DHTSettings);
@@ -1106,12 +1239,36 @@ void bittorrent::readAlerts() {
       if(h.is_valid()){
         emit finishedTorrent(h);
         QString hash = h.hash();
-        // Create .finished file if necessary
+        // Remember finished state
-        QFile finished_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".finished");
+        TorrentPersistentData::saveSeedStatus(h);
-        finished_file.open(QIODevice::WriteOnly | QIODevice::Text);
+        // Move to download directory if necessary
-        finished_file.close();
+        if(!defaultTempPath.isEmpty()) {
+          // Check if directory is different
+          QDir current_dir(h.save_path());
+          QDir save_dir(getSavePath(h.hash()));
+          if(current_dir != save_dir) {
+            h.move_storage(save_dir.path());
+          }
+        }
         h.save_resume_data();
-        qDebug("Received finished alert for %s", h.name().toUtf8().data());
+        // Check if there is a single torrent file inside
+        QString torrent_relpath = misc::toQString(h.get_torrent_info().file_at(0).path);
+        if(torrent_relpath.endsWith(".torrent")) {
+          addConsoleMessage(tr("Recursive download of file %1 embedded in torrent %2", "Recursive download of test.torrent embedded in torrent test2").arg(torrent_relpath).arg(h.name()));
+          QString torrent_fullpath = h.save_path()+QDir::separator()+torrent_relpath;
+          boost::intrusive_ptr<torrent_info> t;
+          try {
+            t = new torrent_info(torrent_fullpath.toLocal8Bit().data());
+            QString sub_hash = misc::toQString(t->info_hash());
+            // Passing the save path along to the sub torrent file
+            TorrentTempData::setSavePath(sub_hash, h.save_path());
+            addTorrent(torrent_fullpath);
+          } catch(std::exception&) {
+            qDebug("Caught error loading torrent");
+            addConsoleMessage(tr("Unable to decode %1 torrent file.").arg(torrent_fullpath), QString::fromUtf8("red"));
+          }
+        }
+        qDebug("Received finished alert for %s", h.name().toLocal8Bit().data());
       }
     }
     else if (save_resume_data_alert* p = dynamic_cast<save_resume_data_alert*>(a.get())) {
@@ -1121,26 +1278,45 @@ void bittorrent::readAlerts() {
       // Delete old fastresume file if necessary
       if(QFile::exists(file))
         QFile::remove(file);
-        qDebug("Saving fastresume data in %s", file.toUtf8().data());
+      qDebug("Saving fastresume data in %s", file.toLocal8Bit().data());
       if (p->resume_data)
       {
-            boost::filesystem::ofstream out(fs::path(torrentBackup.path().toUtf8().data()) / file.toUtf8().data(), std::ios_base::binary);
+        boost::filesystem::ofstream out(fs::path(torrentBackup.path().toLocal8Bit().data()) / file.toLocal8Bit().data(), std::ios_base::binary);
         out.unsetf(std::ios_base::skipws);
         bencode(std::ostream_iterator<char>(out), *p->resume_data);
       }
     }
+    else if (metadata_received_alert* p = dynamic_cast<metadata_received_alert*>(a.get())) {
+      QTorrentHandle h(p->handle);
+      if(h.is_valid()) {
+        qDebug("Received metadata for %s", h.hash().toLocal8Bit().data());
+        emit metadataReceived(h);
+        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
+          emit torrentPaused(h);
+        }
+      }
+    }
     else if (file_error_alert* p = dynamic_cast<file_error_alert*>(a.get())) {
       QTorrentHandle h(p->handle);
       h.auto_managed(false);
-      qDebug("File Error: %s", p->message().c_str());
+      std::cerr << "File Error: " << p->message().c_str() << std::endl;
       if(h.is_valid())
-        emit fullDiskError(h);
+        emit fullDiskError(h, misc::toQString(p->message()));
     }
     else if (dynamic_cast<listen_failed_alert*>(a.get())) {
       // Level: fatal
       addConsoleMessage(tr("Couldn't listen on any of the given ports."), QString::fromUtf8("red"));
       //emit portListeningFailure();
     }
+    else if (torrent_paused_alert* p = dynamic_cast<torrent_paused_alert*>(a.get())) {
+      QTorrentHandle h(p->handle);
+      qDebug("Received a torrent_paused_alert for %s", h.hash().toLocal8Bit().data());
+      if(h.is_valid()) {
+        emit torrentPaused(h);
+      }
+    }
     else if (tracker_error_alert* p = dynamic_cast<tracker_error_alert*>(a.get())) {
       // Level: fatal
       QTorrentHandle h(p->handle);
@@ -1161,7 +1337,7 @@ void bittorrent::readAlerts() {
     else if (tracker_reply_alert* p = dynamic_cast<tracker_reply_alert*>(a.get())) {
       QTorrentHandle h(p->handle);
       if(h.is_valid()){
-        qDebug("Received a tracker reply from %s", (const char*)h.current_tracker().toUtf8());
+        qDebug("Received a tracker reply from %s", (const char*)h.current_tracker().toLocal8Bit());
         QString hash = h.hash();
         QHash<QString, QString> errors = trackersErrors.value(hash, QHash<QString, QString>());
         // p->url requires at least libtorrent v0.13.1
@@ -1189,7 +1365,7 @@ void bittorrent::readAlerts() {
     else if (fastresume_rejected_alert* p = dynamic_cast<fastresume_rejected_alert*>(a.get())) {
       QTorrentHandle h(p->handle);
       if(h.is_valid()){
-        qDebug("/!\\ Fast resume failed for %s, reason: %s", h.name().toUtf8().data(), p->message().c_str());
+        qDebug("/!\\ Fast resume failed for %s, reason: %s", h.name().toLocal8Bit().data(), p->message().c_str());
         addConsoleMessage(tr("Fast resume data was rejected for torrent %1, checking again...").arg(h.name()), QString::fromUtf8("red"));
         //emit fastResumeDataRejected(h.name());
       }
@@ -1202,8 +1378,18 @@ void bittorrent::readAlerts() {
       QTorrentHandle h(p->handle);
       if(h.is_valid()){
         QString hash = h.hash();
-        qDebug("%s have just finished checking", hash.toUtf8().data());
+        qDebug("%s have just finished checking", hash.toLocal8Bit().data());
+        // Move to temp directory if necessary
+        if(!h.is_seed() && !defaultTempPath.isEmpty()) {
+          // Check if directory is different
+          QDir current_dir(h.save_path());
+          QDir save_dir(getSavePath(h.hash()));
+          if(current_dir == save_dir) {
+            h.move_storage(defaultTempPath);
+          }
+        }
         emit torrentFinishedChecking(h);
+        emit metadataReceived(h);
       }
     }
     a = s->pop_alert();
@@ -1223,17 +1409,17 @@ session_status bittorrent::getSessionStatus() const{
 }
 
 QString bittorrent::getSavePath(QString hash) {
-  QFile savepath_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".savepath");
-  QByteArray line;
   QString savePath;
-  if(savepath_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+  if(TorrentTempData::hasTempData(hash)) {
-    line = savepath_file.readAll();
+    savePath = TorrentTempData::getSavePath(hash);
-    savepath_file.close();
+    qDebug("getSavePath, got save_path from temp data: %s", savePath.toLocal8Bit().data());
-    qDebug(" -> Save path: %s", line.data());
-    savePath = QString::fromUtf8(line.data());
   } else {
-    // use default save path
+    savePath = TorrentPersistentData::getSavePath(hash);
-    qDebug("Using default save path because none was set");
+    qDebug("getSavePath, got save_path from persistent data: %s", savePath.toLocal8Bit().data());
+  }
+  if(savePath.isEmpty()) {
+    // use default save path if no other can be found
+    qDebug("Using default save path because none was set: %s", defaultSavePath.toLocal8Bit().data());
     savePath = defaultSavePath;
   }
   // Checking if savePath Dir exists
@@ -1241,7 +1427,7 @@ QString bittorrent::getSavePath(QString hash) {
   QDir saveDir(savePath);
   if(!saveDir.exists()) {
     if(!saveDir.mkpath(saveDir.path())) {
-      std::cerr << "Couldn't create the save directory: " << saveDir.path().toUtf8().data() << "\n";
+      std::cerr << "Couldn't create the save directory: " << saveDir.path().toLocal8Bit().data() << "\n";
       // XXX: handle this better
       return QDir::homePath();
     }
@@ -1259,8 +1445,14 @@ void bittorrent::downloadFromUrl(QString url) {
   downloader->downloadUrl(url);
 }
 
-void bittorrent::downloadUrlAndSkipDialog(QString url) {
+void bittorrent::addMagnetSkipAddDlg(QString uri) {
+  addMagnetUri(uri, false);
+}
+
+void bittorrent::downloadUrlAndSkipDialog(QString url, QString save_path) {
   //emit aboutToDownloadFromUrl(url);
+  if(!save_path.isEmpty())
+    savepath_fromurl[url] = save_path;
   url_skippingDlg << url;
   // Launch downloader thread
   downloader->downloadUrl(url);
@@ -1278,13 +1470,6 @@ void bittorrent::processDownloadedFile(QString url, QString file_path) {
   }
 }
 
-void bittorrent::downloadFromURLList(const QStringList& url_list) {
-  qDebug("DownloadFromUrlList");
-  foreach(const QString url, url_list) {
-    downloadFromUrl(url);
-  }
-}
-
 // Return current download rate for the BT
 // session. Payload means that it only take into
 // account "useful" part of the rate
@@ -1307,7 +1492,7 @@ void bittorrent::saveDHTEntry() {
   if(DHTEnabled) {
     try{
       entry dht_state = s->dht_state();
-      boost::filesystem::ofstream out((misc::qBittorrentPath()+QString::fromUtf8("dht_state")).toUtf8().data(), std::ios_base::binary);
+      boost::filesystem::ofstream out((misc::qBittorrentPath()+QString::fromUtf8("dht_state")).toLocal8Bit().data(), std::ios_base::binary);
       out.unsetf(std::ios_base::skipws);
       bencode(std::ostream_iterator<char>(out), dht_state);
       qDebug("DHT entry saved");
@@ -1322,57 +1507,44 @@ void bittorrent::applyEncryptionSettings(pe_settings se) {
   s->set_pe_settings(se);
 }
 
-void bittorrent::saveTorrentPriority(QString hash, int prio) {
-  // Write .queued file
-  QFile prio_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
-  prio_file.open(QIODevice::WriteOnly | QIODevice::Text);
-  prio_file.write(QByteArray::number(prio));
-  prio_file.close();
-}
-
 // Will fast resume torrents in
 // backup directory
-void bittorrent::resumeUnfinishedTorrents() {
+void bittorrent::startUpTorrents() {
   qDebug("Resuming unfinished torrents");
   QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
   QStringList fileNames;
-  // Scan torrentBackup directory
+  QStringList known_torrents = TorrentPersistentData::knownTorrents();
-  QStringList filters;
-  filters << "*.torrent";
-  fileNames = torrentBackup.entryList(filters, QDir::Files, QDir::Unsorted);
   if(isQueueingEnabled()) {
-      QList<QPair<int, QString> > filePaths;
+    QList<QPair<int, QString> > hashes;
-      foreach(const QString &fileName, fileNames) {
+    foreach(const QString &hash, known_torrents) {
-        QString filePath = torrentBackup.path()+QDir::separator()+fileName;
+      QString filePath;
-        int prio = 99999;
+      if(TorrentPersistentData::isMagnet(hash)) {
-        // Get priority
+        filePath = TorrentPersistentData::getMagnetUri(hash);
-        QString prioPath = filePath;
+      } else {
-        prioPath.replace(".torrent", ".prio");
+        filePath = torrentBackup.path()+QDir::separator()+hash+".torrent";
-        if(QFile::exists(prioPath)) {
-            QFile prio_file(prioPath);
-            if(prio_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-                bool ok = false;
-                prio = prio_file.readAll().toInt(&ok);
-                if(!ok)
-                    prio = 99999;
-                prio_file.close();
       }
-        }
+      int prio = TorrentPersistentData::getPriority(hash);
-        misc::insertSort2<QString>(filePaths, qMakePair(prio, filePath));
+      misc::insertSort2<QString>(hashes, qMakePair(prio, hash));
     }
     // Resume downloads
-      QPair<int, QString> fileName;
+    QPair<int, QString> couple;
-      foreach(fileName, filePaths) {
+    foreach(couple, hashes) {
-        addTorrent(fileName.second, false, QString(), true);
+      QString hash = couple.second;
+      qDebug("Starting up torrent %s", hash.toLocal8Bit().data());
+      if(TorrentPersistentData::isMagnet(hash)) {
+        addMagnetUri(TorrentPersistentData::getMagnetUri(hash), true);
+      } else {
+        addTorrent(torrentBackup.path()+QDir::separator()+hash+".torrent", false, QString(), true);
+      }
     }
   } else {
-        QStringList filePaths;
-        foreach(const QString &fileName, fileNames) {
-            filePaths.append(torrentBackup.path()+QDir::separator()+fileName);
-        }
     // Resume downloads
-          foreach(const QString &fileName, filePaths) {
+    foreach(const QString &hash, known_torrents) {
-            addTorrent(fileName, false, QString(), true);
+      qDebug("Starting up torrent %s", hash.toLocal8Bit().data());
+      if(TorrentPersistentData::isMagnet(hash))
+        addMagnetUri(TorrentPersistentData::getMagnetUri(hash), true);
+      else
+        addTorrent(torrentBackup.path()+QDir::separator()+hash+".torrent", false, QString(), true);
     }
   }
   qDebug("Unfinished torrents resumed");

src/bittorrent.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */
 #ifndef __BITTORRENT_H__
@@ -51,6 +60,7 @@ class bittorrent : public QObject {
     bool DHTEnabled;
     QPointer<downloadThread> downloader;
     QString defaultSavePath;
+    QString defaultTempPath;
     QHash<QString, QHash<QString, QString> > trackersErrors;
     QStringList consoleMessages;
     QStringList peerBanMessages;
@@ -58,7 +68,7 @@ class bittorrent : public QObject {
     bool addInPause;
     int maxConnecsPerTorrent;
     int maxUploadsPerTorrent;
-    float max_ratio;
+    float ratio_limit;
     bool UPnPEnabled;
     bool NATPMPEnabled;
     bool LSDEnabled;
@@ -66,6 +76,7 @@ class bittorrent : public QObject {
     QString filterPath;
     bool queueingEnabled;
     QStringList url_skippingDlg;
+    QHash<QString, QString> savepath_fromurl;
 
   protected:
     QString getSavePath(QString hash);
@@ -97,19 +108,22 @@ class bittorrent : public QObject {
     QStringList getConsoleMessages() const;
     QStringList getPeerBanMessages() const;
     qlonglong getETA(QString hash) const;
+    bool useTemporaryFolder() const;
+    QString getDefaultSavePath() const;
 
   public slots:
     QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
+    QTorrentHandle addMagnetUri(QString magnet_uri, bool resumed=false);
     void loadSessionState();
     void saveSessionState();
     void downloadFromUrl(QString url);
-    void downloadFromURLList(const QStringList& url_list);
     void deleteTorrent(QString hash, bool permanent = false);
+    void startUpTorrents();
     /* Needed by Web UI */
     void pauseAllTorrents();
-    void resumeAllTorrents();
     void pauseTorrent(QString hash);
     void resumeTorrent(QString hash);
+    void resumeAllTorrents();
     /* End Web UI */
     void saveDHTEntry();
     void preAllocateAllFiles(bool b);
@@ -119,15 +133,13 @@ class bittorrent : public QObject {
     void enableIPFilter(QString filter);
     void disableIPFilter();
     void setQueueingEnabled(bool enable);
-    void resumeUnfinishedTorrents();
-    void saveTorrentPriority(QString hash, int prio);
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
     void handleDownloadFailure(QString url, QString reason);
     void loadWebSeeds(QString fileHash);
     void increaseDlTorrentPriority(QString hash);
     void decreaseDlTorrentPriority(QString hash);
-    void downloadUrlAndSkipDialog(QString);
+    void downloadUrlAndSkipDialog(QString url, QString save_path=QString::null);
     // Session configuration - Setters
     void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
     void setMaxConnections(int maxConnec);
@@ -142,6 +154,7 @@ class bittorrent : public QObject {
     void setSessionSettings(session_settings sessionSettings);
     void startTorrentsInPause(bool b);
     void setDefaultSavePath(QString savepath);
+    void setDefaultTempPath(QString temppath);
     void applyEncryptionSettings(pe_settings se);
     void loadFilesPriorities(QTorrentHandle& h);
     void setDownloadLimit(QString hash, long val);
@@ -152,13 +165,14 @@ class bittorrent : public QObject {
     bool enableDHT(bool b);
     void addConsoleMessage(QString msg, QColor color=QApplication::palette().color(QPalette::WindowText));
     void addPeerBanMessage(QString msg, bool from_ipfilter);
+    void processDownloadedFile(QString, QString);
+    void saveTrackerFile(QString hash);
+    void addMagnetSkipAddDlg(QString uri);
 
   protected slots:
     void scanDirectory(QString);
     void readAlerts();
-    void processDownloadedFile(QString, QString);
+    void loadTrackerFile(QString hash);
-    bool loadTrackerFile(QString hash);
-    void saveTrackerFile(QString hash);
     void deleteBigRatios();
 
   signals:
@@ -167,13 +181,15 @@ class bittorrent : public QObject {
     void pausedTorrent(QTorrentHandle& h);
     void resumedTorrent(QTorrentHandle& h);
     void finishedTorrent(QTorrentHandle& h);
-    void fullDiskError(QTorrentHandle& h);
+    void fullDiskError(QTorrentHandle& h, QString msg);
     void trackerError(QString hash, QString time, QString msg);
     void trackerAuthenticationRequired(QTorrentHandle& h);
     void newDownloadedTorrent(QString path, QString url);
     void updateFileSize(QString hash);
     void downloadFromUrlFailure(QString url, QString reason);
     void torrentFinishedChecking(QTorrentHandle& h);
+    void metadataReceived(QTorrentHandle &h);
+    void torrentPaused(QTorrentHandle &h);
 };
 
 #endif

src/console.ui

@@ -13,7 +13,7 @@
    <string>qBittorrent console</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+	  <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <item>
@@ -26,7 +26,7 @@
        <string>General</string>
       </attribute>
       <attribute name="icon" >
-       <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+	      <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
       </attribute>
       <layout class="QVBoxLayout" >
        <item>

src/console_imp.h

@@ -16,6 +16,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
  * Contact : chris@qbittorrent.org
  */