From 60f581319f99afbd678b4f5f56193d588228cbe2 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 7 Jul 2020 23:56:17 +0000 Subject: Added pythons -m module support. __main__.py is the main module entry path, and setup.py now includes the examples (which as been renamed for more convenient module importing) which - enables __main__.py to locate the examples and import them via importlib and execute them. --- archinstall/__init__.py | 5 +---- archinstall/__main__.py | 29 +++++++++++++++++++++++++++++ archinstall/lib/general.py | 1 + 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 archinstall/__main__.py (limited to 'archinstall') diff --git a/archinstall/__init__.py b/archinstall/__init__.py index a9eeb6b5..9cf7faec 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -4,7 +4,4 @@ from .lib.user_interaction import * from .lib.exceptions import * from .lib.installer import * from .lib.profiles import * -from .lib.luks import * - -if __name__ == '__main__': - print('Launching as a module?') \ No newline at end of file +from .lib.luks import * \ No newline at end of file diff --git a/archinstall/__main__.py b/archinstall/__main__.py new file mode 100644 index 00000000..bd657291 --- /dev/null +++ b/archinstall/__main__.py @@ -0,0 +1,29 @@ +import archinstall, sys, os, glob +import importlib.util + +class ProfileNotFound(BaseException): + pass + +# TODO: Learn the dark arts of argparse... +# (I summon thee dark spawn of cPython) + +def find_examples(): + cwd = os.path.abspath(f'{os.path.dirname(__file__)}/../') + examples = f"{cwd}/examples" + + return {os.path.basename(path): path for path in glob.glob(f'{examples}/*.py')} + + +if __name__ == '__main__': + if len(sys.argv) == 1: sys.arv.append('guided') + + profile = sys.argv[1] + library = find_examples() + + if not f'{profile}.py' in library: + raise ProfileNotFound(f'Could not locate {profile}.py among the example files.') + + spec = importlib.util.spec_from_file_location(library[f'{profile}.py'], library[f'{profile}.py']) + imported_path = importlib.util.module_from_spec(spec) + spec.loader.exec_module(imported_path) + sys.modules[library[f'{profile}.py']] = imported_path \ No newline at end of file diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py index 31f81413..b0de39a7 100644 --- a/archinstall/lib/general.py +++ b/archinstall/lib/general.py @@ -2,6 +2,7 @@ import os, json, hashlib, shlex, sys import time, pty from subprocess import Popen, STDOUT, PIPE, check_output from select import epoll, EPOLLIN, EPOLLHUP +from .exceptions import * def log(*args, **kwargs): string = ' '.join([str(x) for x in args]) -- cgit v1.2.3-70-g09d2