Changeset 12765

Timestamp:

Aug 26, 2011, 11:34:43 PM (12 years ago)

Author:

jordan

Message:

(trunk web) better bootstrapping when first loading all the torrents.

Location:

trunk/web/javascript

Files:

• torrent.js (modified) (3 diffs)
• transmission.js (modified) (3 diffs)

trunk/web/javascript/torrent.js

@@ -209 +209 @@
         getLeftUntilDone: function() { return this.fields.leftUntilDone; },
         getMetadataPercentComplete: function() { return this.fields.metadataPercentComplete; },
-        getName: function() { return this.fields.name; },
+        getName: function() { return this.fields.name || 'Unknown'; },
         getPeers: function() { return this.fields.peers; },
         getPeersConnected: function() { return this.fields.peersConnected; },
@@ -256 +256 @@
                         case Torrent._StatusSeedWait:       return 'Queued for seeding';
                         case Torrent._StatusSeed:           return 'Seeding';
-                        default:                            return 'error';
+                        case null:
+                        case undefined:                     return 'Unknown';
+                        default:                            return 'Error';
                 }
         },
@@ -282 +284 @@
                 var f = this.fields;
                 if (!f.collatedName) {
-                        var name = this.getName();
+                        var name = this.fields.name;
                         if (name)
                                 f.collatedName = name.toLowerCase();

trunk/web/javascript/transmission.js

@@ -1048 +1048 @@
         updateFromTorrentGet: function(updates, removed_ids)
         {
-                var new_ids = [];
+                var needinfo = [];
 
                 for (var i=0, o; o=updates[i]; ++i) {
@@ -1059 +1059 @@
                                 t = tr._torrents[id] = new Torrent(o);
                                 $(t).bind('dataChanged',function(ev) {tr.onTorrentChanged(ev);});
-                                new_ids.push(id);
+                                if(!('name' in t.fields) || !('status' in t.fields)) // missing some fields...
+                                        needinfo.push(id);
                         }
                 }
 
-                if (new_ids.length) {
+                if (needinfo.length) {
                         // whee, new torrents! get their initial information.
                         var fields = ['id'].concat(Torrent.Fields.Metadata, Torrent.Fields.Stats);
-                        this.remote.updateTorrents(new_ids, fields, this.updateFromTorrentGet, this);
+                        this.remote.updateTorrents(needinfo, fields, this.updateFromTorrentGet, this);
                         this.refilterSoon();
                 }
@@ -1092 +1093 @@
                 // to bootstrap, we only need to ask for the servers's torrents' ids.
                 // updateFromTorrentGet() automatically asks for the rest of the info when it gets a new id.
-                this.remote.updateTorrents(null, ['id'], this.updateFromTorrentGet, this);
+                var fields = ['id'].concat(Torrent.Fields.Metadata, Torrent.Fields.Stats);
+                this.remote.updateTorrents(null, fields, this.updateFromTorrentGet, this);
         },