From 391cc55537a97ec8b2b55662db9c63f86ab885ef Mon Sep 17 00:00:00 2001 From: Roald de Vries Date: Mon, 5 Dec 2016 10:32:12 +0100 Subject: get templates from pkg_resources --- service/pixelated/application.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'service/pixelated/application.py') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 0c2383dd..7263482d 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -42,6 +42,16 @@ from pixelated.resources.root_resource import RootResource log = Logger() +def get_templates_folder(): + return os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "templates") + + +def get_static_folder(): + # TODO: make sure sandbox keeps working + # TODO: make sure this works for packaging + return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "web-ui", "public")) + + class UserAgentMode(object): def __init__(self, is_single_user): self.is_single_user = is_single_user @@ -88,16 +98,6 @@ def _create_service_factory(args): return ServicesFactory(UserAgentMode(is_single_user=False)) -def get_templates_folder(): - return os.path.join(os.path.dirname(os.path.abspath(__file__)), "assets") - - -def get_static_folder(): - # TODO: make sure sandbox keeps working - # TODO: make sure this works for packaging - return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "web-ui", "public")) - - def initialize(): log.info('Starting the Pixelated user agent') args = arguments.parse_user_agent_args() -- cgit v1.2.3