From 6d524cba102f0cb90fc07c5d853368024c432575 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 10 May 2014 21:15:06 +0200
Subject: [PATCH] Fix tracker.ipfire.org.

---
 templates/tracker-torrent-detail.html | 9 ++-------
 templates/tracker-torrents.html       | 4 ++--
 webapp/backend/releases.py            | 4 ++--
 webapp/handlers_tracker.py            | 3 +--
 webapp/ui_modules.py                  | 8 +++++---
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/templates/tracker-torrent-detail.html b/templates/tracker-torrent-detail.html
index 47072f8..0bdff53 100644
--- a/templates/tracker-torrent-detail.html
+++ b/templates/tracker-torrent-detail.html
@@ -20,12 +20,7 @@
 	</p>
 
 	{% if peers %}
-		<h3>{{ _("Peers") }}</h3>
-		{% module TrackerPeerList(peers, percentages=True) %}
-	{% end %}
-
-	{% if seeds %}
-		<h3>{{ _("Seeds") }}</h3>
-		{% module TrackerPeerList(seeds) %}
+		<h3>{{ _("Peers & Seeds") }}</h3>
+		{% module TrackerPeerList(peers) %}
 	{% end %}
 {% end block %}
diff --git a/templates/tracker-torrents.html b/templates/tracker-torrents.html
index e9d0613..96c03d7 100644
--- a/templates/tracker-torrents.html
+++ b/templates/tracker-torrents.html
@@ -49,10 +49,10 @@
 							<a href="/{{ torrent.torrent_hash }}">{{ torrent.basename }}</a>
 						</td>
 						<td>
-							{{ len(torrent.seeders) }}
+							{{ torrent.seeders }}
 						</td>
 						<td>
-							{{ len(torrent.peers) }}
+							{{ torrent.peers }}
 						</td>
 						<td>
 							<a href="{{ torrent.magnet_link }}">
diff --git a/webapp/backend/releases.py b/webapp/backend/releases.py
index 5da6c62..c3b42d9 100644
--- a/webapp/backend/releases.py
+++ b/webapp/backend/releases.py
@@ -201,14 +201,14 @@ class File(Object):
 		if not self.torrent_hash:
 			return
 
-		return self.tracker.get_seeds(self.torrent_hash)
+		return self.backend.tracker.complete(self.torrent_hash)
 
 	@property
 	def peers(self):
 		if not self.torrent_hash:
 			return
 
-		return self.tracker.get_peers(self.torrent_hash)
+		return self.backend.tracker.incomplete(self.torrent_hash)
 
 
 class Release(Object):
diff --git a/webapp/handlers_tracker.py b/webapp/handlers_tracker.py
index 3a1fd49..ba2f661 100644
--- a/webapp/handlers_tracker.py
+++ b/webapp/handlers_tracker.py
@@ -25,10 +25,9 @@ class TrackerDetailHandler(BaseHandler):
 			raise tornado.web.HTTPError(404, "Could not find torrent file for hash: %s" % torrent_hash)
 
 		peers = self.tracker.get_peers(torrent_hash)
-		seeds = self.tracker.get_seeds(torrent_hash)
 
 		self.render("tracker-torrent-detail.html", release=file.release,
-			file=file, peers=peers, seeds=seeds)
+			file=file, peers=peers)
 
 
 class TrackerDownloadHandler(BaseHandler):
diff --git a/webapp/ui_modules.py b/webapp/ui_modules.py
index 7433134..433ea68 100644
--- a/webapp/ui_modules.py
+++ b/webapp/ui_modules.py
@@ -228,10 +228,12 @@ class PlanetEntryModule(UIModule):
 
 
 class TrackerPeerListModule(UIModule):
-	def render(self, peers, percentages=False):
+	def render(self, peers):
 		# Guess country code and hostname of the host
 		for peer in peers:
-			country_code = backend.GeoIP().get_country(peer["ip"])
+			country_code = self.geoip.get_country(peer["ip"])
+			if country_code:
+				country_code = country_code.lower()
 			peer["country_code"] = country_code or "unknown"
 
 			try:
@@ -240,7 +242,7 @@ class TrackerPeerListModule(UIModule):
 				peer["hostname"] = ""
 
 		return self.render_string("modules/tracker-peerlist.html",
-			peers=[Row(p) for p in peers], percentages=percentages)
+			peers=[Row(p) for p in peers])
 
 
 class StasyTableModule(UIModule):
-- 
2.39.2