diff options
author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-10-22 13:38:01 +0200 |
---|---|---|
committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-10-22 13:38:01 +0200 |
commit | 8df6d98c1b7f06ba1d394908c6e8c333c7c5d517 (patch) | |
tree | 589e5abcce001649f69c69159e42331c9b64dfc4 /service/pixelated/resources/root_resource.py | |
parent | 8f590c5a10a5ff3fbbb51473dac53e30f11119c2 (diff) |
Move interstitial to root resource
- Issue #501
- Moves assets to startup-assets
- No more switching between twisted resources at runtime
Diffstat (limited to 'service/pixelated/resources/root_resource.py')
-rw-r--r-- | service/pixelated/resources/root_resource.py | 24 |
1 files changed, 23 insertions, 1 deletions
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() |