From 699a3ac0dcf68382da8f7aca768b17a4c6a40125 Mon Sep 17 00:00:00 2001 From: fonfon Date: Fri, 3 Oct 2014 06:16:21 +0200 Subject: [PATCH] fixed static_dir of modules; omit hidden files in modules_enabled directory --- plinth/__main__.py | 7 ++++--- plinth/module_loader.py | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plinth/__main__.py b/plinth/__main__.py index c192d6c07..c6d5b5bd9 100644 --- a/plinth/__main__.py +++ b/plinth/__main__.py @@ -96,8 +96,9 @@ def setup_server(): 'tools.staticdir.dir': '.'}} cherrypy.tree.mount(None, django.conf.settings.STATIC_URL, config) - for module_name in module_loader.loaded_modules: - module = importlib.import_module(module_name) + for module_import_path in module_loader.loaded_modules: + module = importlib.import_module(module_import_path) + module_name = module_import_path.split('.')[-1] module_path = os.path.dirname(module.__file__) static_dir = os.path.join(module_path, 'static') if not os.path.isdir(static_dir): @@ -107,7 +108,7 @@ def setup_server(): '/': {'tools.staticdir.root': static_dir, 'tools.staticdir.on': True, 'tools.staticdir.dir': '.'}} - urlprefix = "%s%s" % (django.conf.settings.STATIC_URL, module) + urlprefix = "%s%s" % (django.conf.settings.STATIC_URL, module_name) cherrypy.tree.mount(None, urlprefix, config) if not cfg.no_daemon: diff --git a/plinth/module_loader.py b/plinth/module_loader.py index 20507de10..bbf7a0b4a 100644 --- a/plinth/module_loader.py +++ b/plinth/module_loader.py @@ -142,7 +142,10 @@ def get_modules_to_load(): modules = [] module_directory = os.path.join(cfg.config_dir, 'modules-enabled') - for file_name in os.listdir(module_directory): + # omit hidden files + file_names = [f for f in os.listdir(module_directory) if not + f.startswith(".")] + for file_name in file_names: full_file_name = os.path.join(module_directory, file_name) with open(full_file_name, 'r') as file: for line in file: