Merge pull request #2191 from glassez/webui

WebUI: Implement server-side filtering, sorting and limit/offset.

src/qtlibtorrent/qtorrenthandle.cpp

@@ -40,6 +40,7 @@
 #include "preferences.h"
 #include "qtorrenthandle.h"
 #include "torrentpersistentdata.h"
+#include "qbtsession.h"
 #include <libtorrent/version.hpp>
 #include <libtorrent/magnet_uri.hpp>
 #include <libtorrent/torrent_info.hpp>
@@ -406,6 +407,51 @@ void QTorrentHandle::file_progress(std::vector<size_type>& fp) const {
     torrent_handle::file_progress(fp, torrent_handle::piece_granularity);
 }
 
+QTorrentState QTorrentHandle::torrentState() const {
+    QTorrentState state = QTorrentState::Unknown;
+    libtorrent::torrent_status s = status(torrent_handle::query_accurate_download_counters);
+
+    if (is_paused(s)) {
+        if (has_error(s))
+            state = QTorrentState::Error;
+        else
+            state = is_seed(s) ? QTorrentState::PausedUploading : QTorrentState::PausedDownloading;
+    }
+    else {
+        if (QBtSession::instance()->isQueueingEnabled() && is_queued(s)) {
+            state = is_seed(s) ? QTorrentState::QueuedUploading : QTorrentState::QueuedDownloading;
+        }
+        else {
+            switch (s.state) {
+            case torrent_status::finished:
+            case torrent_status::seeding:
+                state = s.upload_payload_rate > 0 ? QTorrentState::Uploading : QTorrentState::StalledUploading;
+                break;
+            case torrent_status::allocating:
+            case torrent_status::checking_files:
+            case torrent_status::queued_for_checking:
+            case torrent_status::checking_resume_data:
+                state = is_seed(s) ? QTorrentState::CheckingUploading : QTorrentState::CheckingDownloading;
+                break;
+            case torrent_status::downloading:
+            case torrent_status::downloading_metadata:
+                state = s.download_payload_rate > 0 ? QTorrentState::Downloading : QTorrentState::StalledDownloading;
+                break;
+            default:
+                qWarning("Unrecognized torrent status, should not happen!!! status was %d", this->state());
+            }
+        }
+    }
+
+    return state;
+}
+
+qulonglong QTorrentHandle::eta() const
+{
+    libtorrent::torrent_status s = status(torrent_handle::query_accurate_download_counters);
+    return QBtSession::instance()->getETA(hash(), s);
+}
+
 //
 // Setters
 //
@@ -681,3 +727,44 @@ QString QTorrentHandle::filepath_at(const libtorrent::torrent_info &info, unsign
   return fsutils::fromNativePath(misc::toQStringU(info.files().file_path(index)));
 
 }
+
+
+QTorrentState::QTorrentState(int value)
+    : m_value(value)
+{
+}
+
+QString QTorrentState::toString() const
+{
+    switch (m_value) {
+    case Error:
+        return "error";
+    case Uploading:
+        return "uploading";
+    case PausedUploading:
+        return "pausedUP";
+    case QueuedUploading:
+        return "queuedUP";
+    case StalledUploading:
+        return "stalledUP";
+    case CheckingUploading:
+        return "checkingUP";
+    case Downloading:
+        return "downloading";
+    case PausedDownloading:
+        return "pausedDL";
+    case QueuedDownloading:
+        return "queuedDL";
+    case StalledDownloading:
+        return "stalledDL";
+    case CheckingDownloading:
+        return "checkingDL";
+    default:
+        return "unknown";
+    }
+}
+
+QTorrentState::operator int() const
+{
+    return m_value;
+}

src/qtlibtorrent/qtorrenthandle.h

@@ -39,6 +39,36 @@ QT_BEGIN_NAMESPACE
 class QStringList;
 QT_END_NAMESPACE
 
+class QTorrentState
+{
+public:
+    enum {
+        Unknown = -1,
+
+        Error,
+
+        Uploading,
+        PausedUploading,
+        QueuedUploading,
+        StalledUploading,
+        CheckingUploading,
+
+        Downloading,
+        PausedDownloading,
+        QueuedDownloading,
+        StalledDownloading,
+        CheckingDownloading
+    };
+
+    QTorrentState(int value);
+
+    operator int() const;
+    QString toString() const;
+
+private:
+    int m_value;
+};
+
 // A wrapper for torrent_handle in libtorrent
 // to interact well with Qt types
 class QTorrentHandle : public libtorrent::torrent_handle {
@@ -94,6 +124,8 @@ public:
   void downloading_pieces(libtorrent::bitfield& bf) const;
   bool has_metadata() const;
   void file_progress(std::vector<libtorrent::size_type>& fp) const;
+  QTorrentState torrentState() const;
+  qulonglong eta() const;
 
   //
   // Setters

src/webui/btjson.cpp

@@ -32,10 +32,14 @@
 #include "fs_utils.h"
 #include "qbtsession.h"
 #include "torrentpersistentdata.h"
+#include "qtorrentfilter.h"
 #include "jsonutils.h"
 
 #include <QDebug>
 #include <QVariant>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#include <QMetaType>
+#endif
 #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
 #include <QElapsedTimer>
 #endif
@@ -132,6 +136,58 @@ static const char KEY_TRANSFER_DLDATA[] = "dl_info_data";
 static const char KEY_TRANSFER_UPSPEED[] = "up_info_speed";
 static const char KEY_TRANSFER_UPDATA[] = "up_info_data";
 
+class QTorrentCompare
+{
+public:
+    QTorrentCompare(QString key, bool greaterThan = false)
+        : key_(key)
+        , greaterThan_(greaterThan)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+        , type_(QVariant::Invalid)
+#endif
+    {
+    }
+
+    bool operator()(QVariant torrent1, QVariant torrent2)
+    {
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+        if (type_ == QVariant::Invalid)
+            type_ = torrent1.toMap().value(key_).type();
+
+        switch (type_) {
+        case QVariant::Int:
+            return greaterThan_ ? torrent1.toMap().value(key_).toInt() > torrent2.toMap().value(key_).toInt()
+                                : torrent1.toMap().value(key_).toInt() < torrent2.toMap().value(key_).toInt();
+        case QVariant::LongLong:
+            return greaterThan_ ? torrent1.toMap().value(key_).toLongLong() > torrent2.toMap().value(key_).toLongLong()
+                                : torrent1.toMap().value(key_).toLongLong() < torrent2.toMap().value(key_).toLongLong();
+        case QVariant::ULongLong:
+            return greaterThan_ ? torrent1.toMap().value(key_).toULongLong() > torrent2.toMap().value(key_).toULongLong()
+                                : torrent1.toMap().value(key_).toULongLong() < torrent2.toMap().value(key_).toULongLong();
+        case QMetaType::Float:
+            return greaterThan_ ? torrent1.toMap().value(key_).toFloat() > torrent2.toMap().value(key_).toFloat()
+                                : torrent1.toMap().value(key_).toFloat() < torrent2.toMap().value(key_).toFloat();
+        case QVariant::Double:
+            return greaterThan_ ? torrent1.toMap().value(key_).toDouble() > torrent2.toMap().value(key_).toDouble()
+                                : torrent1.toMap().value(key_).toDouble() < torrent2.toMap().value(key_).toDouble();
+        default:
+            return greaterThan_ ? torrent1.toMap().value(key_).toString() > torrent2.toMap().value(key_).toString()
+                                : torrent1.toMap().value(key_).toString() < torrent2.toMap().value(key_).toString();
+        }
+#else
+        return greaterThan_ ? torrent1.toMap().value(key_) > torrent2.toMap().value(key_)
+                            : torrent1.toMap().value(key_) < torrent2.toMap().value(key_);
+#endif
+    }
+
+private:
+    QString key_;
+    bool greaterThan_;
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    QVariant::Type type_;
+#endif
+};
+
 static QVariantMap toMap(const QTorrentHandle& h)
 {
     libtorrent::torrent_status status = h.status(torrent_handle::query_accurate_download_counters);
@@ -153,40 +209,8 @@ static QVariantMap toMap(const QTorrentHandle& h)
     ret[KEY_TORRENT_NUM_INCOMPLETE] = status.num_incomplete;
     const qreal ratio = QBtSession::instance()->getRealRatio(status);
     ret[KEY_TORRENT_RATIO] = (ratio > 100.) ? -1 : ratio;
-  qulonglong eta = 0;
-  QString state;
-  if (h.is_paused(status)) {
-    if (h.has_error(status))
-      state = "error";
-    else
-      state = h.is_seed(status) ? "pausedUP" : "pausedDL";
-  } else {
-    if (QBtSession::instance()->isQueueingEnabled() && h.is_queued(status))
-      state = h.is_seed(status) ? "queuedUP" : "queuedDL";
-    else {
-      switch (status.state) {
-      case torrent_status::finished:
-      case torrent_status::seeding:
-        state = status.upload_payload_rate > 0 ? "uploading" : "stalledUP";
-        break;
-      case torrent_status::allocating:
-      case torrent_status::checking_files:
-      case torrent_status::queued_for_checking:
-      case torrent_status::checking_resume_data:
-        state = h.is_seed(status) ? "checkingUP" : "checkingDL";
-        break;
-      case torrent_status::downloading:
-      case torrent_status::downloading_metadata:
-        state = status.download_payload_rate > 0 ? "downloading" : "stalledDL";
-        eta = QBtSession::instance()->getETA(h.hash(), status);
-        break;
-      default:
-        qWarning("Unrecognized torrent status, should not happen!!! status was %d", h.state());
-      }
-    }
-  }
-  ret[KEY_TORRENT_ETA] = eta ? eta : MAX_ETA;
-  ret[KEY_TORRENT_STATE] =  state;
+    ret[KEY_TORRENT_STATE] = h.torrentState().toString();
+    ret[KEY_TORRENT_ETA] = h.eta();
 
     return ret;
 }
@@ -211,15 +235,37 @@ static QVariantMap toMap(const QTorrentHandle& h)
  *   - "eta": Torrent ETA
  *   - "state": Torrent state
  */
-QByteArray btjson::getTorrents()
+QByteArray btjson::getTorrents(QString filter, QString label,
+    QString sortedColumn, bool reverse, int limit, int offset)
 {
-  CACHED_VARIABLE(QVariantList, torrent_list, CACHE_DURATION_MS);
+    QVariantList torrent_list;
+
     std::vector<torrent_handle> torrents = QBtSession::instance()->getTorrents();
     std::vector<torrent_handle>::const_iterator it = torrents.begin();
     std::vector<torrent_handle>::const_iterator end = torrents.end();
+
+    QTorrentFilter torrentFilter(filter, label);
     for( ; it != end; ++it) {
-    torrent_list.append(toMap(QTorrentHandle(*it)));
+        QTorrentHandle torrent = QTorrentHandle(*it);
+
+        if (torrentFilter.apply(torrent))
+            torrent_list.append(toMap(torrent));
     }
+
+    std::sort(torrent_list.begin(), torrent_list.end(), QTorrentCompare(sortedColumn, reverse));
+    int size = torrent_list.size();
+    // normalize offset
+    if (offset < 0)
+        offset = size - offset;
+    if ((offset >= size) || (offset < 0))
+        offset = 0;
+    // normalize limit
+    if (limit <= 0)
+        limit = -1; // unlimited
+
+    if ((limit > 0) || (offset > 0))
+        return json::toJson(torrent_list.mid(offset, limit));
+    else
         return json::toJson(torrent_list);
 }
 
@@ -262,7 +308,8 @@ QByteArray btjson::getTrackersForTorrent(const QString& hash)
 
             tracker_list.append(tracker_dict);
         }
-  } catch(const std::exception& e) {
+    }
+    catch(const std::exception& e) {
         qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what());
         return QByteArray();
     }
@@ -323,7 +370,8 @@ QByteArray btjson::getPropertiesForTorrent(const QString& hash)
         data[KEY_PROP_CONNECT_COUNT_LIMIT] = status.connections_limit;
         const qreal ratio = QBtSession::instance()->getRealRatio(status);
         data[KEY_PROP_RATIO] = ratio > 100. ? -1 : ratio;
-  } catch(const std::exception& e) {
+    }
+    catch(const std::exception& e) {
         qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what());
         return QByteArray();
     }
@@ -368,7 +416,8 @@ QByteArray btjson::getFilesForTorrent(const QString& hash)
 
             file_list.append(file_dict);
         }
-  } catch (const std::exception& e) {
+    }
+    catch (const std::exception& e) {
         qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what());
         return QByteArray();
     }

src/webui/btjson.h

@@ -34,14 +34,18 @@
 #include <QCoreApplication>
 #include <QString>
 
-class btjson {
+class QTorrentHandle;
+
+class btjson
+{
     Q_DECLARE_TR_FUNCTIONS(misc)
 
 private:
     btjson() {}
 
 public:
-  static QByteArray getTorrents();
+    static QByteArray getTorrents(QString filter = "all", QString label = QString(),
+        QString sortedColumn = "name", bool reverse = false, int limit = 0, int offset = 0);
     static QByteArray getTrackersForTorrent(const QString& hash);
     static QByteArray getPropertiesForTorrent(const QString& hash);
     static QByteArray getFilesForTorrent(const QString& hash);

src/webui/qtorrentfilter.cpp

@@ -0,0 +1,118 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * 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.
+ */
+
+#include "torrentpersistentdata.h"
+#include "qtorrentfilter.h"
+
+QTorrentFilter::QTorrentFilter(QString filter, QString label)
+    : type_(All)
+    , label_(label)
+{
+    if (filter == "downloading")
+        type_ = Downloading;
+    else if (filter == "completed")
+        type_ = Completed;
+    else if (filter == "paused")
+        type_ = Paused;
+    else if (filter == "active")
+        type_ = Active;
+    else if (filter == "inactive")
+        type_ = Inactive;
+}
+
+bool QTorrentFilter::apply(const QTorrentHandle& h) const
+{
+    if (!torrentHasLabel(h))
+        return false;
+
+    switch (type_) {
+    case Downloading:
+        return isTorrentDownloading(h);
+    case Completed:
+        return isTorrentCompleted(h);
+    case Paused:
+        return isTorrentPaused(h);
+    case Active:
+        return isTorrentActive(h);
+    case Inactive:
+        return isTorrentInactive(h);
+    default: // All
+        return true;
+    }
+}
+
+bool QTorrentFilter::isTorrentDownloading(const QTorrentHandle &h) const
+{
+    const QTorrentState state = h.torrentState();
+
+    return state == QTorrentState::Downloading
+            || state == QTorrentState::StalledDownloading
+            || state == QTorrentState::CheckingDownloading
+            || state == QTorrentState::PausedDownloading
+            || state == QTorrentState::QueuedDownloading;
+}
+
+bool QTorrentFilter::isTorrentCompleted(const QTorrentHandle &h) const
+{
+    const QTorrentState state = h.torrentState();
+
+    return state == QTorrentState::Uploading
+            || state == QTorrentState::StalledUploading
+            || state == QTorrentState::CheckingUploading
+            || state == QTorrentState::PausedUploading
+            || state == QTorrentState::QueuedUploading;
+}
+
+bool QTorrentFilter::isTorrentPaused(const QTorrentHandle &h) const
+{
+    const QTorrentState state = h.torrentState();
+
+    return state == QTorrentState::PausedDownloading
+            || state == QTorrentState::PausedUploading;
+}
+
+bool QTorrentFilter::isTorrentActive(const QTorrentHandle &h) const
+{
+    const QTorrentState state = h.torrentState();
+
+    return state == QTorrentState::Downloading
+            || state == QTorrentState::Uploading;
+}
+
+bool QTorrentFilter::isTorrentInactive(const QTorrentHandle &h) const
+{
+    return !isTorrentActive(h);
+}
+
+bool QTorrentFilter::torrentHasLabel(const QTorrentHandle &h) const
+{
+    if (label_.isNull())
+        return true;
+    else
+        return TorrentPersistentData::getLabel(h.hash()) == label_;
+}

src/webui/qtorrentfilter.h

@@ -0,0 +1,63 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * 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.
+ */
+
+#ifndef QTORRENTFILTER_H
+#define QTORRENTFILTER_H
+
+#include "qtorrenthandle.h"
+
+class QTorrentFilter
+{
+public:
+    enum
+    {
+        All,
+        Downloading,
+        Completed,
+        Paused,
+        Active,
+        Inactive
+    };
+
+    // label: pass empty string for "no label" or null string (QString()) for "any label"
+    QTorrentFilter(QString filter, QString label = QString());
+    bool apply(const QTorrentHandle& h) const;
+
+private:
+    int type_;
+    QString label_;
+
+    bool isTorrentDownloading(const QTorrentHandle &h) const;
+    bool isTorrentCompleted(const QTorrentHandle &h) const;
+    bool isTorrentPaused(const QTorrentHandle &h) const;
+    bool isTorrentActive(const QTorrentHandle &h) const;
+    bool isTorrentInactive(const QTorrentHandle &h) const;
+    bool torrentHasLabel(const QTorrentHandle &h) const;
+};
+
+#endif // QTORRENTFILTER_H

src/webui/requesthandler.cpp

@@ -186,9 +186,21 @@ void RequestHandler::action_public_images()
     printFile(path);
 }
 
+// GET params:
+//   - filter (string): all, downloading, completed, paused, active, inactive
+//   - label (string): torrent label for filtering by it (empty string means "unlabeled"; no "label" param presented means "any label")
+//   - sort (string): name of column for sorting by its value
+//   - reverse (bool): enable reverse sorting
+//   - limit (int): set limit number of torrents returned (if greater than 0, otherwise - unlimited)
+//   - offset (int): set offset (if less than 0 - offset from end)
 void RequestHandler::action_json_torrents()
 {
-    print(btjson::getTorrents(), CONTENT_TYPE_JS);
+    const QStringMap& gets = request().gets;
+
+    print(btjson::getTorrents(
+        gets["filter"], gets["label"], gets["sort"], gets["reverse"] == "true",
+        gets["limit"].toInt(), gets["offset"].toInt()
+        ), CONTENT_TYPE_JS);
 }
 
 void RequestHandler::action_json_preferences()

src/webui/webui.pri

@@ -11,7 +11,8 @@ HEADERS += $$PWD/httpserver.h \
            $$PWD/extra_translations.h \
            $$PWD/webapplication.h \
            $$PWD/abstractrequesthandler.h \
-           $$PWD/requesthandler.h
+           $$PWD/requesthandler.h \
+           $$PWD/qtorrentfilter.h
 
 SOURCES += $$PWD/httpserver.cpp \
            $$PWD/httpconnection.cpp \
@@ -21,7 +22,8 @@ SOURCES += $$PWD/httpserver.cpp \
            $$PWD/prefjson.cpp \
            $$PWD/webapplication.cpp \
            $$PWD/abstractrequesthandler.cpp \
-           $$PWD/requesthandler.cpp
+           $$PWD/requesthandler.cpp \
+           $$PWD/qtorrentfilter.cpp
 
 # QJson JSON parser/serializer for using with Qt4
 lessThan(QT_MAJOR_VERSION, 5) {

src/webui/www/public/filters.html

@@ -9,9 +9,9 @@
 				
 				<script type="text/javascript">
 				// Remember this via Cookie
-				var last_filter = Cookie.read('selected_filter');
+				var filter = Cookie.read('selected_filter');
 				if(!$defined(last_filter)) {
-					last_filter = 'all';
+					filter = 'all';
 				}
-				$(last_filter+'_filter').addClass('selectedFilter');
+				$(filter+'_filter').addClass('selectedFilter');
 				</script>

src/webui/www/public/scripts/client.js

@@ -24,9 +24,6 @@
 
 myTable = new dynamicTable();
 ajaxfn = function () {};
-setSortedColumn = function(index){
-  myTable.setSortedColumn(index);
-};
 
 window.addEvent('load', function () {
 
@@ -67,7 +64,12 @@ window.addEvent('load', function(){
         id : 'Filters',
         title : 'Panel',
         header : false,
-		padding: { top: 0, right: 0, bottom: 0, left: 0 },
+        padding : {
+            top : 0,
+            right : 0,
+            bottom : 0,
+            left : 0
+        },
         loadMethod : 'xhr',
         contentURL : 'filters.html',
         column : 'filtersColumn',
@@ -107,9 +109,11 @@ window.addEvent('load', function(){
                     },
                     onSuccess : function (info) {
                         if (info) {
-                        $("DlInfos").set('html', "_(D: %1 - T: %2)".replace("%1", friendlyUnit(info.dl_info_speed, true))
+                            $("DlInfos").set('html', "_(D: %1 - T: %2)"
+                                .replace("%1", friendlyUnit(info.dl_info_speed, true))
                                 .replace("%2", friendlyUnit(info.dl_info_data, false)));
-                        $("UpInfos").set('html', "_(U: %1 - T: %2)".replace("%1", friendlyUnit(info.up_info_speed, true))
+                            $("UpInfos").set('html', "_(U: %1 - T: %2)"
+                                .replace("%1", friendlyUnit(info.up_info_speed, true))
                                 .replace("%2", friendlyUnit(info.up_info_data, false)));
                             if(localStorage.getItem('speed_in_browser_title_bar') == 'true')
                                 document.title = "_(D:%1 U:%2)".replace("%1", friendlyUnit(info.dl_info_speed, true)).replace("%2", friendlyUnit(info.up_info_speed, true));
@@ -127,7 +131,10 @@ window.addEvent('load', function(){
 
     var ajaxfn = function () {
         var queueing_enabled = false;
-		var url = 'json/torrents';
+        var url = new URI('json/torrents');
+        url.setData('filter', filter);
+        url.setData('sort', myTable.table.sortedColumn);
+        url.setData('reverse', myTable.table.reverseSort);
         if (!waiting) {
             waiting = true;
             var request = new Request.JSON({
@@ -145,6 +152,7 @@ window.addEvent('load', function(){
                             // Add new torrents or update them
                             torrent_hashes = myTable.getRowIds();
                             events_hashes = new Array();
+                            pos = 0;
                             events.each(function (event) {
                                 events_hashes[events_hashes.length] = event.hash;
                                 var row = new Array();
@@ -173,7 +181,7 @@ window.addEvent('load', function(){
                                 row[8] = friendlyUnit(event.upspeed, true);
                                 data[8] = event.upspeed;
                                 row[9] = friendlyDuration(event.eta);
-                data[9] = event.eta
+                                data[9] = event.eta;
                                 if (event.ratio == -1)
                                     row[10] = "∞";
                                 else
@@ -185,11 +193,13 @@ window.addEvent('load', function(){
                                     // New unfinished torrent
                                     torrent_hashes[torrent_hashes.length] = event.hash;
                                     //alert("Inserting row");
-                  myTable.insertRow(event.hash, row, data, event.state);
+                                    myTable.insertRow(event.hash, row, data, event.state, pos);
                                 } else {
                                     // Update torrent data
-                  myTable.updateRow(event.hash, row, data, event.state);
+                                    myTable.updateRow(event.hash, row, data, event.state, pos);
                                 }
+                                
+                                pos++;
                             });
                             // Remove deleted torrents
                             torrent_hashes.each(function (hash) {
@@ -204,6 +214,8 @@ window.addEvent('load', function(){
                                 $('queueingButtons').addClass('invisible');
                                 myTable.hidePriority();
                             }
+                            
+                            myTable.altRow();
                         }
                         waiting = false;
                         ajaxfn.delay(1500);
@@ -211,11 +223,23 @@ window.addEvent('load', function(){
                 }).send();
         }
     };
+    
+    setSortedColumn = function (column) {
+        myTable.setSortedColumn(column);
+        // reload torrents
+        ajaxfn();
+    };
+
     new MochaUI.Panel({
         id : 'transferList',
         title : 'Panel',
         header : false,
-		padding: { top: 0, right: 0, bottom: 0, left: 0 },
+        padding : {
+            top : 0,
+            right : 0,
+            bottom : 0,
+            left : 0
+        },
         loadMethod : 'xhr',
         contentURL : 'transferlist.html',
         onContentLoaded : function () {
@@ -234,7 +258,12 @@ window.addEvent('load', function(){
         id : 'propertiesPanel',
         title : 'Panel',
         header : true,
-		padding: { top: 0, right: 0, bottom: 0, left: 0 },
+        padding : {
+            top : 0,
+            right : 0,
+            bottom : 0,
+            left : 0
+        },
         contentURL : 'prop-general.html',
         require : {
             css : ['css/Tabs.css']
@@ -255,9 +284,10 @@ window.addEvent('load', function(){
         $("active_filter").removeClass("selectedFilter");
         $("inactive_filter").removeClass("selectedFilter");
         $(f + "_filter").addClass("selectedFilter");
-	  myTable.setFilter(f);
-	  ajaxfn();
+        filter = f;
         localStorage.setItem('selected_filter', f);
+        // Reload torrents
+        ajaxfn();
     }
 
 });

src/webui/www/public/scripts/dynamicTable.js

@@ -33,8 +33,7 @@
 
 var dynamicTable = new Class({
 
-	initialize: function(){
-	},
+        initialize : function () {},
 
         setup : function (table, progressIndex, context_menu) {
             this.table = $(table);
@@ -42,56 +41,19 @@ var dynamicTable = new Class	({
             this.cur = new Array();
             this.priority_hidden = false;
             this.progressIndex = progressIndex;
-		this.filter = localStorage.getItem('selected_filter');
-		if(!$defined(this.filter)) {
-			this.filter = 'all';
-		}
             this.context_menu = context_menu;
-		this.table.sortedIndex = 1; // Default is NAME
+            this.table.sortedColumn = 'name'; // Default is NAME
             this.table.reverseSort = false;
         },
 
-	sortfunction: function(tr1, tr2) {
-		var i = tr2.getParent().sortedIndex;
-		var reverseSort = tr2.getParent().reverseSort;
-		switch(i) {
-			case 1: // Name
-				if(!reverseSort)
-					return tr1.getElements('td')[i].get('html').localeCompare(tr2.getElements('td')[i].get('html'));
-				else
-					return tr2.getElements('td')[i].get('html').localeCompare(tr1.getElements('td')[i].get('html'));
-			case 2: // Prio
-			case 3: // Size
-			case 4: // Progress
-			case 5: // Seeds
-			case 6: // Peers
-			case 7: // Up Speed
-			case 8: // Down Speed
-			case 9: // ETA
-			default: // Ratio
-				if(!reverseSort)
-					return (tr1.getElements('td')[i].get('data-raw') - tr2.getElements('td')[i].get('data-raw'));
-				else
-					return (tr2.getElements('td')[i].get('data-raw') - tr1.getElements('td')[i].get('data-raw'));
-		}
-	},
-	
-	updateSort: function() {
-		var trs = this.table.getChildren('tr');
-		trs.sort(this.sortfunction);
-		this.table.adopt(trs);
-	},
-	
-	setSortedColumn: function(index) {
-		if(index != this.table.sortedIndex) {
-			this.table.sortedIndex = index;
+        setSortedColumn : function (column) {
+            if (column != this.table.sortedColumn) {
+                this.table.sortedColumn = column;
                 this.table.reverseSort = false;
             } else {
                 // Toggle sort order
                 this.table.reverseSort = !this.table.reverseSort;
             }
-		this.updateSort();
-		this.altRow();
         },
 
         getCurrentTorrentHash : function () {
@@ -100,8 +62,7 @@ var dynamicTable = new Class	({
             return '';
         },
 
-	altRow: function()
-	{
+        altRow : function () {
             var trs = this.table.getElements('tr');
             trs.each(function (el, i) {
                 if (i % 2) {
@@ -113,7 +74,8 @@ var dynamicTable = new Class	({
         },
 
         hidePriority : function () {
-		if(this.priority_hidden) return;
+            if (this.priority_hidden)
+                return;
             $('prioHeader').addClass('invisible');
             var trs = this.table.getElements('tr');
             trs.each(function (tr, i) {
@@ -123,12 +85,9 @@ var dynamicTable = new Class	({
             this.priority_hidden = true;
         },
 
-	setFilter: function(f) {
-		this.filter = f;
-	},
-
         showPriority : function () {
-                if(!this.priority_hidden) return;
+            if (!this.priority_hidden)
+                return;
             $('prioHeader').removeClass('invisible');
             var trs = this.table.getElements('tr');
             trs.each(function (tr, i) {
@@ -138,66 +97,28 @@ var dynamicTable = new Class	({
             this.priority_hidden = false;
         },
 
-	applyFilterOnRow: function(tr, status) {
-		switch(this.filter) {
-			case 'all':
-				tr.removeClass("invisible");
-				break;
-			case 'downloading':
-				if(status == "downloading" || status == "stalledDL" || status == "checkingDL" || status == "pausedDL" || status == "queuedDL") {
-					tr.removeClass("invisible");
-				} else {
-					tr.addClass("invisible");
-				}
-				break;
-			case 'completed':
-				if(status == "uploading" || status == "stalledUP" || status == "checkingUP" || status == "pausedUP" || status == "queuedUP") {
-					tr.removeClass("invisible");
-				} else {
-					tr.addClass("invisible");
-				}
-				break;
-                        case 'paused':
-				if(status == "pausedDL" || status == "pausedUP") {
-					tr.removeClass("invisible");
-				} else {
-					tr.addClass("invisible");
-				}
-				break;
-			case 'active':
-				if(status == "downloading" || status == "uploading") {
-					tr.removeClass("invisible");
-				} else {
-					tr.addClass("invisible");
-				}
-				break;
-			case 'inactive':
-				if(status != "downloading" && status != "uploading") {
-					tr.removeClass("invisible");
-				} else {
-					tr.addClass("invisible");
-				}
-		}
-		return !tr.hasClass('invisible');
-	},
-
-	insertRow: function(id, row, data, status){
+        insertRow : function (id, row, data, status, pos) {
             if (this.rows.has(id)) {
                 return;
             }
             var tr = new Element('tr');
             tr.addClass("menu-target");
             this.rows.set(id, tr);
-		for(var i=0; i<row.length; i++)
-		{
+            for (var i = 0; i < row.length; i++) {
                 var td = new Element('td');
                 if (i == this.progressIndex) {
-				td.adopt(new ProgressBar(row[i].toFloat(), {'id': 'pb_'+id, 'width':80}));
+                    td.adopt(new ProgressBar(row[i].toFloat(), {
+                            'id' : 'pb_' + id,
+                            'width' : 80
+                        }));
                     if (typeof data[i] != 'undefined')
                         td.set('data-raw', data[i])
                 } else {
                     if (i == 0) {
-					td.adopt(new Element('img', {'src':row[i], 'class': 'statusIcon'}));
+                        td.adopt(new Element('img', {
+                                'src' : row[i],
+                                'class' : 'statusIcon'
+                            }));
                     } else {
                         if (i == 2) {
                             // Priority
@@ -297,21 +218,15 @@ var dynamicTable = new Class	({
                 }
                 return false;
             }.bind(this));
-		// Apply filter
-		this.applyFilterOnRow(tr, status);
+
             // Insert
             var trs = this.table.getChildren('tr');
-		var i=0;
-		while(i<trs.length && this.sortfunction(tr, trs[i]) > 0) {
-			i++;
-		}
-		if(i==trs.length) {
+            if (pos >= trs.length) {
                 tr.inject(this.table);
             } else {
-			tr.inject(trs[i], 'before');
+                tr.inject(trs[pos], 'before');
             }
             //tr.injectInside(this.table);
-		this.altRow();
             // Update context menu
             this.context_menu.addTarget(tr);
         },
@@ -326,16 +241,16 @@ var dynamicTable = new Class	({
             }, this);
         },
 
-	updateRow: function(id, row, data, status){
+        updateRow : function (id, row, data, status, newpos) {
             if (!this.rows.has(id)) {
                 return false;
             }
+            
             var tr = this.rows.get(id);
-		// Apply filter
-		if(this.applyFilterOnRow(tr, status)) {
             var tds = tr.getElements('td');
             for (var i = 0; i < row.length; i++) {
-				if(i==1) continue; // Do not refresh name
+                if (i == 1)
+                    continue; // Do not refresh name
                 if (i == this.progressIndex) {
                     $('pb_' + id).setValue(row[i]);
                 } else {
@@ -348,22 +263,23 @@ var dynamicTable = new Class	({
                 if (typeof data[i] != 'undefined')
                     tds[i].set('data-raw', data[i])
             };
+            
+            // Prevent freezing of the backlight.
+            tr.removeClass('over');
+            
+            // Move to 'newpos'
+            var trs = this.table.getChildren('tr');
+            if (newpos >= trs.length) {
+                tr.inject(this.table);
             } else {
-			// Row was hidden, check if it was selected
-			// and unselect it if it was
-			if(this.cur.contains(id)) {
-				// Remove from selection
-				this.cur.erase(id);
-				// Remove selected style
-				tr.removeClass('selected');
-			}
+                tr.inject(trs[newpos], 'before');
             }
+            
             return true;
         },
 
         removeRow : function (id) {
-		if(this.cur.contains(id))
-		{
+            if (this.cur.contains(id)) {
                 this.cur.erase(id);
             }
             if (this.rows.has(id)) {

src/webui/www/public/transferlist.html

@@ -2,16 +2,16 @@
                     <thead>
                             <tr>
                                     <th style="width: 0"></th>
-                                    <th onClick="setSortedColumn(1);" style="cursor: pointer;">_(Name)</th>
-                                    <th id='prioHeader' onClick="setSortedColumn(2);" style="cursor: pointer;">#</th>
-                                    <th onClick="setSortedColumn(3);" style="cursor: pointer;">_(Size)</th>
-                                    <th style="width: 90px;cursor: pointer;" onClick="setSortedColumn(4);">_(Done)</th>
-                                    <th onClick="setSortedColumn(5);" style="cursor: pointer;">_(Seeds)</th>
-                                    <th onClick="setSortedColumn(6);" style="cursor: pointer;">_(Peers)</th>
-                                    <th onClick="setSortedColumn(7);" style="cursor: pointer;">_(Down Speed)</th>
-                                    <th onClick="setSortedColumn(8);" style="cursor: pointer;">_(Up Speed)</th>
-                                    <th onClick="setSortedColumn(9);" style="cursor: pointer;">_(ETA)</th>
-                                    <th onClick="setSortedColumn(10);" style="cursor: pointer;">_(Ratio)</th>
+                                    <th onClick="setSortedColumn('name');" style="cursor: pointer;">_(Name)</th>
+                                    <th id='prioHeader' onClick="setSortedColumn('priority');" style="cursor: pointer;">#</th>
+                                    <th onClick="setSortedColumn('size');" style="cursor: pointer;">_(Size)</th>
+                                    <th style="width: 90px;cursor: pointer;" onClick="setSortedColumn('progress');">_(Done)</th>
+                                    <th onClick="setSortedColumn('num_seeds');" style="cursor: pointer;">_(Seeds)</th>
+                                    <th onClick="setSortedColumn('num_leechs');" style="cursor: pointer;">_(Peers)</th>
+                                    <th onClick="setSortedColumn('dlspeed');" style="cursor: pointer;">_(Down Speed)</th>
+                                    <th onClick="setSortedColumn('upspeed');" style="cursor: pointer;">_(Up Speed)</th>
+                                    <th onClick="setSortedColumn('eta');" style="cursor: pointer;">_(ETA)</th>
+                                    <th onClick="setSortedColumn('ratio');" style="cursor: pointer;">_(Ratio)</th>
                                     
                             </tr>
                     </thead>
@@ -59,9 +59,11 @@
                 downloadLimitFN();
             }
         },
-		offsets: { x:-15, y:2 }
+        offsets : {
+            x : -15,
+            y : 2
+        }
     });
 
     myTable.setup('myTable', 4, context_menu);
-	
 </script>