Changeset 10061

Timestamp:

Feb 1, 2010, 1:08:17 AM (12 years ago)

Author:

kjg

Message:

(trunk web) mjpieters' patch for adding announce and scrape status to the trackers tab with some code cleanup and style adjustments

Location:

trunk/web

Files:

• javascript/torrent.js (modified) (2 diffs)
• javascript/transmission.js (modified) (3 diffs)
• stylesheets/common.css (modified) (1 diff)
• stylesheets/iphone.css (modified) (2 diffs)

trunk/web/javascript/torrent.js

@@ -27 +27 @@
 Torrent._ErrTrackerError       = 2;
 Torrent._ErrLocalError         = 3;
+
+Torrent._TrackerInactive         = 0;
+Torrent._TrackerWaiting          = 1;
+Torrent._TrackerQueued           = 2;
+Torrent._TrackerActive           = 3;
+
 
 Torrent._StaticFields = [ 'addedDate', 'comment', 'creator', 'dateCreated',
@@ -160 +166 @@
                         tier[tier.length] = {
                                 'host': tracker.host,
+                                'announce': tracker.announce,
+                                'hasAnnounced': tracker.hasAnnounced,
+                                'lastAnnounceTime': tracker.lastAnnounceTime,
+                                'lastAnnounceSucceeded': tracker.lastAnnounceSucceeded,
+                                'lastAnnounceResult': tracker.lastAnnounceResult,
+                                'lastAnnouncePeerCount': tracker.lastAnnouncePeerCount,
+                                'announceState': tracker.announceState,
+                                'nextAnnounceTime': tracker.nextAnnounceTime,
+                                'isBackup': tracker.isBackup,
+                                'hasScraped': tracker.hasScraped,
+                                'lastScrapeTime': tracker.lastScrapeTime,
+                                'lastScrapeSucceeded': tracker.lastScrapeSucceeded,
+                                'lastScrapeResult': tracker.lastScrapeResult,
                                 'seederCount': tracker.seederCount,
                                 'leecherCount': tracker.leecherCount,

trunk/web/javascript/transmission.js

@@ -1191 +1191 @@
                 // By building up the HTML as as string, then have the browser
                 // turn this into a DOM tree, this is a fast operation.
+                var tr = this;
                 var html = '';
                 var na = 'N/A';
@@ -1199 +1200 @@
                                 html += 'Tier ' + (i + 1) + '</div><ul class="tier_list">';
                                 for( var j=0, tracker; tracker=tier[j]; ++j ) {
+                                        var lastAnnounceStatusHash = tr.lastAnnounceStatus(tracker);
+                                        var announceState = tr.announceState(tracker);
+                                        var lastScrapeStatusHash = tr.lastScrapeStatus(tracker);
+
+                                        // Display construction
                                         var parity = ((j+1) % 2 == 0 ? 'even' : 'odd');
-                                        html += '<li class="inspector_tracker_entry ' + parity + '"><div class="tracker_host">'
-                                        html += tracker.host + '</div><table class="tracker_stats">';
+                                        html += '<li class="inspector_tracker_entry ' + parity + '"><div class="tracker_host" title="' + tracker.announce + '">';
+                                        html += tracker.host + '</div>';
+                                        html += '<div class="tracker_activity">';
+                                        html += '<div>' + lastAnnounceStatusHash['label'] + ': ' + lastAnnounceStatusHash['value'] + '</div>';
+                                        html += '<div>' + announceState + '</div>';
+                                        html += '<div>' + lastScrapeStatusHash['label'] + ': ' + lastScrapeStatusHash['value'] + '</div>';
+                                        html += '</div><table class="tracker_stats">';
                                         html += '<tr><th>Seeders:</th><td>' + (tracker.seederCount > -1 ? tracker.seederCount : na) + '</td></tr>';
                                         html += '<tr><th>Leechers:</th><td>' + (tracker.leecherCount > -1 ? tracker.leecherCount : na) + '</td></tr>';
@@ -1211 +1222 @@
                 }
                 setInnerHTML(this._inspector_trackers_list, html);
+        },
+
+        lastAnnounceStatus: function(tracker){
+                var lastAnnounceLabel = 'Last Announce';
+                var lastAnnounce = 'N/A';
+                if (tracker.hasAnnounced) {
+                        var lastAnnounceTime = Math.formatTimestamp(tracker.lastAnnounceTime);
+                        if (tracker.lastAnnounceSucceeded) {
+                                lastAnnounce = lastAnnounceTime;
+                                lastAnnounce += ' (got ' + tracker.lastAnnouncePeerCount + ' peer';
+                                if (tracker.lastAnnouncePeerCount != 1){ lastAnnounce += 's'; }
+                                lastAnnounce += ')';
+                        } else {
+                                lastAnnounceLabel = 'Announce error';
+                                lastAnnounce = (tracker.lastAnnounceResult ? tracker.lastAnnounceResult + ' - ' : '') + lastAnnounceTime;
+                        }
+                }
+                return {'label':lastAnnounceLabel, 'value':lastAnnounce};
+        },
+
+        announceState: function(tracker){
+                var announceState = '';
+                switch (tracker.announceState) {
+                        case Torrent._TrackerActive:
+                                announceState = 'Announce in progress';
+                                break;
+                        case Torrent._TrackerWaiting:
+                                var timeUntilAnnounce = tracker.nextAnnounceTime - ((new Date()).getTime() / 1000);
+                                if(timeUntilAnnounce < 0){
+                                        timeUntilAnnounce = 0;
+                                }
+                                announceState = 'Next announce in ' + Math.formatSeconds(timeUntilAnnounce);
+                                break;
+                        case Torrent._TrackerQueued:
+                                announceState = 'Announce is queued';
+                                break;
+                        case Torrent._TrackerInactive:
+                                announceState = tracker.isBackup ?
+                                        'Tracker will be used as a backup' :
+                                        'Announce not scheduled';
+                                break;
+                        default:
+                                announceState = 'unknown announce state: ' + tracker.announceState;
+                }
+                return announceState;
+        },
+
+        lastScrapeStatus: function(tracker){
+                var lastScrapeLabel = 'Last Scrape';
+                var lastScrape = 'N/A';
+                if (tracker.hasScraped) {
+                        var lastScrapeTime = Math.formatTimestamp(tracker.lastScrapeTime);
+                        if (tracker.lastScrapeSucceeded) {
+                                lastScrape = lastScrapeTime;
+                        } else {
+                                lastScrapeLabel = 'Scrape error';
+                                lastScrape = (tracker.lastScrapeResult ? tracker.lastScrapeResult + ' - ' : '') + lastScrapeTime;
+                        }
+                }
+                return {'label':lastScrapeLabel, 'value':lastScrape}
         },
 

trunk/web/stylesheets/common.css

@@ -620 +620 @@
         clear: both;
 }
+.tier_list li{
+        overflow: hidden;
+}
+.tier_list .tracker_activity{
+        float: left;
+        color: #666;
+        width: 200px;
+        display: table;
+        margin-top: 1px;
+}
+.tier_list .tracker_activity div{
+        padding: 2px;
+}
 .tier_list table{
-  margin-left: 15px;
-  color: #666;
+        float: right;
+        color: #666;
 }
 .tier_list th{
-  text-align: right;
+        text-align: right;
 }
 

trunk/web/stylesheets/iphone.css

@@ -643 +643 @@
         overflow: hidden;
 }
+
 #inspector_trackers_list > div.inspector_group {
         padding-bottom: 0;
         margin-bottom: 0;
 }
+
 ul.tier_list {
         width: 100%;
@@ -659 +661 @@
         clear: both;
 }
+.tier_list li{
+        overflow: hidden;
+}
+.tier_list .tracker_activity{
+        float: left;
+        color: #666;
+        width: 200px;
+        display: table;
+        margin-top: 1px;
+}
+.tier_list .tracker_activity div{
+        padding: 2px;
+}
 .tier_list table{
-  margin-left: 15px;
-  color: #666;
+        float: right;
+        color: #666;
 }
 .tier_list th{
-  text-align: right;
-}
+        text-align: right;
+}
+
 li.inspector_tracker_entry {
         padding: 3px 0 3px 2px;
         display: block;
 }
+
 li.inspector_tracker_entry.odd {
         background-color: #EEEEEE;