Move things from routing.py to tools/routing.py
This stops a cyclic import. Move add_route, mount and endpoint_to_controller into tools/routing.py and change all callers.
This commit is contained in:
parent
48cf435d71
commit
3d91433230
@ -17,7 +17,8 @@
|
|||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from mediagoblin.routing import get_url_map, endpoint_to_controller
|
from mediagoblin.routing import get_url_map
|
||||||
|
from mediagoblin.tools.routing import endpoint_to_controller
|
||||||
|
|
||||||
from werkzeug.wrappers import Request
|
from werkzeug.wrappers import Request
|
||||||
from werkzeug.exceptions import HTTPException, NotFound
|
from werkzeug.exceptions import HTTPException, NotFound
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from mediagoblin.routing import add_route
|
from mediagoblin.tools.routing import add_route
|
||||||
|
|
||||||
add_route('mediagoblin.edit.profile', '/edit/profile/',
|
add_route('mediagoblin.edit.profile', '/edit/profile/',
|
||||||
'mediagoblin.edit.views:edit_profile')
|
'mediagoblin.edit.views:edit_profile')
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from mediagoblin.routing import add_route
|
from mediagoblin.tools.routing import add_route
|
||||||
|
|
||||||
add_route('mediagoblin.listings.tags_listing',
|
add_route('mediagoblin.listings.tags_listing',
|
||||||
"/tag/<string:tag>/",
|
"/tag/<string:tag>/",
|
||||||
|
@ -16,53 +16,12 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from werkzeug.routing import Map, Rule
|
from mediagoblin.tools.routing import add_route, mount, url_map
|
||||||
from mediagoblin.tools.common import import_component
|
|
||||||
from mediagoblin.tools.pluginapi import PluginManager
|
from mediagoblin.tools.pluginapi import PluginManager
|
||||||
|
|
||||||
|
|
||||||
_log = logging.getLogger(__name__)
|
_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
|
|
||||||
"""
|
|
||||||
# XXX: We cannot use this, since running tests means that the plugin
|
|
||||||
# routes will be populated over and over over the same session.
|
|
||||||
#
|
|
||||||
# assert endpoint not in view_functions.keys(), 'Trying to overwrite a rule'
|
|
||||||
|
|
||||||
view_functions.update({endpoint: controller})
|
|
||||||
|
|
||||||
url_map.add(Rule(url, endpoint=endpoint))
|
|
||||||
|
|
||||||
|
|
||||||
def mount(mountpoint, routes):
|
|
||||||
"""
|
|
||||||
Mount a bunch of routes to this mountpoint
|
|
||||||
"""
|
|
||||||
for endpoint, url, controller in routes:
|
|
||||||
url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/'))
|
|
||||||
add_route(endpoint, url, controller)
|
|
||||||
|
|
||||||
|
|
||||||
def get_url_map():
|
def get_url_map():
|
||||||
for route in PluginManager().get_routes():
|
for route in PluginManager().get_routes():
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from mediagoblin.routing import add_route
|
from mediagoblin.tools.routing import add_route
|
||||||
|
|
||||||
add_route('mediagoblin.submit.start',
|
add_route('mediagoblin.submit.start',
|
||||||
'/submit/', 'mediagoblin.submit.views:submit_start')
|
'/submit/', 'mediagoblin.submit.views:submit_start')
|
||||||
|
63
mediagoblin/tools/routing.py
Normal file
63
mediagoblin/tools/routing.py
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
# GNU MediaGoblin -- federated, autonomous media hosting
|
||||||
|
# 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
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# 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
|
||||||
|
|
||||||
|
|
||||||
|
_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
|
||||||
|
"""
|
||||||
|
# XXX: We cannot use this, since running tests means that the plugin
|
||||||
|
# routes will be populated over and over over the same session.
|
||||||
|
#
|
||||||
|
# assert endpoint not in view_functions.keys(), 'Trying to overwrite a rule'
|
||||||
|
|
||||||
|
view_functions.update({endpoint: controller})
|
||||||
|
|
||||||
|
url_map.add(Rule(url, endpoint=endpoint))
|
||||||
|
|
||||||
|
|
||||||
|
def mount(mountpoint, routes):
|
||||||
|
"""
|
||||||
|
Mount a bunch of routes to this mountpoint
|
||||||
|
"""
|
||||||
|
for endpoint, url, controller in routes:
|
||||||
|
url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/'))
|
||||||
|
add_route(endpoint, url, controller)
|
@ -14,7 +14,7 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from mediagoblin.routing import add_route
|
from mediagoblin.tools.routing import add_route
|
||||||
|
|
||||||
add_route('mediagoblin.user_pages.user_home',
|
add_route('mediagoblin.user_pages.user_home',
|
||||||
'/u/<string:user>/', 'mediagoblin.user_pages.views:user_home')
|
'/u/<string:user>/', 'mediagoblin.user_pages.views:user_home')
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from mediagoblin.routing import add_route
|
from mediagoblin.tools.routing import add_route
|
||||||
|
|
||||||
add_route('mediagoblin.webfinger.host_meta', '/.well-known/host-meta',
|
add_route('mediagoblin.webfinger.host_meta', '/.well-known/host-meta',
|
||||||
'mediagoblin.webfinger.views:host_meta')
|
'mediagoblin.webfinger.views:host_meta')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user