Deferring TagsController.tags and fixing tests to deal with deferreds

2 files changed, 15 insertions, 5 deletions

diff --git a/service/pixelated/controllers/__init__.py b/service/pixelated/controllers/__init__.py
index 9e447d4d..e1c13515 100644
--- a/service/pixelated/controllers/__init__.py
+++ b/service/pixelated/controllers/__init__.py
@@ -22,6 +22,13 @@ def respond_json(entity, request, status_code=200):
     return json_response
 
 
+def respond_json_deferred(entity, request, status_code=200):
+    json_response = json.dumps(entity)
+    request.responseHeaders.addRawHeader(b"content-type", b"application/json")
+    request.code = status_code
+    request.write(json_response)
+    request.finish()
+
 import json
 
 from home_controller import HomeController
diff --git a/service/pixelated/controllers/tags_controller.py b/service/pixelated/controllers/tags_controller.py
index 0b9a94ac..b6741dcc 100644
--- a/service/pixelated/controllers/tags_controller.py
+++ b/service/pixelated/controllers/tags_controller.py
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
-from flask import request
-from pixelated.controllers import respond_json
+from pixelated.controllers import respond_json_deferred
+from twisted.internet.threads import deferToThread
 
 
 class TagsController:
@@ -25,6 +25,9 @@ class TagsController:
 
     def tags(self, request):
         query = request.args.get('q', [''])[0]
-        skip_default_tags = request.args.get('skipDefaultTags')
-        tags = self._search_engine.tags(query=query, skip_default_tags=skip_default_tags)
-        return respond_json(tags, request)
+        skip_default_tags = request.args.get('skipDefaultTags', [False])[0]
+
+        d = deferToThread(lambda: self._search_engine.tags(query=query, skip_default_tags=skip_default_tags))
+        d.addCallback(lambda tags: respond_json_deferred(tags, request))
+
+        return d