- Sync with stable branch (lot of bug fixing)

qbittorrent · Sep 13, 2008 · 95ecaec · 95ecaec
1 parent 0e7c169
commit 95ecaec
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 120 deletions.
diff --git a/Changelog b/Changelog
@@ -1,6 +1,5 @@
 * 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
@@ -10,6 +9,15 @@
     - COSMETIC: Allow to hide or display top toolbar
     - COSMETIC: Log is now in a separate dialog
 
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.1.4
+    - FEATURE: DHT is no longer used as fallback only
+    - BUGFIX: Fixed 'start seeding after torrent creation' feature
+    - BUGFIX: Fixed compilation with boost v1.36
+    - BUGFIX: Some code optimization
+    - BUGFIX: Fixed memory leak in Web UI
+    - BUGFIX: Fixed problems with column sorting
+    - BUGFIX: Improved code for pausing torrents on startup
+
 * Tue Aug 26 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.3
     - BUGFIX: Fixed ratio saving for seeding torrents
     - I18N: Added czech and traditional chinese translations

diff --git a/src/FinishedTorrents.cpp b/src/FinishedTorrents.cpp
@@ -58,7 +58,7 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   // Make download list header clickable for sorting
   finishedList->header()->setClickable(true);
   finishedList->header()->setSortIndicatorShown(true);
-  connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortFinishedList(int)));
+  connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(toggleFinishedListSortOrder(int)));
   finishedListDelegate = new FinishedListDelegate(finishedList);
   finishedList->setItemDelegate(finishedListDelegate);
   connect(finishedList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFinishedListMenu(const QPoint&)));
@@ -139,6 +139,7 @@ void FinishedTorrents::addTorrent(QString hash){
   // Update the number of finished torrents
   ++nbFinished;
   emit finishedTorrentsNumberChanged(nbFinished);
+  sortFinishedList();
 }
 
 void FinishedTorrents::torrentAdded(QTorrentHandle& h) {
@@ -190,10 +191,27 @@ bool FinishedTorrents::loadColWidthFinishedList(){
   for(unsigned int i=0; i<listSize; ++i){
         finishedList->header()->resizeSection(i, width_list.at(i).toInt());
   }
+  loadLastSortedColumn();
   qDebug("Finished list columns width loaded");
   return true;
 }
 
+void FinishedTorrents::loadLastSortedColumn() {
+  // Loading last sorted column
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  QString sortedCol = settings.value(QString::fromUtf8("FinishedListSortedCol"), QString()).toString();
+  if(!sortedCol.isEmpty()) {
+    Qt::SortOrder sortOrder;
+    if(sortedCol.endsWith(QString::fromUtf8("d")))
+      sortOrder = Qt::DescendingOrder;
+    else
+      sortOrder = Qt::AscendingOrder;
+    sortedCol = sortedCol.left(sortedCol.size()-1);
+    int index = sortedCol.toInt();
+    sortFinishedList(index, sortOrder);
+  }
+}
+
 // Save columns width in a file to remember them
 // (finished list)
 void FinishedTorrents::saveColWidthFinishedList() const{
@@ -262,9 +280,6 @@ void FinishedTorrents::updateFinishedList(){
       }
     }
     if(h.is_paused()) continue;
-    if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
-      continue;
-    }
     if(h.state() == torrent_status::downloading || (h.state() != torrent_status::checking_files && h.state() != torrent_status::queued_for_checking && h.is_seed())) {
       // What are you doing here? go back to download tab!
       int reponse = QMessageBox::question(this, tr("Incomplete torrent in seeding list"), tr("It appears that the state of '%1' torrent changed from 'seeding' to 'downloading'. Would you like to move it back to download list? (otherwise the torrent will simply be deleted)").arg(h.name()), QMessageBox::Yes | QMessageBox::No);
@@ -577,17 +592,12 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
  * Sorting functions
  */
 
-void FinishedTorrents::sortFinishedList(int index){
-  static Qt::SortOrder sortOrder = Qt::AscendingOrder;
+void FinishedTorrents::toggleFinishedListSortOrder(int index) {
+  Qt::SortOrder sortOrder = Qt::AscendingOrder;
   if(finishedList->header()->sortIndicatorSection() == index){
-    if(sortOrder == Qt::AscendingOrder){
-      sortOrder = Qt::DescendingOrder;
-    }else{
-      sortOrder = Qt::AscendingOrder;
-    }
+    sortOrder = (Qt::SortOrder)!(bool)finishedList->header()->sortIndicatorSection();
   }
-  finishedList->header()->setSortIndicator(index, sortOrder);
-  switch(index){
+  switch(index) {
     case F_SIZE:
     case F_UPSPEED:
     case F_PRIORITY:
@@ -596,6 +606,30 @@ void FinishedTorrents::sortFinishedList(int index){
     default:
       sortFinishedListString(index, sortOrder);
   }
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  QString sortOrderLetter;
+  if(sortOrder == Qt::AscendingOrder)
+    sortOrderLetter = QString::fromUtf8("a");
+  else
+    sortOrderLetter = QString::fromUtf8("d");
+  settings.setValue(QString::fromUtf8("FinishedListSortedCol"), misc::toQString(index)+sortOrderLetter);
+}
+
+void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
+  if(index == -1) {
+    index = finishedList->header()->sortIndicatorSection();
+    sortOrder = finishedList->header()->sortIndicatorOrder();
+  } else {
+    finishedList->header()->setSortIndicator(index, sortOrder);
+  }
+  switch(index) {
+    case F_SIZE:
+    case F_UPSPEED:
+      sortFinishedListFloat(index, sortOrder);
+      break;
+    default:
+      sortFinishedListString(index, sortOrder);
+  }
 }
 
 void FinishedTorrents::sortFinishedListFloat(int index, Qt::SortOrder sortOrder){

diff --git a/src/FinishedTorrents.h b/src/FinishedTorrents.h
@@ -60,7 +60,9 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void displayFinishedHoSMenu(const QPoint&);
     void setRowColor(int row, QString color);
     void saveColWidthFinishedList() const;
-    void sortFinishedList(int index);
+    void loadLastSortedColumn();
+    void toggleFinishedListSortOrder(int index);
+    void sortFinishedList(int index=-1, Qt::SortOrder sortOrder=Qt::AscendingOrder);
     void sortFinishedListFloat(int index, Qt::SortOrder sortOrder);
     void sortFinishedListString(int index, Qt::SortOrder sortOrder);
     void updateFileSize(QString hash);

diff --git a/src/GUI.cpp b/src/GUI.cpp
@@ -125,7 +125,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   BTSession = new bittorrent();
   connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&)), this, SLOT(fullDiskError(QTorrentHandle&)));
   connect(BTSession, SIGNAL(finishedTorrent(QTorrentHandle&)), this, SLOT(finishedTorrent(QTorrentHandle&)));
-  connect(BTSession, SIGNAL(torrentFinishedChecking(QString)), this, SLOT(torrentChecked(QString)));
   connect(BTSession, SIGNAL(trackerAuthenticationRequired(QTorrentHandle&)), this, SLOT(trackerAuthenticationRequired(QTorrentHandle&)));
   connect(BTSession, SIGNAL(scanDirFoundTorrents(const QStringList&)), this, SLOT(processScannedFiles(const QStringList&)));
   connect(BTSession, SIGNAL(newDownloadedTorrent(QString, QString)), this, SLOT(processDownloadedFiles(QString, QString)));
@@ -338,27 +337,6 @@ void GUI::writeSettings() {
   settings.endGroup();
 }
 
-// Called when a torrent finished checking
-void GUI::torrentChecked(QString hash) const {
-  // Check if the torrent was paused after checking
-  if(BTSession->isPaused(hash)) {
-    // Was paused, change its icon/color
-    if(BTSession->isFinished(hash)) {
-      // In finished list
-      qDebug("Automatically paused torrent was in finished list");
-      finishedTorrentTab->pauseTorrent(hash);
-    }else{
-      // In download list
-      downloadingTorrentTab->pauseTorrent(hash);
-    }
-  }
-  if(!BTSession->isFinished(hash)){
-    // Delayed Sorting
-    downloadingTorrentTab->updateFileSizeAndProgress(hash);
-    downloadingTorrentTab->sortProgressColumnDelayed();
-  }
-}
-
 // called when a torrent has finished
 void GUI::finishedTorrent(QTorrentHandle& h) const {
   qDebug("In GUI, a torrent has finished");

diff --git a/src/GUI.h b/src/GUI.h
@@ -163,7 +163,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void downloadFromURLList(const QStringList& urls);
     void deleteTorrent(QString hash);
     void finishedTorrent(QTorrentHandle& h) const;
-    void torrentChecked(QString hash) const;
     void updateLists();
     bool initWebUi(QString username, QString password, int port);
     void pauseTorrent(QString hash);

diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
@@ -574,8 +574,6 @@ bool bittorrent::isPaused(QString hash) const{
     qDebug("/!\\ Error: Invalid handle");
     return true;
   }
-  if(torrentsToPauseAfterChecking.contains(hash))
-    return true;
   return h.is_paused();
 }
 
@@ -833,11 +831,6 @@ bool bittorrent::resumeTorrent(QString hash) {
   // Delete .paused file
   if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".paused"))
     QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".paused");
-  int index = torrentsToPauseAfterChecking.indexOf(hash);
-  if(index != -1) {
-    torrentsToPauseAfterChecking.removeAt(index);
-    change = true;
-  }
   if(queueingEnabled) {
     updateDownloadQueue();
     updateUploadQueue();
@@ -892,7 +885,7 @@ void bittorrent::loadWebSeeds(QString hash) {
 }
 
 // Add a torrent to the bittorrent session
-void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bool resumed) {
+void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bool) {
   QTorrentHandle h;
   entry resume_data;
   bool fastResume=false;
@@ -1005,18 +998,15 @@ void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bo
       // Copy it to torrentBackup directory
       QFile::copy(file, newFile);
     }
-    // Pause torrent if it was paused last time
-    if((!resumed && addInPause) || QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".paused")) {
-      torrentsToPauseAfterChecking << hash;
-      qDebug("Adding a torrent to the torrentsToPauseAfterChecking list");
-    }
     // 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_sequenced_download_threshold(1);
     }
-    // Start torrent because it was added in paused state
-    h.resume();
+    if(!addInPause && !QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".paused")) {
+      // Start torrent because it was added in paused state
+      h.resume();
+    }
     if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".finished")) {
       finishedTorrents << hash;
       if(queueingEnabled) {
@@ -1353,6 +1343,14 @@ void bittorrent::loadDownloadUploadForTorrent(QString hash) {
   ratioData[hash] = downUp;
 }
 
+float bittorrent::getUncheckedTorrentProgress(QString hash) const {
+  /*if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".finished"))
+    return 1.;*/
+  QTorrentHandle h = getTorrentHandle(hash);
+  QPair<size_type,size_type> downUpInfo = ratioData.value(hash, QPair<size_type,size_type>(0,0));
+  return (float)downUpInfo.first / (float)h.actual_size();
+}
+
 float bittorrent::getRealRatio(QString hash) const{
   QPair<size_type,size_type> downUpInfo = ratioData.value(hash, QPair<size_type,size_type>(0,0));
   size_type download = downUpInfo.first;
@@ -1813,20 +1811,14 @@ void bittorrent::readAlerts() {
       if(h.is_valid()){
         QString hash = h.hash();
         qDebug("%s have just finished checking", hash.toUtf8().data());
-        int index = torrentsToPauseAfterChecking.indexOf(hash);
-        if(index != -1) {
-          torrentsToPauseAfterChecking.removeAt(index);
-          // Pause torrent
-          pauseTorrent(hash);
-          qDebug("%s was paused after checking", hash.toUtf8().data());
-        } else {
+	if(!h.is_paused()) {
           // Save Addition DateTime
           if(calculateETA) {
             TorrentsStartTime[hash] = QDateTime::currentDateTime();
             TorrentsStartData[hash] = h.total_payload_download();
           }
-        }
-        emit torrentFinishedChecking(hash);
+	}
+        //emit torrentFinishedChecking(hash);
       }
     }
     a = s->pop_alert();
@@ -1837,10 +1829,6 @@ QHash<QString, QString> bittorrent::getTrackersErrors(QString hash) const{
   return trackersErrors.value(hash, QHash<QString, QString>());
 }
 
-QStringList bittorrent::getTorrentsToPauseAfterChecking() const{
-  return torrentsToPauseAfterChecking;
-}
-
 // Reload a torrent with full allocation mode
 void bittorrent::reloadTorrent(const QTorrentHandle &h, bool full_alloc) {
   qDebug("** Reloading a torrent");

diff --git a/src/bittorrent.h b/src/bittorrent.h
@@ -54,7 +54,6 @@ class bittorrent : public QObject {
     bool DHTEnabled;
     downloadThread *downloader;
     QString defaultSavePath;
-    QStringList torrentsToPauseAfterChecking;
     QHash<QString, QDateTime> TorrentsStartTime;
     QHash<QString, size_type> TorrentsStartData;
     QHash<QString, QPair<size_type,size_type> > ratioData;
@@ -100,7 +99,6 @@ class bittorrent : public QObject {
     float getPayloadUploadRate() const;
     session_status getSessionStatus() const;
     int getListenPort() const;
-    QStringList getTorrentsToPauseAfterChecking() const;
     qlonglong getETA(QString hash) const;
     float getRealRatio(QString hash) const;
     session* getSession() const;
@@ -121,6 +119,7 @@ class bittorrent : public QObject {
     int loadTorrentPriority(QString hash);
     QStringList getConsoleMessages() const;
     QStringList getPeerBanMessages() const;
+    float getUncheckedTorrentProgress(QString hash) const;
 
   public slots:
     void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
@@ -215,7 +214,7 @@ class bittorrent : public QObject {
     void downloadFromUrlFailure(QString url, QString reason);
     //void fastResumeDataRejected(QString name);
     //void urlSeedProblem(QString url, QString msg);
-    void torrentFinishedChecking(QString hash);
+    //void torrentFinishedChecking(QString hash);
     //void torrent_ratio_deleted(QString fileName);
     //void UPnPError(QString msg);
     //void UPnPSuccess(QString msg);