From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 12 Oct 2017 13:54:36 +0000 (+0100)
Subject: Replace .torrent file download URLs
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5276cd4124242a0a6666d3e3c7bf610b0a7f7ad2;p=ipfire.org.git

Replace .torrent file download URLs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/templates/modules/release-item.html b/templates/modules/release-item.html
index 9cbaf720..fd3741bb 100644
--- a/templates/modules/release-item.html
+++ b/templates/modules/release-item.html
@@ -40,12 +40,17 @@
 							<span class="label label-default">{{ format_size(file.size) }}</span>
 
 							<div class="btn-group">
-								<a class="btn btn-default btn-xs" href="{{ file.magnet_link }}" title="{{ _("Magnet Link") }}">
-									<span class="glyphicon glyphicon-magnet"></span>
-								</a>
-								<a class="btn btn-default btn-xs" href="http://tracker.ipfire.org/{{ file.torrent_hash }}/download" title="{{ _("Torrent Download") }}">
-									<span class="glyphicon glyphicon-download-alt"></span>
-								</a>
+								{% if file.magnet_link %}
+									<a class="btn btn-default btn-xs" href="{{ file.magnet_link }}" title="{{ _("Magnet Link") }}">
+										<span class="glyphicon glyphicon-magnet"></span>
+									</a>
+								{% end %}
+
+								{% if file.torrent_url %}
+									<a class="btn btn-default btn-xs" href="{{ file.torrent_url }}" title="{{ _("Torrent Download") }}">
+										<span class="glyphicon glyphicon-download-alt"></span>
+									</a>
+								{% end %}
 							</div>
 						</div>
 					{% end %}
diff --git a/webapp/backend/releases.py b/webapp/backend/releases.py
index 42c8f75b..70c846ee 100644
--- a/webapp/backend/releases.py
+++ b/webapp/backend/releases.py
@@ -187,6 +187,11 @@ class File(Object):
 	def torrent_hash(self):
 		return self.data.get("torrent_hash", None)
 
+        @property
+        def torrent_url(self):
+                if self.torrent_hash:
+                        return "%s.torrent" % self.url
+
 	@property
 	def magnet_link(self):
 		# Don't return anything if we have no torrent hash.