tagged v2.4.10 release

torrent is in the temp dir (closes #673271)

AUTHORS

@@ -83,7 +83,7 @@ Translations authors:
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
+  - Italian: Matteo Sechi (bu17714@gmail.com)
   - Japanese: Nardog (alphisation@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
   - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)

Changelog

@@ -1,3 +1,60 @@
+* Wed Nov 10 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.10
+    - BUGFIX: Fix possible crash when selecting a RSS item (really closes #575624)
+    - BUGFIX: Improved IPv6 support (IP filter and Peer list)
+    - BUGFIX: Make IP filter more tolerant towards strangely formatted IPs
+    - BUGFIX: More reliable folder scanning
+    - BUGFIX: Do not create the torrent root folder at final destination if
+    torrent is in the temp dir (closes #673271)
+    - BUGFIX: Fix compilation with libnotify v0.7.0 (closes #671769)
+    - BUGFIX: Use a pointing cursor over status bar buttons
+
+* Sun Oct 31 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.9
+    - BUGFIX: Fix crash when pressing enter in save path field in torrent addition dialog
+    - BUGFIX: Fix crash when deleting a torrent with no metadata (closes #667528)
+    - BUGFIX: Fix possible crash on clicking a RSS article (closes #575624)
+    - BUGFIX: Correctly update total number of torrents when a torrent is automatically removed (closes #668726)
+    - BUGFIX: Correctly display the hash of torrents with no metadata
+    - BUGFIX: Elide status bar text if it is too wide
+    - BUGFIX: Make sure the splash screen is displayed for 2 seconds
+    - BUGFIX: Make listening on a particular interface more reliable
+    - BUGFIX: Fix torrent size update in torrent addition dialog
+    - BUGFIX: Fix possible crash on qBittorrent shutdown
+    - BUGFIX: Fix and improve file priorities editing (closes #669084)
+    - I18N: Updated Arabic, Italian and Croatian translations
+
+* Sun Oct 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.8
+    - BUGFIX: Fix possible crash on manual peer ban
+    - BUGFIX: Improved hostname resolution code
+    - BUGFIX: Several search plugins fixed
+    - BUGFIX: Auto-disable the shutdown feature
+    - BUGFIX: Remember the current property tab on startup
+    - BUGFIX: Fix status list widget height issue on style change
+    - BUGFIX: Fix rounding issue in torrent progress display
+    - BUGFIX: Fix issue when altering files priorities of a seeding torrent
+    - BUGFIX: Better fix for save path editing issues in torrent addition dialog
+    - BUGFIX: Peers can now be sorted by country
+
+* Tue Oct 19 2010  - Christophe Dumez <chris@qbittorrent.org> - v2.4.7
+    - BUGFIX: Display the priority column when the queueing system gets enabled
+    - BUGFIX: Fix encoding problem in file renaming
+    - BUGFIX: Delete uneeded files on torrent "soft" deletion
+    - BUGFIX: Fix issues when marking a file as 'not downloaded' causes the torrent to complete
+    - BUGFIX: Improved "Set Location" and "Change save path" dialogs
+    - BUGFIX: Fix display of queued seeding torrents
+
+* Sun Oct 17 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.6
+    - BUGFIX: Fix "torrent seeding after creation" feature
+    - BUGFIX: The properties panel data would sometimes not match the selected torrent
+    - BUGFIX: Fix detection of files at final destination when temp dir is used
+    - BUGFIX: Fix moving of a torrent to an unexisting directory
+
+* Tue Oct 12 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.5
+    - BUGFIX: Remember torrent completion date correctly
+    - BUGFIX: Fix feature to keep incomplete torrents in a separate folder
+    - BUGFIX: Fix display of URL seeds in the UI
+    - BUGFIX: Improved peer hostname resolution with caching
+    - BUGFIX: Piece availability/downloaded widgets performance improvement
+
 * Fri Oct 1 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.4
     - BUGFIX: Clean program exit on system shutdown/logout
     - BUGFIX: Fix possible search engine plugin update

qcm/qtsingleapplication.qcm

@@ -0,0 +1,26 @@
+/*
+-----BEGIN QCMOD-----
+name: libboost
+arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
+-----END QCMOD-----
+*/
+class qc_qtsingleapplication : public ConfObj
+{
+public:
+        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
+        QString name() const { return "qtsingleapplication library"; }
+        QString shortname() const { return "qtsingleapplication"; }
+
+        bool exec(){
+                QString s;
+                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
+                if(s.compare("system", Qt::CaseInsensitive) == 0) {
+                  // System
+                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
+                  printf(" [system] ");
+                } else {
+                  printf(" [shipped] ");
+                }
+                return true;
+        }
+};

src/GUI.cpp

@@ -42,6 +42,7 @@
 #include <QClipboard>
 #include <QCloseEvent>
 #include <QShortcut>
+#include <QScrollBar>
 
 #include "GUI.h"
 #include "transferlistwidget.h"
@@ -209,13 +210,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), for
   properties->readSettings();
 
   // Limit status filters list height
-  int cur_height = 80;
-  do {
-    transferListFilters->getStatusFilters()->setFixedHeight(cur_height);
-    cur_height += 10;
-    transferListFilters->getStatusFilters()->scrollToBottom();
-  }while(transferListFilters->getStatusFilters()->verticalScrollBar()->sliderPosition() > 0);
-  transferListFilters->getStatusFilters()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  transferListFilters->getStatusFilters()->updateHeight();
 
   if(ui_locked) {
     hide();
@@ -963,7 +958,7 @@ void GUI::loadPreferences(bool configure_session) {
   properties->getPeerList()->setAlternatingRowColors(Preferences::useAlternatingRowColors());
   // Queueing System
   if(Preferences::isQueueingSystemEnabled()) {
-    if(!configure_session || !BTSession->isQueueingEnabled()) {
+    if(!actionDecreasePriority->isVisible()) {
       transferList->hidePriorityColumn(false);
       actionDecreasePriority->setVisible(true);
       actionIncreasePriority->setVisible(true);
@@ -972,7 +967,7 @@ void GUI::loadPreferences(bool configure_session) {
       toolBar->layout()->setSpacing(7);
     }
   } else {
-    if(BTSession->isQueueingEnabled()) {
+    if(actionDecreasePriority->isVisible()) {
       transferList->hidePriorityColumn(true);
       actionDecreasePriority->setVisible(false);
       actionIncreasePriority->setVisible(false);
@@ -1040,7 +1035,12 @@ void GUI::showNotificationBaloon(QString title, QString msg) const {
 #ifdef WITH_LIBNOTIFY
   if (notify_init ("summary-body")) {
     NotifyNotification* notification;
-    notification = notify_notification_new (qPrintable(title), qPrintable(msg), "qbittorrent", 0);
+
+    notification = notify_notification_new (qPrintable(title), qPrintable(msg), "qbittorrent"
+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
+                                            , 0
+#endif
+                                            );
     gboolean success = notify_notification_show (notification, NULL);
     g_object_unref(G_OBJECT(notification));
     notify_uninit ();
@@ -1211,3 +1211,8 @@ void GUI::on_actionDownload_from_URL_triggered() {
   }
 }
 
+void GUI::on_actionDonate_money_triggered()
+{
+    QDesktopServices::openUrl(QUrl("http://sourceforge.net/donate/index.php?group_id=163414"));
+}
+

src/GUI.h

@@ -183,6 +183,7 @@ private slots:
     void on_actionSpeed_in_title_bar_triggered();
     void on_actionTop_tool_bar_triggered();
     void on_actionShutdown_when_downloads_complete_triggered();
+    void on_actionDonate_money_triggered();
 };
 
 #endif

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.4.4
+Comment=V2.4.10
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[ar]=العميل Bittorrent

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.4.4</string>
+	<string>2.4.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/about.qrc

@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+  <file>gpl.html</file>
+</qresource>
+</RCC>
+

src/createtorrent_imp.cpp

@@ -220,16 +220,22 @@ void createtorrent::handleCreationSuccess(QString path, QString branch_path) {
   // Remove busy cursor
   setCursor(QCursor(Qt::ArrowCursor));
   if(checkStartSeeding->isChecked()) {
+    QString root_folder;
     // Create save path temp data
     boost::intrusive_ptr<torrent_info> t;
     try {
       t = new torrent_info(path.toUtf8().data());
+      root_folder = misc::truncateRootFolder(t);
     } catch(std::exception&) {
       QMessageBox::critical(0, tr("Torrent creation"), tr("Created torrent file is invalid. It won't be added to download list."));
       return;
     }
     QString hash = misc::toQString(t->info_hash());
-    TorrentTempData::setSavePath(hash, branch_path);
+    QString save_path = branch_path;
+    if(!root_folder.isEmpty()) {
+      save_path = QDir(save_path).absoluteFilePath(root_folder);
+    }
+    TorrentTempData::setSavePath(hash, save_path);
 #if LIBTORRENT_VERSION_MINOR > 14
     // Enable seeding mode (do not recheck the files)
     TorrentTempData::setSeedingMode(hash, true);
@@ -285,8 +291,7 @@ void torrentCreatorThread::run() {
   char const* creator_str = "qBittorrent "VERSION;
   try {
     file_storage fs;
-    file_pool fp;
-    path full_path = complete(path(input_path.toLocal8Bit().data()));
+    path full_path = complete(path(input_path.toUtf8().constData()));
     // Adding files to the torrent
     add_files(fs, full_path, file_filter);
     if(abort) return;
@@ -311,7 +316,7 @@ void torrentCreatorThread::run() {
     t.set_priv(is_private);
     if(abort) return;
     // create the torrent and print it to out
-    ofstream out(complete(path((const char*)save_path.toLocal8Bit())), std::ios_base::binary);
+    ofstream out(complete(path((const char*)save_path.toUtf8())), std::ios_base::binary);
     bencode(std::ostream_iterator<char>(out), t.generate());
     emit updateProgress(100);
     emit creationSuccess(save_path, QString::fromUtf8(full_path.branch_path().string().c_str()));

src/downloadedpiecesbar.h

@@ -60,31 +60,34 @@ public:
       pix.fill();
       pixmap = pix;
     } else {
-      const int nb_pieces = pieces.size();
+      const qulonglong nb_pieces = pieces.size();
       // Reduce the number of pieces before creating the pixmap
       // otherwise it can crash when there are too many pieces
-      if(nb_pieces > width()) {
-        const int ratio = floor(nb_pieces/(double)width());
-        std::vector<bool> scaled_pieces;
-        std::vector<bool> scaled_downloading;
-        for(int i=0; i<nb_pieces; i+= ratio) {
+      const uint w = width();
+      if(nb_pieces > w) {
+        const uint ratio = floor(nb_pieces/(double)w);
+        bitfield scaled_pieces(ceil(nb_pieces/(double)ratio), false);
+        bitfield scaled_downloading(ceil(nb_pieces/(double)ratio), false);
+        uint scaled_index = 0;
+        for(qulonglong i=0; i<nb_pieces; i+= ratio) {
           bool have = true;
-          for(int j=i; j<qMin(i+ratio, nb_pieces); ++j) {
+          for(qulonglong j=i; j<qMin(i+ratio, nb_pieces); ++j) {
             if(!pieces[i]) { have = false; break; }
           }
-          scaled_pieces.push_back(have);
           if(have) {
-            scaled_downloading.push_back(false);
+            scaled_pieces.set_bit(scaled_index);
           } else {
             bool downloading = false;
-            for(int j=i; j<qMin(i+ratio, nb_pieces); ++j) {
+            for(qulonglong j=i; j<qMin(i+ratio, nb_pieces); ++j) {
               if(downloading_pieces[i]) { downloading = true; break; }
             }
-            scaled_downloading.push_back(downloading);
+            if(downloading)
+              scaled_downloading.set_bit(scaled_index);
           }
+          ++scaled_index;
         }
         QPixmap pix = QPixmap(scaled_pieces.size(), 1);
-        pix.fill();
+        //pix.fill();
         QPainter painter(&pix);
         for(uint i=0; i<scaled_pieces.size(); ++i) {
           if(scaled_pieces[i]) {
@@ -101,7 +104,7 @@ public:
         pixmap = pix;
       } else {
         QPixmap pix = QPixmap(pieces.size(), 1);
-        pix.fill();
+        //pix.fill();
         QPainter painter(&pix);
         for(uint i=0; i<pieces.size(); ++i) {
           if(pieces[i]) {

src/engineselectdlg.cpp

@@ -44,7 +44,7 @@
 #include <QTemporaryFile>
 
 enum EngineColumns {ENGINE_NAME, ENGINE_URL, ENGINE_STATE, ENGINE_ID};
-#define UPDATE_URL "http://qbittorrent.svn.sourceforge.net/viewvc/qbittorrent/trunk/src/search_engine/engines/"
+#define UPDATE_URL "http://qbittorrent.svn.sourceforge.net/viewvc/qbittorrent/branches/v2_4_x/src/search_engine/engines/"
 
 engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines) : QDialog(parent), supported_engines(supported_engines) {
   setupUi(this);

src/filesystemwatcher.h

@@ -19,6 +19,8 @@
 #endif
 #endif
 
+#include "misc.h"
+
 #ifndef CIFS_MAGIC_NUMBER
 #define CIFS_MAGIC_NUMBER 0xFF534D42
 #endif
@@ -27,6 +29,9 @@
 #define NFS_SUPER_MAGIC 0x6969
 #endif
 
+const int WATCH_INTERVAL = 10000; // 10 sec
+const int MAX_PARTIAL_RETRIES = 5;
+
 /*
  * Subclassing QFileSystemWatcher in order to support Network File
  * System watching (NFS, CIFS) on Linux and Mac OS.
@@ -39,11 +44,14 @@ private:
   QList<QDir> watched_folders;
   QPointer<QTimer> watch_timer;
 #endif
-  QStringList filters;
+  QStringList m_filters;
+  // Partial torrents
+  QHash<QString, int> m_partialTorrents;
+  QPointer<QTimer> m_partialTorrentTimer;
 
 #ifndef Q_WS_WIN
-protected:
-  bool isNetworkFileSystem(QString path) {
+private:
+  static bool isNetworkFileSystem(QString path) {
     QString file = path;
     if(!file.endsWith(QDir::separator()))
       file += QDir::separator();
@@ -99,7 +107,7 @@ protected:
 
 public:
   FileSystemWatcher(QObject *parent): QFileSystemWatcher(parent) {
-    filters << "*.torrent";
+    m_filters << "*.torrent";
     connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanLocalFolder(QString)));
   }
 
@@ -108,6 +116,8 @@ public:
     if(watch_timer)
       delete watch_timer;
 #endif
+    if(m_partialTorrentTimer)
+      delete m_partialTorrentTimer;
   }
 
   QStringList directories() const {
@@ -137,7 +147,7 @@ public:
       if (!watch_timer) {
         watch_timer = new QTimer(this);
         connect(watch_timer, SIGNAL(timeout()), this, SLOT(scanNetworkFolders()));
-        watch_timer->start(5000); // 5 sec
+        watch_timer->start(WATCH_INTERVAL); // 5 sec
       }
     } else {
 #endif
@@ -196,21 +206,74 @@ protected slots:
 #endif
   }
 
+  void processPartialTorrents() {
+    QStringList no_longer_partial;
+
+    // Check which torrents are still partial
+    foreach(const QString& torrent_path, m_partialTorrents.keys()) {
+      if(!QFile::exists(torrent_path)) {
+        m_partialTorrents.remove(torrent_path);
+        continue;
+      }
+      if(misc::isValidTorrentFile(torrent_path)) {
+        no_longer_partial << torrent_path;
+         m_partialTorrents.remove(torrent_path);
+      } else {
+        if(m_partialTorrents[torrent_path] >= MAX_PARTIAL_RETRIES) {
+          m_partialTorrents.remove(torrent_path);
+          QFile::rename(torrent_path, torrent_path+".invalid");
+        } else {
+          m_partialTorrents[torrent_path]++;
+        }
+      }
+    }
+
+    // Stop the partial timer if necessary
+    if(m_partialTorrents.empty()) {
+      m_partialTorrentTimer->stop();
+      m_partialTorrentTimer->deleteLater();
+      qDebug("No longer any partial torrent.");
+    } else {
+      qDebug("Still %d partial torrents after delayed processing.", m_partialTorrents.count());
+      m_partialTorrentTimer->start(WATCH_INTERVAL);
+    }
+    // Notify of new torrents
+    if(!no_longer_partial.isEmpty())
+      emit torrentsAdded(no_longer_partial);
+  }
+
 signals:
   void torrentsAdded(QStringList &pathList);
 
 private:
-  void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
-    const QStringList files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
-    foreach(const QString &file, files) {
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-      torrents << dir.absoluteFilePath(file).replace("/", "\\");
-#else
-      torrents << dir.absoluteFilePath(file);
-#endif
+  void startPartialTorrentTimer() {
+    Q_ASSERT(!m_partialTorrents.isEmpty());
+    if(!m_partialTorrentTimer) {
+      m_partialTorrentTimer = new QTimer();
+      connect(m_partialTorrentTimer, SIGNAL(timeout()), SLOT(processPartialTorrents()));
+      m_partialTorrentTimer->setSingleShot(true);
+      m_partialTorrentTimer->start(WATCH_INTERVAL);
     }
   }
 
+  void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
+    const QStringList files = dir.entryList(m_filters, QDir::Files, QDir::Unsorted);
+    foreach(const QString &file, files) {
+      const QString file_abspath = dir.absoluteFilePath(file);
+      if(misc::isValidTorrentFile(file_abspath)) {
+        torrents << file_abspath;
+      } else {
+        if(!m_partialTorrents.contains(file_abspath)) {
+          qDebug("Partial torrent detected at: %s", qPrintable(file_abspath));
+          qDebug("Delay the file's processing...");
+          m_partialTorrents.insert(file_abspath, 0);
+        }
+      }
+    }
+    if(!m_partialTorrents.empty())
+      startPartialTorrentTimer();
+  }
+
 };
 
 #endif // FILESYSTEMWATCHER_H

src/httpconnection.h

@@ -54,7 +54,7 @@ class HttpConnection : public QObject
 
 	protected slots:
 		void write();
-		virtual void respond();
+		void respond();
 		void respondJson();
                 void respondGenPropertiesJson(QString hash);
                 void respondTrackersPropertiesJson(QString hash);

src/httpresponsegenerator.h

@@ -44,7 +44,7 @@ class HttpResponseGenerator : public QHttpResponseHeader
 		void setMessage(const QString message);
 		void stripMessage();
 		void setContentTypeByExt(const QString ext);
-		virtual QByteArray toByteArray() const;
+		QByteArray toByteArray() const;
 };
 
 #endif

src/icons.qrc

@@ -161,6 +161,7 @@
   <file>Icons/oxygen/encrypted.png</file>
   <file>Icons/oxygen/folder-remote16.png</file>
   <file>Icons/oxygen/go-top.png</file>
+  <file>Icons/oxygen/emblem-favorite.png</file>
   <file>Icons/oxygen/edit_clear.png</file>
   <file>Icons/oxygen/bug.png</file>
   <file>Icons/oxygen/gear.png</file>