# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors. See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# 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
+import logging
+from mediagoblin.tools.routing import add_route, mount, url_map
+from mediagoblin.tools.pluginapi import PluginManager
+from mediagoblin.admin.routing import admin_routes
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
-def get_mapper():
- mapping = Mapper()
- mapping.minimization = False
+_log = logging.getLogger(__name__)
- mapping.connect(
- "index", "/",
- controller="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')
+def get_url_map():
+ add_route('index', '/', 'mediagoblin.views:root_view')
+ mount('/auth', auth_routes)
+ mount('/a', admin_routes)
- return mapping
+ import mediagoblin.submit.routing
+ import mediagoblin.user_pages.routing
+ import mediagoblin.edit.routing
+ import mediagoblin.webfinger.routing
+ import mediagoblin.listings.routing
+
+ for route in PluginManager().get_routes():
+ add_route(*route)
+
+ return url_map