I2P_Developers/i2p.www
3
0
Fork 5
Code Issues 27 Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Created dedicated section for shortcodes, added /d and /get -> /en/download

Browse Source
This commit is contained in:
str4d
2014-05-23 12:45:05 +00:00
parent 599a20d94f
commit 320dc99bd6
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
i2p2www/legacy.py
View File

@ -1,6 +1,16 @@
from flask import g, redirect, url_for from flask import g, redirect, url_for
############
# Shortcodes
#
# Two-letter shortcodes are not allowed, they clash with language codes
SHORTCODES={
'd': {'function': 'downloads_list', 'params': {}},
'get': {'function': 'downloads_list', 'params': {}},
}
############## ##############
# Legacy paths # Legacy paths
@ -189,7 +199,9 @@ def legacy_show(f):
lang = g.lang lang = g.lang
if lang == 'zh': if lang == 'zh':
lang = 'zh_CN' lang = 'zh_CN'
if f in LEGACY_FUNCTIONS_MAP: if f in SHORTCODES:
return redirect(url_for(SHORTCODES[f]['function'], lang=lang, **SHORTCODES[f]['params']), 301)
elif f in LEGACY_FUNCTIONS_MAP:
return redirect(url_for(LEGACY_FUNCTIONS_MAP[f]['function'], lang=lang, **LEGACY_FUNCTIONS_MAP[f]['params']), 301) return redirect(url_for(LEGACY_FUNCTIONS_MAP[f]['function'], lang=lang, **LEGACY_FUNCTIONS_MAP[f]['params']), 301)
elif f in LEGACY_PAGES_MAP: elif f in LEGACY_PAGES_MAP:
return redirect(url_for('site_show', lang=lang, page=LEGACY_PAGES_MAP[f]), 301) return redirect(url_for('site_show', lang=lang, page=LEGACY_PAGES_MAP[f]), 301)

1
i2p2www/urls.py
View File

@ -68,7 +68,6 @@ url('/<lang:lang>/meetings/<int:id>.rst', 'meetings.views.meetings_show_rst')
url('/<lang:lang>/feed/meetings/atom', 'meetings.views.meetings_atom') url('/<lang:lang>/feed/meetings/atom', 'meetings.views.meetings_atom')
url('/<lang:lang>/download', 'downloads.downloads_list') url('/<lang:lang>/download', 'downloads.downloads_list')
url('/<lang:lang>/dl', 'downloads.downloads_list')
url('/<lang:lang>/download/debian', 'downloads.downloads_debian') url('/<lang:lang>/download/debian', 'downloads.downloads_debian')
url('/<lang:lang>/download/<string:version>/<path:file>/mirrors', 'downloads.downloads_select') url('/<lang:lang>/download/<string:version>/<path:file>/mirrors', 'downloads.downloads_select')
url('/<lang:lang>/download/<string:version>/<string:protocol>/any/<path:file>/download', 'downloads.downloads_redirect', defaults={'domain': None}) url('/<lang:lang>/download/<string:version>/<string:protocol>/any/<path:file>/download', 'downloads.downloads_redirect', defaults={'domain': None})