From 2282e39afc3892aeaec65e195cbf32c6e4759f2a Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Sep 01 2019 19:27:45 +0000
Subject: Move setup of the routes in its own module.


Make it easier to find and modify where the routes are configured.

Signed-off-by: Clement Verna <cverna@tutanota.com>

---

diff --git a/mdapi/__init__.py b/mdapi/__init__.py
index e590d0f..dd21c60 100644
--- a/mdapi/__init__.py
+++ b/mdapi/__init__.py
@@ -407,26 +407,3 @@ def get_supplements(request):
 def index(request):
     _log.info('index %s', request)
     return web.FileResponse(indexfile)
-
-
-def _set_routes(app):
-    app.add_routes([
-        web.get('/', index),
-        web.get('/branches', list_branches),
-        web.get('/{branch}/pkg/{name}', get_pkg),
-        web.get('/{branch}/srcpkg/{name}', get_src_pkg),
-
-        web.get('/{branch}/provides/{name}', get_provides),
-        web.get('/{branch}/requires/{name}', get_requires),
-        web.get('/{branch}/obsoletes/{name}', get_obsoletes),
-        web.get('/{branch}/conflicts/{name}', get_conflicts),
-
-        web.get('/{branch}/enhances/{name}', get_enhances),
-        web.get('/{branch}/recommends/{name}', get_recommends),
-        web.get('/{branch}/suggests/{name}', get_suggests),
-        web.get('/{branch}/supplements/{name}', get_supplements),
-
-        web.get('/{branch}/files/{name}', get_pkg_files),
-        web.get('/{branch}/changelog/{name}', get_pkg_changelog),
-    ])
-    return app
diff --git a/mdapi/routes.py b/mdapi/routes.py
new file mode 100644
index 0000000..c8c286f
--- /dev/null
+++ b/mdapi/routes.py
@@ -0,0 +1,40 @@
+from aiohttp import web
+
+from . import (
+    index,
+    list_branches,
+    get_pkg,
+    get_src_pkg,
+    get_conflicts,
+    get_enhances,
+    get_obsoletes,
+    get_provides,
+    get_requires,
+    get_recommends,
+    get_suggests,
+    get_supplements,
+    get_pkg_files,
+    get_pkg_changelog
+)
+
+
+def set_routes(app):
+    app.add_routes(
+        [
+            web.get("/", index),
+            web.get("/branches", list_branches),
+            web.get("/{branch}/pkg/{name}", get_pkg),
+            web.get("/{branch}/srcpkg/{name}", get_src_pkg),
+            web.get("/{branch}/provides/{name}", get_provides),
+            web.get("/{branch}/requires/{name}", get_requires),
+            web.get("/{branch}/obsoletes/{name}", get_obsoletes),
+            web.get("/{branch}/conflicts/{name}", get_conflicts),
+            web.get("/{branch}/enhances/{name}", get_enhances),
+            web.get("/{branch}/recommends/{name}", get_recommends),
+            web.get("/{branch}/suggests/{name}", get_suggests),
+            web.get("/{branch}/supplements/{name}", get_supplements),
+            web.get("/{branch}/files/{name}", get_pkg_files),
+            web.get("/{branch}/changelog/{name}", get_pkg_changelog),
+        ]
+    )
+    return app
diff --git a/mdapi/server.py b/mdapi/server.py
index bdc9ca1..2c4d369 100644
--- a/mdapi/server.py
+++ b/mdapi/server.py
@@ -3,7 +3,8 @@ import logging.config
 
 from aiohttp import web
 
-from mdapi import CONFIG, _set_routes
+from mdapi import CONFIG
+from mdapi.routes import set_routes
 
 
 def main():
@@ -12,7 +13,7 @@ def main():
     logging.config.dictConfig(CONFIG.get("LOGGING") or {"version": 1})
 
     app = web.Application()
-    app = _set_routes(app)
+    app = set_routes(app)
 
     host = CONFIG.get("HOST", "127.0.0.1")
     port = CONFIG.get("PORT", 8080)