nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed static_dir of modules; omit hidden files in modules_enabled directory

Browse Source
This commit is contained in:
fonfon 2014-10-03 06:16:21 +02:00 committed by Sunil Mohan Adapa
parent b793dc984a
commit 699a3ac0dc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plinth/__main__.py
View File

@ -96,8 +96,9 @@ def setup_server():
'tools.staticdir.dir': '.'}} 'tools.staticdir.dir': '.'}}
cherrypy.tree.mount(None, django.conf.settings.STATIC_URL, config) cherrypy.tree.mount(None, django.conf.settings.STATIC_URL, config)
for module_name in module_loader.loaded_modules: for module_import_path in module_loader.loaded_modules:
module = importlib.import_module(module_name) module = importlib.import_module(module_import_path)
module_name = module_import_path.split('.')[-1]
module_path = os.path.dirname(module.__file__) module_path = os.path.dirname(module.__file__)
static_dir = os.path.join(module_path, 'static') static_dir = os.path.join(module_path, 'static')
if not os.path.isdir(static_dir): if not os.path.isdir(static_dir):
@ -107,7 +108,7 @@ def setup_server():
'/': {'tools.staticdir.root': static_dir, '/': {'tools.staticdir.root': static_dir,
'tools.staticdir.on': True, 'tools.staticdir.on': True,
'tools.staticdir.dir': '.'}} '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) cherrypy.tree.mount(None, urlprefix, config)
if not cfg.no_daemon: if not cfg.no_daemon:

5
plinth/module_loader.py
View File

@ -142,7 +142,10 @@ def get_modules_to_load():
modules = [] modules = []
module_directory = os.path.join(cfg.config_dir, 'modules-enabled') 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) full_file_name = os.path.join(module_directory, file_name)
with open(full_file_name, 'r') as file: with open(full_file_name, 'r') as file:
for line in file: for line in file: