Tagged todays releases

Fix progress bar style on Windows

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: Matteo Sechi (bu17714@gmail.com)
+  - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@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,16 +1,46 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
+* Sun Oct 17 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.6
-    - FEATURE: qBittorrent can now act as a tracker
+    - BUGFIX: Fix "torrent seeding after creation" feature
-    - FEATURE: New and improved RSS feed automated downloader
+    - BUGFIX: The properties panel data would sometimes not match the selected torrent
-    - FEATURE: Added feature to shutdown qbittorrent on torrents completion
+    - BUGFIX: Fix detection of files at final destination when temp dir is used
-    - FEATURE: Added a torrent import assistant to seed or keep downloading outside torrents
+    - BUGFIX: Fix moving of a torrent to an unexisting directory
-    - FEATURE: qBittorrent can update itself from Sourceforge (Windows/Mac OS X only)
+
-    - FEATURE: Added a transfer list column to display the current tracker
+* Tue Oct 12 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.5
-    - FEATURE: Remember the last trackers used in the torrent creation tool
+    - BUGFIX: Remember torrent completion date correctly
-    - FEATURE: The optimal piece size is now automatically computed in the torrent creation tool
+    - BUGFIX: Fix feature to keep incomplete torrents in a separate folder
-    - FEATURE: Bring up the connection settings when clicking on the connection status icon
+    - BUGFIX: Fix display of URL seeds in the UI
-    - COSMETIC: Replaced message box by on-screen notification for download errors
+    - BUGFIX: Improved peer hostname resolution with caching
-    - COSMETIC: Improved the torrent creation tool appearance
+    - BUGFIX: Piece availability/downloaded widgets performance improvement
-    - OTHERS: Dropped support for Qt <= 4.4
+
+* 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
+
+* Tue Sep 28 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.3
+    - BUGFIX: Fix encoding issue in command line parameters processing
+    - BUGFIX: Fix possible crash when changing the save path in addition dialog
+    - BUGFIX: Fix wrong mapping to source model
+
+* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.2
+    - BUGFIX: Fix display of torrent content in addition dialog
+    - BUGFIX: Really fix manual editing of save path in torrent addition dialog
+
+* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.1
+    - I18N: Updated Arabic translation
+    - I18N: Fixes to German translation
+    - BUGFIX: Save path can now be edited in torrent addition dialog
+    - BUGFIX: Fix save path encoding on non-utf8 systems
+    - BUGFIX: Fix saving to drive root on Windows
+    - BUGFIX: OGV can now be previewed
+    - BUGFIX: Maximum download limit is now 10MB/s
+    - BUGFIX: Fix 'download in scan dir' persistence
+    - BUGFIX: Add .torrent extension only when missing (torrent creator)
+    - BUGFIX: Fix possible issue with temporary download path persistence
+    - BUGFIX: Added support for | (OR) operator in RSS feed downloader
+    - BUGFIX: Fix Web UI for spanish users
+    - BUGFIX: Fix locale switching from Web UI
+    - BUGFIX: Use AND operator for torrentdownloads.net searches
+    - BUGFIX: Limit torrent addition dialog width to fit the screen
+    - COSMETIC: Fix progress bars style on Windows
 
 * Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
     - FEATURE: Added actions to "Move to top/bottom" of priority queue

INSTALL

@@ -10,7 +10,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.5.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+    - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
     - pkg-config executable
 

configure

@@ -325,7 +325,7 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.5
+name: Qt >= 4.4
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
@@ -333,14 +333,14 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.5"; }
+	QString name() const { return "Qt >= 4.4"; }
-	QString shortname() const { return "Qt 4.5"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			conf->addDefine("DISABLE_GUI");
 		}	
-		return(QT_VERSION >= 0x040500);
+		return(QT_VERSION >= 0x040400);
 	}
 };
 #line 1 "pkg-config.qcm"
@@ -616,22 +616,22 @@ arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplicat
 class qc_qtsingleapplication : public ConfObj
 {
 public:
-        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
+	qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
-        QString name() const { return "qtsingleapplication library"; }
+	QString name() const { return "qtsingleapplication library"; }
-        QString shortname() const { return "qtsingleapplication"; }
+	QString shortname() const { return "qtsingleapplication"; }
 
-        bool exec(){
+	bool exec(){
-                QString s;
+        	QString s;
-                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
+		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;
+		return true;
-        }
+	}
 };
 
 EOT

qcm/qt4.qcm

@@ -1,6 +1,6 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.5
+name: Qt >= 4.4
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
@@ -8,13 +8,13 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.5"; }
+	QString name() const { return "Qt >= 4.4"; }
-	QString shortname() const { return "Qt 4.5"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			conf->addDefine("DISABLE_GUI");
 		}	
-		return(QT_VERSION >= 0x040500);
+		return(QT_VERSION >= 0x040400);
 	}
 };

src/GUI.h

@@ -37,7 +37,7 @@
 #include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-class QBtSession;
+class Bittorrent;
 class QTimer;
 class downloadFromURL;
 class SearchEngine;
@@ -54,19 +54,19 @@ class PropertiesWidget;
 class StatusBar;
 class consoleDlg;
 class about;
-class TorrentCreatorDlg;
+class createtorrent;
 class downloadFromURL;
 class HidableTabWidget;
 class LineEdit;
 class QFileSystemWatcher;
 
-class MainWindow : public QMainWindow, private Ui::MainWindow{
+class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
 
 public:
   // Construct / Destruct
-  MainWindow(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
+  GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
-  ~MainWindow();
+  ~GUI();
   // Methods
   QWidget* getCurrentTabWidget() const;
   TransferListWidget* getTransferList() const { return transferList; }
@@ -105,7 +105,6 @@ protected slots:
   void defineUILockPassword();
   bool unlockUI();
   void notifyOfUpdate(QString);
-  void showConnectionSettings();
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;
@@ -130,10 +129,6 @@ protected slots:
   void optionsSaved();
   // HTTP slots
   void on_actionDownload_from_URL_triggered();
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-  void handleUpdateCheckFinished(bool update_available, QString new_version);
-  void handleUpdateInstalled(QString error_msg);
-#endif
 
 protected:
   void closeEvent(QCloseEvent *);
@@ -145,7 +140,7 @@ protected:
 private:
   QFileSystemWatcher *executable_watcher;
   // Bittorrent
-  QBtSession *BTSession;
+  Bittorrent *BTSession;
   QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
   // GUI related
   QTimer *guiUpdater;
@@ -154,7 +149,7 @@ private:
   QPointer<options_imp> options;
   QPointer<consoleDlg> console;
   QPointer<about> aboutDlg;
-  QPointer<TorrentCreatorDlg> createTorrentDlg;
+  QPointer<createtorrent> createTorrentDlg;
   QPointer<downloadFromURL> downloadFromURLDialog;
   QPointer<QSystemTrayIcon> systrayIcon;
   QPointer<QTimer> systrayCreator;
@@ -188,9 +183,6 @@ private slots:
     void on_actionSpeed_in_title_bar_triggered();
     void on_actionTop_tool_bar_triggered();
     void on_actionShutdown_when_downloads_complete_triggered();
-    void on_actionShutdown_qBittorrent_when_downloads_complete_triggered();
-    void on_action_Import_Torrent_triggered();
-    void on_actionDonate_money_triggered();
 };
 
 #endif

src/Icons/qBittorrent.desktop

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

src/about_imp.h

@@ -73,7 +73,7 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\
           <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)</li>\
           <li><u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)</li>\
-          <li><u>Italian:</u> Matteo Sechi (bu17714@gmail.com)</li>\
+          <li><u>Italian:</u> Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)</li>\
           <li><u>Japanese:</u> Nardog (alphisation@gmail.com)</li>\
           <li><u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)</li>\
           <li><u>Norwegian:</u> Lars-Erik Labori (hamil@users.sourceforge.net)</li>\

src/advancedsettings.h

@@ -11,15 +11,15 @@
 #include "preferences.h"
 
 enum AdvSettingsCols {PROPERTY, VALUE};
-enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE, PROGRAM_NOTIFICATIONS, TRACKER_STATUS, TRACKER_PORT };
+enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE, PROGRAM_NOTIFICATIONS };
-#define ROW_COUNT 15
+#define ROW_COUNT 13
 
 class AdvancedSettings: public QTableWidget {
   Q_OBJECT
 
 private:
-  QSpinBox *spin_cache, *outgoing_ports_min, *outgoing_ports_max, *spin_list_refresh, *spin_maxhalfopen, *spin_tracker_port;
+  QSpinBox *spin_cache, *outgoing_ports_min, *outgoing_ports_max, *spin_list_refresh, *spin_maxhalfopen;
-  QCheckBox *cb_ignore_limits_lan, *cb_count_overhead, *cb_recheck_completed, *cb_resolve_countries, *cb_resolve_hosts, *cb_super_seeding, *cb_program_notifications, *cb_tracker_status;
+  QCheckBox *cb_ignore_limits_lan, *cb_count_overhead, *cb_recheck_completed, *cb_resolve_countries, *cb_resolve_hosts, *cb_super_seeding, *cb_program_notifications;
   QComboBox *combo_iface;
 
 public:
@@ -53,8 +53,6 @@ public:
     delete cb_super_seeding;
     delete combo_iface;
     delete cb_program_notifications;
-    delete spin_tracker_port;
-    delete cb_tracker_status;
   }
 
 public slots:
@@ -90,9 +88,6 @@ public slots:
     }
     // Program notification
     Preferences::useProgramNotification(cb_program_notifications->isChecked());
-    // Tracker
-    Preferences::setTrackerEnabled(cb_tracker_status->isChecked());
-    Preferences::setTrackerPort(spin_tracker_port->value());
   }
 
 protected slots:
@@ -195,25 +190,11 @@ protected slots:
     connect(combo_iface, SIGNAL(currentIndexChanged(int)), this, SLOT(emitSettingsChanged()));
     setCellWidget(NETWORK_IFACE, VALUE, combo_iface);
     // Program notifications
-    setItem(PROGRAM_NOTIFICATIONS, PROPERTY, new QTableWidgetItem(tr("Display program notification balloons")));
+    setItem(PROGRAM_NOTIFICATIONS, PROPERTY, new QTableWidgetItem(tr("Display program notification baloons")));
     cb_program_notifications = new QCheckBox();
     connect(cb_program_notifications, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
     cb_program_notifications->setChecked(Preferences::useProgramNotification());
     setCellWidget(PROGRAM_NOTIFICATIONS, VALUE, cb_program_notifications);
-    // Tracker State
-    setItem(TRACKER_STATUS, PROPERTY, new QTableWidgetItem(tr("Enable embedded tracker")));
-    cb_tracker_status = new QCheckBox();
-    connect(cb_tracker_status, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_tracker_status->setChecked(Preferences::isTrackerEnabled());
-    setCellWidget(TRACKER_STATUS, VALUE, cb_tracker_status);
-    // Tracker port
-    setItem(TRACKER_PORT, PROPERTY, new QTableWidgetItem(tr("Embedded tracker port")));
-    spin_tracker_port = new QSpinBox();
-    connect(spin_tracker_port, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    spin_tracker_port->setMinimum(1);
-    spin_tracker_port->setMaximum(65535);
-    spin_tracker_port->setValue(Preferences::getTrackerPort());
-    setCellWidget(TRACKER_PORT, VALUE, spin_tracker_port);
   }
 
   void emitSettingsChanged() {

src/bittorrent.h

@@ -46,10 +46,7 @@
 #include <libtorrent/version.hpp>
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
-
-#include "qtracker.h"
 #include "qtorrenthandle.h"
-#include "trackerinfos.h"
 
 using namespace libtorrent;
 
@@ -62,43 +59,70 @@ class HttpServer;
 class BandwidthScheduler;
 class ScanFoldersModel;
 
-class QBtSession : public QObject {
+class TrackerInfos {
-  Q_OBJECT
+public:
-  Q_DISABLE_COPY(QBtSession)
+  QString name_or_url;
+  QString last_message;
+  unsigned long num_peers;
+#if LIBTORRENT_VERSION_MINOR < 15
+  bool verified;
+  uint fail_count;
+#endif
 
-private:
+  //TrackerInfos() {}
-  explicit QBtSession();
+  TrackerInfos(const TrackerInfos &b) {
-  static QBtSession* m_instance;
+    name_or_url = b.name_or_url;
+    Q_ASSERT(!name_or_url.isEmpty());
+    last_message = b.last_message;
+    num_peers = b.num_peers;
+#if LIBTORRENT_VERSION_MINOR < 15
+    verified = b.verified;
+    fail_count = b.fail_count;
+#endif
+  }
+  TrackerInfos(QString name_or_url): name_or_url(name_or_url), last_message(""), num_peers(0) {
+#if LIBTORRENT_VERSION_MINOR < 15
+    fail_count = 0;
+    verified = false;
+#endif
+  }
+};
+
+class Bittorrent : public QObject {
+  Q_OBJECT
 
 public:
-  static QBtSession* instance();
+  // Constructor / Destructor
-  static void drop();
+  Bittorrent();
-  ~QBtSession();
+  ~Bittorrent();
   QTorrentHandle getTorrentHandle(QString hash) const;
   std::vector<torrent_handle> getTorrents() const;
   bool isFilePreviewPossible(QString fileHash) const;
+  bool isDHTEnabled() const;
+  bool isLSDEnabled() const;
   float getPayloadDownloadRate() const;
   float getPayloadUploadRate() const;
   session_status getSessionStatus() const;
   int getListenPort() const;
   float getRealRatio(QString hash) const;
+  session* getSession() const;
   QHash<QString, TrackerInfos> getTrackersInfo(QString hash) const;
   bool hasActiveTorrents() const;
   bool hasDownloadingTorrents() const;
-  //int getMaximumActiveDownloads() const;
+  bool isQueueingEnabled() const;
-  //int getMaximumActiveTorrents() const;
+  int getMaximumActiveDownloads() const;
+  int getMaximumActiveTorrents() const;
   int loadTorrentPriority(QString hash);
+  QStringList getConsoleMessages() const;
+  QStringList getPeerBanMessages() const;
   qlonglong getETA(QString hash);
-  inline QStringList getConsoleMessages() const { return consoleMessages; }
+  bool useTemporaryFolder() const;
-  inline QStringList getPeerBanMessages() const { return peerBanMessages; }
+  QString getDefaultSavePath() const;
-  inline session* getSession() const { return s; }
+  ScanFoldersModel* getScanFoldersModel() const;
-  inline bool useTemporaryFolder() const { return !defaultTempPath.isEmpty(); }
+  bool isPexEnabled() const;
-  inline QString getDefaultSavePath() const { return defaultSavePath; }
+#if LIBTORRENT_VERSION_MINOR < 15
-  inline ScanFoldersModel* getScanFoldersModel() const {  return m_scanFolders; }
+  void saveDHTEntry();
-  inline bool isDHTEnabled() const { return DHTEnabled; }
+#endif
-  inline bool isLSDEnabled() const { return LSDEnabled; }
-  inline bool isPexEnabled() const { return DHTEnabled; }
-  inline bool isQueueingEnabled() const { return queueingEnabled; }
 
 public slots:
   QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
@@ -123,7 +147,7 @@ public slots:
   void disableIPFilter();
   void setQueueingEnabled(bool enable);
   void handleDownloadFailure(QString url, QString reason);
-  void downloadUrlAndSkipDialog(QString url, QString save_path, QString label);
+  void downloadUrlAndSkipDialog(QString url, QString save_path=QString::null);
   // Session configuration - Setters
   void setListeningPort(int port);
   void setMaxConnections(int maxConnec);
@@ -168,10 +192,6 @@ public slots:
 protected:
   QString getSavePath(QString hash, bool fromScanDir = false, QString filePath = QString::null, QString root_folder=QString::null);
   bool initWebUi(QString username, QString password, int port);
-  bool loadFastResumeData(QString hash, std::vector<char> &buf);
-  void loadTorrentSettings(QTorrentHandle h);
-  void loadTorrentTempData(QTorrentHandle h, QString savePath, bool magnet);
-  add_torrent_params initializeAddTorrentParams(QString hash);
 
 protected slots:
   void addTorrentsFromScanFolder(QStringList&);
@@ -183,11 +203,6 @@ protected slots:
   void sendNotificationEmail(QTorrentHandle h);
   void autoRunExternalProgram(QTorrentHandle h, bool async=true);
   void cleanUpAutoRunProcess(int);
-  void mergeTorrents(QTorrentHandle h_ex, boost::intrusive_ptr<torrent_info> t);
-  void exportTorrentFile(QTorrentHandle h);
-#if LIBTORRENT_VERSION_MINOR < 15
-  void saveDHTEntry();
-#endif
 
 signals:
   void addedTorrent(QTorrentHandle& h);
@@ -213,7 +228,7 @@ private:
   session *s;
   QPointer<QTimer> timerAlerts;
   QPointer<BandwidthScheduler> bd_scheduler;
-  QMap<QUrl, QPair<QString, QString> > savepathLabel_fromurl;
+  QMap<QUrl, QString> savepath_fromurl;
   QHash<QString, QHash<QString, TrackerInfos> > trackersInfos;
   QHash<QString, QString> savePathsToRemove;
   QStringList torrentsToPausedAfterChecking;
@@ -262,8 +277,6 @@ private:
   bool geoipDBLoaded;
   bool resolve_countries;
 #endif
-  // Tracker
-  QPointer<QTracker> m_tracker;
 
 };
 

src/console_imp.h

@@ -31,7 +31,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include "qbtsession.h"
+#include "bittorrent.h"
 #include "ui_console.h"
 
 using namespace libtorrent;
@@ -39,13 +39,17 @@ using namespace libtorrent;
 class consoleDlg : public QDialog, private Ui_ConsoleDlg{
   Q_OBJECT
   
+  private:
+    Bittorrent *BTSession;
+  
   public:
-    consoleDlg(QWidget *parent) : QDialog(parent) {
+    consoleDlg(QWidget *parent, Bittorrent* _BTSession) : QDialog(parent) {
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       setModal(true);
-      textConsole->setHtml(QBtSession::instance()->getConsoleMessages().join("<br>"));
+      BTSession = _BTSession;
-      textBannedPeers->setHtml(QBtSession::instance()->getPeerBanMessages().join("<br>"));
+      textConsole->setHtml(BTSession->getConsoleMessages().join("<br>"));
+      textBannedPeers->setHtml(BTSession->getPeerBanMessages().join("<br>"));
       show();
     }
     

src/createtorrent_imp.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2010  Christophe Dumez
+ * Copyright (C) 2006  Christophe Dumez
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,16 +31,56 @@
 #ifndef CREATE_TORRENT_IMP_H
 #define CREATE_TORRENT_IMP_H
 
+#include <QThread>
+
 #include "ui_createtorrent.h"
 
-class TorrentCreatorThread;
+class torrentCreatorThread : public QThread {
-
-class TorrentCreatorDlg : public QDialog, private Ui::createTorrentDialog{
   Q_OBJECT
+  
+  QString input_path;
+  QString save_path;
+  QStringList trackers;
+  QStringList url_seeds;
+  QString comment;
+  bool is_private;
+  int piece_size;
+  bool abort;
+  QDialog *parent;
+  
+  public:
+    torrentCreatorThread(QDialog *_parent) {
+        parent = _parent;
+    }
+    ~torrentCreatorThread() {
+      abort = true;
+      wait();
+    }
+    void create(QString _input_path, QString _save_path, QStringList _trackers, QStringList _url_seeds, QString _comment, bool _is_private, int _piece_size);
+    void sendProgressSignal(int progress);
+    void abortCreation() { abort = true; }
+  
+  protected:
+    void run();
+    
+  signals:
+    void creationFailure(QString msg);
+    void creationSuccess(QString path, QString branch_path);
+
+  signals:
+    void updateProgress(int progress);
+};
+
+class createtorrent : public QDialog, private Ui::createTorrentDialog{
+  Q_OBJECT
+
+  private:
+    torrentCreatorThread *creatorThread;
     
   public:
-    TorrentCreatorDlg(QWidget *parent = 0);
+    createtorrent(QWidget *parent = 0);
-    ~TorrentCreatorDlg();
+    ~createtorrent();
+    QStringList allItems(QListWidget *list);
     int getPieceSize() const;
 
   signals:
@@ -54,18 +94,12 @@ class TorrentCreatorDlg : public QDialog, private Ui::createTorrentDialog{
     void on_createButton_clicked();
     void on_addFile_button_clicked();
     void on_addFolder_button_clicked();
+    void on_addTracker_button_clicked();
+    void on_removeTracker_button_clicked();
+    void on_addURLSeed_button_clicked();
+    void on_removeURLSeed_button_clicked();
     void handleCreationFailure(QString msg);
     void handleCreationSuccess(QString path, QString branch_path);
-    void setInteractionEnabled(bool enabled);
-    void showProgressBar(bool show);
-    void on_checkAutoPieceSize_clicked(bool checked);
-    void updateOptimalPieceSize();
-    void saveTrackerList();
-    void loadTrackerList();
-
-private:
-  TorrentCreatorThread *creatorThread;
-  QList<int> m_piece_sizes;
 };
 
 #endif

src/downloadedpiecesbar.h

@@ -43,7 +43,6 @@ using namespace libtorrent;
 
 class DownloadedPiecesBar: public QWidget {
   Q_OBJECT
-  Q_DISABLE_COPY(DownloadedPiecesBar)
 
 private:
   QPixmap pixmap;

src/downloadthread.cpp

@@ -39,6 +39,8 @@
 #include "preferences.h"
 #include "qinisettings.h"
 
+enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4, SOCKS4=5};
+
 /** Download Thread **/
 
 downloadThread::downloadThread(QObject* parent) : QObject(parent) {
@@ -178,7 +180,7 @@ void downloadThread::applyProxySettings() {
     qDebug("Using proxy: %s", qPrintable(IP));
     proxy.setPort(port.toUShort());
     // Default proxy type is HTTP, we must change if it is SOCKS5
-    if(intValue == Proxy::SOCKS5 || intValue == Proxy::SOCKS5_PW) {
+    if(intValue == SOCKS5 || intValue == SOCKS5_PW) {
       qDebug("Proxy is SOCKS5, not HTTP");
       proxy.setType(QNetworkProxy::Socks5Proxy);
     } else {

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/searchengine/nova/engines/"
+#define UPDATE_URL "http://qbittorrent.svn.sourceforge.net/viewvc/qbittorrent/trunk/src/search_engine/engines/"
 
 engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines) : QDialog(parent), supported_engines(supported_engines) {
   setupUi(this);
@@ -164,7 +164,7 @@ void engineSelectDlg::on_actionUninstall_triggered() {
     int index = pluginsTree->indexOfTopLevelItem(item);
     Q_ASSERT(index != -1);
     QString id = item->text(ENGINE_ID);
-    if(QFile::exists(":/nova/engines/"+id+".py")) {
+    if(QFile::exists(":/search_engine/engines/"+id+".py")) {
       error = true;
       // Disable it instead
       supported_engines->value(id)->setEnabled(false);

src/eventmanager.cpp

@@ -31,7 +31,7 @@
 
 #include <libtorrent/version.hpp>
 #include "eventmanager.h"
-#include "qbtsession.h"
+#include "bittorrent.h"
 #include "scannedfoldersmodel.h"
 #include "misc.h"
 #include "preferences.h"
@@ -40,8 +40,8 @@
 #include <QDebug>
 #include <QTranslator>
 
-EventManager::EventManager(QObject *parent)
+EventManager::EventManager(QObject *parent, Bittorrent *BTSession)
-  : QObject(parent)
+  : QObject(parent), BTSession(BTSession)
 {
 }
 
@@ -51,9 +51,9 @@ QList<QVariantMap> EventManager::getEventList() const {
 
 QList<QVariantMap> EventManager::getPropTrackersInfo(QString hash) const {
   QList<QVariantMap> trackersInfo;
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+  QTorrentHandle h = BTSession->getTorrentHandle(hash);
   if(h.is_valid()) {
-    QHash<QString, TrackerInfos> trackers_data = QBtSession::instance()->getTrackersInfo(hash);
+    QHash<QString, TrackerInfos> trackers_data = BTSession->getTrackersInfo(hash);
     std::vector<announce_entry> vect_trackers = h.trackers();
     std::vector<announce_entry>::iterator it;
     for(it = vect_trackers.begin(); it != vect_trackers.end(); it++) {
@@ -96,7 +96,7 @@ QList<QVariantMap> EventManager::getPropTrackersInfo(QString hash) const {
 
 QList<QVariantMap> EventManager::getPropFilesInfo(QString hash) const {
   QList<QVariantMap> files;
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+  QTorrentHandle h = BTSession->getTorrentHandle(hash);
   if(!h.is_valid() || !h.has_metadata()) return files;
   std::vector<int> priorities = h.file_priorities();
   std::vector<size_type> fp;
@@ -160,7 +160,7 @@ void EventManager::setGlobalPreferences(QVariantMap m) const {
       foreach(const QString &old_folder, old_folders) {
         // Update deleted folders
         if(!new_folders.contains(old_folder)) {
-          QBtSession::instance()->getScanFoldersModel()->removePath(old_folder);
+          BTSession->getScanFoldersModel()->removePath(old_folder);
         }
       }
       int i = 0;
@@ -168,7 +168,7 @@ void EventManager::setGlobalPreferences(QVariantMap m) const {
         qDebug("New watched folder: %s", qPrintable(new_folder));
         // Update new folders
         if(!old_folders.contains(new_folder)) {
-          QBtSession::instance()->getScanFoldersModel()->addPath(new_folder, download_at_path.at(i));
+          BTSession->getScanFoldersModel()->addPath(new_folder, download_at_path.at(i));
         }
         ++i;
       }
@@ -269,7 +269,7 @@ void EventManager::setGlobalPreferences(QVariantMap m) const {
   if(m.contains("web_ui_password"))
     Preferences::setWebUiPassword(m["web_ui_password"].toString());
   // Reload preferences
-  QBtSession::instance()->configureSession();
+  BTSession->configureSession();
 }
 
 QVariantMap EventManager::getGlobalPreferences() const {
@@ -342,7 +342,7 @@ QVariantMap EventManager::getGlobalPreferences() const {
 
 QVariantMap EventManager::getPropGeneralInfo(QString hash) const {
   QVariantMap data;
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+  QTorrentHandle h = BTSession->getTorrentHandle(hash);
   if(h.is_valid() && h.has_metadata()) {
     // Save path
     QString p = TorrentPersistentData::getSavePath(hash);
@@ -370,7 +370,7 @@ QVariantMap EventManager::getPropGeneralInfo(QString hash) const {
     data["time_elapsed"] = elapsed_txt;
     data["nb_connections"] = QVariant(QString::number(h.num_connections())+" ("+tr("%1 max", "e.g. 10 max").arg(QString::number(h.connections_limit()))+")");
     // Update ratio info
-    double ratio = QBtSession::instance()->getRealRatio(h.hash());
+    double ratio = BTSession->getRealRatio(h.hash());
     if(ratio > 100.)
       data["share_ratio"] = QString::fromUtf8("∞");
     else
@@ -404,7 +404,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
         event["state"] = QVariant("pausedDL");
     }
   } else {
-    if(QBtSession::instance()->isQueueingEnabled() && h.is_queued()) {
+    if(BTSession->isQueueingEnabled() && h.is_queued()) {
       if(h.is_seed())
         event["state"] = QVariant("queuedUP");
       else
@@ -436,7 +436,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
           event["state"] = QVariant("downloading");
         else
           event["state"] = QVariant("stalledDL");
-        event["eta"] = misc::userFriendlyDuration(QBtSession::instance()->getETA(hash));
+        event["eta"] = misc::userFriendlyDuration(BTSession->getETA(hash));
         break;
                         default:
         qDebug("No status, should not happen!!! status is %d", h.state());
@@ -448,7 +448,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
   event["size"] = QVariant(misc::friendlyUnit(h.actual_size()));
   event["progress"] = QVariant((double)h.progress());
   event["dlspeed"] = QVariant(tr("%1/s", "e.g. 120 KiB/s").arg(misc::friendlyUnit(h.download_payload_rate())));
-  if(QBtSession::instance()->isQueueingEnabled()) {
+  if(BTSession->isQueueingEnabled()) {
     if(h.queue_position() >= 0)
       event["priority"] = QVariant(QString::number(h.queue_position()));
     else
@@ -466,7 +466,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
     leechs += " ("+QString::number(h.num_incomplete())+")";
   event["num_leechs"] = QVariant(leechs);
   event["seed"] = QVariant(h.is_seed());
-  double ratio = QBtSession::instance()->getRealRatio(hash);
+  double ratio = BTSession->getRealRatio(hash);
   if(ratio > 100.)
     event["ratio"] = QString::fromUtf8("∞");
   else

src/eventmanager.h

@@ -36,30 +36,31 @@
 #include <QHash>
 #include <QVariant>
 
+class Bittorrent;
+
 class EventManager : public QObject
 {
-  Q_OBJECT
+	Q_OBJECT
-  Q_DISABLE_COPY(EventManager)
+	private:
+		QHash<QString, QVariantMap> event_list;
+                Bittorrent* BTSession;
 
-private:
+	protected:
-  QHash<QString, QVariantMap> event_list;
+		void update(QVariantMap event);
 
-protected:
+	public:
-  void update(QVariantMap event);
+                EventManager(QObject *parent, Bittorrent* BTSession);
+                QList<QVariantMap> getEventList() const;
+                QVariantMap getPropGeneralInfo(QString hash) const;
+                QList<QVariantMap> getPropTrackersInfo(QString hash) const;
+                QList<QVariantMap> getPropFilesInfo(QString hash) const;
+                QVariantMap getGlobalPreferences() const;
+                void setGlobalPreferences(QVariantMap m) const;
 
-public:
+	public slots:
-  EventManager(QObject *parent);
+		void addedTorrent(QTorrentHandle& h);
-  QList<QVariantMap> getEventList() const;
+		void deletedTorrent(QString hash);
-  QVariantMap getPropGeneralInfo(QString hash) const;
+		void modifiedTorrent(QTorrentHandle h);
-  QList<QVariantMap> getPropTrackersInfo(QString hash) const;
-  QList<QVariantMap> getPropFilesInfo(QString hash) const;
-  QVariantMap getGlobalPreferences() const;
-  void setGlobalPreferences(QVariantMap m) const;
-
-public slots:
-  void addedTorrent(QTorrentHandle& h);
-  void deletedTorrent(QString hash);
-  void modifiedTorrent(QTorrentHandle h);
 };
 
 #endif

src/feedList.h

@@ -0,0 +1,221 @@
+#ifndef FEEDLIST_H
+#define FEEDLIST_H
+
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QDropEvent>
+#include <QDragMoveEvent>
+#include <QStringList>
+#include <QHash>
+#include <QUrl>
+#include "rss.h"
+
+class FeedList: public QTreeWidget {
+  Q_OBJECT
+
+private:
+  RssManager *rssmanager;
+  QHash<QTreeWidgetItem*, RssFile*> mapping;
+  QHash<QString, QTreeWidgetItem*> feeds_items;
+  QTreeWidgetItem* current_feed;
+  QTreeWidgetItem *unread_item;
+
+public:
+  FeedList(QWidget *parent, RssManager *rssmanager): QTreeWidget(parent), rssmanager(rssmanager) {
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    setDragDropMode(QAbstractItemView::InternalMove);
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
+    setColumnCount(1);
+    QTreeWidgetItem *___qtreewidgetitem = headerItem();
+    ___qtreewidgetitem->setText(0, QApplication::translate("RSS", "RSS feeds", 0, QApplication::UnicodeUTF8));
+    unread_item = new QTreeWidgetItem(this);
+    unread_item->setText(0, tr("Unread") + QString::fromUtf8("  (") + QString::number(rssmanager->getNbUnRead(), 10)+ QString(")"));
+    unread_item->setData(0,Qt::DecorationRole, QVariant(QIcon(":/Icons/oxygen/mail-folder-inbox.png")));
+    itemAdded(unread_item, rssmanager);
+    connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(updateCurrentFeed(QTreeWidgetItem*)));
+    setCurrentItem(unread_item);
+  }
+
+  ~FeedList() {
+    disconnect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(updateCurrentFeed(QTreeWidgetItem*)));
+    delete unread_item;
+  }
+
+  void itemAdded(QTreeWidgetItem *item, RssFile* file) {
+    mapping[item] = file;
+    if(file->getType() == RssFile::STREAM) {
+      feeds_items[file->getID()] = item;
+    }
+  }
+
+  void itemAboutToBeRemoved(QTreeWidgetItem *item) {
+    RssFile* file = mapping.take(item);
+    if(file->getType() == RssFile::STREAM) {
+      feeds_items.remove(file->getID());
+    } else {
+      QList<RssStream*> feeds = ((RssFolder*)file)->getAllFeeds();
+      foreach(RssStream* feed, feeds) {
+        feeds_items.remove(feed->getID());
+      }
+    }
+  }
+
+  bool hasFeed(QString url) const {
+    return feeds_items.contains(QUrl(url).toString());
+  }
+
+  QList<QTreeWidgetItem*> getAllFeedItems() const {
+    return feeds_items.values();
+  }
+
+  QTreeWidgetItem* getUnreadItem() const {
+    return unread_item;
+  }
+
+  QStringList getItemPath(QTreeWidgetItem* item) const {
+    QStringList path;
+    if(item) {
+      if(item->parent())
+        path << getItemPath(item->parent());
+      path.append(getRSSItem(item)->getID());
+    }
+    return path;
+  }
+
+  QList<QTreeWidgetItem*> getAllOpenFolders(QTreeWidgetItem *parent=0) const {
+    QList<QTreeWidgetItem*> open_folders;
+    int nbChildren;
+    if(parent)
+      nbChildren = parent->childCount();
+    else
+      nbChildren = topLevelItemCount();
+    for(int i=0; i<nbChildren; ++i) {
+      QTreeWidgetItem *item;
+      if(parent)
+        item = parent->child(i);
+      else
+        item = topLevelItem(i);
+      if(getItemType(item) == RssFile::FOLDER && item->isExpanded()) {
+        QList<QTreeWidgetItem*> open_subfolders = getAllOpenFolders(item);
+        if(!open_subfolders.empty()) {
+          open_folders << open_subfolders;
+        } else {
+          open_folders << item;
+        }
+      }
+    }
+    return open_folders;
+  }
+
+  QList<QTreeWidgetItem*> getAllFeedItems(QTreeWidgetItem* folder) {
+    QList<QTreeWidgetItem*> feeds;
+    int nbChildren = folder->childCount();
+    for(int i=0; i<nbChildren; ++i) {
+      QTreeWidgetItem *item = folder->child(i);
+      if(getItemType(item) == RssFile::STREAM) {
+        feeds << item;
+      } else {
+        feeds << getAllFeedItems(item);
+      }
+    }
+    return feeds;
+  }
+
+  RssFile* getRSSItem(QTreeWidgetItem *item) const {
+    return mapping.value(item, 0);
+  }
+
+  RssFile::FileType getItemType(QTreeWidgetItem *item) const {
+    return mapping.value(item)->getType();
+  }
+
+  QString getItemID(QTreeWidgetItem *item) const {
+    return mapping.value(item)->getID();
+  }
+
+  QTreeWidgetItem* getTreeItemFromUrl(QString url) const{
+    return feeds_items.value(url, 0);
+  }
+
+  RssStream* getRSSItemFromUrl(QString url) const {
+    return (RssStream*)getRSSItem(getTreeItemFromUrl(url));
+  }
+
+  QTreeWidgetItem* currentItem() const {
+    return current_feed;
+  }
+
+  QTreeWidgetItem* currentFeed() const {
+    return current_feed;
+  }
+
+signals:
+  void foldersAltered(QList<QTreeWidgetItem*> folders);
+  void overwriteAttempt(QString filename);
+
+protected slots:
+  void updateCurrentFeed(QTreeWidgetItem* new_item) {
+    if(!new_item) return;
+    if(!mapping.contains(new_item)) return;
+    if((getItemType(new_item) == RssFile::STREAM) || new_item == unread_item)
+      current_feed = new_item;
+  }
+
+protected:
+  void dragMoveEvent(QDragMoveEvent * event) {
+    QTreeWidgetItem *item = itemAt(event->pos());
+    if(item == unread_item) {
+      event->ignore();
+    } else {
+      if(item && getItemType(item) != RssFile::FOLDER)
+        event->ignore();
+      else {
+        if(selectedItems().contains(unread_item)) {
+          event->ignore();
+        } else {
+          QTreeWidget::dragMoveEvent(event);
+        }
+      }
+    }
+  }
+
+  void dropEvent(QDropEvent *event) {
+    qDebug("dropEvent");
+    QList<QTreeWidgetItem*> folders_altered;
+    QTreeWidgetItem *dest_folder_item =  itemAt(event->pos());
+    RssFolder *dest_folder;
+    if(dest_folder_item) {
+      dest_folder = (RssFolder*)getRSSItem(dest_folder_item);
+      folders_altered << dest_folder_item;
+    } else {
+      dest_folder = rssmanager;
+    }
+    QList<QTreeWidgetItem *> src_items = selectedItems();
+    // Check if there is not going to overwrite another file
+    foreach(QTreeWidgetItem *src_item, src_items) {
+      RssFile *file = getRSSItem(src_item);
+      if(dest_folder->hasChild(file->getID())) {
+        emit overwriteAttempt(file->getID());
+        return;
+      }
+    }
+    // Proceed with the move
+    foreach(QTreeWidgetItem *src_item, src_items) {
+      QTreeWidgetItem *parent_folder = src_item->parent();
+      if(parent_folder && !folders_altered.contains(parent_folder))
+        folders_altered << parent_folder;
+      // Actually move the file
+      RssFile *file = getRSSItem(src_item);
+      rssmanager->moveFile(file, dest_folder);
+    }
+    QTreeWidget::dropEvent(event);
+    if(dest_folder_item)
+      dest_folder_item->setExpanded(true);
+    // Emit signal for update
+    if(!folders_altered.empty())
+      emit foldersAltered(folders_altered);
+  }
+
+};
+
+#endif // FEEDLIST_H

src/filesystemwatcher.h

@@ -3,12 +3,11 @@
 
 #include <QFileSystemWatcher>
 #include <QDir>
+
+#ifndef Q_WS_WIN
 #include <QTimer>
 #include <QPointer>
 #include <QStringList>
-#include <QHash>
-
-#ifndef Q_WS_WIN
 #include <QSet>
 #include <iostream>
 #include <errno.h>
@@ -20,8 +19,6 @@
 #endif
 #endif
 
-#include "misc.h"
-
 #ifndef CIFS_MAGIC_NUMBER
 #define CIFS_MAGIC_NUMBER 0xFF534D42
 #endif
@@ -30,9 +27,6 @@
 #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.
@@ -45,14 +39,11 @@ private:
   QList<QDir> watched_folders;
   QPointer<QTimer> watch_timer;
 #endif
-  QStringList m_filters;
+  QStringList filters;
-  // Partial torrents
-  QHash<QString, int> m_partialTorrents;
-  QPointer<QTimer> m_partialTorrentTimer;
 
 #ifndef Q_WS_WIN
-private:
+protected:
-  static bool isNetworkFileSystem(QString path) {
+  bool isNetworkFileSystem(QString path) {
     QString file = path;
     if(!file.endsWith(QDir::separator()))
       file += QDir::separator();
@@ -108,7 +99,7 @@ private:
 
 public:
   FileSystemWatcher(QObject *parent): QFileSystemWatcher(parent) {
-    m_filters << "*.torrent";
+    filters << "*.torrent";
     connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanLocalFolder(QString)));
   }
 
@@ -117,8 +108,6 @@ public:
     if(watch_timer)
       delete watch_timer;
 #endif
-    if(m_partialTorrentTimer)
-      delete m_partialTorrentTimer;
   }
 
   QStringList directories() const {
@@ -148,7 +137,7 @@ public:
       if (!watch_timer) {
         watch_timer = new QTimer(this);
         connect(watch_timer, SIGNAL(timeout()), this, SLOT(scanNetworkFolders()));
-        watch_timer->start(WATCH_INTERVAL); // 5 sec
+        watch_timer->start(5000); // 5 sec
       }
     } else {
 #endif
@@ -207,72 +196,19 @@ 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 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);
+    const QStringList files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
     foreach(const QString &file, files) {
-      const QString file_abspath = dir.absoluteFilePath(file);
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-      if(misc::isValidTorrentFile(file_abspath)) {
+      torrents << dir.absoluteFilePath(file).replace("/", "\\");
-        torrents << file_abspath;
+#else
-      } else {
+      torrents << dir.absoluteFilePath(file);
-        if(!m_partialTorrents.contains(file_abspath)) {
+#endif
-          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();
   }
 
 };

src/headlessloader.h

@@ -34,7 +34,7 @@
 #include <QObject>
 #include <QCoreApplication>
 #include "preferences.h"
-#include "qbtsession.h"
+#include "bittorrent.h"
 
 class HeadlessLoader: public QObject {
   Q_OBJECT
@@ -44,7 +44,7 @@ public:
     // Enable Web UI
     Preferences::setWebUiEnabled(true);
     // Instanciate Bittorrent Object
-    BTSession = QBtSession::instance();
+    BTSession = new Bittorrent();
     connect(BTSession, SIGNAL(newConsoleMessage(QString)), this, SLOT(displayConsoleMessage(QString)));
     // Resume unfinished torrents
     BTSession->startUpTorrents();
@@ -61,7 +61,7 @@ public:
   }
 
   ~HeadlessLoader() {
-    QBtSession::drop();
+    delete BTSession;
   }
 
 public slots:
@@ -103,7 +103,7 @@ public slots:
   }
 
 private:
-  QBtSession *BTSession;
+  Bittorrent *BTSession;
 
 };
 

src/httpconnection.cpp

@@ -34,7 +34,7 @@
 #include "eventmanager.h"
 #include "preferences.h"
 #include "json.h"
-#include "qbtsession.h"
+#include "bittorrent.h"
 #include "misc.h"
 #include <QTcpSocket>
 #include <QDateTime>
@@ -46,8 +46,8 @@
 #include <QRegExp>
 #include <QTemporaryFile>
 
-HttpConnection::HttpConnection(QTcpSocket *socket, HttpServer *parent)
+HttpConnection::HttpConnection(QTcpSocket *socket, Bittorrent *BTSession, HttpServer *parent)
-  : QObject(parent), socket(socket), httpserver(parent)
+    : QObject(parent), socket(socket), parent(parent), BTSession(BTSession)
 {
   socket->setParent(this);
   connect(socket, SIGNAL(readyRead()), this, SLOT(read()));
@@ -134,7 +134,7 @@ QString HttpConnection::translateDocument(QString data) {
 void HttpConnection::respond() {
   //qDebug("Respond called");
   const QString peer_ip = socket->peerAddress().toString();
-  const int nb_fail = httpserver->NbFailedAttemptsForIp(peer_ip);
+  const int nb_fail = parent->NbFailedAttemptsForIp(peer_ip);
   if(nb_fail >= MAX_AUTH_FAILED_ATTEMPTS) {
     generator.setStatusLine(403, "Forbidden");
     generator.setMessage(tr("Your IP address has been banned after too many failed authentication attempts."));
@@ -146,23 +146,23 @@ void HttpConnection::respond() {
     // Return unauthorized header
     qDebug("Auth is Empty...");
     generator.setStatusLine(401, "Unauthorized");
-    generator.setValue("WWW-Authenticate",  "Digest realm=\""+QString(QBT_REALM)+"\", nonce=\""+httpserver->generateNonce()+"\", opaque=\""+httpserver->generateNonce()+"\", stale=\"false\", algorithm=\"MD5\", qop=\"auth\"");
+    generator.setValue("WWW-Authenticate",  "Digest realm=\""+QString(QBT_REALM)+"\", nonce=\""+parent->generateNonce()+"\", opaque=\""+parent->generateNonce()+"\", stale=\"false\", algorithm=\"MD5\", qop=\"auth\"");
     write();
     return;
   }
   //qDebug("Auth: %s", qPrintable(auth.split(" ").first()));
-  if (QString::compare(auth.split(" ").first(), "Digest", Qt::CaseInsensitive) != 0 || !httpserver->isAuthorized(auth.toLocal8Bit(), parser.method())) {
+  if (QString::compare(auth.split(" ").first(), "Digest", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth.toLocal8Bit(), parser.method())) {
     // Update failed attempt counter
-    httpserver->increaseNbFailedAttemptsForIp(peer_ip);
+    parent->increaseNbFailedAttemptsForIp(peer_ip);
     qDebug("client IP: %s (%d failed attempts)", qPrintable(peer_ip), nb_fail+1);
     // Return unauthorized header
     generator.setStatusLine(401, "Unauthorized");
-    generator.setValue("WWW-Authenticate",  "Digest realm=\""+QString(QBT_REALM)+"\", nonce=\""+httpserver->generateNonce()+"\", opaque=\""+httpserver->generateNonce()+"\", stale=\"false\", algorithm=\"MD5\", qop=\"auth\"");
+    generator.setValue("WWW-Authenticate",  "Digest realm=\""+QString(QBT_REALM)+"\", nonce=\""+parent->generateNonce()+"\", opaque=\""+parent->generateNonce()+"\", stale=\"false\", algorithm=\"MD5\", qop=\"auth\"");
     write();
     return;
   }
   // Client successfully authenticated, reset number of failed attempts
-  httpserver->resetNbFailedAttemptsForIp(peer_ip);
+  parent->resetNbFailedAttemptsForIp(peer_ip);
   QString url  = parser.url();
   // Favicon
   if(url.endsWith("favicon.ico")) {
@@ -231,13 +231,10 @@ void HttpConnection::respond() {
       return;
     }
   }
-  if (list[0] == "images") {
+  if (list[0] == "images")
     list[0] = "Icons";
-  } else {
+  else
-    if(list.last().endsWith(".html"))
-      list.prepend("html");
     list.prepend("webui");
-  }
   url = ":/" + list.join("/");
   QFile file(url);
   if(!file.open(QIODevice::ReadOnly))
@@ -271,7 +268,7 @@ void HttpConnection::respondNotFound()
 
 void HttpConnection::respondJson()
 {
-  EventManager* manager =  httpserver->eventManager();
+  EventManager* manager =  parent->eventManager();
   QString string = json::toJson(manager->getEventList());
   generator.setStatusLine(200, "OK");
   generator.setContentTypeByExt("js");
@@ -280,7 +277,7 @@ void HttpConnection::respondJson()
 }
 
 void HttpConnection::respondGenPropertiesJson(QString hash) {
-  EventManager* manager =  httpserver->eventManager();
+  EventManager* manager =  parent->eventManager();
   QString string = json::toJson(manager->getPropGeneralInfo(hash));
   generator.setStatusLine(200, "OK");
   generator.setContentTypeByExt("js");
@@ -289,7 +286,7 @@ void HttpConnection::respondGenPropertiesJson(QString hash) {
 }
 
 void HttpConnection::respondTrackersPropertiesJson(QString hash) {
-  EventManager* manager =  httpserver->eventManager();
+  EventManager* manager =  parent->eventManager();
   QString string = json::toJson(manager->getPropTrackersInfo(hash));
   generator.setStatusLine(200, "OK");
   generator.setContentTypeByExt("js");
@@ -298,7 +295,7 @@ void HttpConnection::respondTrackersPropertiesJson(QString hash) {
 }
 
 void HttpConnection::respondFilesPropertiesJson(QString hash) {
-  EventManager* manager =  httpserver->eventManager();
+  EventManager* manager =  parent->eventManager();
   QString string = json::toJson(manager->getPropFilesInfo(hash));
   generator.setStatusLine(200, "OK");
   generator.setContentTypeByExt("js");
@@ -307,7 +304,7 @@ void HttpConnection::respondFilesPropertiesJson(QString hash) {
 }
 
 void HttpConnection::respondPreferencesJson() {
-  EventManager* manager =  httpserver->eventManager();
+  EventManager* manager =  parent->eventManager();
   QString string = json::toJson(manager->getGlobalPreferences());
   generator.setStatusLine(200, "OK");
   generator.setContentTypeByExt("js");
@@ -317,7 +314,7 @@ void HttpConnection::respondPreferencesJson() {
 
 void HttpConnection::respondGlobalTransferInfoJson() {
   QVariantMap info;
-  session_status sessionStatus = QBtSession::instance()->getSessionStatus();
+  session_status sessionStatus = BTSession->getSessionStatus();
   info["DlInfos"] = tr("D: %1/s - T: %2", "Download speed: x KiB/s - Transferred: x MiB").arg(misc::friendlyUnit(sessionStatus.payload_download_rate)).arg(misc::friendlyUnit(sessionStatus.total_payload_download));
   info["UpInfos"] = tr("U: %1/s - T: %2", "Upload speed: x KiB/s - Transferred: x MiB").arg(misc::friendlyUnit(sessionStatus.payload_upload_rate)).arg(misc::friendlyUnit(sessionStatus.total_payload_upload));
   QString string = json::toJson(info);
@@ -353,7 +350,7 @@ void HttpConnection::respondCommand(QString command)
   if(command == "addTrackers") {
     QString hash = parser.post("hash");
     if(!hash.isEmpty()) {
-      QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+      QTorrentHandle h = BTSession->getTorrentHandle(hash);
       if(h.is_valid() && h.has_metadata()) {
         QString urls = parser.post("urls");
         QStringList list = urls.split('\n');
@@ -407,14 +404,14 @@ void HttpConnection::respondCommand(QString command)
   }
   if(command == "setPreferences") {
     QString json_str = parser.post("json");
-    EventManager* manager =  httpserver->eventManager();
+    EventManager* manager =  parent->eventManager();
     manager->setGlobalPreferences(json::fromJson(json_str));
   }
   if(command == "setFilePrio") {
     QString hash = parser.post("hash");
     int file_id = parser.post("id").toInt();
     int priority = parser.post("priority").toInt();
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
     if(h.is_valid() && h.has_metadata()) {
       h.file_priority(file_id, priority);
     }
@@ -422,18 +419,18 @@ void HttpConnection::respondCommand(QString command)
   if(command == "getGlobalUpLimit") {
     generator.setStatusLine(200, "OK");
     generator.setContentTypeByExt("html");
-    generator.setMessage(QString::number(QBtSession::instance()->getSession()->upload_rate_limit()));
+    generator.setMessage(QString::number(BTSession->getSession()->upload_rate_limit()));
     write();
   }
   if(command == "getGlobalDlLimit") {
     generator.setStatusLine(200, "OK");
     generator.setContentTypeByExt("html");
-    generator.setMessage(QString::number(QBtSession::instance()->getSession()->download_rate_limit()));
+    generator.setMessage(QString::number(BTSession->getSession()->download_rate_limit()));
     write();
   }
   if(command == "getTorrentUpLimit") {
     QString hash = parser.post("hash");
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
     if(h.is_valid()) {
       generator.setStatusLine(200, "OK");
       generator.setContentTypeByExt("html");
@@ -443,7 +440,7 @@ void HttpConnection::respondCommand(QString command)
   }
   if(command == "getTorrentDlLimit") {
     QString hash = parser.post("hash");
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
     if(h.is_valid()) {
       generator.setStatusLine(200, "OK");
       generator.setContentTypeByExt("html");
@@ -455,7 +452,7 @@ void HttpConnection::respondCommand(QString command)
     QString hash = parser.post("hash");
     qlonglong limit = parser.post("limit").toLongLong();
     if(limit == 0) limit = -1;
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
     if(h.is_valid()) {
       h.set_upload_limit(limit);
     }
@@ -464,7 +461,7 @@ void HttpConnection::respondCommand(QString command)
     QString hash = parser.post("hash");
     qlonglong limit = parser.post("limit").toLongLong();
     if(limit == 0) limit = -1;
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
     if(h.is_valid()) {
       h.set_download_limit(limit);
     }
@@ -472,13 +469,13 @@ void HttpConnection::respondCommand(QString command)
   if(command == "setGlobalUpLimit") {
     qlonglong limit = parser.post("limit").toLongLong();
     if(limit == 0) limit = -1;
-    QBtSession::instance()->getSession()->set_upload_rate_limit(limit);
+    BTSession->getSession()->set_upload_rate_limit(limit);
     Preferences::setGlobalUploadLimit(limit/1024.);
   }
   if(command == "setGlobalDlLimit") {
     qlonglong limit = parser.post("limit").toLongLong();
     if(limit == 0) limit = -1;
-    QBtSession::instance()->getSession()->set_download_rate_limit(limit);
+    BTSession->getSession()->set_download_rate_limit(limit);
     Preferences::setGlobalDownloadLimit(limit/1024.);
   }
   if(command == "pause") {
@@ -494,22 +491,22 @@ void HttpConnection::respondCommand(QString command)
     return;
   }
   if(command == "increasePrio") {
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(parser.post("hash"));
+    QTorrentHandle h = BTSession->getTorrentHandle(parser.post("hash"));
     if(h.is_valid()) h.queue_position_up();
     return;
   }
   if(command == "decreasePrio") {
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(parser.post("hash"));
+    QTorrentHandle h = BTSession->getTorrentHandle(parser.post("hash"));
     if(h.is_valid()) h.queue_position_down();
     return;
   }
   if(command == "topPrio") {
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(parser.post("hash"));
+    QTorrentHandle h = BTSession->getTorrentHandle(parser.post("hash"));
     if(h.is_valid()) h.queue_position_top();
     return;
   }
   if(command == "bottomPrio") {
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(parser.post("hash"));
+    QTorrentHandle h = BTSession->getTorrentHandle(parser.post("hash"));
     if(h.is_valid()) h.queue_position_bottom();
     return;
   }
@@ -524,18 +521,18 @@ void HttpConnection::respondCommand(QString command)
 }
 
 void HttpConnection::recheckTorrent(QString hash) {
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+  QTorrentHandle h = BTSession->getTorrentHandle(hash);
   if(h.is_valid()){
-    QBtSession::instance()->recheckTorrent(h.hash());
+    BTSession->recheckTorrent(h.hash());
   }
 }
 
 void HttpConnection::recheckAllTorrents() {
-  std::vector<torrent_handle> torrents = QBtSession::instance()->getTorrents();
+  std::vector<torrent_handle> torrents = BTSession->getTorrents();
   std::vector<torrent_handle>::iterator torrentIT;
   for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
     QTorrentHandle h = QTorrentHandle(*torrentIT);
     if(h.is_valid())
-      QBtSession::instance()->recheckTorrent(h.hash());
+      BTSession->recheckTorrent(h.hash());
   }
 }

src/httpconnection.h

@@ -38,55 +38,55 @@
 
 class QTcpSocket;
 class HttpServer;
+class Bittorrent;
 
 class HttpConnection : public QObject
 {
-  Q_OBJECT
+	Q_OBJECT
-  Q_DISABLE_COPY(HttpConnection)
+	private:
+		QTcpSocket *socket;
+		HttpServer *parent;
+                Bittorrent *BTSession;
 
-private:
+	protected:
-  QTcpSocket *socket;
+		HttpRequestParser parser;
-  HttpServer *httpserver;
+		HttpResponseGenerator generator;
 
-protected:
+	protected slots:
-  HttpRequestParser parser;
+		void write();
-  HttpResponseGenerator generator;
+		virtual void respond();
+		void respondJson();
+                void respondGenPropertiesJson(QString hash);
+                void respondTrackersPropertiesJson(QString hash);
+                void respondFilesPropertiesJson(QString hash);
+                void respondPreferencesJson();
+                void respondGlobalTransferInfoJson();
+		void respondCommand(QString command);
+		void respondNotFound();
+		void processDownloadedFile(QString, QString);
+		void handleDownloadFailure(QString, QString);
+                void recheckTorrent(QString hash);
+                void recheckAllTorrents();
 
-protected slots:
+	public:
-  void write();
+                HttpConnection(QTcpSocket *socket, Bittorrent* BTSession, HttpServer *parent);
-  void respond();
+		~HttpConnection();
-  void respondJson();
+                QString translateDocument(QString data);
-  void respondGenPropertiesJson(QString hash);
-  void respondTrackersPropertiesJson(QString hash);
-  void respondFilesPropertiesJson(QString hash);
-  void respondPreferencesJson();
-  void respondGlobalTransferInfoJson();
-  void respondCommand(QString command);
-  void respondNotFound();
-  void processDownloadedFile(QString, QString);
-  void handleDownloadFailure(QString, QString);
-  void recheckTorrent(QString hash);
-  void recheckAllTorrents();
 
-public:
+	private slots:
-  HttpConnection(QTcpSocket *socket, HttpServer *httpserver);
+		void read();
-  ~HttpConnection();
-  QString translateDocument(QString data);
 
-private slots:
+	signals:
-  void read();
+                void UrlReadyToBeDownloaded(QString url);
-
+                void MagnetReadyToBeDownloaded(QString uri);
-signals:
+		void torrentReadyToBeDownloaded(QString, bool, QString, bool);
-  void UrlReadyToBeDownloaded(QString url);
+                void deleteTorrent(QString hash, bool permanently);
-  void MagnetReadyToBeDownloaded(QString uri);
+		void resumeTorrent(QString hash);
-  void torrentReadyToBeDownloaded(QString, bool, QString, bool);
+		void pauseTorrent(QString hash);
-  void deleteTorrent(QString hash, bool permanently);
+                void increasePrioTorrent(QString hash);
-  void resumeTorrent(QString hash);
+                void decreasePrioTorrent(QString hash);
-  void pauseTorrent(QString hash);
+		void resumeAllTorrents();
-  void increasePrioTorrent(QString hash);
+		void pauseAllTorrents();
-  void decreasePrioTorrent(QString hash);
-  void resumeAllTorrents();
-  void pauseAllTorrents();
 };
 
 #endif