aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/routing.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-12-01 21:36:18 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-12-23 12:26:34 +0100
commit48cf435d718b47e33cb98b048e5b58d79a46b486 (patch)
treea78533b8859cb83ab2a8da13f704216df64c1fad /mediagoblin/routing.py
parentdfc23dd1e16618cdbac0a22261573be3e5d29852 (diff)
downloadmediagoblin-48cf435d718b47e33cb98b048e5b58d79a46b486.tar.lz
mediagoblin-48cf435d718b47e33cb98b048e5b58d79a46b486.tar.xz
mediagoblin-48cf435d718b47e33cb98b048e5b58d79a46b486.zip
Refactor routing in app.py.
Move some things out of app.py into functions in routing.py. This makes app.py a bit more readable and allows us to rewrite routing.
Diffstat (limited to 'mediagoblin/routing.py')
-rw-r--r--mediagoblin/routing.py30
1 files changed, 30 insertions, 0 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index defbc4ba..dc22ba09 100644
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -14,12 +14,33 @@
# 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/>.
+import logging
+
from werkzeug.routing import Map, Rule
+from mediagoblin.tools.common import import_component
+from mediagoblin.tools.pluginapi import PluginManager
+
+
+_log = logging.getLogger(__name__)
url_map = Map()
view_functions = {}
+
+def endpoint_to_controller(endpoint):
+ view_func = view_functions[endpoint]
+
+ _log.debug('endpoint: {0} view_func: {1}'.format(endpoint, view_func))
+
+ # import the endpoint, or if it's already a callable, call that
+ if isinstance(view_func, basestring):
+ view_func = import_component(view_func)
+ view_functions[endpoint] = view_func
+
+ return view_func
+
+
def add_route(endpoint, url, controller):
"""
Add a route to the url mapping
@@ -33,6 +54,7 @@ def add_route(endpoint, url, controller):
url_map.add(Rule(url, endpoint=endpoint))
+
def mount(mountpoint, routes):
"""
Mount a bunch of routes to this mountpoint
@@ -41,6 +63,14 @@ def mount(mountpoint, routes):
url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/'))
add_route(endpoint, url, controller)
+
+def get_url_map():
+ for route in PluginManager().get_routes():
+ add_route(*route)
+
+ return url_map
+
+
add_route('index', '/', 'mediagoblin.views:root_view')
from mediagoblin.admin.routing import admin_routes