From 56466319f509186434677525b907bb9638bc5b5a Mon Sep 17 00:00:00 2001
From: Kevin Glowacz <kevin@glowacz.info>
Date: Sun, 31 Jan 2010 02:42:48 +0000
Subject: [PATCH] (trunk web) Add a trackers tab patch from mjpieters, with
 minor style changes

---
 web/images/buttons/Makefile.am       |   1 +
 web/images/buttons/info_trackers.png | Bin 0 -> 782 bytes
 web/index.html                       |   6 ++++
 web/javascript/torrent.js            |  20 ++++++++++-
 web/javascript/transmission.js       |  29 ++++++++++++++++
 web/stylesheets/common.css           |  50 ++++++++++++++++++++++++++-
 web/stylesheets/iphone.css           |  46 +++++++++++++++++++++++-
 7 files changed, 149 insertions(+), 3 deletions(-)
 create mode 100644 web/images/buttons/info_trackers.png

diff --git a/web/images/buttons/Makefile.am b/web/images/buttons/Makefile.am
index 7d08a1bad..17993e41f 100644
--- a/web/images/buttons/Makefile.am
+++ b/web/images/buttons/Makefile.am
@@ -7,6 +7,7 @@ dist_data_DATA = \
   info_activity.png \
   info_files.png \
   info_general.png \
+  info_trackers.png \
   tab_backgrounds.png \
   toolbar_buttons.png \
   torrent_buttons.png
diff --git a/web/images/buttons/info_trackers.png b/web/images/buttons/info_trackers.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a08daaf67add63f54f9bae6ef95b881e7a4b000
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004b3#c}2nYxW
zd<bNS00009a7bBm000W`000W`0Ya=am;e9(9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGnm#!0{{R36?8>dbVG7wVRUJ4ZXi@?ZDjy4FEKSQFgUw?cuoKS0%u7?
zK~y-6t(4D88$lGuKjVg>u#1FU!KOz+O0g6J%_S5u#LJ>q$i+iF^oNAp0wRc^|A5CF
zyV#}&dn)xJB7%p~ix-Pnx}k?)dI}2Nkjjc8E7OB3O?6|S_+a48yzlqRn>Tz%D5bc~
z=($xjAl40#%jHJL#>OfDTU%Q%R##U)-$+nOp_JkcDiM`eDwS5PR#UZFO;swDRyTb6
zmG4F6hGA&+dYyW`j$s&DH+;LG?g)CrTsVTe08+}uAP5eEAUKdxE&_x#5$3&seksyE
z!yaG|_zL_2GLGO=UOim_c0$Y#M<9U=upOQawl~%;xC=aY1a4mO(-GVU9*m5Ph{?&x
zZGg44wd4$66wnMYcYr6r`)gOuD}DnFU^?7y<`sMCbb4M&iIkFbIz69P?Bx}kA#ECH
zgxqU0B(L}gBppG~5$K6TA}*zzs#dF~)oS%rN;#ECB;t-hcLYTs8FGje4C6JR0V12t
z<~+|cOw-&kO>@WdJR_UU=D2teEyVs4;wI}YEG&HA-`^ifCX*LK-rZ$jV8C5kT6)-t
z)6sgVRBG7w{UKe~8>LbyQ!14*x~?~T-yce)Qp25i9Xp(zon1LTK7M9d7E($8&d$#8
zJP%#hKP)dV&qNY0Ez`a%%Ze8Yg(KUxPh8iXP)dy|rAA%Xov>~Dq);dvS(X)#;zo98
z+xE+NJpT6l{2bFX34#ECSS&`f*+kPcTCLWrjg5_WSGkeDO<!N%+~MIN<KyGSVzKzG
zy;d%lAFZ#im;3ws=YVU1oo4tLFu1Usf2C%Gb)UbM>?-)*aqB<!A0!ebP5$GOf&c&j
M07*qoM6N<$f)D;so&W#<

literal 0
HcmV?d00001

diff --git a/web/index.html b/web/index.html
index fd4664b3a..0f8e7c637 100755
--- a/web/index.html
+++ b/web/index.html
@@ -68,6 +68,7 @@
 			<div id="inspector_tabs">
 				<div class="inspector_tab selected" id="inspector_tab_info"><a href="#info"><img src="images/buttons/info_general.png" alt="Information"/></a></div>
 				<div class="inspector_tab" id="inspector_tab_activity"><a href="#activity"><img src="images/buttons/info_activity.png" alt="Activity"/></a></div>
+				<div class="inspector_tab" id="inspector_tab_trackers"><a href="#trackers"><img src="images/buttons/info_trackers.png" alt="Trackers"/></a></div>
 				<div class="inspector_tab" id="inspector_tab_files"><a href="#files"><img src="images/buttons/info_files.png" alt="Files"/></a></div>
 			</div>
 			
@@ -173,6 +174,11 @@
 				</div><!-- class="inspector_group"-->
 			</div><!-- id="inspector_tab_activity_container" -->
 
+			<div style="display:none;" class="inspector_container" id="inspector_tab_trackers_container">
+				<div id="inspector_trackers_list">
+				</div>
+			</div><!-- id="inspector_tab_trackers_container" -->
+
 			<div style="display:none;" class="inspector_container" id="inspector_tab_files_container">
 				<div id="inspector_file_list">
 					<ul id="select_all_button_container">
diff --git a/web/javascript/torrent.js b/web/javascript/torrent.js
index 70c1253bd..17320dc68 100644
--- a/web/javascript/torrent.js
+++ b/web/javascript/torrent.js
@@ -32,7 +32,7 @@ Torrent._StaticFields = [ 'addedDate', 'comment', 'creator', 'dateCreated',
 Torrent._DynamicFields = [ 'downloadedEver', 'error', 'errorString', 'eta',
     'haveUnchecked', 'haveValid', 'leftUntilDone', 'metadataPercentComplete', 'peersConnected',
     'peersGettingFromUs', 'peersSendingToUs', 'rateDownload', 'rateUpload',
-    'recheckProgress', 'sizeWhenDone', 'status',
+    'recheckProgress', 'sizeWhenDone', 'status', 'trackerStats',
     'uploadedEver', 'uploadRatio', 'seedRatioLimit', 'seedRatioMode', 'downloadDir' ]
 
 Torrent.prototype =
@@ -54,6 +54,7 @@ Torrent.prototype =
 		this._sizeWhenDone  = data.sizeWhenDone;
 		this._name          = data.name;
 		this._name_lc       = this._name.toLowerCase( );
+		this._trackerStats  = this.buildTrackerStats(data.trackerStats);
 		this._file_model    = [ ];
 		this._file_view     = [ ];
 
@@ -152,6 +153,21 @@ Torrent.prototype =
 		return $(this._fileList);
 	},
 	
+	buildTrackerStats: function(trackerStats) {
+		result = [];
+		for( var i=0, tracker; tracker=trackerStats[i]; ++i ) {
+			tier = result[tracker.tier - 1] || [];
+			tier[tier.length] = {
+				'host': tracker.host,
+				'seederCount': tracker.seederCount,
+				'leecherCount': tracker.leecherCount,
+				'downloadCount': tracker.downloadCount
+			};
+			result[tracker.tier - 1] = tier;
+		}
+		return result;
+	},
+
 	/*--------------------------------------------
 	 *
 	 *  S E T T E R S   /   G E T T E R S
@@ -207,6 +223,7 @@ Torrent.prototype =
 			default:                            return 'error';
 		}
 	},
+	trackerStats: function() { return this._trackerStats; },
 	uploadSpeed: function() { return this._upload_speed; },
 	uploadTotal: function() { return this._upload_total; },
 	showFileList: function() {
@@ -333,6 +350,7 @@ Torrent.prototype =
 		this._error                   = data.error;
 		this._error_string            = data.errorString;
 		this._eta                     = data.eta;
+		this._trackerStats            = this.buildTrackerStats(data.trackerStats);
 		this._state                   = data.status;
 		this._download_dir            = data.downloadDir;
 		this._metadataPercentComplete = data.metadataPercentComplete;
diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js
index 1f89c8608..2fba31b23 100644
--- a/web/javascript/transmission.js
+++ b/web/javascript/transmission.js
@@ -75,6 +75,7 @@ Transmission.prototype =
 
 		this._torrent_list             = $('#torrent_list')[0];
 		this._inspector_file_list      = $('#inspector_file_list')[0];
+		this._inspector_trackers_list  = $('#inspector_trackers_list')[0];
 		this._inspector_tab_files      = $('#inspector_tab_files')[0];
 		this._toolbar_buttons          = $('#torrent_global_menu ul li');
 		this._toolbar_pause_button     = $('li#pause_selected')[0];
@@ -682,6 +683,7 @@ Transmission.prototype =
 		this.hideiPhoneAddressbar();
 	
 		this.updateVisibleFileLists();
+		this.updateTrackersLists();
 	},
 
 	fileWantedClicked: function(event, element){
@@ -1085,6 +1087,7 @@ Transmission.prototype =
 			setInnerHTML( tab.download_dir, na );
 			setInnerHTML( tab.error, na );
 			this.updateVisibleFileLists();
+			this.updateTrackersLists();
 			$("#torrent_inspector_size, .inspector_row > div:contains('N/A')").css('color', '#666');
 			return;
 		}
@@ -1159,6 +1162,7 @@ Transmission.prototype =
 		setInnerHTML( tab.download_dir, download_dir == na ? download_dir : download_dir.replace(/([\/_\.])/g, "$1&#8203;") );
 		setInnerHTML( tab.error, error );
 		
+		this.updateTrackersLists();
 		$(".inspector_row > div:contains('N/A')").css('color', '#666');
 		this.updateVisibleFileLists();
 	},
@@ -1183,6 +1187,31 @@ Transmission.prototype =
 		}
 	},
 
+	updateTrackersLists: function() {
+		// By building up the HTML as as string, then have the browser
+		// turn this into a DOM tree, this is a fast operation.
+		var html = '';
+		var na = 'N/A';
+		var torrents = this.getSelectedTorrents( );
+		if( $(this._inspector_trackers_list).is(':visible') && torrents.length == 1 ) {
+			for( var i=0, tier; tier=torrents[0]._trackerStats[i]; ++i ) {
+				html += '<div class="inspector_group"><div class="inspector_group_label">';
+				html += 'Tier ' + (i + 1) + '</div><ul class="tier_list">';
+				for( var j=0, tracker; tracker=tier[j]; ++j ) {
+					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 += '<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>';
+					html += '<tr><th>Downloads:</th><td>' + (tracker.downloadCount > -1 ? tracker.downloadCount : na)+ '</td></tr>';
+					html += '</table></li>';
+				}
+				html += '</ul></div>';
+			}
+		}
+		setInnerHTML(this._inspector_trackers_list, html);
+	},
+
 	/*
 	 * Toggle the visibility of the inspector (used by the context menu)
 	 */
diff --git a/web/stylesheets/common.css b/web/stylesheets/common.css
index f5946a493..10f90b7e6 100644
--- a/web/stylesheets/common.css
+++ b/web/stylesheets/common.css
@@ -549,7 +549,7 @@ div#inspector_header {
 	padding-right: 10px;
 }
 div#inspector_tabs {
-	width: 189px;
+	width: 243px;
 	margin: 0 auto;
 	padding-top: 10px;
 }
@@ -593,6 +593,54 @@ div#inspector_tabs {
 	width: 230px; /* inspector_container_width==330 - inspector_label_width==100 */
 }
 
+/* Trackers Inspector Tab */
+#inspector_trackers_list {
+	padding: 0 0 0 0;
+	margin: 0 0 0 0;
+	text-align: left;
+	cursor: default;
+	overflow: hidden;
+}
+
+#inspector_trackers_list > div.inspector_group {
+	padding-bottom: 0;
+	margin-bottom: 0;
+}
+
+ul.tier_list {
+	width: 100%;
+	margin: 10px 0 0 0;
+	padding-left: 0px;
+	text-align: left;
+	display: block;
+	cursor: default;
+	list-style-type: none;
+	list-style: none;
+	list-style-image: none;
+	clear: both;
+}
+.tier_list table{
+  margin-left: 15px;
+  color: #666;
+}
+.tier_list th{
+  text-align: right;
+}
+
+li.inspector_tracker_entry {
+	padding: 3px 0 3px 2px;
+	display: block;
+}
+
+li.inspector_tracker_entry.odd {
+	background-color: #EEEEEE;
+}
+div.tracker_host {
+	font-size: 1.2em;
+	font-weight: bold;
+	color: #222;
+}
+
 /* Files Inspector Tab */
 #inspector_file_list {
 	padding: 0 0 0 0;
diff --git a/web/stylesheets/iphone.css b/web/stylesheets/iphone.css
index 5d89dcd4b..7a1d96b24 100644
--- a/web/stylesheets/iphone.css
+++ b/web/stylesheets/iphone.css
@@ -590,7 +590,7 @@ div#inspector_header {
 	padding-right: 10px;
 }
 div#inspector_tabs {
-	width: 189px;
+	width: 243px;
 	margin: 0 auto;
 	padding-top: 10px;
 }
@@ -634,6 +634,50 @@ div#inspector_tabs {
 	width: 230px; /* inspector_container_width==330 - inspector_label_width==100 */
 }
 
+/* Trackers Inspector Tab */
+#inspector_trackers_list {
+	padding: 0 0 0 0;
+	margin: 0 0 0 0;
+	text-align: left;
+	cursor: default;
+	overflow: hidden;
+}
+#inspector_trackers_list > div.inspector_group {
+	padding-bottom: 0;
+	margin-bottom: 0;
+}
+ul.tier_list {
+	width: 100%;
+	margin: 10px 0 0 0;
+	padding-left: 0px;
+	text-align: left;
+	display: block;
+	cursor: default;
+	list-style-type: none;
+	list-style: none;
+	list-style-image: none;
+	clear: both;
+}
+.tier_list table{
+  margin-left: 15px;
+  color: #666;
+}
+.tier_list th{
+  text-align: right;
+}
+li.inspector_tracker_entry {
+	padding: 3px 0 3px 2px;
+	display: block;
+}
+li.inspector_tracker_entry.odd {
+	background-color: #EEEEEE;
+}
+div.tracker_host {
+	font-size: 1.2em;
+	font-weight: bold;
+	color: #222;
+}
+
 /* Files Inspector Tab */
 #inspector_file_list {
 	padding: 0 0 0 0;