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

main: List apps instead of modules

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2021-11-23 00:25:05 -08:00 committed by James Valleroy
parent 8382a604bb
commit f2af08d8a6
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/tests/control vendored
View File

@ -7,7 +7,7 @@
# - Ability to create and initialize database # - Ability to create and initialize database
# - Module inititailzation for essential modules # - Module inititailzation for essential modules
# #
Test-Command: plinth --list-modules 2> /dev/null Test-Command: plinth --list-apps 2> /dev/null
Restrictions: needs-root Restrictions: needs-root
# #

36
plinth/__main__.py
View File

@ -5,8 +5,10 @@ import argparse
import logging import logging
import sys import sys
from . import (__version__, cfg, frontpage, glib, log, menu, module_loader, from . import __version__
setup, utils, web_framework, web_server) from . import app as app_module
from . import (cfg, frontpage, glib, log, menu, module_loader, setup, utils,
web_framework, web_server)
if utils.is_axes_old(): if utils.is_axes_old():
import axes import axes
@ -37,8 +39,8 @@ def parse_arguments():
help='run setup tasks without installing packages and exit') help='run setup tasks without installing packages and exit')
parser.add_argument('--list-dependencies', default=False, nargs='*', parser.add_argument('--list-dependencies', default=False, nargs='*',
help='list package dependencies for essential modules') help='list package dependencies for essential modules')
parser.add_argument('--list-modules', default=False, nargs='*', parser.add_argument('--list-apps', default=False, nargs='*',
help='list modules') help='list apps')
return parser.parse_args() return parser.parse_args()
@ -69,15 +71,18 @@ def list_dependencies(module_list):
sys.exit(error_code) sys.exit(error_code)
def list_modules(modules_type): def list_apps(apps_type):
"""List all/essential/optional modules and exit.""" """List all/essential/optional apps and exit."""
for module_name, module in module_loader.loaded_modules.items(): for app in app_module.App.list():
is_essential = module.app.info.is_essential is_essential = app.info.is_essential
if 'essential' in modules_type and not is_essential: if 'essential' in apps_type and not is_essential:
continue continue
elif 'optional' in modules_type and is_essential:
if 'optional' in apps_type and is_essential:
continue continue
print('{module_name}'.format(module_name=module_name))
print(f'{app.app_id}')
sys.exit() sys.exit()
@ -112,6 +117,12 @@ def main():
module_loader.apps_init() module_loader.apps_init()
list_dependencies(arguments.list_dependencies) list_dependencies(arguments.list_dependencies)
if arguments.list_apps is not False:
log.default_level = 'ERROR'
module_loader.load_modules()
app_module.apps_init()
list_apps(arguments.list_apps)
log.init() log.init()
web_framework.init() web_framework.init()
@ -137,9 +148,6 @@ def main():
if arguments.setup_no_install is not False: if arguments.setup_no_install is not False:
run_setup_and_exit(arguments.setup_no_install, allow_install=False) run_setup_and_exit(arguments.setup_no_install, allow_install=False)
if arguments.list_modules is not False:
list_modules(arguments.list_modules)
setup.run_setup_in_background() setup.run_setup_in_background()
glib.run() glib.run()