From 2424639bf98951ab659e6109cf1af59eabea856e Mon Sep 17 00:00:00 2001
From: Kfir Hadas <sharkykh@gmail.com>
Date: Wed, 26 Jul 2017 18:11:00 +0300
Subject: [PATCH] Refactor routes.py

---
 nyaa/routes.py         | 32 ++++++++------------------------
 nyaa/views/__init__.py | 15 +++++++++------
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/nyaa/routes.py b/nyaa/routes.py
index 3b69898..a67ac28 100644
--- a/nyaa/routes.py
+++ b/nyaa/routes.py
@@ -1,25 +1,9 @@
-from nyaa import api_handler, app, template_utils, views
+from nyaa import app, template_utils, views
+from nyaa.api_handler import api_blueprint
 
-DEBUG_API = False
-
-
-# #################################### BLUEPRINTS ####################################
-
-def register_blueprints(flask_app):
-    """ Register the blueprints using the flask_app object """
-
-    # Template filters and globals
-    flask_app.register_blueprint(template_utils.bp)
-    # API routes
-    flask_app.register_blueprint(api_handler.api_blueprint, url_prefix='/api')
-    # Site routes
-    flask_app.register_blueprint(views.account_bp)
-    flask_app.register_blueprint(views.admin_bp)
-    flask_app.register_blueprint(views.main_bp)
-    flask_app.register_blueprint(views.site_bp)
-    flask_app.register_blueprint(views.torrents_bp)
-    flask_app.register_blueprint(views.users_bp)
-
-
-# When done, this can be moved to nyaa/__init__.py instead of importing this file
-register_blueprints(app)
+# Register all template filters and template globals
+app.register_blueprint(template_utils.bp)
+# Register the API routes
+app.register_blueprint(api_blueprint, url_prefix='/api')
+# Register the site's routes
+views.register(app)
diff --git a/nyaa/views/__init__.py b/nyaa/views/__init__.py
index d2b940c..924cc3e 100644
--- a/nyaa/views/__init__.py
+++ b/nyaa/views/__init__.py
@@ -7,9 +7,12 @@ from nyaa.views import (
     users,
 )
 
-account_bp = account.bp
-admin_bp = admin.bp
-main_bp = main.bp
-site_bp = site.bp
-torrents_bp = torrents.bp
-users_bp = users.bp
+
+def register(flask_app):
+    """ Register the blueprints using the flask_app object """
+    flask_app.register_blueprint(account.bp)
+    flask_app.register_blueprint(admin.bp)
+    flask_app.register_blueprint(main.bp)
+    flask_app.register_blueprint(site.bp)
+    flask_app.register_blueprint(torrents.bp)
+    flask_app.register_blueprint(users.bp)