- Tagging v1.2.1 release

- Progress column is now correctly sorted on startup (closes #133925 again)

AUTHORS

@@ -17,13 +17,14 @@ Images Authors:
   license: Creative Commons Public Domain Dedication
   url: http://www.openclipart.org
 
-* files: src/Icons/skins/*.png
+* files: src/Icons/skin/*.png
+  files: src/menuicons/YYxYY/*.png
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* files: src/menuicons/YYxYY/*.png
-  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
-  license: GPLv2
+* file: src/Icons/skin/tabs.gif
+  copyright: Greg Houston <gregory.houston@gmail.com>
+  license: MIT
 
 * file: src/search_engine/engines/btjunkie.png
   copyright: Downloaded from btjunkie.org
@@ -46,7 +47,7 @@ Translations authors:
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
   - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
-  - Chinese (Simplified): Guo Yue (guoyue0418@hotmail.com)
+  - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)

Changelog

@@ -1,14 +1,21 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
+* Sun Nov 9 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.1
+    - BUGFIX: Fixed possible crash when deleting a torrent permanently
+    - BUGFIX: Queued_for_checking torrents were not displayed as checking in seeding list
+    - BUGFIX: Speed up startup time when having a lot of torrents
+
+* Wed Oct 29 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
     - FEATURE: Torrent queueing system (with priorities)
     - FEATURE: The number of DHT nodes is displayed
     - FEATURE: RSS can now be disabled from program preferences
-    - FEATURE: Added collapse/expand all buttons in addition dialog
+    - FEATURE: Added collapse/expand all buttons in addition and properties dialogs
     - FEATURE: Can have different proxies for Bittorrent and search engine
     - FEATURE: Allow multiple item selection in Web UI transfer list
     - FEATURE: Moved uploads to a separate list in Web UI
     - BUGFIX: Totally rewritten Web UI list refresh system (fixed memory leak)
     - BUGFIX: Disable ETA calculation when ETA column is hidden
     - BUGFIX: Removed "disconnected" connection state, detection was far from perfect
+    - BUGFIX: Torrents are no longer starting from scratch when changing default save path (when torrent addition dialog is disabled)
+    - BUGFIX: Single instance code is now more reliable on Qt >= 4.4
     - COSMETIC: Transfer speed, ratio, connection status and DHT nodes are displayed in status bar    
     - COSMETIC: RSS Tab is now hidden as a default
     - COSMETIC: Allow to hide or display top toolbar

TODO

@@ -1,4 +1,18 @@
 See https://blueprints.launchpad.net/qbittorrent/
 
-// in v1.2.0
-- Split download and uploads in Web UI (Ishan Ahora)
+// translations done
+- french
+- chinese traditional
+- chinese simplified
+- finish
+- swedish
+- slovak
+- German
+- Hungarian
+- Italian
+- Dutch
+- Romanian
+- Korean
+- Russian
+- Bulgarian
+- Greek

src/FinishedTorrents.cpp

@@ -139,7 +139,6 @@ void FinishedTorrents::addTorrent(QString hash){
   // Update the number of finished torrents
   ++nbFinished;
   emit finishedTorrentsNumberChanged(nbFinished);
-  sortFinishedList();
 }
 
 void FinishedTorrents::torrentAdded(QTorrentHandle& h) {
@@ -280,7 +279,7 @@ void FinishedTorrents::updateFinishedList(){
       }
     }
     if(h.is_paused()) continue;
-    if(h.state() == torrent_status::downloading || (h.state() != torrent_status::checking_files && h.state() != torrent_status::queued_for_checking && !h.is_seed())) {
+    if(h.state() == torrent_status::downloading || (h.state() != torrent_status::checking_files && h.state() != torrent_status::queued_for_checking && h.progress() < 1.)) {
       // 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);
       if (reponse == QMessageBox::Yes) {
@@ -291,11 +290,11 @@ void FinishedTorrents::updateFinishedList(){
       }
       else if (reponse == QMessageBox::No) {
 		    qDebug("Deleted from the finished");
-		    BTSession->deleteTorrent(hash, true);
+		    BTSession->deleteTorrent(hash, false);
       }
       continue;
     }
-    if(h.state() == torrent_status::checking_files){
+    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);
       setRowColor(row, QString::fromUtf8("grey"));
       continue;
@@ -625,6 +624,7 @@ void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
   switch(index) {
     case F_SIZE:
     case F_UPSPEED:
+    case F_PRIORITY:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:

src/FinishedTorrents.h

@@ -60,7 +60,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void displayFinishedHoSMenu(const QPoint&);
     void setRowColor(int row, QString color);
     void saveColWidthFinishedList() const;
-    void loadLastSortedColumn();
     void toggleFinishedListSortOrder(int index);
     void sortFinishedList(int index=-1, Qt::SortOrder sortOrder=Qt::AscendingOrder);
     void sortFinishedListFloat(int index, Qt::SortOrder sortOrder);
@@ -85,6 +84,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void deleteTorrent(QString hash);
     void showPropertiesFromHash(QString hash);
     void hidePriorityColumn(bool hide);
+    void loadLastSortedColumn();
 
   signals:
     void torrentMovedFromFinishedList(QString);

src/GUI.cpp

@@ -166,6 +166,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   configureSession(true);
   // Resume unfinished torrents
   BTSession->resumeUnfinishedTorrents();
+  downloadingTorrentTab->loadLastSortedColumn();
+  finishedTorrentTab->loadLastSortedColumn();
   // Add torrent given on command line
   processParams(torrentCmdLine);
   // Initialize Web UI
@@ -181,6 +183,13 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
 #ifdef QT_4_4
   localServer = new QLocalServer();
   QString uid = QString::number(getuid());
+#ifdef Q_WS_X11
+  if(QFile::exists(QDir::tempPath()+QDir::separator()+QString("qBittorrent-")+uid)) {
+    // Socket was not closed cleanly
+    std::cerr << "Warning: Local domain socket was not closed cleanly, deleting file...\n";
+    QFile::remove(QDir::tempPath()+QDir::separator()+QString("qBittorrent-")+uid);
+  }
+#endif
   if (!localServer->listen("qBittorrent-"+uid)) {
 #else
   localServer = new QTcpServer();
@@ -188,7 +197,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
 #endif
     std::cerr  << "Couldn't create socket, single instance mode won't work...\n";
   }
-#ifndef QT_4_4  
+#ifndef QT_4_4
   else {
     QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
     settings.setValue(QString::fromUtf8("uniqueInstancePort"), localServer->serverPort());
@@ -264,6 +273,7 @@ GUI::~GUI() {
     delete myTrayIconMenu;
   }
   qDebug("2");
+  localServer->close();
   delete localServer;
   delete connecStatusLblIcon;
   delete tabs;
@@ -1555,7 +1565,7 @@ bool GUI::initWebUi(QString username, QString password, int port)
     httpServer->close();
   }
   else
-    httpServer = new HttpServer(BTSession, 1000, this);
+    httpServer = new HttpServer(BTSession, 2000, this);
   httpServer->setAuthorization(username, password);
   bool success = httpServer->listen(QHostAddress::Any, port);
   if (success)

src/Icons/qBittorrent.desktop

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

src/addTorrentDialog.ui

@@ -120,7 +120,7 @@
      <item>
       <widget class="QPushButton" name="expandAllButton" >
        <property name="text" >
-        <string>Expand All</string>
+        <string>Expand all</string>
        </property>
       </widget>
      </item>

src/bittorrent.h

@@ -187,6 +187,7 @@ class bittorrent : public QObject {
     void setETACalculation(bool enable);
     void addConsoleMessage(QString msg, QColor color=QApplication::palette().color(QPalette::WindowText));
     void addPeerBanMessage(QString msg, bool from_ipfilter);
+    void fixTorrentPriorities();
 
   protected slots:
     void scanDirectory();
@@ -216,7 +217,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);

src/deleteThread.h

@@ -42,8 +42,8 @@ class subDeleteThread : public QThread {
     }
 
     ~subDeleteThread(){
+      wait();
       qDebug("subDeleteThread successfuly deleted");
-      //wait();
     }
 
   signals:
@@ -58,8 +58,8 @@ class subDeleteThread : public QThread {
       else
         emit deletionFailureST(this);*/
       arb->removeFromFS(save_path);
-      emit deletionSuccessST(this);
       delete arb;
+      emit deletionSuccessST(this);
     }
 };
 

src/downloadingTorrents.cpp

@@ -69,6 +69,7 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
 
   connect(BTSession, SIGNAL(addedTorrent(QTorrentHandle&)), this, SLOT(torrentAdded(QTorrentHandle&)));
   connect(BTSession, SIGNAL(forceUnfinishedListUpdate()), this, SLOT(updateDlList()));
+  connect(BTSession, SIGNAL(torrentFinishedChecking(QString)), this, SLOT(sortProgressColumn(QString)));
 
   // Load last columns width for download list
   if(!loadColWidthDLList()) {
@@ -621,12 +622,12 @@ void DownloadingTorrents::addTorrent(QString hash) {
     DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/paused.png"))), Qt::DecorationRole);
     setRowColor(row, QString::fromUtf8("red"));
   }else{
+    DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
     DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/connecting.png"))), Qt::DecorationRole);
     setRowColor(row, QString::fromUtf8("grey"));
   }
   ++nbTorrents;
   emit unfinishedTorrentsNumberChanged(nbTorrents);
-  sortDownloadList();
 }
 
 void DownloadingTorrents::sortDownloadListFloat(int index, Qt::SortOrder sortOrder) {
@@ -687,6 +688,7 @@ void DownloadingTorrents::toggleDownloadListSortOrder(int index) {
     case UPSPEED:
     case DLSPEED:
     case PROGRESS:
+    case PRIORITY:
       sortDownloadListFloat(index, sortOrder);
       break;
     default:
@@ -701,6 +703,19 @@ void DownloadingTorrents::toggleDownloadListSortOrder(int index) {
   settings.setValue(QString::fromUtf8("DownloadListSortedCol"), misc::toQString(index)+sortOrderLetter);
 }
 
+void DownloadingTorrents::sortProgressColumn(QString hash) {
+  int index = downloadList->header()->sortIndicatorSection();
+  if(index == PROGRESS) {
+    int row = getRowFromHash(hash);
+    if(row >= 0) {
+      QTorrentHandle h = BTSession->getTorrentHandle(hash);
+      DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+      Qt::SortOrder sortOrder = downloadList->header()->sortIndicatorOrder();
+      sortDownloadListFloat(index, sortOrder);
+    }
+  }
+}
+
 void DownloadingTorrents::sortDownloadList(int index, Qt::SortOrder sortOrder) {
   if(index == -1) {
     index = downloadList->header()->sortIndicatorSection();
@@ -768,7 +783,6 @@ bool DownloadingTorrents::loadColWidthDLList() {
   for(unsigned int i=0; i<listSize; ++i) {
         downloadList->header()->resizeSection(i, width_list.at(i).toInt());
   }
-  loadLastSortedColumn();
   qDebug("Download list columns width loaded");
   return true;
 }
@@ -808,8 +822,7 @@ void DownloadingTorrents::torrentAdded(QTorrentHandle& h) {
   DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
   DLListModel->setData(DLListModel->index(row, HASH), QVariant(hash));
   // Pause torrent if it was paused last time
-  // Not using isPaused function because torrents are paused after checking now
-  if(QFile::exists(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+hash+QString::fromUtf8(".paused"))) {
+  if(h.is_paused()) {
     DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)BTSession->getUncheckedTorrentProgress(hash)));
     DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/paused.png"))), Qt::DecorationRole);
     setRowColor(row, QString::fromUtf8("red"));
@@ -819,7 +832,6 @@ void DownloadingTorrents::torrentAdded(QTorrentHandle& h) {
   }
   ++nbTorrents;
   emit unfinishedTorrentsNumberChanged(nbTorrents);
-  sortDownloadList();
 }
 
 void DownloadingTorrents::updateFileSizeAndProgress(QString hash) {

src/downloadingTorrents.h

@@ -84,7 +84,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void hideOrShowColumnRatio();
     void hideOrShowColumnEta();
     void hideOrShowColumnPriority();
-    void loadLastSortedColumn();
 
   public slots:
     void updateDlList();
@@ -95,6 +94,8 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void updateFileSizeAndProgress(QString hash);
     void showPropertiesFromHash(QString hash);
     void hidePriorityColumn(bool hide);
+    void sortProgressColumn(QString hash);
+    void loadLastSortedColumn();
 
 };