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

Split off legacy support code

Browse Source
This commit is contained in:
str4d
2012-12-19 10:30:49 +00:00
parent 5a088b76c7
commit 7dbf4a35bd
2 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
i2p2www/__init__.py
View File

@ -57,6 +57,15 @@ url('/<string:lang>/meetings/<int:id>.log', 'meetings.views.meetings_show_log')
url('/<string:lang>/meetings/<int:id>.rst', 'meetings.views.meetings_show_rst') url('/<string:lang>/meetings/<int:id>.rst', 'meetings.views.meetings_show_rst')
url('/<string:lang>/feed/meetings/atom', 'meetings.views.meetings_atom') url('/<string:lang>/feed/meetings/atom', 'meetings.views.meetings_atom')
url('/meeting<int:id>', 'legacy.legacy_meeting')
url('/meeting<int:id>.html', 'legacy.legacy_meeting')
url('/status-<int:year>-<int:month>-<int:day>', 'legacy.legacy_status')
url('/status-<int:year>-<int:month>-<int:day>.html', 'legacy.legacy_status')
url('/<string:f>_<string:lang>', 'legacy.legacy_show')
url('/<string:f>_<string:lang>.html', 'legacy.legacy_show')
url('/<string:f>', 'legacy.legacy_show')
url('/<string:f>.html', 'legacy.legacy_show')
################# #################
# Babel selectors # Babel selectors
@ -284,37 +293,6 @@ def hosts():
def robots(): def robots():
return send_from_directory(STATIC_DIR, 'robots.txt', mimetype='text/plain') return send_from_directory(STATIC_DIR, 'robots.txt', mimetype='text/plain')
##############
# Legacy paths
@app.route('/meeting<int:id>')
@app.route('/meeting<int:id>.html')
def legacy_meeting(id):
return redirect(url_for('meetings_show', id=id, lang='en'))
@app.route('/status-<int:year>-<int:month>-<int:day>')
@app.route('/status-<int:year>-<int:month>-<int:day>.html')
def legacy_status(year, month, day):
return redirect(url_for('blog_entry', lang='en', slug=('%s/%s/%s/status' % (year, month, day))))
LEGACY_MAP={
'download': 'downloads_list'
}
@app.route('/<string:f>_<string:lang>')
@app.route('/<string:f>_<string:lang>.html')
@app.route('/<string:f>')
@app.route('/<string:f>.html')
def legacy_show(f):
lang = 'en'
if hasattr(g, 'lang') and g.lang:
lang = g.lang
if f in LEGACY_MAP:
return redirect(url_for(LEGACY_MAP[f], lang=lang))
else:
return redirect(url_for('site_show', lang=lang, page=f))
@app.route('/favicon.ico') @app.route('/favicon.ico')
def favicon(): def favicon():
return send_from_directory(os.path.join(app.root_path, 'static'), return send_from_directory(os.path.join(app.root_path, 'static'),

24
i2p2www/legacy.py Normal file
View File

@ -0,0 +1,24 @@
from flask import g, redirect, url_for
##############
# Legacy paths
LEGACY_MAP={
'download': 'downloads_list'
}
def legacy_show(f):
lang = 'en'
if hasattr(g, 'lang') and g.lang:
lang = g.lang
if f in LEGACY_MAP:
return redirect(url_for(LEGACY_MAP[f], lang=lang))
else:
return redirect(url_for('site_show', lang=lang, page=f))
def legacy_meeting(id):
return redirect(url_for('meetings_show', id=id, lang='en'))
def legacy_status(year, month, day):
return redirect(url_for('blog_entry', lang='en', slug=('%s/%s/%s/status' % (year, month, day))))