diff options
author | Joar Wandborg <git@wandborg.com> | 2012-10-14 13:46:31 +0200 |
---|---|---|
committer | Joar Wandborg <git@wandborg.com> | 2012-10-14 13:46:31 +0200 |
commit | 7742dcc1fbda04c3a1c76a057a1a93a8f504502e (patch) | |
tree | 6b07eb54c43230d0810d9241df02558a88cd754e /mediagoblin/routing.py | |
parent | a817fb76b1a9f6412cd36ddbef8a9f7a35cb6615 (diff) | |
download | mediagoblin-7742dcc1fbda04c3a1c76a057a1a93a8f504502e.tar.lz mediagoblin-7742dcc1fbda04c3a1c76a057a1a93a8f504502e.tar.xz mediagoblin-7742dcc1fbda04c3a1c76a057a1a93a8f504502e.zip |
Switched most stuff over from Routes
Removed the Routes routing functionality and replaced it with
werkzeug.routes. Most views are functional.
Known issues:
- Translation integration with the request object is not yet figured
out. This breaks 404 pages.
Diffstat (limited to 'mediagoblin/routing.py')
-rw-r--r-- | mediagoblin/routing.py | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 90e1f3f8..4b9c42ee 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -14,36 +14,22 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from routes import Mapper +from werkzeug.routing import Map, Rule -from mediagoblin.auth.routing import auth_routes -from mediagoblin.submit.routing import submit_routes -from mediagoblin.user_pages.routing import user_routes -from mediagoblin.edit.routing import edit_routes -from mediagoblin.listings.routing import tag_routes -from mediagoblin.webfinger.routing import webfinger_well_known_routes, \ - webfinger_routes -from mediagoblin.admin.routing import admin_routes +url_map = Map() +view_functions = {'index': 'mediagoblin.views:index'} -def get_mapper(plugin_routes): - mapping = Mapper() - mapping.minimization = False +def add_route(endpoint, url, controller): + view_functions.update({endpoint: controller}) - # Plugin routes go first so they can override default routes. - mapping.extend(plugin_routes) + url_map.add(Rule(url, endpoint=endpoint)) - mapping.connect( - "index", "/", - controller="mediagoblin.views:root_view") +add_route('index', '/', 'mediagoblin.views:root_view') - mapping.extend(auth_routes, '/auth') - mapping.extend(submit_routes, '/submit') - mapping.extend(user_routes, '/u') - mapping.extend(edit_routes, '/edit') - mapping.extend(tag_routes, '/tag') - mapping.extend(webfinger_well_known_routes, '/.well-known') - mapping.extend(webfinger_routes, '/api/webfinger') - mapping.extend(admin_routes, '/a') - - return mapping +import mediagoblin.submit.routing +import mediagoblin.user_pages.routing +import mediagoblin.auth.routing +import mediagoblin.edit.routing +import mediagoblin.webfinger.routing +import mediagoblin.listings.routing |