Merge pull request #2463 from TrimmingFool/replace-tracker-focus-with…

…-size webui: Replace tracker focus with size
Novik · Mar 30, 2023 · d015442 · d015442
2 parents df16114 + 028b1b7
commit d015442
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/js/rtorrent.js b/js/rtorrent.js
@@ -29,7 +29,7 @@ var theRequestManager =
 			"d.get_up_total=", "d.get_ratio=", "d.get_up_rate=", "d.get_down_rate=", "d.get_chunk_size=",
 			"d.get_custom1=", "d.get_peers_accounted=", "d.get_peers_not_connected=", "d.get_peers_connected=", "d.get_peers_complete=",
 			"d.get_left_bytes=", "d.get_priority=", "d.get_state_changed=", "d.get_skip_total=", "d.get_hashing=",
-			"d.get_chunks_hashed=", "d.get_base_path=", "d.get_creation_date=", "d.get_tracker_focus=", "d.is_active=",
+			"d.get_chunks_hashed=", "d.get_base_path=", "d.get_creation_date=", "d.get_tracker_size=", "d.is_active=",
 			"d.get_message=", "d.get_custom2=", "d.get_free_diskspace=", "d.is_private=", "d.is_multi_file="
 		],
 		handlers: []
@@ -1085,7 +1085,7 @@ rTorrentStub.prototype.getalltrackersResponse = function(values)
  * @property {string} status (e.g. "Seeding")
  * @property {string} throttle
  * @property {string} tracker
- * @property {string} tracker_focus
+ * @property {string} tracker_size
  * @property {number} ul
  * @property {number} uploaded
  */
@@ -1200,7 +1200,7 @@ rTorrentStub.prototype.listResponse = function(data)
 		torrent.save_path = (torrent.base_path.substring(pos+1) === torrent.name) ?
 			torrent.base_path.substring(0,pos) : torrent.base_path;
 		torrent.created = values[26];
-		torrent.tracker_focus = values[27];
+		torrent.tracker_size = values[27];
 		try {
 		torrent.comment = values[30];
 		if(torrent.comment.search("VRS24mrker")==0)

diff --git a/js/webui.js b/js/webui.js
@@ -1096,8 +1096,6 @@ var theWebUI =
 						table.setAttr(sId,trk[i].attr);
 	            			}
 					trk[i]._updated = true;
-	        	 		$('#'+sId+" > .stable-TrackerList-col-0").css( "font-weight",
-			        	 	($type(theWebUI.torrents[hash]) && (i==theWebUI.torrents[hash].tracker_focus)) ? "bold" : "normal" );
         	 		}
 			}
 	   	});
@@ -2603,7 +2601,8 @@ var theWebUI =
 			$("#wa").text(theConverter.bytes(d.skip_total, 'details'));
 	        	$("#bf").text(d.base_path);
 	        	$("#co").text(theConverter.date(iv(d.created)+theWebUI.deltaTime/1000));
-			$("#tu").text($type(this.trackers[this.dID]) && $type(this.trackers[this.dID][d.tracker_focus]) ? this.trackers[this.dID][d.tracker_focus].name : '');
+			const trackers = this.trackers[this.dID] ?? [];
+			$("#tu").text(trackers.length ? (trackers[0].name  + (trackers.length > 1 ? ` ${theUILang.of} ${d.tracker_size}` : '')) : `${d.tracker_size}`);
 	        	$("#hs").text(this.dID.substring(0,40));
 			$("#ts").text(d.msg);
 			var url = d.comment.trim();

diff --git a/plugins/httprpc/action.php b/plugins/httprpc/action.php
@@ -93,7 +93,7 @@ function makeSimpleCall($cmds,$hash)
 			"d.get_up_total=", "d.get_ratio=", "d.get_up_rate=", "d.get_down_rate=", "d.get_chunk_size=",
 			"d.get_custom1=", "d.get_peers_accounted=", "d.get_peers_not_connected=", "d.get_peers_connected=", "d.get_peers_complete=",
 			"d.get_left_bytes=", "d.get_priority=", "d.get_state_changed=", "d.get_skip_total=", "d.get_hashing=",
-			"d.get_chunks_hashed=", "d.get_base_path=", "d.get_creation_date=", "d.get_tracker_focus=", "d.is_active=",
+			"d.get_chunks_hashed=", "d.get_base_path=", "d.get_creation_date=", "d.get_tracker_size=", "d.is_active=",
 			"d.get_message=", "d.get_custom2=", "d.get_free_diskspace=", "d.is_private=", "d.is_multi_file="
 			);
 		$cmd = new rXMLRPCCommand( "d.multicall", "main" );