X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Frouting.py;h=1fbc6e9b83f60e1a448f1db103b796ada197e2e4;hb=b73fcd96fe471c1e034ef878a8ec59f015ed8103;hp=4b9c42ee5baeb81299a593b0d431f1ef082964fe;hpb=7742dcc1fbda04c3a1c76a057a1a93a8f504502e;p=mediagoblin.git

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index 4b9c42ee..1fbc6e9b 100644
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -14,22 +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/>.
 
-from werkzeug.routing import Map, Rule
+import logging
 
-url_map = Map()
+from mediagoblin.tools.routing import add_route, mount, url_map
+from mediagoblin.tools.pluginapi import PluginManager
+from mediagoblin.moderation.routing import moderation_routes
+from mediagoblin.auth.routing import auth_routes
 
-view_functions = {'index': 'mediagoblin.views:index'}
 
-def add_route(endpoint, url, controller):
-    view_functions.update({endpoint: controller})
+_log = logging.getLogger(__name__)
 
-    url_map.add(Rule(url, endpoint=endpoint))
 
-add_route('index', '/', 'mediagoblin.views:root_view')
+def get_url_map():
+    add_route('index', '/', 'mediagoblin.views:root_view')
+    add_route('terms_of_service','/terms_of_service',
+        'mediagoblin.views:terms_of_service'),
+    mount('/auth', auth_routes)
+    mount('/mod', moderation_routes)
 
-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
+    import mediagoblin.submit.routing
+    import mediagoblin.user_pages.routing
+    import mediagoblin.edit.routing
+    import mediagoblin.listings.routing
+    import mediagoblin.notifications.routing
+    import mediagoblin.oauth.routing
+    import mediagoblin.api.routing
+
+    for route in PluginManager().get_routes():
+        add_route(*route)
+
+    return url_map