- Tagged v1.5.0beta2

- RefreshAllFeeds() only sets loading.png icon for feeds (and not folders)

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

Changelog

@@ -1,3 +1,37 @@
+* 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: 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

configure

@@ -18,17 +18,12 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --with-libtorrent-inc=[path]            Path to libtorrent-rasterbar include
+  --with-libboost-inc=[path]     Path to libboost include files
-                                         files
+  --with-libcurl-inc=[path]      Path to libcurl include files
-  --with-libtorrent-lib=[path]            Path to libtorrent-rasterbar library
+  --with-libcurl-lib=[path]      Path to libcurl library files
-                                         files
+  --disable-libzzip             Disable use of libzzip
-  --with-libtorrent-static-lib=[path]     Path to libtorrent-rasterbar .a file
+  --with-libzzip-inc=[path]      Path to libzzip++ include files
-  --with-libboost-inc=[path]              Path to libboost include files
+  --with-libzzip-lib=[path]      Path to libzzip++ library files
-  --with-libcurl-inc=[path]               Path to libcurl include files
-  --with-libcurl-lib=[path]               Path to libcurl library files
-  --disable-libzzip                      Disable use of libzzip
-  --with-libzzip-inc=[path]               Path to libzzip++ include files
-  --with-libzzip-lib=[path]               Path to libzzip++ library files
 
 EOT
 }
@@ -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;
-				return false;
+		VersionMode mode = VersionMin;
-      			}
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
-		}else{
+			return false;
-			QStringList sl;
+		for(int n = 0; n < incs.count(); ++n)
-			sl << "/usr/include";
+			conf->addIncludePath(incs[n]);
-			sl << "/usr/local/include";
+		if(!libs.isEmpty())
-			bool found = false;
+			conf->addLib(libs);
-			foreach(s, sl){
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-				if(conf->checkHeader(s, "libtorrent/magnet_uri.hpp")){
+			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());
-					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";
+                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;
-				return false;
+		VersionMode mode = VersionMin;
-      			}
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
-		}else{
+			return false;
-			QStringList sl;
+		for(int n = 0; n < incs.count(); ++n)
-			sl << "/usr/include";
+			conf->addIncludePath(incs[n]);
-			sl << "/usr/local/include";
+		if(!libs.isEmpty())
-			bool found = false;
+			conf->addLib(libs);
-			foreach(s, sl){
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-				if(conf->checkHeader(s, "libtorrent/magnet_uri.hpp")){
+			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());
-					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/FinishedListDelegate.h

@@ -44,9 +44,11 @@
 #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.
 
@@ -62,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;

src/FinishedTorrents.cpp

@@ -46,11 +46,13 @@ 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);
@@ -62,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);
@@ -77,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()));
@@ -86,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()));
 }
 
@@ -117,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()) {
@@ -227,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) { 
@@ -260,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){
@@ -269,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;
     }
@@ -293,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))));
@@ -318,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"));
 }
 
@@ -374,6 +402,7 @@ 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();
       }
   }
@@ -420,6 +449,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint&){
   myFinishedListMenu.addAction(actionOpen_destination_folder);
   myFinishedListMenu.addAction(actionTorrent_Properties);
   myFinishedListMenu.addSeparator();
+  myFinishedListMenu.addAction(actionCopy_magnet_link);
   myFinishedListMenu.addAction(actionBuy_it);
 
   // Call menu
@@ -458,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
@@ -486,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() {
@@ -513,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;
@@ -549,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;
@@ -574,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:
@@ -598,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

@@ -79,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();
 
@@ -91,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.h

@@ -70,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;
@@ -139,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;
@@ -177,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);
@@ -189,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: