diff --git a/i2p2www/__init__.py b/i2p2www/__init__.py index fecf8534..c7920f78 100644 --- a/i2p2www/__init__.py +++ b/i2p2www/__init__.py @@ -57,6 +57,15 @@ url('//meetings/.log', 'meetings.views.meetings_show_log') url('//meetings/.rst', 'meetings.views.meetings_show_rst') url('//feed/meetings/atom', 'meetings.views.meetings_atom') +url('/meeting', 'legacy.legacy_meeting') +url('/meeting.html', 'legacy.legacy_meeting') +url('/status---', 'legacy.legacy_status') +url('/status---.html', 'legacy.legacy_status') +url('/_', 'legacy.legacy_show') +url('/_.html', 'legacy.legacy_show') +url('/', 'legacy.legacy_show') +url('/.html', 'legacy.legacy_show') + ################# # Babel selectors @@ -284,37 +293,6 @@ def hosts(): def robots(): return send_from_directory(STATIC_DIR, 'robots.txt', mimetype='text/plain') - -############## -# Legacy paths - -@app.route('/meeting') -@app.route('/meeting.html') -def legacy_meeting(id): - return redirect(url_for('meetings_show', id=id, lang='en')) - -@app.route('/status---') -@app.route('/status---.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('/_') -@app.route('/_.html') -@app.route('/') -@app.route('/.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') def favicon(): return send_from_directory(os.path.join(app.root_path, 'static'), diff --git a/i2p2www/legacy.py b/i2p2www/legacy.py new file mode 100644 index 00000000..0b6f2f0b --- /dev/null +++ b/i2p2www/legacy.py @@ -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))))