Some more code reorganizing

src/qtlibtorrent/bandwidthscheduler.h

@@ -0,0 +1,111 @@
+#ifndef BANDWIDTHSCHEDULER_H
+#define BANDWIDTHSCHEDULER_H
+
+#include <QTimer>
+#include <QTime>
+#include <QDateTime>
+#include "preferences.h"
+#include <iostream>
+
+class BandwidthScheduler: public QTimer {
+  Q_OBJECT
+
+private:
+  bool in_alternative_mode;
+
+public:
+  BandwidthScheduler(QObject *parent): QTimer(parent), in_alternative_mode(false) {
+    Q_ASSERT(Preferences::isSchedulerEnabled());
+    // Signal shot, we call start() again manually
+    setSingleShot(true);
+    // Connect Signals/Slots
+    connect(this, SIGNAL(timeout()), this, SLOT(switchMode()));
+  }
+
+public slots:
+  void start() {
+    Q_ASSERT(Preferences::isSchedulerEnabled());
+
+    QTime startAltSpeeds = Preferences::getSchedulerStartTime();
+    QTime endAltSpeeds = Preferences::getSchedulerEndTime();
+    if(startAltSpeeds == endAltSpeeds) {
+      std::cerr << "Error: bandwidth scheduler have the same start time and end time." << std::endl;
+      std::cerr << "The bandwidth scheduler will be disabled" << std::endl;
+      stop();
+      emit switchToAlternativeMode(false);
+      return;
+    }
+
+    // Determine what the closest QTime is
+    QTime now = QTime::currentTime();
+    uint time_to_start = secsTo(now, startAltSpeeds);
+    uint time_to_end = secsTo(now, endAltSpeeds);
+    if(time_to_end < time_to_start) {
+      // We should be in alternative mode
+      in_alternative_mode = true;
+      // Start counting
+      QTimer::start(time_to_end*1000);
+    } else {
+      // We should be in normal mode
+      in_alternative_mode = false;
+      // Start counting
+      QTimer::start(time_to_start*1000);
+    }
+    // Send signal to notify BTSession
+    emit switchToAlternativeMode(in_alternative_mode);
+  }
+
+  void switchMode() {
+    // Get the day this mode was started (either today or yesterday)
+    QDate current_date = QDateTime::currentDateTime().toLocalTime().date();
+    int day = current_date.dayOfWeek();
+    if(in_alternative_mode) {
+      // It is possible that starttime was yesterday
+      if(QTime::currentTime().secsTo(Preferences::getSchedulerStartTime()) > 0) {
+        current_date.addDays(-1); // Go to yesterday
+        day = current_date.day();
+      }
+    }
+    // Check if the day is in scheduler days
+    // Notify BTSession only if necessary
+    switch(Preferences::getSchedulerDays()) {
+    case EVERY_DAY:
+      emit switchToAlternativeMode(!in_alternative_mode);
+      break;
+    case WEEK_ENDS:
+      if(day == Qt::Saturday || day == Qt::Sunday)
+        emit switchToAlternativeMode(!in_alternative_mode);
+      break;
+    case WEEK_DAYS:
+      if(day != Qt::Saturday && day != Qt::Sunday)
+        emit switchToAlternativeMode(!in_alternative_mode);
+      break;
+    default:
+      // Convert our enum index to Qt enum index
+      int scheduler_day = ((int)Preferences::getSchedulerDays()) - 2;
+      if(day == scheduler_day)
+        emit switchToAlternativeMode(!in_alternative_mode);
+      break;
+    }
+    // Call start again
+    start();
+  }
+
+signals:
+  void switchToAlternativeMode(bool alternative);
+
+private:
+  // Qt function can return negative values and we
+  // don't want that
+  uint secsTo(QTime now, QTime t) {
+    int diff = now.secsTo(t);
+    if(diff < 0) {
+      // 86400 seconds in a day
+      diff += 86400;
+    }
+    Q_ASSERT(diff >= 0);
+    return diff;
+  }
+};
+
+#endif // BANDWIDTHSCHEDULER_H

src/qtlibtorrent/qbtsession.h

@@ -46,7 +46,9 @@
 #include <libtorrent/version.hpp>
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
+
 #include "qtorrenthandle.h"
+#include "trackerinfos.h"
 
 using namespace libtorrent;
 
@@ -59,35 +61,6 @@ class HttpServer;
 class BandwidthScheduler;
 class ScanFoldersModel;
 
-class TrackerInfos {
-public:
-  QString name_or_url;
-  QString last_message;
-  unsigned long num_peers;
-#if LIBTORRENT_VERSION_MINOR < 15
-  bool verified;
-  uint fail_count;
-#endif
-
-  //TrackerInfos() {}
-  TrackerInfos(const TrackerInfos &b) {
-    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
 

src/qtlibtorrent/qtlibtorrent.pri

@@ -1,7 +1,9 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += $$PWD/qbtsession.h \
-           $$PWD/qtorrenthandle.h
+           $$PWD/qtorrenthandle.h \
+           $$PWD/bandwidthscheduler.h \
+           $$PWD/trackerinfos.h
 
 SOURCES += $$PWD/qbtsession.cpp \
            $$PWD/qtorrenthandle.cpp

src/qtlibtorrent/trackerinfos.h

@@ -0,0 +1,65 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2010  Christophe Dumez
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#ifndef TRACKERINFOS_H
+#define TRACKERINFOS_H
+
+#include <QString>
+
+class TrackerInfos {
+public:
+  QString name_or_url;
+  QString last_message;
+  unsigned long num_peers;
+#if LIBTORRENT_VERSION_MINOR < 15
+  bool verified;
+  uint fail_count;
+#endif
+
+  //TrackerInfos() {}
+  TrackerInfos(const TrackerInfos &b) {
+    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
+  }
+};
+
+#endif // TRACKERINFOS_H