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

Tweaking Profile() to use Script() as a handler for any given path.

This commit is contained in:
Anton Hvornum 2020-11-29 20:52:59 +00:00
parent 817465b8fb
commit b60b173a91
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
archinstall/lib/profiles.py
View File

@ -90,12 +90,13 @@ class Script():
def localize_path(profile_path): def localize_path(profile_path):
if (url := urllib.parse.urlparse(profile_path)).scheme and url.scheme in ('https', 'http'): if (url := urllib.parse.urlparse(profile_path)).scheme and url.scheme in ('https', 'http'):
temp_file_path = f"/tmp/{self.profile}_{hashlib.md5(os.urandom(12)).hexdigest()}.py" if not self.converted_path:
self.converted_path = f"/tmp/{self.profile}_{hashlib.md5(os.urandom(12)).hexdigest()}.py"
with open(temp_file_path, "w") as temp_file: with open(self.converted_path, "w") as temp_file:
temp_file.write(urllib.request.urlopen(url).read().decode('utf-8')) temp_file.write(urllib.request.urlopen(url).read().decode('utf-8'))
return temp_file_path return self.converted_path
else: else:
return profile_path return profile_path
@ -130,40 +131,22 @@ class Script():
spec.loader.exec_module(imported_path) spec.loader.exec_module(imported_path)
sys.modules["tempscript"] = imported_path sys.modules["tempscript"] = imported_path
class Profile(): class Profile():
def __init__(self, installer, path, args={}): def __init__(self, installer, path, args={}):
self._path = path self._path = Script(path)
self.installer = installer self.installer = installer
self._cache = None self._cache = None
self.args = args self.args = args
def __dump__(self, *args, **kwargs): def __dump__(self, *args, **kwargs):
return {'path' : self._path} return {'path' : self.path}
def __repr__(self, *args, **kwargs): def __repr__(self, *args, **kwargs):
return f'Profile({self._path} <"{self.path}">)' return f'Profile({self.path})'
@property @property
def path(self, *args, **kwargs): def path(self, *args, **kwargs):
if os.path.isfile(f'{self._path}'): self._path.path
return os.path.abspath(f'{self._path}')
for path in ['./profiles', '/etc/archinstall', '/etc/archinstall/profiles', os.path.abspath(f'{os.path.dirname(__file__)}/../profiles')]: # Step out of /lib
if os.path.isfile(f'{path}/{self._path}.py'):
return os.path.abspath(f'{path}/{self._path}.py')
try:
if (cache := grab_url_data(f'{storage["UPSTREAM_URL"]}/{self._path}.py')):
self._cache = cache
return f'{storage["UPSTREAM_URL"]}/{self._path}.py'
except urllib.error.HTTPError:
pass
return None
# def py_exec_mock(self):
# spec.loader.exec_module(imported)
def load_instructions(self, namespace=None): def load_instructions(self, namespace=None):
if (absolute_path := self.path): if (absolute_path := self.path):