Move interstitial to root resource

- Issue #501
- Moves assets to startup-assets
- No more switching between twisted resources at runtime

2 files changed, 23 insertions, 50 deletions

diff --git a/service/pixelated/resources/loading_page.py b/service/pixelated/resources/loading_page.py
deleted file mode 100644
index 84388068..00000000
--- a/service/pixelated/resources/loading_page.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated 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.
-#
-# Pixelated 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 Pixelated. If not, see <http://www.gnu.org/licenses/>.
-
-import os
-from twisted.internet.threads import deferToThread
-from twisted.web.resource import Resource
-from twisted.web.server import NOT_DONE_YET
-from twisted.web.static import File
-
-
-class LoadingResource(Resource):
-
-    def __init__(self):
-        Resource.__init__(self)
-        self._path = os.path.dirname(os.path.abspath(__file__))
-        self.putChild('assets', File(os.path.join(self._path, '..', 'assets')))
-
-    def render_GET(self, request):
-
-        def open_html():
-            return open(os.path.join(self._path, '..', 'assets', 'Interstitial.html')).read()
-
-        def close_request(html):
-            request.responseHeaders.addRawHeader("Connection", "close")
-            request.write(html)
-            request.finish()
-
-        d = deferToThread(open_html)
-        d.addCallback(close_request)
-
-        return NOT_DONE_YET
-
-    def getChild(self, path, request):
-        if path == '':
-            return self
-        return Resource.getChild(self, path, request)
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py
index 8b536450..e6046eae 100644
--- a/service/pixelated/resources/root_resource.py
+++ b/service/pixelated/resources/root_resource.py
@@ -12,11 +12,21 @@ from twisted.web.resource import Resource
 from twisted.web.static import File
 
 
+MODE_STARTUP = 1
+MODE_RUNNING = 2
+
+
 class RootResource(Resource):
 
     def __init__(self):
         Resource.__init__(self)
+        self._startup_assets_folder = self._get_startup_folder()
         self._static_folder = self._get_static_folder()
+        self._startup_mode()
+
+    def _startup_mode(self):
+        self.putChild('startup-assets', File(self._startup_assets_folder))
+        self._mode = MODE_STARTUP
 
     def getChild(self, path, request):
         if path == '':
@@ -34,6 +44,12 @@ class RootResource(Resource):
         self.putChild('mail', MailResource(mail_service))
         self.putChild('feedback', FeedbackResource(feedback_service))
 
+        self._mode = MODE_RUNNING
+
+    def _get_startup_folder(self):
+        path = os.path.dirname(os.path.abspath(__file__))
+        return os.path.join(path, '..', 'assets')
+
     def _get_static_folder(self):
         static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app"))
         # this is a workaround for packaging
@@ -44,5 +60,11 @@ class RootResource(Resource):
             static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent')
         return static_folder
 
+    def _is_starting(self):
+        return self._mode == MODE_STARTUP
+
     def render_GET(self, request):
-        return open(os.path.join(self._static_folder, 'index.html')).read()
+        if self._is_starting():
+            return open(os.path.join(self._startup_assets_folder, 'Interstitial.html')).read()
+        else:
+            return open(os.path.join(self._static_folder, 'index.html')).read()