- Tagged v1.2.0beta1 release

standard

Changelog

@@ -1,4 +1,13 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
+    - FEATURE: Torrent queueing system (with priorities)
+    - FEATURE: DHT is always ON (no longer used as fallback)
+    - FEATURE: The number of DHT nodes is displayed
+    - FEATURE: RSS can now be disabled from program preferences
+    - BUGFIX: Disable ETA calculation when ETA column is hidden
+    - COSMETIC: Transfer speed, ratio and DHT nodes are displayed in status bar    
+    - COSMETIC: RSS Tab is now hidden as a default
+
+* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
     - FEATURE: Web interface to control qbittorrent (Ishan Arora)
     - FEATURE: Can spoof Azureus peer id to avoid ban
     - FEATURE: Allow to hide/show some columns in download and seeding lists
@@ -27,6 +36,7 @@
     - COSMETIC: Display "unpaused/total_torrent" in download/upload tabs
     - COSMETIC: Allow to resize RSS column
     - COSMETIC: Global UP/DL speeds and ratio are displayed above tabs
+    - COSMETIC: Use infinity symbol for ETA when time is infinite
 
 * Fri Apr 11 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
     - FEATURE: Based on new libtorrent v0.13

TODO

@@ -43,3 +43,4 @@ Translations updated:
 - Brazilian
 - Slovak
 - Swedish
+- Romanian

src/DLListDelegate.h

@@ -40,7 +40,8 @@
 #define SEEDSLEECH 5
 #define RATIO 6
 #define ETA 7
-#define HASH 8
+#define PRIORITY 8
+#define HASH 9
 
 class DLListDelegate: public QItemDelegate {
   Q_OBJECT

src/FinishedListDelegate.h

@@ -37,7 +37,8 @@
 #define F_UPSPEED 2
 #define F_LEECH 3
 #define F_RATIO 4
-#define F_HASH 5
+#define F_PRIORITY 5
+#define F_HASH 6
 
 class FinishedListDelegate: public QItemDelegate {
   Q_OBJECT

src/FinishedTorrents.cpp

@@ -38,14 +38,17 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
   connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), this, SLOT(torrentAdded(QString, QTorrentHandle&, bool)));
-  finishedListModel = new QStandardItemModel(0,6);
+  finishedListModel = new QStandardItemModel(0,7);
   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_RATIO, Qt::Horizontal, tr("Ratio"));
+  finishedListModel->setHeaderData(F_PRIORITY, Qt::Horizontal, tr("Priority"));
   finishedList->setModel(finishedListModel);
   loadHiddenColumns();
+  // Hide priority column
+  finishedList->hideColumn(F_PRIORITY);
   // Hide hash column
   finishedList->hideColumn(F_HASH);
   // Load last columns width for download list
@@ -82,6 +85,7 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
   connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
   connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
+  connect(actionHOSColPriority, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPriority()));
 }
 
 FinishedTorrents::~FinishedTorrents(){
@@ -97,6 +101,10 @@ void FinishedTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
   emit torrentDoubleClicked(hash, true);
 }
 
+void FinishedTorrents::hidePriorityColumn(bool hide) {
+  finishedList->setColumnHidden(F_PRIORITY, hide);
+}
+
 void FinishedTorrents::addTorrent(QString hash){
   if(!BTSession->isFinished(hash)){
     BTSession->setFinishedTorrent(hash);
@@ -112,6 +120,8 @@ void FinishedTorrents::addTorrent(QString hash){
   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_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
+  if(BTSession->isQueueingEnabled())
+    finishedListModel->setData(finishedListModel->index(row, F_PRIORITY), QVariant((int)BTSession->getUpTorrentPriority(hash)));
   finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
   if(h.is_paused()) {
     finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole);
@@ -237,6 +247,14 @@ void FinishedTorrents::updateFinishedList(){
       row = getRowFromHash(hash);
     }
     Q_ASSERT(row != -1);
+    // Update priority
+    if(BTSession->isQueueingEnabled()) {
+      finishedListModel->setData(finishedListModel->index(row, F_PRIORITY), QVariant((int)BTSession->getUpTorrentPriority(hash)));
+      if(h.is_paused() && BTSession->isUploadQueued(hash)) {
+        finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
+        setRowColor(row, QString::fromUtf8("grey"));
+      }
+    }
     if(h.is_paused()) continue;
     if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
       continue;
@@ -394,7 +412,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
 
   // Call menu
   // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,55));
+  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
 }
 
 
@@ -406,11 +424,17 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
 void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
   QMenu hideshowColumn(this);
   hideshowColumn.setTitle(tr("Hide or Show Column"));
+  int lastCol;
+  if(BTSession->isQueueingEnabled()) {
+    lastCol = F_PRIORITY;
+  } else {
+    lastCol = F_RATIO;
+  }
   for(int i=0; i<=F_RATIO; i++) {
     hideshowColumn.addAction(getActionHoSCol(i));
   }
   // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,55));
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,34));
 }
 
 // toggle hide/show a column
@@ -464,6 +488,10 @@ void FinishedTorrents::hideOrShowColumnRatio() {
   hideOrShowColumn(F_RATIO);
 }
 
+void FinishedTorrents::hideOrShowColumnPriority() {
+  hideOrShowColumn(F_PRIORITY);
+}
+
 // load the previous settings, and hide the columns
 bool FinishedTorrents::loadHiddenColumns() {
   bool loaded = false;
@@ -525,6 +553,9 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
     case F_RATIO :
       return actionHOSColRatio;
       break;
+    case F_PRIORITY :
+      return actionHOSColPriority;
+      break;
     default :
       return NULL;
   }

src/FinishedTorrents.h

@@ -72,6 +72,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void hideOrShowColumnUpSpeed();
     void hideOrShowColumnLeechers();
     void hideOrShowColumnRatio();
+    void hideOrShowColumnPriority();
 
   public slots:
     void addTorrent(QString hash);
@@ -81,6 +82,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void propertiesSelection();
     void deleteTorrent(QString hash);
     void showPropertiesFromHash(QString hash);
+    void hidePriorityColumn(bool hide);
 
   signals:
     void torrentMovedFromFinishedList(QString);

src/GUI.h

@@ -52,6 +52,7 @@ class QTabWidget;
 class QLabel;
 class QModelIndex;
 class HttpServer;
+class QFrame;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -75,12 +76,20 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     bool force_exit;
     unsigned int refreshInterval;
     QTimer *refresher;
+    QLabel *dlSpeedLbl;
+    QLabel *upSpeedLbl;
+    QLabel *ratioLbl;
+    QLabel *DHTLbl;
+    QFrame *statusSep1;
+    QFrame *statusSep2;
+    QFrame *statusSep3;
     // Keyboard shortcuts
     QShortcut *switchSearchShortcut;
     QShortcut *switchSearchShortcut2;
     QShortcut *switchDownShortcut;
     QShortcut *switchUpShortcut;
     QShortcut *switchRSSShortcut;
+    QAction *prioSeparator;
     // Search
     SearchEngine *searchEngine;
     // RSS
@@ -116,6 +125,8 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void readSettings();
     void on_actionExit_triggered();
     void createTrayIcon();
+    void updateUnfinishedTorrentNumberCalc();
+    void updateFinishedTorrentNumberCalc();
     void updateUnfinishedTorrentNumber(unsigned int nb);
     void updateFinishedTorrentNumber(unsigned int nb);
     void fullDiskError(QTorrentHandle& h) const;
@@ -154,6 +165,8 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void updateLists();
     bool initWebUi(QString username, QString password, int port);
     void pauseTorrent(QString hash);
+    void on_actionIncreasePriority_triggered();
+    void on_actionDecreasePriority_triggered();
     // Options slots
     void on_actionOptions_triggered();
     void OptionsSaved(QString info, bool deleteOptions);
@@ -171,6 +184,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
   protected:
     void closeEvent(QCloseEvent *);
     void hideEvent(QHideEvent *);
+    void displayRSSTab(bool enable);
 
   public:
     // Construct / Destruct

src/Icons/qBittorrent.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
-Categories=Qt;Application;Network;P2P
-Comment=V1.1.0
-Exec=qbittorrent
+Categories=Qt;Network;P2P
+Comment=V1.2.0
+Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
 GenericName[de]=Bittorren Client
@@ -19,7 +19,7 @@ GenericName[tr]=Bittorrent istemcisi
 GenericName[uk]=Bittorrent-клієнт
 GenericName[zh]=Bittorrent之用户
 Icon=qbittorrent
-MimeType=application/x-bittorrent
+MimeType=application/x-bittorrent;
 Name=qBittorrent
 Name[ko]=큐비토런트
 Terminal=false

src/SearchTab.cpp

@@ -41,6 +41,7 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget()
     box=new QVBoxLayout();
     results_lbl=new QLabel();
     resultsBrowser = new QTreeView();
+    resultsBrowser->setSelectionMode(QAbstractItemView::ExtendedSelection);
     box->addWidget(results_lbl);
     box->addWidget(resultsBrowser);
     
@@ -185,4 +186,4 @@ bool SearchTab::loadColWidthSearchList(){
   }
   qDebug("Search list columns width loaded");
   return true;
-}
+}

src/about_imp.h

@@ -56,13 +56,13 @@ class about : public QDialog, private Ui::AboutDlg{
           "<i>- <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Bulgarian:</u> Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)<br>\
           - <u>Catalan:</u> Gekko Dam Beer (gekko04@users.sourceforge.net)<br>\
-          - <u>Chinese (Simplified):</u> Guo Yue (guoyue0418@hotmail.com)<br>\
+          - <u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)<br>\
           - <u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)<br>\
-          - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net)<br>\
+          - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net) and Peter Koeleman (peter@peerweb.nl)<br>\
           - <u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net)<br>\
           - <u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)<br>\
           - <u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)<br>\
-          - <u>Hungarian:</u> Majoros Péter (majoros.j.p@t-online.hu)<br>\
+          - <u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)<br>\
           - <u>Italian:</u> Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)<br>\
           - <u>Japanese:</u> Nardog (nardog@e2umail.com)<br>\
           - <u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)<br>\
@@ -70,9 +70,9 @@ class about : public QDialog, private Ui::AboutDlg{
           - <u>Polish:</u> Jarek Smieja (ajep9691@wp.pl)<br>\
           - <u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)<br>\
-          - <u>Russian:</u> Nick Khazov (m2k3d0n at users.sourceforge.net)<br>\
+          - <u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)<br>\
           - <u>Slovak:</u>  helix84<br>\
-          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)<br>\
+          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net) and Gabriel de Oliveira (deadloop@hotmail.com)<br>\
           - <u>Swedish:</u> Daniel Nylander (po@danielnylander.se)<br>\
           - <u>Turkish:</u> Erdem Bingöl (erdem84@gmail.com)<br>\
           - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net)<br><br>"));

src/arborescence.h

@@ -234,7 +234,7 @@ class arborescence {
     void addFile(QString path, size_type file_size, int index, float progress=0., int priority=1) {
       Q_ASSERT(root->isDir());
       path = QDir::cleanPath(path);
-      Q_ASSERT(path.startsWith(root->path()));
+      //Q_ASSERT(path.startsWith(root->path()));
       QString relative_path = path.remove(0, root->path().size());
       if(relative_path.at(0) ==QDir::separator())
         relative_path.remove(0, 1);

src/bittorrent.h

@@ -70,6 +70,15 @@ class bittorrent : public QObject{
     FilterParserThread *filterParser;
     QString filterPath;
     int folderScanInterval; // in seconds
+    bool queueingEnabled;
+    int maxActiveDownloads;
+    int maxActiveTorrents;
+    int currentActiveDownloads;
+    QStringList *downloadQueue;
+    QStringList *queuedDownloads;
+    QStringList *uploadQueue;
+    QStringList *queuedUploads;
+    bool calculateETA;
 
   protected:
     QString getSavePath(QString hash);
@@ -97,6 +106,14 @@ class bittorrent : public QObject{
     bool has_filtered_files(QString hash) const;
     unsigned int getFinishedPausedTorrentsNb() const;
     unsigned int getUnfinishedPausedTorrentsNb() const;
+    bool isQueueingEnabled() const;
+    int getDlTorrentPriority(QString hash) const;
+    int getUpTorrentPriority(QString hash) const;
+    int getMaximumActiveDownloads() const;
+    int getMaximumActiveTorrents() const;
+    bool isDownloadQueued(QString hash) const;
+    bool isUploadQueued(QString hash) const;
+    int loadTorrentPriority(QString hash);
 
   public slots:
     void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
@@ -116,6 +133,7 @@ class bittorrent : public QObject{
     void enablePeerExchange();
     void enableIPFilter(QString filter);
     void disableIPFilter();
+    void setQueueingEnabled(bool enable);
     void resumeUnfinishedTorrents();
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
@@ -123,6 +141,13 @@ class bittorrent : public QObject{
     void loadDownloadUploadForTorrent(QString hash);
     void handleDownloadFailure(QString url, QString reason);
     void loadWebSeeds(QString fileHash);
+    void updateDownloadQueue();
+    void updateUploadQueue();
+    void increaseDlTorrentPriority(QString hash);
+    void decreaseDlTorrentPriority(QString hash);
+    void increaseUpTorrentPriority(QString hash);
+    void decreaseUpTorrentPriority(QString hash);
+    void saveTorrentPriority(QString hash, int prio);
     // Session configuration - Setters
     void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
     void setMaxConnections(int maxConnec);
@@ -149,6 +174,9 @@ class bittorrent : public QObject{
     bool enableDHT(bool b);
     void reloadTorrent(const QTorrentHandle &h, bool full_alloc);
     void setTimerScanInterval(int secs);
+    void setMaxActiveDownloads(int val);
+    void setMaxActiveTorrents(int val);
+    void setETACalculation(bool enable);
 
   protected slots:
     void scanDirectory();
@@ -182,6 +210,8 @@ class bittorrent : public QObject{
     void torrent_ratio_deleted(QString fileName);
     void UPnPError(QString msg);
     void UPnPSuccess(QString msg);
+    void updateFinishedTorrentNumber();
+    void updateUnfinishedTorrentNumber();
 };
 
 #endif

src/download.ui

@@ -239,6 +239,11 @@
     <string>Buy it</string>
    </property>
   </action>
+  <action name="actionHOSColPriority" >
+   <property name="text" >
+    <string>Priority</string>
+   </property>
+  </action>
   <zorder>tabBottom</zorder>
   <zorder></zorder>
  </widget>

src/downloadThread.cpp

@@ -24,6 +24,8 @@
 #include <QSettings>
 #include <stdio.h>
 
+#define MAX_THREADS 3
+
 // http://curl.rtin.bz/libcurl/c/libcurl-errors.html
 QString subDownloadThread::errorCodeToString(CURLcode status) {
   switch(status){
@@ -150,9 +152,7 @@ downloadThread::~downloadThread(){
 
 void downloadThread::downloadUrl(QString url){
   QMutexLocker locker(&mutex);
-  if(downloading_list.contains(url)) return;
-  url_list << url;
-  downloading_list << url;
+  urls_queue.enqueue(url);
   if(!isRunning()){
     start();
   }else{
@@ -165,8 +165,8 @@ void downloadThread::run(){
     if(abort)
       return;
     mutex.lock();
-    if(url_list.size() != 0){
-      QString url = url_list.takeFirst();
+    if(!urls_queue.empty() && subThreads.size() < MAX_THREADS){
+      QString url = urls_queue.dequeue();
       mutex.unlock();
       subDownloadThread *st = new subDownloadThread(0, url);
       subThreads << st;
@@ -187,9 +187,9 @@ void downloadThread::propagateDownloadedFile(subDownloadThread* st, QString url,
   delete st;
   emit downloadFinished(url, path);
   mutex.lock();
-  index = downloading_list.indexOf(url);
-  Q_ASSERT(index != -1);
-  downloading_list.removeAt(index);
+  if(!urls_queue.empty()) {
+    condition.wakeOne();
+  }
   mutex.unlock();
 }
 
@@ -200,8 +200,8 @@ void downloadThread::propagateDownloadFailure(subDownloadThread* st, QString url
   delete st;
   emit downloadFailure(url, reason);
   mutex.lock();
-  index = downloading_list.indexOf(url);
-  Q_ASSERT(index != -1);
-  downloading_list.removeAt(index);
+  if(!urls_queue.empty()) {
+    condition.wakeOne();
+  }
   mutex.unlock();
 }

src/downloadThread.h

@@ -30,6 +30,7 @@
 #include <QWaitCondition>
 #include <QStringList>
 #include <curl/curl.h>
+#include <QQueue>
 
 class subDownloadThread : public QThread {
   Q_OBJECT
@@ -55,8 +56,7 @@ class downloadThread : public QThread {
   Q_OBJECT
 
   private:
-    QStringList url_list;
-    QStringList downloading_list;
+    QQueue<QString> urls_queue;
     QMutex mutex;
     QWaitCondition condition;
     bool abort;

src/downloadingTorrents.cpp

@@ -49,7 +49,7 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
 //   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/filter.png")));
 
   // Set Download list model
-  DLListModel = new QStandardItemModel(0,9);
+  DLListModel = new QStandardItemModel(0,10);
   DLListModel->setHeaderData(NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
   DLListModel->setHeaderData(SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
   DLListModel->setHeaderData(PROGRESS, Qt::Horizontal, tr("Progress", "i.e: % downloaded"));
@@ -58,9 +58,12 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   DLListModel->setHeaderData(SEEDSLEECH, Qt::Horizontal, tr("Seeds/Leechs", "i.e: full/partial sources"));
   DLListModel->setHeaderData(RATIO, Qt::Horizontal, tr("Ratio"));
   DLListModel->setHeaderData(ETA, Qt::Horizontal, tr("ETA", "i.e: Estimated Time of Arrival / Time left"));
+  DLListModel->setHeaderData(PRIORITY, Qt::Horizontal, tr("Priority"));
   downloadList->setModel(DLListModel);
   DLDelegate = new DLListDelegate(downloadList);
   downloadList->setItemDelegate(DLDelegate);
+  // Hide priority column
+  downloadList->hideColumn(PRIORITY);
   // Hide hash column
   downloadList->hideColumn(HASH);
   loadHiddenColumns();
@@ -108,6 +111,7 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   connect(actionHOSColSeedersLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSeedersLeechers()));
   connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
   connect(actionHOSColEta, SIGNAL(triggered()), this, SLOT(hideOrShowColumnEta()));
+  connect(actionHOSColPriority, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPriority()));
 
   // Set info Bar infos
   setInfoBar(tr("qBittorrent %1 started.", "e.g: qBittorrent v0.x started.").arg(QString::fromUtf8(""VERSION)));
@@ -121,6 +125,13 @@ DownloadingTorrents::~DownloadingTorrents() {
   delete DLListModel;
 }
 
+void DownloadingTorrents::enablePriorityColumn(bool enable) {
+  if(enable) {
+    downloadList->showColumn(PRIORITY);
+  } else {
+    downloadList->hideColumn(PRIORITY);
+  }
+}
 
 void DownloadingTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
   unsigned int row = index.row();
@@ -311,7 +322,7 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
   myDLLlistMenu.addAction(actionBuy_it);
   // Call menu
   // XXX: why mapToGlobal() is not enough?
-  myDLLlistMenu.exec(mapToGlobal(pos)+QPoint(10,60));
+  myDLLlistMenu.exec(mapToGlobal(pos)+QPoint(10,35));
 }
 
 
@@ -323,11 +334,17 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
 void DownloadingTorrents::displayDLHoSMenu(const QPoint& pos){
   QMenu hideshowColumn(this);
   hideshowColumn.setTitle(tr("Hide or Show Column"));
-  for(int i=0; i<=ETA; i++) {
+  int lastCol;
+  if(BTSession->isQueueingEnabled()) {
+    lastCol = PRIORITY;
+  } else {
+    lastCol = ETA;
+  }
+  for(int i=0; i <= lastCol; ++i) {
     hideshowColumn.addAction(getActionHoSCol(i));
   }
   // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,55));
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,10));
 }
 
 // toggle hide/show a column
@@ -347,11 +364,19 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
     downloadList->setColumnHidden(index, true);
     getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
     --nbVisibleColumns;
+    if(index == ETA) {
+      BTSession->setETACalculation(false);
+      qDebug("Disable ETA calculation");
+    }
   } else {
     // User want to display the column
     downloadList->setColumnHidden(index, false);
     getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
     ++nbVisibleColumns;
+    if(index == ETA) {
+      BTSession->setETACalculation(true);
+      qDebug("Enable ETA calculation");
+    }
   }
   //resize all others non-hidden columns
   for(unsigned int i=0; i<nbCols; ++i) {
@@ -361,6 +386,10 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
   }
 }
 
+void DownloadingTorrents::hidePriorityColumn(bool hide) {
+  downloadList->setColumnHidden(PRIORITY, hide);
+}
+
 // save the hidden columns in settings
 void DownloadingTorrents::saveHiddenColumns() {
   QSettings settings("qBittorrent", "qBittorrent");
@@ -436,6 +465,9 @@ void DownloadingTorrents::hideOrShowColumnEta() {
   hideOrShowColumn(ETA);
 }
 
+void DownloadingTorrents::hideOrShowColumnPriority() {
+  hideOrShowColumn(PRIORITY);
+}
 
 void DownloadingTorrents::on_actionClearLog_triggered() {
   infoBar->clear();
@@ -468,6 +500,9 @@ QAction* DownloadingTorrents::getActionHoSCol(int index) {
     case ETA :
       return actionHOSColEta;
     break;
+    case PRIORITY :
+      return actionHOSColPriority;
+      break;
     default :
       return NULL;
   }
@@ -524,6 +559,17 @@ void DownloadingTorrents::updateDlList() {
         row = getRowFromHash(hash);
       }
       Q_ASSERT(row != -1);
+      // Update Priority
+      if(BTSession->isQueueingEnabled()) {
+        DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
+        if(h.is_paused() && BTSession->isDownloadQueued(hash)) {
+          DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
+          if(!downloadList->isColumnHidden(ETA)) {
+            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+          }
+          setRowColor(row, QString::fromUtf8("grey"));
+        }
+      }
       // No need to update a paused torrent
       if(h.is_paused()) continue;
       if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
@@ -633,6 +679,8 @@ void DownloadingTorrents::addTorrent(QString hash) {
   DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.));
   DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(QString::fromUtf8("0/0")));
   DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+  if(BTSession->isQueueingEnabled())
+    DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
   DLListModel->setData(DLListModel->index(row, HASH), QVariant(hash));
   // Pause torrent if it was paused last time
   if(BTSession->isPaused(hash)) {

src/downloadingTorrents.h

@@ -55,6 +55,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     QString getHashFromRow(unsigned int row) const;
     QStringList getSelectedTorrents(bool only_one=false) const;
     unsigned int getNbTorrentsInList() const;
+    void enablePriorityColumn(bool enable);
 
   signals:
     void unfinishedTorrentsNumberChanged(unsigned int);
@@ -92,6 +93,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void hideOrShowColumnSeedersLeechers();
     void hideOrShowColumnRatio();
     void hideOrShowColumnEta();
+    void hideOrShowColumnPriority();
     void displayUPnPError(QString msg);
     void displayUPnPSuccess(QString msg);
 
@@ -106,6 +108,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void sortProgressColumnDelayed();
     void updateFileSizeAndProgress(QString hash);
     void showPropertiesFromHash(QString hash);
+    void hidePriorityColumn(bool hide);
 
 };
 

src/httpconnection.cpp

@@ -30,6 +30,7 @@
 #include <QHttpResponseHeader>
 #include <QFile>
 #include <QDebug>
+#include <QTemporaryFile>
 
 HttpConnection::HttpConnection(QTcpSocket *socket, HttpServer *parent)
 	: QObject(parent), socket(socket), parent(parent)
@@ -45,11 +46,17 @@ HttpConnection::~HttpConnection()
 
 void HttpConnection::read()
 {
-	QString input = socket->readAll();
+	QByteArray input = socket->readAll();
 	qDebug(" -------");
 	qDebug("|REQUEST|");
 	qDebug(" -------");
-	qDebug("%s", input.toAscii().constData());
+	//qDebug("%s", input.toAscii().constData());
+	if(input.size() > 100000) {
+		qDebug("Request too big");
+		generator.setStatusLine(400, "Bad Request");
+		write();
+		return;
+	}
 	parser.write(input);
 	if(parser.isError())
 	{
@@ -74,6 +81,7 @@ void HttpConnection::write()
 
 void HttpConnection::respond()
 {
+	qDebug("Respond called");
 	QStringList auth = parser.value("Authorization").split(" ", QString::SkipEmptyParts);
 	if (auth.size() != 2 || QString::compare(auth[0], "Basic", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth[1].toUtf8()))
 	{
@@ -176,6 +184,25 @@ void HttpConnection::respondCommand(QString command)
 		emit urlsReadyToBeDownloaded(url_list_cleaned);
 		return;
 	}
+	if(command == "upload")
+	{
+		QByteArray torrentfile = parser.torrent();
+		// XXX: Trick to get a unique filename
+		QString filePath;
+		QTemporaryFile *tmpfile = new QTemporaryFile();
+		if (tmpfile->open()) {
+			filePath = tmpfile->fileName();
+		}
+		delete tmpfile;
+		// write it to HD
+		QFile torrent(filePath);
+		if(torrent.open(QIODevice::WriteOnly)) {
+			torrent.write(torrentfile);
+			torrent.close();
+		}
+		emit torrentReadyToBeDownloaded(filePath, false, QString(), false);
+		return;
+	}
 	if(command == "resumeall")
 	{
 		emit resumeAllTorrents();

src/httpconnection.h

@@ -57,6 +57,7 @@ class HttpConnection : public QObject
 
 	signals:
 		void urlsReadyToBeDownloaded(const QStringList&);
+		void torrentReadyToBeDownloaded(QString, bool, QString, bool);
 		void deleteTorrent(QString hash);
 		void resumeTorrent(QString hash);
 		void pauseTorrent(QString hash);

src/httprequestparser.cpp

@@ -49,11 +49,11 @@ QString HttpRequestParser::url() const
 	return path;
 }
 
-QString HttpRequestParser::message() const
+QByteArray HttpRequestParser::message() const
 {
 	if(isParsable())
 		return data;
-	return QString();
+	return QByteArray();
 }
 
 QString HttpRequestParser::get(const QString key) const
@@ -66,7 +66,12 @@ QString HttpRequestParser::post(const QString key) const
 	return postMap[key];
 }
 
-void HttpRequestParser::write(QString str)
+QByteArray HttpRequestParser::torrent() const
+{
+	return torrent_content;
+}
+
+void HttpRequestParser::write(QByteArray str)
 {
 	while (!headerDone && str.size()>0)
 	{
@@ -111,7 +116,7 @@ void HttpRequestParser::write(QString str)
 				if(contentType() == "application/x-www-form-urlencoded")
 				{
 					QUrl url;
-					url.setEncodedQuery(data.toAscii());
+					url.setEncodedQuery(data);
 					QListIterator<QPair<QString, QString> > i(url.queryItems());
 					while (i.hasNext())
 					{
@@ -120,9 +125,15 @@ void HttpRequestParser::write(QString str)
 						qDebug() << pair.first << "=" << post(pair.first);
 					}
 				}
+				if(contentType() == "multipart/form-data")
+				{
+					//qDebug() << data.right(data.size()-data.indexOf("\r\n\r\n")-QByteArray("\r\n\r\n").size());
+					torrent_content = data.right(data.size()-data.indexOf("\r\n\r\n")-QByteArray("\r\n\r\n").size());
+				}
 			}
 		}
 		else
 			error = true;
 	}
+	qDebug() << "isError: " << isError();
 }

src/httprequestparser.h

@@ -30,10 +30,11 @@ class HttpRequestParser : public QHttpRequestHeader
 		bool headerDone;
 		bool messageDone;
 		bool error;
-		QString data;
+		QByteArray data;
 		QString path;
 		QMap<QString, QString> postMap;
 		QMap<QString, QString> getMap;
+		QByteArray torrent_content;
 
 	public:
 		HttpRequestParser();
@@ -41,10 +42,11 @@ class HttpRequestParser : public QHttpRequestHeader
 		bool isParsable() const;
 		bool isError() const;
 		QString url() const;
-		QString message() const;
+		QByteArray message() const;
 		QString get(const QString key) const;
 		QString post(const QString key) const;
-		void write(QString str);
+		QByteArray torrent() const;
+		void write(QByteArray str);
 };
 
 #endif

src/httpserver.cpp

@@ -62,6 +62,7 @@ void HttpServer::newHttpConnection()
 		HttpConnection *connection = new HttpConnection(socket, this);
 		//connect connection to BTSession
 		connect(connection, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), BTSession, SLOT(downloadFromURLList(const QStringList&)));
+		connect(connection, SIGNAL(torrentReadyToBeDownloaded(QString, bool, QString, bool)), BTSession, SLOT(addTorrent(QString, bool, QString, bool)));
 		connect(connection, SIGNAL(deleteTorrent(QString)), BTSession, SLOT(deleteTorrent(QString)));
 		connect(connection, SIGNAL(pauseTorrent(QString)), BTSession, SLOT(pauseTorrent(QString)));
 		connect(connection, SIGNAL(resumeTorrent(QString)), BTSession, SLOT(resumeTorrent(QString)));