- Tagged v1.5.0beta2

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

Changelog

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

qcm/libtorrent-rasterbar.qcm

@@ -23,7 +23,7 @@ public:
 		if(!libs.isEmpty())
 			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-			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());
+			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());
 		return true;
 	}
 };

src/FinishedTorrents.cpp

@@ -64,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);
@@ -79,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()));
@@ -88,6 +92,7 @@ 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()));
@@ -266,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){
@@ -433,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

src/FinishedTorrents.h

@@ -93,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

@@ -143,6 +143,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     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;
@@ -191,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.4.0
+Comment=V1.5.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент

src/arborescence.h

@@ -37,7 +37,7 @@
 #include "misc.h"
 
 class torrent_file {
-  private:
+private:
   torrent_file *parent;
   bool is_dir;
   QString rel_path;
@@ -47,7 +47,7 @@ class torrent_file {
   int priority;
   int index; // Index in torrent_info
 
-  public:
+public:
   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);
@@ -175,10 +175,10 @@ class torrent_file {
 };
 
 class arborescence {
-  private:
+private:
   torrent_file *root;
 
-  public:
+public:
   arborescence(boost::intrusive_ptr<torrent_info> t) {
     torrent_info::file_iterator fi = t->begin_files();
     if(t->num_files() > 1) {
@@ -199,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");
@@ -207,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, ((double)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, ((double)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;
     }
@@ -237,7 +237,7 @@ class arborescence {
     return success;
   }
 
-  protected:
+protected:
   void addFile(QString path, size_type file_size, int index, float progress=0., int priority=1) {
     Q_ASSERT(root->isDir());
     path = QDir::cleanPath(path);

src/bittorrent.h

@@ -76,6 +76,7 @@ class bittorrent : public QObject {
     QString filterPath;
     bool queueingEnabled;
     QStringList url_skippingDlg;
+    QHash<QString, QString> savepath_fromurl;
 
   protected:
     QString getSavePath(QString hash);
@@ -107,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);
@@ -129,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);
@@ -164,12 +166,13 @@ class bittorrent : public QObject {
     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();
-    bool loadTrackerFile(QString hash);
-    void saveTrackerFile(QString hash);
+    void loadTrackerFile(QString hash);
     void deleteBigRatios();
 
   signals:
@@ -185,6 +188,8 @@ class bittorrent : public QObject {
     void updateFileSize(QString hash);
     void downloadFromUrlFailure(QString url, QString reason);
     void torrentFinishedChecking(QTorrentHandle& h);
+    void metadataReceived(QTorrentHandle &h);
+    void torrentPaused(QTorrentHandle &h);
 };
 
 #endif

src/downloadFromURLImp.h

@@ -36,6 +36,7 @@
 #include <QString>
 #include <QRegExp>
 #include <QStringList>
+#include <QClipboard>
 #include "ui_downloadFromURL.h"
 
 class downloadFromURL : public QDialog, private Ui::downloadFromURL{
@@ -47,6 +48,11 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
       setAttribute(Qt::WA_DeleteOnClose);
       icon_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/url.png")));
       show();
+      // Paste clipboard if there is an URL in it
+      QString clip_txt = qApp->clipboard()->text();
+      if(clip_txt.startsWith("http://", Qt::CaseInsensitive) || clip_txt.startsWith("https://", Qt::CaseInsensitive) || clip_txt.startsWith("ftp://", Qt::CaseInsensitive) || clip_txt.startsWith("magnet:", Qt::CaseInsensitive)) {
+        textUrls->setText(clip_txt);
+      }
     }
 
     ~downloadFromURL(){}

src/downloadThread.cpp

@@ -158,7 +158,9 @@ downloadThread::~downloadThread(){
   abort = true;
   condition.wakeOne();
   mutex.unlock();
+  //qDebug("downloadThread deleting subthreads...");
   qDeleteAll(subThreads);
+  //qDebug("downloadThread deleted subthreads");
   wait();
 }
 
@@ -174,28 +176,36 @@ void downloadThread::downloadUrl(QString url){
 
 void downloadThread::run(){
   forever{
-    if(abort)
+    if(abort) {
+      qDebug("DownloadThread aborting...");
       return;
+    }
     mutex.lock();
     if(!urls_queue.empty() && subThreads.size() < MAX_THREADS){
       QString url = urls_queue.dequeue();
       mutex.unlock();
+      //qDebug("DownloadThread downloading %s...", url.toLocal8Bit().data());
       subDownloadThread *st = new subDownloadThread(0, url);
       subThreads << st;
       connect(st, SIGNAL(downloadFinishedST(subDownloadThread*, QString, QString)), this, SLOT(propagateDownloadedFile(subDownloadThread*, QString, QString)));
       connect(st, SIGNAL(downloadFailureST(subDownloadThread*, QString, QString)), this, SLOT(propagateDownloadFailure(subDownloadThread*, QString, QString)));
       st->start();
     }else{
+      //qDebug("DownloadThread sleeping...");
       condition.wait(&mutex);
+      //qDebug("DownloadThread woke up");
       mutex.unlock();
     }
   }
 }
 
 void downloadThread::propagateDownloadedFile(subDownloadThread* st, QString url, QString path){
+  qDebug("Downloading %s was successful", url.toLocal8Bit().data());
+  mutex.lock();
   int index = subThreads.indexOf(st);
   Q_ASSERT(index != -1);
   subThreads.removeAt(index);
+  mutex.unlock();
   delete st;
   emit downloadFinished(url, path);
   mutex.lock();
@@ -206,9 +216,12 @@ void downloadThread::propagateDownloadedFile(subDownloadThread* st, QString url,
 }
 
 void downloadThread::propagateDownloadFailure(subDownloadThread* st, QString url, QString reason){
+  qDebug("Downloading %s failed", url.toLocal8Bit().data());
+  mutex.lock();
   int index = subThreads.indexOf(st);
   Q_ASSERT(index != -1);
   subThreads.removeAt(index);
+  mutex.unlock();
   delete st;
   emit downloadFailure(url, reason);
   mutex.lock();