Evolinx/evorepo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move some logic out of the templates to the Release model

Browse Source 
This includes magnet URI generation, ISO paths, etc.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2012-11-20 19:33:49 -06:00
parent f7331a0eca
commit 402487b007
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
releng/models.py
View File

@ -1,3 +1,5 @@
from urllib import urlencode
from django.core.urlresolvers import reverse
from django.db import models
from django.db.models.signals import pre_save
@ -121,6 +123,22 @@ class Meta:
def __unicode__(self):
return self.version
def dir_path(self):
return "iso/%s/" % self.version
def iso_url(self):
return "iso/%s/archlinux-%s-dual.iso" % (self.version, self.version)
def magnet_uri(self):
query = {
'dn': "archlinux-%s-dual.iso" % self.version,
'tr': ("udp://tracker.archlinux.org:6969",
"http://tracker.archlinux.org:6969/announce"),
}
if self.torrent_infohash:
query['xt'] = "urn:btih:%s" % self.torrent_infohash
return "magnet:?%s" % urlencode(query, doseq=True)
for model in (Iso, Test, Release):
pre_save.connect(set_created_field, sender=model,

16
templates/public/download.html
View File

@ -44,9 +44,9 @@ <h3>BitTorrent Download (recommended)</h3>
download is finished, so you can seed it back to others.
<em>A web-seed capable client is recommended for fastest download speeds.</em></p>
<ul>
<li><a href="https://www.archlinux.org/iso/{{ release.version }}/archlinux-{{ release.version }}-dual.iso.torrent"
title="Download for both architectures">Download archlinux-{{ release.version }}-dual.iso.torrent</a>
(<a href="magnet:?{% if release.torrent_infohash %}xt=urn:btih:{{ release.torrent_infohash }}&amp;{% endif %}dn=archlinux-{{ release.version }}-dual.iso&amp;tr=udp://tracker.archlinux.org:6969&amp;tr=http://tracker.archlinux.org:6969/announce">Magnet</a>)</li>
<li><a href="https://www.archlinux.org/{{ release.iso_url }}.torrent"
title="Download for both architectures">Download torrent for {{ release.version }}</a>
(<a href="{{ release.magnet_uri }}">Magnet</a>)</li>
</ul>
<h3>Netboot</h3>
@ -69,11 +69,11 @@ <h4>Checksums</h4>
<p>File integrity checksums for the latest releases can be found below:</p>
<ul>
<li><a href="https://www.archlinux.org/iso/{{ release.version }}/archlinux-{{ release.version }}-dual.iso.sig"
<li><a href="https://www.archlinux.org/{{ release.iso_url }}.sig"
title="Get the latest PGP signature">PGP signature</a></li>
<li><a href="https://www.archlinux.org/iso/{{ release.version }}/sha1sums.txt"
<li><a href="https://www.archlinux.org/{{ release.dir_path }}sha1sums.txt"
title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
<li><a href="https://www.archlinux.org/iso/{{ release.version }}/md5sums.txt"
<li><a href="https://www.archlinux.org/{{ release.dir_path }}md5sums.txt"
title="Get the latest MD5 checksums">MD5 checksums</a></li>
</ul>
@ -85,8 +85,8 @@ <h4>Checksums</h4>
{% else %}<h5>Worldwide</h5>{% endif %}
<ul>
{% for mirror_url in country.list %}
<li><a href="{{ mirror_url.url }}iso/{{ release.version }}/"
title="Download from {{ mirror_url.url }}iso/{{ release.version }}/">{{ mirror_url.mirror.name }}</a></li>
<li><a href="{{ mirror_url.url }}{{ release.dir_path }}"
title="Download from {{ mirror_url.url }}">{{ mirror_url.mirror.name }}</a></li>
{% endfor %}
</ul>
{% endfor %}