From 8c89ae48bf8760c87c8b5058a41409da5062e5fe Mon Sep 17 00:00:00 2001 From: str4d Date: Tue, 4 Jun 2013 09:36:42 +0000 Subject: [PATCH] Added version to download urls (to pass to mirrors requiring it) --- i2p2www/downloads.py | 10 ++++----- i2p2www/pages/downloads/list.html | 32 ++++++++++++++--------------- i2p2www/pages/downloads/select.html | 4 ++-- i2p2www/pages/global/macros | 2 +- i2p2www/urls.py | 6 +++--- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py index 79c6fb9f..36590700 100644 --- a/i2p2www/downloads.py +++ b/i2p2www/downloads.py @@ -37,12 +37,12 @@ def downloads_list(): return render_template('downloads/list.html') # Specific file downloader -def downloads_select(file): +def downloads_select(version, file): if (file == 'debian'): return render_template('downloads/debian.html', file=file) mirrors=read_mirrors() data = { - 'version': CURRENT_I2P_VERSION, + 'version': version, 'file': file, } obj=[] @@ -53,15 +53,15 @@ def downloads_select(file): for mirror in a['mirrors']: mirror['url']=mirror['url'] % data obj.append(a) - return render_template('downloads/select.html', mirrors=obj, file=file) + return render_template('downloads/select.html', mirrors=obj, version=version, file=file) -def downloads_redirect(protocol, file, mirror): +def downloads_redirect(version, protocol, file, mirror): mirrors=read_mirrors() if not protocol in mirrors: abort(404) mirrors=mirrors[protocol] data = { - 'version': CURRENT_I2P_VERSION, + 'version': version, 'file': file, } if mirror: diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html index c5bed54f..b7ff6bb4 100644 --- a/i2p2www/pages/downloads/list.html +++ b/i2p2www/pages/downloads/list.html @@ -23,12 +23,12 @@ or type java -version at your command prompt.

Windows

- i2pinstall_0.9.5-win1_windows.exe (Google Code) - ({{ _('select alternate link') }}) + i2pinstall_0.9.5-win1_windows.exe (Google Code) + ({{ _('select alternate link') }})
(SHA256 d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8 - sig) + sig)
@@ -41,12 +41,12 @@ or type java -version at your command prompt.

Mac OS X

- i2pinstall_{{ ver() }}.jar (Google Code) - ({{ _('select alternate link') }}) + i2pinstall_{{ ver() }}.jar (Google Code) + ({{ _('select alternate link') }})
(SHA256 af251596e034b751dc17b73bd35254b94f92d4a3121a6e96479c45c4d846ab30 - sig) + sig)
@@ -69,12 +69,12 @@ or type java -version at your command prompt.

GNU/Linux / BSD / Solaris

- i2pinstall_{{ ver() }}.jar (Google Code) - ({{ _('select alternate link') }}) + i2pinstall_{{ ver() }}.jar (Google Code) + ({{ _('select alternate link') }})
(SHA256 af251596e034b751dc17b73bd35254b94f92d4a3121a6e96479c45c4d846ab30 - sig) + sig)
@@ -97,7 +97,7 @@ or type java -version at your command prompt.

Debian / Ubuntu

- {% trans %}Packages for Debian & Ubuntu are available.{% endtrans %} + {% trans %}Packages for Debian & Ubuntu are available.{% endtrans %}
@@ -131,12 +131,12 @@ or type java -version at your command prompt.

{{ _('Source package') }}

- i2psource_{{ ver() }}.tar.bz2 (Google Code) - ({{ _('select alternate link') }}) + i2psource_{{ ver() }}.tar.bz2 (Google Code) + ({{ _('select alternate link') }})
(SHA256 441eac3cb7f25c03e7711c7d516626dc86ba6ad373145ab802d150848262c7c2 - sig) + sig)
@@ -257,12 +257,12 @@ receive the release.

{{ _('Manual updates') }}

- i2pupdate_{{ ver() }}.zip (Google Code) - ({{ _('select alternate link') }}) + i2pupdate_{{ ver() }}.zip (Google Code) + ({{ _('select alternate link') }})
(SHA256 d20c3f3845c1f4a4cf734dc69cae7de72ff0874cea1382d03d8ac953c50fb139 - sig) + sig)
diff --git a/i2p2www/pages/downloads/select.html b/i2p2www/pages/downloads/select.html index 3087afa6..eba0517e 100644 --- a/i2p2www/pages/downloads/select.html +++ b/i2p2www/pages/downloads/select.html @@ -7,9 +7,9 @@

{{ protocol.name | upper }}

diff --git a/i2p2www/pages/global/macros b/i2p2www/pages/global/macros index 49642f19..fd80e6de 100644 --- a/i2p2www/pages/global/macros +++ b/i2p2www/pages/global/macros @@ -6,7 +6,7 @@ {%- endif -%} {%- elif request.endpoint == 'blog_post' -%}{{ url_for('blog_post', lang=lang, slug=slug) }} {%- elif request.endpoint == 'meetings_show' -%}{{ url_for('meetings_show', lang=lang, id=id) }} -{%- elif request.endpoint == 'downloads_select' -%}{{ url_for('downloads_select', lang=lang, file=file) }} +{%- elif request.endpoint == 'downloads_select' -%}{{ url_for('downloads_select', lang=lang, version=version, file=file) }} {%- elif request.endpoint -%}{{ url_for(request.endpoint, lang=lang) }} {%- else -%}{{ url_for('site_show', lang=lang) }} {%- endif -%} diff --git a/i2p2www/urls.py b/i2p2www/urls.py index 532ef141..15c1fe44 100644 --- a/i2p2www/urls.py +++ b/i2p2www/urls.py @@ -55,9 +55,9 @@ url('//meetings/.rst', 'meetings.views.meetings_show_rst') url('//feed/meetings/atom', 'meetings.views.meetings_atom') url('//download', 'downloads.downloads_list') -url('//download/', 'downloads.downloads_select') -url('/download//any/', 'downloads.downloads_redirect', defaults={'mirror': None}) -url('/download///', 'downloads.downloads_redirect') +url('//download//', 'downloads.downloads_select') +url('/download///any/', 'downloads.downloads_redirect', defaults={'mirror': None}) +url('/download////', 'downloads.downloads_redirect') url('/meeting', 'legacy.legacy_meeting') url('/meeting.html', 'legacy.legacy_meeting')