Changeset 12747

Timestamp:

Aug 26, 2011, 12:43:35 AM (12 years ago)

Author:

jordan

Message:

(trunk web) in Transmission.refilter(), don't rebuild the row array if the filtered + sorted list of torrents hasn't changed. This is a big CPU win on large torrent lists.

Location:

trunk/web/javascript

Files:

• torrent-row.js (modified) (1 diff)
• transmission.js (modified) (7 diffs)

trunk/web/javascript/torrent-row.js

@@ -370 +370 @@
                 return this._torrent;
         },
+        getTorrentId: function() {
+                return this.getTorrent().getId();
+        },
         isEven: function() {
                 return this.getElement().className.indexOf('even') != -1;

trunk/web/javascript/transmission.js

@@ -410 +410 @@
                 for (var i=0, row; row=this._rows[i]; ++i)
                         if (row.isSelected())
-                                s.push(row.getTorrent().getId());
+                                s.push(row.getTorrentId());
                 return s;
         },
@@ -445 +445 @@
         indexOfLastTorrent: function() {
                 for (var i=0, r; r=this._rows[i]; ++i)
-                        if (r.getTorrent().getId() === this._last_torrent_clicked)
+                        if (r.getTorrentId() === this._last_torrent_clicked)
                                 return i;
                 return -1;
@@ -544 +544 @@
                                         this.setSelectedRow(r);
                         }
-                        this._last_torrent_clicked = r.getTorrent().getId();
+                        this._last_torrent_clicked = r.getTorrentId();
                         this.scrollToRow(r);
                 }
@@ -1636 +1636 @@
                 }
 
-                this._last_torrent_clicked = row.getTorrent().getId();
+                this._last_torrent_clicked = row.getTorrentId();
         },
 
@@ -1979 +1979 @@
         },
 
+        matchesTorrentList: function(torrents)
+        {
+                if (!torrents || !this._rows)
+                        return false;
+                if (torrents.length !== this._rows.length)
+                        return false;
+
+                for (var i=0, tor; tor=torrents[i]; ++i)
+                        if (tor.getId() !== this._rows[i].getTorrentId())
+                                return false;
+
+                return true;
+        },
+
         refilter: function()
         {
@@ -1984 +1998 @@
                 delete this.refilterTimer;
 
-                // decide which torrents to show
+                // make a filtered, sorted array of our torrents
                 var keep = [];
                 var all_torrents = this.getAllTorrents();
@@ -1990 +2004 @@
                         if (t.test(this[Prefs._FilterMode], this._current_search, this.filterTracker))
                                 keep.push(t);
-
-                // sort the torrents we're going to show
-                Torrent.sortTorrents(keep, this[Prefs._SortMethod],
-                                           this[Prefs._SortDirection]);
-
-                // make a temporary backup of the selection
-                var sel = this.getSelectedTorrents();
-                var new_sel_count = 0;
-
-                // make the new rows
-                var tr = this;
-                var rows = [ ];
-                var fragment = document.createDocumentFragment();
-                for (var i=0, tor; tor=keep[i]; ++i)
+                Torrent.sortTorrents(keep, this[Prefs._SortMethod], this[Prefs._SortDirection]);
+
+                // maybe rebuild the rows
+                if (!this.matchesTorrentList(keep))
                 {
-                        var is_selected = sel.indexOf(tor) !== -1;
-                        var row = new TorrentRow(this.torrentRenderer, this, tor, is_selected);
-                        row.setEven((i+1) % 2 == 0);
-                        if (is_selected)
-                                new_sel_count++;
-                        if (!iPhone) {
-                                var b = row.getToggleRunningButton();
-                                if (b)
-                                        $(b).click({r:row}, function(ev) {tr.onToggleRunningClicked(ev);});
+                        var old_sel = this.getSelectedTorrents();
+                        var new_sel_count = 0;
+
+                        // make the new rows
+                        var tr = this;
+                        var rows = [ ];
+                        var fragment = document.createDocumentFragment();
+                        for (var i=0, tor; tor=keep[i]; ++i)
+                        {
+                                var is_selected = old_sel.indexOf(tor) !== -1;
+                                var row = new TorrentRow(this.torrentRenderer, this, tor, is_selected);
+                                row.setEven((i+1) % 2 == 0);
+                                if (is_selected)
+                                        new_sel_count++;
+                                if (!iPhone) {
+                                        var b = row.getToggleRunningButton();
+                                        if (b)
+                                                $(b).click({r:row}, function(ev) {tr.onToggleRunningClicked(ev);});
+                                }
+                                $(row.getElement()).click({r: row}, function(ev) {tr.onRowClicked(ev,ev.data.r);});
+                                $(row.getElement()).dblclick(function() { tr.toggleInspector();});
+                                fragment.appendChild(row.getElement());
+                                rows.push(row);
                         }
-                        $(row.getElement()).click({r: row}, function(ev) {tr.onRowClicked(ev,ev.data.r);});
-                        $(row.getElement()).dblclick(function() { tr.toggleInspector();});
-                        fragment.appendChild(row.getElement());
-                        rows.push(row);
-                }
-                $('ul.torrent_list').empty();
-                delete this._rows;
-                this._rows = rows;
-                this._torrent_list.appendChild(fragment);
+                        $('ul.torrent_list').empty();
+                        delete this._rows;
+                        this._rows = rows;
+                        this._torrent_list.appendChild(fragment);
+
+                        if (old_sel.length !== new_sel_count)
+                                this.selectionChanged();
+                }
 
                 // sync gui
                 this.updateStatusbar();
-                if (sel.length !== new_sel_count)
-                        this.selectionChanged();
                 this.refreshFilterButton();
         },