RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Making list_examples() results cached 

This to lock in found modules, in case paths dissapear during runtime.
This commit is contained in:
Anton Hvornum 2020-12-06 17:12:12 +01:00
parent a0c9e58c82
commit 22e1271a0b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archinstall/__main__.py
View File

@ -13,7 +13,6 @@ def run_as_a_module():
""" """
# Add another path for finding profiles, so that list_profiles() in Script() can find guided.py, unattended.py etc. # Add another path for finding profiles, so that list_profiles() in Script() can find guided.py, unattended.py etc.
print('ID in module:', id(archinstall.storage), archinstall.storage)
archinstall.storage['PROFILE_PATH'].append(os.path.abspath(f'{os.path.dirname(__file__)}/examples')) archinstall.storage['PROFILE_PATH'].append(os.path.abspath(f'{os.path.dirname(__file__)}/examples'))
if len(sys.argv) == 1: if len(sys.argv) == 1:

16
archinstall/lib/profiles.py
View File

@ -22,7 +22,6 @@ def list_profiles(filter_irrelevant_macs=True, subpath=''):
cache = {} cache = {}
# Grab all local profiles found in PROFILE_PATH # Grab all local profiles found in PROFILE_PATH
print('ID in profiles:', id(storage), storage)
for PATH_ITEM in storage['PROFILE_PATH']: for PATH_ITEM in storage['PROFILE_PATH']:
for root, folders, files in os.walk(os.path.abspath(os.path.expanduser(PATH_ITEM+subpath))): for root, folders, files in os.walk(os.path.abspath(os.path.expanduser(PATH_ITEM+subpath))):
for file in files: for file in files:
@ -75,6 +74,7 @@ class Script():
self.installer = installer self.installer = installer
self.converted_path = None self.converted_path = None
self.spec = None self.spec = None
self.examples = None
self.namespace = os.path.splitext(os.path.basename(self.path))[0] self.namespace = os.path.splitext(os.path.basename(self.path))[0]
def __enter__(self, *args, **kwargs): def __enter__(self, *args, **kwargs):
@ -105,13 +105,14 @@ class Script():
# The Profile was not a direct match on a remote URL # The Profile was not a direct match on a remote URL
if not parsed_url.scheme: if not parsed_url.scheme:
# Try to locate all local or known URL's # Try to locate all local or known URL's
examples = list_profiles() if not self.examples:
self.examples = list_profiles()
if f"{self.profile}" in examples: if f"{self.profile}" in self.examples:
return self.localize_path(examples[self.profile]['path']) return self.localize_path(self.examples[self.profile]['path'])
# TODO: Redundant, the below block shouldnt be needed as profiles are stripped of their .py, but just in case for now: # TODO: Redundant, the below block shouldnt be needed as profiles are stripped of their .py, but just in case for now:
elif f"{self.profile}.py" in examples: elif f"{self.profile}.py" in self.examples:
return self.localize_path(examples[f"{self.profile}.py"]['path']) return self.localize_path(self.examples[f"{self.profile}.py"]['path'])
# Path was not found in any known examples, check if it's an abolute path # Path was not found in any known examples, check if it's an abolute path
if os.path.isfile(self.profile): if os.path.isfile(self.profile):
@ -167,7 +168,8 @@ class Application(Profile):
# The Profile was not a direct match on a remote URL # The Profile was not a direct match on a remote URL
if not parsed_url.scheme: if not parsed_url.scheme:
# Try to locate all local or known URL's # Try to locate all local or known URL's
examples = list_profiles(subpath='/applications') if not self.examples:
self.examples = list_profiles(subpath='/applications')
if f"{self.profile}" in examples: if f"{self.profile}" in examples:
return self.localize_path(examples[self.profile]['path']) return self.localize_path(examples[self.profile]['path'])