Tagged v2.2.8 release

Fix unicode issue in start seeding after torrent creation code

AUTHORS

@@ -60,11 +60,13 @@ Images Authors:
 Translations authors:
 * files: src/lang/*.ts
   copyright:
+  - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
   - Catalan: Francisco Luque Contreras (frannoe@ya.com)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
+  - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
   - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)

Changelog

@@ -1,3 +1,32 @@
+* Mon May 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.8
+    - BUGFIX: ETA for finished torrent is now 0 instead of Infinite (closes #583704)
+    - BUGFIX: Fix sorting of ETA column when having infinite values (closes #583347)
+    - BUGFIX: Torrent queue position now starts at 1 (closes #581130)
+    - BUGFIX: Fix unicode issue in start seeding after torrent creation code
+    - BUGFIX: Fix torrent error state clearance on resuming
+    - BUGFIX: Fix possible checkbox update in Web UI
+    - COSMETIC: Fix torrent properties layout
+
+* Wed May 12 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.7
+    - BUGFIX: Fix unicode problem in torrent moving code
+    - BUGFIX: Fix possible initialization problem in Web UI
+    - BUGFIX: Fix torrent moving after completion feature
+    - BUGFIX: Improved empty folder removing code
+    - BUGFIX: Use guid or news url as RSS items identifier (instead of title)
+    - BUGFIX: Fix possible crash in RSS item selection code
+    - BUGFIX: Added support for url encoded ampersands in RSS
+    - COSMETIC: Sort torrent labels in popup menu
+    - I18N: Added Croatian translation
+
+* Sun Apr 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.6
+    - BUGFIX: Announce to all trackers at once
+    - BUGFIX: Added support for single-thread boost
+    - BUGFIX: Remove old folder when moving a torrent
+    - BUGFIX: Improved reliability of torrent moving
+    - BUGFIX: Stop rechecking torrents when they are moved
+    - BUGFIX: Status filters height stays correct when the visual style changes
+    - I18N: Added Arabic translation
+
 * Wed Apr 07 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.5
     - BUGFIX: Fix crash when adding a new torrent label
     - BUGFIX: Fix HTTPS protocol support in torrent/rss downloader

README.os2

@@ -0,0 +1,62 @@
+qBittorrent - A BitTorrent client in Qt4
+------------------------------------------
+
+This is the eComStation (OS/2) qBittorrent part of the readme. See also README for more general information.
+
+
+Building qBittorrent
+********************
+
+
+Requirements
+============
+
+- gcc based build env (recommended gcc v4.4.2 or greater)
+  
+- Qt4 for eCS (OS/2) dev package (see http://svn.netlabs.org/qt4 for more information)
+
+- libtorrent-rasterbar for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+- boost for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+
+How to build
+============
+
+First you need to create the conf.pri file in the same dir as this readme.os2 is.
+the conf.pri file has the following content:
+
+##### conf.pri content beginn #####
+PREFIX = .
+BINDIR = ./bin
+INCDIR = ./include
+LIBDIR = ./lib
+DATADIR = ./share
+
+CONFIG += staticlib
+INCLUDEPATH += x:/trees/libtorrent/trunk/include
+LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
+        -Lx:/trees/boost/trunk/stage/lib \
+        -Lx:/trees/openssl \
+	-Lx:/extras/lib
+##### conf.pri content end #####
+
+Of course all the above path references have to be adjusted to your build env.
+
+It should now be easy to build qBittorrent:
+
+Simply type:
+$ qmake
+
+Followed by:
+$ make
+
+If all works fine you should get a working qbittorrent executable.
+
+If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:
+#netlabs on irc.freenode.net
+
+------------------------------------------
+Silvan Scherrer <silvan.scherrer@aroa.ch>
+
+

configure

@@ -376,7 +376,9 @@ public:
 		//conf->doCommand("pkg-config", params, &staticlibs);
 		//conf->addLib(staticlibs.trimmed());
 		//libcrypto
-		conf->addLib("-lcrypto");
+		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+  		  conf->addLib("-lcrypto");
+                }
 		return true;
 	}
 };
@@ -405,6 +407,16 @@ public:
       name = result.first().mid(3);
       // Remove .so
       name.chop(3);
+    } else {
+      // Fall back to non -mt boost lib
+      filters.clear();
+      filters << "libboost_"+lib+"*.so";
+      result = libDir.entryList(filters, QDir::Files);
+      if(!result.empty()) {
+        name = result.first().mid(3);
+        // Remove .so
+        name.chop(3);
+      }
     }
     return name;
   }
@@ -452,11 +464,13 @@ public:
 		// Find library
 		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
-    required_libs 
 #if BOOST_VERSION >= 103500
-      << "system" 
+      required_libs << "system"; 
 #endif
-      << "filesystem" << "thread";
+    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+      // Not required by nox
+      required_libs << "filesystem" << "thread";
+    }
     QStringList libDirs;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
     foreach(const QString& lib, required_libs) {

qcm/libboost.qcm

@@ -22,6 +22,16 @@ public:
       name = result.first().mid(3);
       // Remove .so
       name.chop(3);
+    } else {
+      // Fall back to non -mt boost lib
+      filters.clear();
+      filters << "libboost_"+lib+"*.so";
+      result = libDir.entryList(filters, QDir::Files);
+      if(!result.empty()) {
+        name = result.first().mid(3);
+        // Remove .so
+        name.chop(3);
+      }
     }
     return name;
   }
@@ -69,11 +79,13 @@ public:
 		// Find library
 		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
-    required_libs 
 #if BOOST_VERSION >= 103500
-      << "system" 
+      required_libs << "system"; 
 #endif
-      << "filesystem" << "thread";
+    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+      // Not required by nox
+      required_libs << "filesystem" << "thread";
+    }
     QStringList libDirs;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
     foreach(const QString& lib, required_libs) {

qcm/libtorrent-rasterbar.qcm

@@ -34,7 +34,9 @@ public:
 		//conf->doCommand("pkg-config", params, &staticlibs);
 		//conf->addLib(staticlibs.trimmed());
 		//libcrypto
-		conf->addLib("-lcrypto");
+		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+  		  conf->addLib("-lcrypto");
+                }
 		return true;
 	}
 };

src/GUI.cpp

@@ -170,8 +170,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
 #ifdef Q_WS_WIN
   char buffer[UNLEN+1] = {0};
   DWORD buffer_len = UNLEN + 1;
-  if (!GetUserName(buffer, &buffer_len))
-    uid = QString(buffer)
+  if (!GetUserNameA(buffer, &buffer_len))
+    uid = QString(buffer);
 #else
     uid = QString::number(getuid());
 #endif

src/Icons/qBittorrent.desktop

@@ -1,8 +1,9 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.2.5
+Comment=V2.2.8
 Exec=qbittorrent %f
 GenericName=Bittorrent client
+GenericName[ar]=العميل Bittorrent
 GenericName[bg]=Торент клиент
 GenericName[cs]=Bittorrent klient
 GenericName[de]=Bittorren Client
@@ -10,6 +11,7 @@ GenericName[el]=Bittorrent πελάτης
 GenericName[es]=Cliente Bittorrent
 GenericName[fi]=Bittorrent-ohjelma
 GenericName[fr]=Client Bittorrent
+GenericName[hr]=Bittorrent klijent
 GenericName[hu]=Bittorrent kliens
 GenericName[it]=Client Bittorrent
 GenericName[ja]=Bittorrent クライアント

src/about_imp.h

@@ -62,11 +62,13 @@ class about : public QDialog, private Ui::AboutDlg{
       te_translation->append(QString::fromUtf8("<a name='top'></a>"));
       te_translation->append(tr("I would like to thank the following people who volunteered to translate qBittorrent:")+QString::fromUtf8("<br>"));
       te_translation->append(QString::fromUtf8(
-          "<i>- <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
+          "<i><u>Arabic:</u> SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)<br>\
+          - <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)<br>\
           - <u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)<br>\
           - <u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)<br>\
           - <u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)<br>\
+          - <u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)<br>\
           - <u>Czech:</u> Jirka Vilim (web@tets.cz)<br>\
           - <u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)<br>\
           - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net) and Peter Koeleman (peter@peerweb.nl)<br>\

src/bittorrent.cpp

@@ -421,6 +421,7 @@ void Bittorrent::configureSession() {
   //sessionSettings.announce_to_all_trackers = true;
   sessionSettings.auto_scrape_interval = 1200; // 20 minutes
 #ifdef LIBTORRENT_0_15
+  sessionSettings.announce_to_all_trackers = true;
   sessionSettings.announce_to_all_tiers = true; //uTorrent behavior
   sessionSettings.auto_scrape_min_interval = 900; // 15 minutes
 #endif
@@ -1651,12 +1652,10 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
     } else {
       new_save_path = old_dir.absoluteFilePath(new_label);
     }
-    TorrentPersistentData::saveSavePath(h.hash(), new_save_path);
     if(move_storage) {
       // Move storage
       h.move_storage(new_save_path);
     }
-    emit savePathChanged(h);
   }
 
   void Bittorrent::appendLabelToTorrentSavePath(QTorrentHandle h) {
@@ -1668,12 +1667,10 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
     const QDir old_dir(old_save_path);
     if(old_dir.dirName() != label) {
       const QString &new_save_path = old_dir.absoluteFilePath(label);
-      TorrentPersistentData::saveSavePath(h.hash(), new_save_path);
       if(old_dir == QDir(h.save_path())) {
         // Move storage
         h.move_storage(new_save_path);
       }
-      emit savePathChanged(h);
     }
   }
 
@@ -1900,12 +1897,15 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
           if(appendqBExtension)
             appendqBextensionToTorrent(h, false);
 #endif
+          qDebug("A torrent has finished downloading");
           // Move to download directory if necessary
           if(!defaultTempPath.isEmpty()) {
+            qDebug("A torrent has finished downloading and will be moved to the final download location");
             // Check if directory is different
             const QDir current_dir(h.save_path());
             const QDir save_dir(getSavePath(hash));
             if(current_dir != save_dir) {
+              qDebug("current dir is different that final destination, actually move the storage...");
               h.move_storage(save_dir.path());
             }
           }
@@ -1964,8 +1964,19 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
       }
       else if (storage_moved_alert* p = dynamic_cast<storage_moved_alert*>(a.get())) {
         QTorrentHandle h(p->handle);
-        if(h.is_valid())
-          h.force_recheck(); //XXX: Required by libtorrent for now
+        if(h.is_valid()) {
+          // Attempt to remove old folder if empty
+          const QString& old_save_path = TorrentPersistentData::getSavePath(h.hash());
+          const QString new_save_path = QString::fromLocal8Bit(p->path.c_str());
+          qDebug("Torrent moved from %s to %s", qPrintable(old_save_path), qPrintable(new_save_path));
+          qDebug("Attempting to remove %s", qPrintable(old_save_path));
+          if(old_save_path != defaultSavePath && old_save_path != defaultTempPath)
+            QDir().rmdir(old_save_path);
+          if(new_save_path != defaultTempPath)
+            TorrentPersistentData::saveSavePath(h.hash(), new_save_path);
+          emit savePathChanged(h);
+          //h.force_recheck();
+        }
       }
       else if (metadata_received_alert* p = dynamic_cast<metadata_received_alert*>(a.get())) {
         QTorrentHandle h(p->handle);

src/createtorrent_imp.cpp

@@ -199,7 +199,7 @@ void createtorrent::handleCreationSuccess(QString path, const char* branch_path)
       return;
     }
     QString hash = misc::toQString(t->info_hash());
-    TorrentTempData::setSavePath(hash, QString(branch_path));
+    TorrentTempData::setSavePath(hash, QString::fromLocal8Bit(branch_path));
 #ifdef LIBTORRENT_0_15
     // Enable seeding mode (do not recheck the files)
     TorrentTempData::setSeedingMode(hash, true);

src/downloadthread.cpp

@@ -42,7 +42,9 @@ enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4, SOCKS4=5};
 downloadThread::downloadThread(QObject* parent) : QObject(parent) {
   networkManager = new QNetworkAccessManager(this);
   connect(networkManager, SIGNAL(finished (QNetworkReply*)), this, SLOT(processDlFinished(QNetworkReply*)));
+#ifndef QT_NO_OPENSSL
   connect(networkManager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(ignoreSslErrors(QNetworkReply*,QList<QSslError>)));
+#endif
 }
 
 downloadThread::~downloadThread(){
@@ -52,7 +54,7 @@ downloadThread::~downloadThread(){
 }
 
 void downloadThread::processDlFinished(QNetworkReply* reply) {
-  QString url = reply->url().toString();
+  QString url = reply->url().toEncoded().data();
   if(reply->error() != QNetworkReply::NoError) {
     // Failure
     emit downloadFailure(url, errorCodeToString(reply->error()));
@@ -215,8 +217,10 @@ QString downloadThread::errorCodeToString(QNetworkReply::NetworkError status) {
   }
 }
 
+#ifndef QT_NO_OPENSSL
 void downloadThread::ignoreSslErrors(QNetworkReply* reply,QList<QSslError> errors) {
   Q_UNUSED(errors)
   // Ignore all SSL errors
   reply->ignoreSslErrors();
 }
+#endif

src/downloadthread.h

@@ -63,7 +63,9 @@ protected:
 protected slots:
   void processDlFinished(QNetworkReply* reply);
   void checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal);
+#ifndef QT_NO_OPENSSL
   void ignoreSslErrors(QNetworkReply*,QList<QSslError>);
+#endif
 
 };
 

src/filesystemwatcher.h

@@ -2,10 +2,10 @@
 #define FILESYSTEMWATCHER_H
 
 #include <QFileSystemWatcher>
+#include <QDir>
 
 #ifndef Q_WS_WIN
 #include <QTimer>
-#include <QDir>
 #include <QPointer>
 #include <QStringList>
 #include <QSet>
@@ -180,6 +180,7 @@ protected slots:
   }
 
   void scanNetworkFolders() {
+#ifndef Q_WS_WIN
     qDebug("scanNetworkFolders() called");
     QStringList torrents;
     // Network folders scan
@@ -192,6 +193,7 @@ protected slots:
       qDebug("The following files are being reported: %s", qPrintable(torrents.join("\n")));
       emit torrentsAdded(torrents);
     }
+#endif
   }
 
 signals:

src/geoip.h

@@ -188,6 +188,7 @@ public:
       if(iso[1] == 'S') return QIcon(":/Icons/flags/serbia.png");
       break;
     case 'S':
+      if(iso[1] == 'A') return QIcon(":/Icons/flags/saoudi_arabia.png");
       if(iso[1] == 'E') return QIcon(":/Icons/flags/sweden.png");
       if(iso[1] == 'K') return QIcon(":/Icons/flags/slovakia.png");
       if(iso[1] == 'G') return QIcon(":/Icons/flags/singapore.png");

src/icons.qrc

@@ -121,6 +121,7 @@
   <file>Icons/flags/egypt.png</file>
   <file>Icons/flags/italy.png</file>
   <file>Icons/flags/south_korea.png</file>
+  <file>Icons/flags/saoudi_arabia.png</file>
   <file>Icons/flags/bosnia.png</file>
   <file>Icons/flags/japan.png</file>
   <file>Icons/flags/malaysia.png</file>

src/lang.qrc

@@ -7,6 +7,7 @@
   <file>lang/qbittorrent_sv.qm</file>
   <file>lang/qbittorrent_pl.qm</file>
   <file>lang/qbittorrent_it.qm</file>
+  <file>lang/qbittorrent_ar.qm</file>
   <file>lang/qbittorrent_ko.qm</file>
   <file>lang/qbittorrent_en.qm</file>
   <file>lang/qbittorrent_ro.qm</file>
@@ -20,6 +21,7 @@
   <file>lang/qbittorrent_pt_BR.qm</file>
   <file>lang/qbittorrent_el.qm</file>
   <file>lang/qbittorrent_ca.qm</file>
+  <file>lang/qbittorrent_hr.qm</file>
   <file>lang/qbittorrent_sr.qm</file>
   <file>lang/qbittorrent_hu.qm</file>
   <file>lang/qbittorrent_da.qm</file>