Fix compilation error

Changelog

@@ -1,19 +1,3 @@
-* Thu Jan 6 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.5
-    - BUGFIX: Added --enable-debug parameter to the configure script
-    - BUGFIX: Prioritize first and last pieces when sequential download is enabled
-    - BUGFIX: Some encoding fixes (Windows)
-    - BUGFIX: Display default password on stdout when using nox
-    - BUGFIX: Fix issues when search engines results contain a '|'
-    - BUGFIX: Avoid possible crash on exit when the IP filter is enabled (closes #695945)
-
-* Sat Jan 1 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.3
-    - BUGFIX: Fix priority up/down for multiple torrents at the same time (closes #692184)
-    - BUGFIX: Make sure the number of torrents is properly set on startup (closes #694135)
-    - BUGFIX: Fix scan directories saving (closes #694768)
-    - BUGFIX: Remove empty folders on torrent soft deletion (closes #695174)
-    - BUGFIX: Make sure the main window has focus on startup
-    - BUGFIX: Fix ampersand display in search tabs (closes #695715)
-
 * Sun Dec 19 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.2
     - BUGFIX: Fix alternative speed icon staying pressed when disabled
     - BUGFIX: Fix slot warning on startup

configure

@@ -18,11 +18,9 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --enable-debug                                  Enable debug mode
   --disable-gui                                   Disable qBittorrent
                                                  Graphical user interface for
                                                  headless running
-  --enable-debug                                  Enable debug mode
   --with-libboost-inc=[path]                      Path to libboost include
                                                  files
   --with-libboost-lib=[path]                      Path to libboost library
@@ -34,6 +32,8 @@ Dependency options:
                                                  executable (please follow
                                                  instructions in
                                                  src/geoip/README)
+  --disable-qtsingleapplication                  Disable use of
+                                                 qtsingleapplication
   --with-qtsingleapplication=[system|shipped]     Use the shipped
                                                  qtsingleapplication library
                                                  or the system one
@@ -153,21 +153,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--enable-debug)
-			QC_ENABLE_DEBUG="Y"
-			shift
-			;;
-
 		--disable-gui)
 			QC_DISABLE_GUI="Y"
 			shift
 			;;
 
-		--enable-debug)
-			QC_ENABLE_DEBUG="Y"
-			shift
-			;;
-
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -193,6 +183,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--disable-qtsingleapplication)
+			QC_DISABLE_qtsingleapplication="Y"
+			shift
+			;;
+
 		--with-qtsingleapplication=*)
 			QC_WITH_QTSINGLEAPPLICATION=$optarg
 			shift
@@ -219,14 +214,13 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 echo QC_DISABLE_GUI=$QC_DISABLE_GUI
-echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
 echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
 echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
 echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
+echo QC_DISABLE_qtsingleapplication=$QC_DISABLE_qtsingleapplication
 echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
 fi
@@ -333,9 +327,7 @@ cat >$1/modules.cpp <<EOT
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.5
-arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
-arg: enable-debug, Enable debug mode
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -346,14 +338,9 @@ public:
 	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
-                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			conf->addExtra("CONFIG += nox");
-		}
-                // Debug mode
-                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
-                  conf->addExtra("CONFIG += debug");
-                }
+		}	
 		return(QT_VERSION >= 0x040500);
 	}
 };
@@ -669,7 +656,7 @@ cat >$1/modules_new.cpp <<EOT
     o->required = false;
     o->disabled = false;
     o = new qc_qtsingleapplication(conf);
-    o->required = true;
+    o->required = false;
     o->disabled = false;
 
 EOT
@@ -1616,14 +1603,13 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_ENABLE_DEBUG
 export QC_DISABLE_GUI
-export QC_ENABLE_DEBUG
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBBOOST_LIB
 export QC_DISABLE_libnotify
 export QC_DISABLE_geoip_database
 export QC_WITH_GEOIP_DATABASE_EMBEDDED
+export QC_DISABLE_qtsingleapplication
 export QC_WITH_QTSINGLEAPPLICATION
 export QC_VERBOSE
 rm -rf .qconftemp

install.os2

@@ -1,136 +0,0 @@
-QBittorrent installation
-
-
-
-0. CONTENTS OF THIS FILE
-========================
-
-1. INTRODUCTION
-
-2. REQUIREMENTS
-
-3. INSTALLATION
-
-4. CONTACT
-
-5. CREDITS
-
-6. SUPPORT AND DONATIONS
-
-7. HISTORY
-
-
-1. INTRODUCTION
-===============
-
-Welcome to QBittorrent port for OS/2 and eComStation.
-
-
-2. REQUIREMENTS
-===============
-
-* klibc 0.6.3 or later
-
-    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
-
-* openssl 1.0
- 
-    ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
-
-* Qt4 dll
-
-    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
-
-
-3. INSTALLATION
-===============
-          
-To install QBittorrent, do the following:
-
-klibc
------
-
-  1. Download klibc 0.6.3 csd3 or later.
-  2. Install the package by double-clicking on the WPI file.
-
-
-openssl 1.0
------------
-
-  1. Download the zip file
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-Qt4 dll
--------
-
-  1. Download the package
-  2. Install the package by double-clicking on the wpi file.
-
-
-
-QBittorrent
------------
-
-  1. Create a directory for QBittorrent.
-  2. Extract the QBittorrent package to the new directory.
-  3. Create a WPS object for QBittorrent.exe.
-  4. Start QBittorrent
-  5. Happy torrenting
-  
-
-
-4. CONTACT
-==========
-
-Please send bugreports to:
-
-  ecs@aroa.ch
-
-Only bug reports with a reproducable bug are accepted. :-)
-
-
-
-5. CREDITS
-==========
-
-The port was done by:
-
-Silvan Scherrer aka _diver
-
-Thanks go to:
-
-  * Dmitry A. Kuminov
-
-They either helped me when I had some nasty questions or did some testing for
-me.
-
-
-6. SUPPORT AND DONATIONS
-========================
-
-QBittorrent port is based on volunteer work. If you would like to support further
-development, you can do so in one of the following ways:
-
-
-  * Donate to the Qt4 project: see qt.netlabs.org for more information
-
-  * Contribute to the project: Besides actual development, this also includes
-    maintaining the documentation and the project web site as well as help
-    for users.
-
-
-7. HISTORY
-==========
-
-2010-12-23
-
-  * updated to 2.5.2 code level of QBittorrent
-
-2010-11-22
-
-  * updated to 2.4.11 code level of QBittorrent
-
-2010-xx-xx
-
-  * initial port
-

os2conf.pri

@@ -1,10 +1,3 @@
-INCLUDEPATH += $$PWD
-
-exists(conf.pri) {
-    # to the conf.pri goes all system dependent stuff
-    include(conf.pri)
-}
-
 LIBS += -ltorrent-rasterbar \
         -lboost_thread \
         -lboost_system \

qbittorrent.qc

@@ -20,6 +20,5 @@
   <dep type='geoip-database'>
   </dep>
   <dep type='qtsingleapplication'>
-    <required/>
   </dep>
 </qconf>

qcm/qt4.qcm

@@ -1,9 +1,7 @@
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.5
-arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
-arg: enable-debug, Enable debug mode
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -14,14 +12,9 @@ public:
 	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
-                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			conf->addExtra("CONFIG += nox");
-		}
-                // Debug mode
-                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
-                  conf->addExtra("CONFIG += debug");
-                }
+		}	
 		return(QT_VERSION >= 0x040500);
 	}
 };

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.5.5
+Comment=V2.5.2
 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.5.5</string>
+	<string>2.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/filterparserthread.h

@@ -88,7 +88,6 @@ protected:
         }
       }
     }
-    if(abort) return;
     s->set_ip_filter(filter);
     qDebug("IP Filter thread: finished parsing, filter applied");
   }

src/headlessloader.h

@@ -54,8 +54,7 @@ public:
     std::cout << std::endl << "******** " << qPrintable(tr("Information")) << " ********" << std::endl;
     std::cout << qPrintable(tr("To control qBittorrent, access the Web UI at http://localhost:%1").arg(QString::number(pref.getWebUiPort()))) << std::endl;
     std::cout << qPrintable(tr("The Web UI administrator user name is: %1").arg(pref.getWebUiUsername())) << std::endl;
-    qDebug() << "Password:" << pref.getWebUiPassword();
-    if(pref.getWebUiPassword() == "32fe0bd2bb001911bb8bcfe23fc92b63") {
+    if(pref.getWebUiPassword() == "f6fdffe48c908deb0f4c3bd36c032e72") {
       std::cout << qPrintable(tr("The Web UI administrator password is still the default one: %1").arg("adminadmin")) << std::endl;
       std::cout << qPrintable(tr("This is a security risk, please consider changing your password from program preferences.")) << std::endl;
     }

src/main.cpp

@@ -263,9 +263,9 @@ int main(int argc, char *argv[]){
     painter.setFont(QFont("Arial", 22, QFont::Black));
     painter.drawText(224 - painter.fontMetrics().width(version), 270, version);
     splash = new QSplashScreen(splash_img, Qt::WindowStaysOnTopHint);
-    QTimer::singleShot(1500, splash, SLOT(deleteLater()));
     splash->show();
     app.processEvents();
+    QTimer::singleShot(2000, splash, SLOT(deleteLater()));
   }
 #endif
   // Set environment variable
@@ -296,8 +296,6 @@ int main(int argc, char *argv[]){
   torrentCmdLine.removeFirst();
 #ifndef DISABLE_GUI
   MainWindow window(0, torrentCmdLine);
-  if(!no_splash)
-    window.raise();
   QObject::connect(&app, SIGNAL(messageReceived(const QString&)),
                    &window, SLOT(processParams(const QString&)));
   app.setActivationWindow(&window);

src/mainwindow.cpp

@@ -163,6 +163,8 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   vSplitter->setCollapsible(0, true);
   vSplitter->setCollapsible(1, false);
   tabs->addTab(vSplitter, QIcon(QString::fromUtf8(":/Icons/oxygen/folder-remote.png")), tr("Transfers"));
+  connect(transferList->getSourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(updateNbTorrents()));
+  connect(transferList->getSourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(updateNbTorrents()));
 
   vboxLayout->addWidget(tabs);
 
@@ -225,8 +227,6 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   } else {
     if(pref.startMinimized())
       showMinimized();
-    else
-      setFocus();
   }
 
   // Start watching the executable for updates
@@ -242,11 +242,6 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   // Populate the transfer list
   transferList->getSourceModel()->populate();
 
-  // Update the number of torrents (tab)
-  updateNbTorrents();
-  connect(transferList->getSourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(updateNbTorrents()));
-  connect(transferList->getSourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(updateNbTorrents()));
-
   qDebug("GUI Built");
 #ifdef Q_WS_WIN
   if(!pref.neverCheckFileAssoc() && !Preferences::isFileAssocOk()) {
@@ -268,7 +263,6 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   connect(updater, SIGNAL(updateCheckFinished(bool, QString)), SLOT(handleUpdateCheckFinished(bool, QString)));
   updater->checkForUpdates();
 #endif
-
 }
 
 void MainWindow::deleteBTSession() {

src/misc.cpp

@@ -557,6 +557,19 @@ bool misc::isPreviewable(QString extension){
   return false;
 }
 
+bool misc::removeEmptyTree(QString path) {
+  QDir dir(path);
+  foreach(const QString &child, dir.entryList(QDir::AllDirs)) {
+    if(child == "." || child == "..") continue;
+    return removeEmptyTree(dir.absoluteFilePath(child));
+  }
+  const QString dir_name = dir.dirName();
+  if(dir.cdUp()) {
+    return dir.rmdir(dir_name);
+  }
+  return false;
+}
+
 QString misc::bcLinkToMagnet(QString bc_link) {
   QByteArray raw_bc = bc_link.toUtf8();
   raw_bc = raw_bc.mid(8); // skip bc://bt/
@@ -746,9 +759,3 @@ bool misc::isValidTorrentFile(const QString &torrent_path) {
   }
   return true;
 }
-
-QString misc::branchPath(QString file_path)
-{
-  file_path.replace("\\", "/");
-  return file_path.left(file_path.lastIndexOf('/'));
-}

src/misc.h

@@ -149,7 +149,7 @@ public:
   // value must be given in bytes
   static QString friendlyUnit(double val);
   static bool isPreviewable(QString extension);
-  static QString branchPath(QString file_path);
+  static bool removeEmptyTree(QString path);
   static QString magnetUriToName(QString magnet_uri);
   static QString magnetUriToHash(QString magnet_uri);
   static QString bcLinkToMagnet(QString bc_link);

src/preferences/options_imp.cpp

@@ -341,7 +341,7 @@ void options_imp::saveOptions(){
   pref.preAllocateAllFiles(preAllocateAllFiles());
   pref.useAdditionDialog(useAdditionDialog());
   pref.addTorrentsInPause(addTorrentsInPause());
-  ScanFoldersModel::instance()->makePersistent();
+  ScanFoldersModel::instance()->makePersistent(pref);
   addedScanDirs.clear();
   QString export_dir = getExportDir();
 #if defined(Q_WS_WIN) || defined(Q_OS_OS2)

src/properties/propertieswidget.cpp

@@ -631,8 +631,7 @@ void PropertiesWidget::renameSelectedFile() {
       // Remove old folder
       const QDir old_folder(h.save_path()+"/"+old_path);
       int timeout = 10;
-      while(!QDir().rmpath(old_folder.absolutePath()) && timeout > 0) {
-        // XXX: We should not sleep here (freezes the UI for 1 second)
+      while(!misc::removeEmptyTree(old_folder.absolutePath()) && timeout > 0) {
         SleeperThread::msleep(100);
         --timeout;
       }

src/qtlibtorrent/qbtsession.cpp

@@ -155,6 +155,9 @@ QBtSession::~QBtSession() {
 #endif
   saveSessionState();
   saveFastResumeData();
+  qDebug("Deleting the session");
+  delete s;
+  qDebug("Session deleted");
   // Delete our objects
   if(m_tracker)
     delete m_tracker;
@@ -171,8 +174,6 @@ QBtSession::~QBtSession() {
     delete httpServer;
   if(timerETA)
     delete timerETA;
-  qDebug("Deleting the session");
-  delete s;
   qDebug("BTSession destructor OUT");
 }
 
@@ -275,7 +276,6 @@ void QBtSession::configureSession() {
   }
   int i = 0;
   foreach (const QString &dir, scan_dirs) {
-    qDebug() << "Adding scan dir" << dir << downloadInDirList.at(i);
     m_scanFolders->addPath(dir, downloadInDirList.at(i));
     ++i;
   }
@@ -735,9 +735,6 @@ void QBtSession::deleteTorrent(QString hash, bool delete_local_files) {
     foreach(const QString &uneeded_file, uneeded_files) {
       qDebug("Removing uneeded file: %s", qPrintable(uneeded_file));
       misc::safeRemove(uneeded_file);
-      const QString parent_folder = misc::branchPath(uneeded_file);
-      qDebug("Attempt to remove parent folder (if empty): %s", qPrintable(parent_folder));
-      QDir().rmpath(parent_folder);
     }
   }
   // Remove it from torrent backup directory
@@ -1156,7 +1153,6 @@ void QBtSession::loadTorrentTempData(QTorrentHandle h, QString savePath, bool ma
   if(TorrentTempData::hasTempData(hash)) {
     // sequential download
     h.set_sequential_download(TorrentTempData::isSequential(hash));
-    h.prioritize_first_last_piece(TorrentTempData::isSequential(hash));
 
     // The following is useless for newly added magnet
     if(!magnet) {
@@ -2110,14 +2106,14 @@ void QBtSession::readAlerts() {
 #endif
       if(!hash.isEmpty()) {
         if(savePathsToRemove.contains(hash)) {
-          QDir().rmpath(savePathsToRemove.take(hash));
+          misc::removeEmptyTree(savePathsToRemove.take(hash));
         }
       } else {
         // XXX: Fallback
         QStringList hashes_deleted;
         foreach(const QString& key, savePathsToRemove.keys()) {
           // Attempt to delete
-          QDir().rmpath(savePathsToRemove[key]);
+          misc::removeEmptyTree(savePathsToRemove[key]);
           if(!QDir(savePathsToRemove[key]).exists()) {
             hashes_deleted << key;
           }
@@ -2138,7 +2134,7 @@ void QBtSession::readAlerts() {
         QDir old_save_dir(old_save_path);
         if(old_save_dir != QDir(defaultSavePath) && old_save_dir != QDir(defaultTempPath)) {
           qDebug("Attempting to remove %s", qPrintable(old_save_path));
-          QDir().rmpath(old_save_path);
+          misc::removeEmptyTree(old_save_path);
         }
         if(defaultTempPath.isEmpty() || !new_save_path.startsWith(defaultTempPath)) {
           qDebug("Storage has been moved, updating save path to %s", qPrintable(new_save_path));

src/scannedfoldersmodel.cpp

@@ -29,7 +29,7 @@
  */
 
 #include "scannedfoldersmodel.h"
-#include "preferences.h"
+
 #include "filesystemwatcher.h"
 
 #include <QDir>
@@ -189,16 +189,15 @@ int ScanFoldersModel::findPathData(const QString &path) const {
   return -1;
 }
 
-void ScanFoldersModel::makePersistent() {
-  Preferences pref;
+void ScanFoldersModel::makePersistent(QIniSettings &settings) {
   QStringList paths;
   QList<bool> downloadInFolderInfo;
   foreach (const PathData* pathData, m_pathList) {
     paths << pathData->path;
     downloadInFolderInfo << pathData->downloadAtPath;
   }
-  pref.setScanDirs(paths);
-  pref.setDownloadInScanDirs(downloadInFolderInfo);
+  settings.setValue(QString::fromUtf8("ScanDirs"), paths);
+  settings.setValue(QString::fromUtf8("DownloadInScanDirs"), misc::toStringList(downloadInFolderInfo));
 }
 
 ScanFoldersModel *ScanFoldersModel::m_instance = 0;

src/scannedfoldersmodel.h

@@ -61,7 +61,7 @@ public:
   PathStatus setDownloadAtPath(int row, bool downloadAtPath);
 
   bool downloadInTorrentFolder(const QString &filePath) const;
-  void makePersistent();
+  void makePersistent(QIniSettings &settings);
 
 signals:
   // The absolute paths of new torrent files in the scanned directories.

src/searchengine/nova/novaprinter.py

@@ -1,4 +1,4 @@
-#VERSION: 1.34
+#VERSION: 1.33
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,7 +35,7 @@ def prettyPrinter(dictionary):
 		if isinstance(dictionary[key], str):
 			dictionary[key] = unicode(dictionary[key], 'utf-8')
 	dictionary['size'] = anySizeToBytes(dictionary['size'])
-	print u"%s|%s|%s|%s|%s|%s"%(dictionary['link'],dictionary['name'].replace('|', ''),dictionary['size'],dictionary['seeds'],dictionary['leech'],dictionary['engine_url'])
+	print u"%s|%s|%s|%s|%s|%s"%(dictionary['link'],dictionary['name'],dictionary['size'],dictionary['seeds'],dictionary['leech'],dictionary['engine_url'])
 
 def anySizeToBytes(size_string):
 	"""

src/searchengine/searchengine.cpp

@@ -313,7 +313,7 @@ void SearchEngine::on_search_button_clicked(){
   // Reload environment variables (proxy)
   searchProcess->setEnvironment(QProcess::systemEnvironment());
 
-  const QString pattern = search_pattern->text().trimmed();
+  QString pattern = search_pattern->text().trimmed();
   // No search pattern entered
   if(pattern.isEmpty()){
     QMessageBox::critical(0, tr("Empty search pattern"), tr("Please type a search pattern first"));
@@ -323,9 +323,7 @@ void SearchEngine::on_search_button_clicked(){
   currentSearchTab=new SearchTab(this);
   connect(currentSearchTab->header(), SIGNAL(sectionResized(int, int, int)), this, SLOT(propagateSectionResized(int,int,int)));
   all_tab.append(currentSearchTab);
-  QString tabName = pattern;
-  tabName.replace(QRegExp("&{1}"), "&&");
-  tabWidget->addTab(currentSearchTab, tabName);
+  tabWidget->addTab(currentSearchTab, pattern);
   tabWidget->setCurrentWidget(currentSearchTab);
 #if QT_VERSION < 0x040500
   closeTab_button->setEnabled(true);
@@ -596,7 +594,7 @@ void SearchEngine::searchFinished(int exitcode,QProcess::ExitStatus){
 // SLOT to append one line to search results list
 // Line is in the following form :
 // file url | file name | file size | nb seeds | nb leechers | Search engine url
-void SearchEngine::appendSearchResult(const QString &line){
+void SearchEngine::appendSearchResult(QString line){
   if(!currentSearchTab) {
     if(searchProcess->state() != QProcess::NotRunning){
       searchProcess->terminate();
@@ -608,7 +606,7 @@ void SearchEngine::appendSearchResult(const QString &line){
     return;
   }
   QStringList parts = line.split("|");
-  if(parts.size() < 6){
+  if(parts.size() != 6){
     return;
   }
   Q_ASSERT(currentSearchTab);

src/searchengine/searchengine.h

@@ -91,7 +91,7 @@ protected slots:
 #else
   void closeTab(int index);
 #endif
-  void appendSearchResult(const QString& line);
+  void appendSearchResult(QString line);
   void searchFinished(int exitcode,QProcess::ExitStatus);
   void readSearchOutput();
   void searchStarted();

src/src.pro

@@ -2,6 +2,39 @@
 TEMPLATE = app
 CONFIG += qt thread
 
+unix:!macx {
+  exists(../conf.pri) {
+    # generated by configure
+    include(../conf.pri)
+  }
+}
+
+nox {
+  QT = core
+  TARGET = qbittorrent-nox
+  DEFINES += DISABLE_GUI
+} else {
+  QT += xml
+  TARGET = qbittorrent
+}
+QT += network
+
+# Vars
+LANG_PATH = lang
+ICONS_PATH = Icons
+
+# use "CONFIG -= debug" to disable debug
+CONFIG -= debug
+CONFIG += release
+
+# Disable debug output in release mode
+!debug {
+   DEFINES += QT_NO_DEBUG_OUTPUT
+}
+
+# VERSION DEFINES
+include(../version.pri)
+
 # Windows specific configuration
 win32 {
   include(../winconf.pri)
@@ -22,32 +55,6 @@ os2 {
   include(../os2conf.pri)
 }
 
-nox {
-  QT -= gui
-  TARGET = qbittorrent-nox
-  DEFINES += DISABLE_GUI
-} else {
-  QT += xml
-  TARGET = qbittorrent
-}
-QT += network
-
-# Vars
-LANG_PATH = lang
-ICONS_PATH = Icons
-
-CONFIG(debug, debug|release):message(Project is built in DEBUG mode.)
-CONFIG(release, debug|release):message(Project is built in RELEASE mode.)
-
-# Disable debug output in release mode
-CONFIG(release, debug|release) {
-   message(Disabling debug output.)
-   DEFINES += QT_NO_DEBUG_OUTPUT
-}
-
-# VERSION DEFINES
-include(../version.pri)
-
 DEFINES += QT_NO_CAST_TO_ASCII
 # Fast concatenation (Qt >= 4.6)
 DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS

src/torrentcreator/torrentcreatordlg.cpp

@@ -240,6 +240,8 @@ void TorrentCreatorDlg::updateOptimalPieceSize()
     }
     ++i;
   }while(i<m_piece_sizes.size());
+  qDebug("ASSERT value %d <= %d", (int)(torrent_size/(m_piece_sizes.at(i)*1024.)), NB_PIECES_MIN);
+  Q_ASSERT((double)torrent_size/(m_piece_sizes.at(i)*1024.) > NB_PIECES_MIN);
   comboPieceSize->setCurrentIndex(i);
 }
 

src/torrentcreator/torrentcreatorthread.cpp

@@ -92,7 +92,7 @@ void TorrentCreatorThread::run() {
     add_files(fs, input_path.toUtf8().constData(), file_filter);
 #else
     // Adding files to the torrent
-    path full_path = path(input_path.toUtf8().constData());
+    path full_path = complete(path(input_path.toUtf8().constData()));
     add_files(fs, full_path, file_filter);
 #endif
     if(abort) return;
@@ -125,19 +125,12 @@ void TorrentCreatorThread::run() {
     t.set_priv(is_private);
     if(abort) return;
     // create the torrent and print it to out
-    qDebug("Saving to %s", qPrintable(save_path));
-    std::vector<char> torrent;
-    bencode(back_inserter(torrent), t.generate());
-    QFile outfile(save_path);
-    if(outfile.open(QIODevice::WriteOnly)) {
-      outfile.write(&torrent[0], torrent.size());
-      outfile.close();
-      emit updateProgress(100);
-      emit creationSuccess(save_path, parent_path);
-    } else {
-      throw std::exception();
-    }
-  } catch (std::exception& e){
-    emit creationFailure(QString::fromLocal8Bit(e.what()));
+    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, parent_path);
+  }
+  catch (std::exception& e){
+    emit creationFailure(QString::fromUtf8(e.what()));
   }
 }

src/transferlistwidget.cpp

@@ -53,12 +53,9 @@
 #include <QRegExp>
 #include <QFileDialog>
 #include <vector>
-#include <queue>
 
 #include "qinisettings.h"
 
-using namespace libtorrent;
-
 TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *main_window, QBtSession *_BTSession):
   QTreeView(parent), BTSession(_BTSession), main_window(main_window) {
   // Create and apply delegate
@@ -315,50 +312,24 @@ void TransferListWidget::deleteVisibleTorrents() {
 }
 
 void TransferListWidget::increasePrioSelectedTorrents() {
-  qDebug() << Q_FUNC_INFO;
   if(main_window->getCurrentTabWidget() != this) return;
   const QStringList hashes = getSelectedTorrentsHashes();
-  std::priority_queue<QPair<int, QTorrentHandle>, std::vector<QPair<int, QTorrentHandle> >, std::greater<QPair<int, QTorrentHandle> > > torrent_queue;
-  // Sort torrents by priority
   foreach(const QString &hash, hashes) {
-    try {
-      QTorrentHandle h = BTSession->getTorrentHandle(hash);
-      if(!h.is_seed()) {
-        torrent_queue.push(qMakePair(h.queue_position(), h));
-      }
-    }catch(invalid_handle&){}
-  }
-  // Increase torrents priority (starting with the ones with highest priority)
-  while(!torrent_queue.empty()) {
-    QTorrentHandle h = torrent_queue.top().second;
-    try {
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
+    if(h.is_valid() && !h.is_seed()) {
       h.queue_position_up();
-    } catch(invalid_handle& h) {}
-    torrent_queue.pop();
+    }
   }
 }
 
 void TransferListWidget::decreasePrioSelectedTorrents() {
-  qDebug() << Q_FUNC_INFO;
   if(main_window->getCurrentTabWidget() != this) return;
   const QStringList hashes = getSelectedTorrentsHashes();
-  std::priority_queue<QPair<int, QTorrentHandle>, std::vector<QPair<int, QTorrentHandle> >, std::less<QPair<int, QTorrentHandle> > > torrent_queue;
-  // Sort torrents by priority
   foreach(const QString &hash, hashes) {
-    try {
-      QTorrentHandle h = BTSession->getTorrentHandle(hash);
-      if(!h.is_seed()) {
-        torrent_queue.push(qMakePair(h.queue_position(), h));
-      }
-    }catch(invalid_handle&){}
-  }
-  // Decrease torrents priority (starting with the ones with lowest priority)
-  while(!torrent_queue.empty()) {
-    QTorrentHandle h = torrent_queue.top().second;
-    try {
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
+    if(h.is_valid() && !h.is_seed()) {
       h.queue_position_down();
-    } catch(invalid_handle& h) {}
-    torrent_queue.pop();
+    }
   }
 }
 

src/webui/httpconnection.cpp

@@ -45,8 +45,6 @@
 #include <QDebug>
 #include <QRegExp>
 #include <QTemporaryFile>
-#include <queue>
-#include <vector>
 
 using namespace libtorrent;
 
@@ -500,25 +498,23 @@ void HttpConnection::respondCommand(QString command)
     return;
   }
   if(command == "increasePrio") {
-    increaseTorrentsPriority(parser.post("hashes").split("|"));
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(parser.post("hash"));
+    if(h.is_valid()) h.queue_position_up();
     return;
   }
   if(command == "decreasePrio") {
-    decreaseTorrentsPriority(parser.post("hashes").split("|"));
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(parser.post("hash"));
+    if(h.is_valid()) h.queue_position_down();
     return;
   }
   if(command == "topPrio") {
-    foreach(const QString &hash, parser.post("hashes").split("|")) {
-      QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
-      if(h.is_valid()) h.queue_position_top();
-    }
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(parser.post("hash"));
+    if(h.is_valid()) h.queue_position_top();
     return;
   }
   if(command == "bottomPrio") {
-    foreach(const QString &hash, parser.post("hashes").split("|")) {
-      QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
-      if(h.is_valid()) h.queue_position_bottom();
-    }
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(parser.post("hash"));
+    if(h.is_valid()) h.queue_position_bottom();
     return;
   }
   if(command == "recheck"){
@@ -547,49 +543,3 @@ void HttpConnection::recheckAllTorrents() {
       QBtSession::instance()->recheckTorrent(h.hash());
   }
 }
-
-void HttpConnection::decreaseTorrentsPriority(const QStringList &hashes)
-{
-  qDebug() << Q_FUNC_INFO << hashes;
-  std::priority_queue<QPair<int, QTorrentHandle>, std::vector<QPair<int, QTorrentHandle> >, std::less<QPair<int, QTorrentHandle> > > torrent_queue;
-  // Sort torrents by priority
-  foreach(const QString &hash, hashes) {
-    try {
-      QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
-      if(!h.is_seed()) {
-        torrent_queue.push(qMakePair(h.queue_position(), h));
-      }
-    }catch(invalid_handle&){}
-  }
-  // Decrease torrents priority (starting with the ones with lowest priority)
-  while(!torrent_queue.empty()) {
-    QTorrentHandle h = torrent_queue.top().second;
-    try {
-      h.queue_position_down();
-    } catch(invalid_handle& h) {}
-    torrent_queue.pop();
-  }
-}
-
-void HttpConnection::increaseTorrentsPriority(const QStringList &hashes)
-{
-  qDebug() << Q_FUNC_INFO << hashes;
-  std::priority_queue<QPair<int, QTorrentHandle>, std::vector<QPair<int, QTorrentHandle> >, std::greater<QPair<int, QTorrentHandle> > > torrent_queue;
-  // Sort torrents by priority
-  foreach(const QString &hash, hashes) {
-    try {
-      QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
-      if(!h.is_seed()) {
-        torrent_queue.push(qMakePair(h.queue_position(), h));
-      }
-    }catch(invalid_handle&){}
-  }
-  // Increase torrents priority (starting with the ones with highest priority)
-  while(!torrent_queue.empty()) {
-    QTorrentHandle h = torrent_queue.top().second;
-    try {
-      h.queue_position_up();
-    } catch(invalid_handle& h) {}
-    torrent_queue.pop();
-  }
-}

src/webui/httpconnection.h

@@ -67,9 +67,6 @@ protected slots:
   void handleDownloadFailure(QString, QString);
   void recheckTorrent(QString hash);
   void recheckAllTorrents();
-  void decreaseTorrentsPriority(const QStringList& hashes);
-  void increaseTorrentsPriority(const QStringList& hashes);
-
 
 public:
   HttpConnection(QTcpSocket *socket, HttpServer *httpserver);

src/webui/httpserver.cpp

@@ -208,7 +208,7 @@ bool HttpServer::isAuthorized(QByteArray auth, QString method) const {
     return false;
   }
   QByteArray prop_nonce = regex_nonce.cap(1).toLocal8Bit();
-  //qDebug("prop nonce is: %s", prop_nonce.data());
+  qDebug("prop nonce is: %s", prop_nonce.data());
   // get uri
   QRegExp regex_uri(".*uri=\"([^\"]+)\".*");
   if(regex_uri.indexIn(auth) < 0) {
@@ -216,7 +216,7 @@ bool HttpServer::isAuthorized(QByteArray auth, QString method) const {
     return false;
   }
   QByteArray prop_uri = regex_uri.cap(1).toLocal8Bit();
-  //qDebug("prop uri is: %s", prop_uri.data());
+  qDebug("prop uri is: %s", prop_uri.data());
   // get response
   QRegExp regex_response(".*response=[\"]?([\\w=]+)[\"]?.*");
   if(regex_response.indexIn(auth) < 0) {
@@ -224,7 +224,7 @@ bool HttpServer::isAuthorized(QByteArray auth, QString method) const {
     return false;
   }
   QByteArray prop_response = regex_response.cap(1).toLocal8Bit();
-  //qDebug("prop response is: %s", prop_response.data());
+  qDebug("prop response is: %s", prop_response.data());
   // Compute correct reponse
   QCryptographicHash md5_ha2(QCryptographicHash::Md5);
   md5_ha2.addData(method.toLocal8Bit() + ":" + prop_uri);
@@ -239,21 +239,21 @@ bool HttpServer::isAuthorized(QByteArray auth, QString method) const {
       return false;
     }
     QByteArray prop_nc = regex_nc.cap(1).toLocal8Bit();
-    //qDebug("prop nc is: %s", prop_nc.data());
+    qDebug("prop nc is: %s", prop_nc.data());
     QRegExp regex_cnonce(".*cnonce=[\"]?([\\w=]+)[\"]?.*");
     if(regex_cnonce.indexIn(auth) < 0) {
       qDebug("AUTH-PROB: qop but missing cnonce");
       return false;
     }
     QByteArray prop_cnonce = regex_cnonce.cap(1).toLocal8Bit();
-    //qDebug("prop cnonce is: %s", prop_cnonce.data());
+    qDebug("prop cnonce is: %s", prop_cnonce.data());
     QRegExp regex_qop(".*qop=[\"]?(\\w+)[\"]?.*");
     if(regex_qop.indexIn(auth) < 0) {
       qDebug("AUTH-PROB: missing qop");
       return false;
     }
     QByteArray prop_qop = regex_qop.cap(1).toLocal8Bit();
-    //qDebug("prop qop is: %s", prop_qop.data());
+    qDebug("prop qop is: %s", prop_qop.data());
     md5_ha.addData(password_ha1+":"+prop_nonce+":"+prop_nc+":"+prop_cnonce+":"+prop_qop+":"+ha2);
     response = md5_ha.result().toHex();
   } else {
@@ -261,7 +261,7 @@ bool HttpServer::isAuthorized(QByteArray auth, QString method) const {
     md5_ha.addData(password_ha1+":"+prop_nonce+":"+ha2);
     response = md5_ha.result().toHex();
   }
-  //qDebug("AUTH: comparing reponses: (%d)", static_cast<int>(prop_response == response));
+  qDebug("AUTH: comparing reponses: (%d)", static_cast<int>(prop_response == response));
   return prop_response == response;
 }
 

src/webui/scripts/mocha-init.js

@@ -204,7 +204,7 @@ initializeWindows = function(){
 		}
 	};
 
-	['pause','resume', 'recheck'].each(function(item) {
+	['pause','resume','decreasePrio','increasePrio', 'topPrio', 'bottomPrio', 'recheck'].each(function(item) {
 		addClickEvent(item, function(e){
 			new Event(e).stop();
 			var h = myTable.selectedIds();
@@ -220,18 +220,13 @@ initializeWindows = function(){
 			new Request({url: '/command/'+item+'all'}).send();
 		});
 	});
-
-	['decreasePrio','increasePrio', 'topPrio', 'bottomPrio'].each(function(item) {
-		addClickEvent(item, function(e){
-			new Event(e).stop();
-			setPriorityFN(item);
-		});
-	});
 	
 	setPriorityFN = function(cmd) {
 		var h = myTable.selectedIds();
-		if(h.length) {
-			new Request({url: '/command/'+cmd, method: 'post', data: {hashes: h.join("|")}}).send();
+		if(h.length){
+			h.each(function(hash, index){
+				  new Request({url: '/command/'+cmd, method: 'post', data: {hash: hash}}).send();
+				});
 		}
 	}
 	

unixconf.pri

@@ -1,6 +1,3 @@
-# Generated by the configure file
-include(conf.pri)
-
 # COMPILATION SPECIFIC
 QT += dbus
 QMAKE_LFLAGS_APP += -rdynamic

version.pri

@@ -1,11 +1,11 @@
 os2 {
-    DEFINES += VERSION=\'\"v2.5.5\"\'
+    DEFINES += VERSION=\'\"v2.5.2\"\'
 } else {
-    DEFINES += VERSION=\\\"v2.5.5\\\"
+    DEFINES += VERSION=\\\"v2.5.2\\\"
 }
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=5
-DEFINES += VERSION_BUGFIX=5
+DEFINES += VERSION_BUGFIX=2
 
 # NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL
 DEFINES += VERSION_TYPE=NORMAL