From a60a3ca812619ace82993272233b9783cf4bc4fe Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 10:46:28 +0200 Subject: Added profile `desktop.py` which helps users select a desktop environment. Also added `archinstall.generic_select` to help with selecting generic things from a list of options. --- archinstall/lib/user_interaction.py | 28 ++++++++++++++++++++++++++++ profiles/dekstop.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 profiles/dekstop.py diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index 23141fa9..e5ca01d3 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -5,6 +5,34 @@ from .locale_helpers import search_keyboard_layout ## TODO: Some inconsistencies between the selection processes. ## Some return the keys from the options, some the values? +def generic_select(options, input_text="Select one of the above by index or absolute value: ", sort=True): + """ + A generic select function that does not output anything + other than the options and their indexs. As an example: + + generic_select(["first", "second", "third option"]) + 1: first + 2: second + 3: third option + """ + + if type(options) == dict: options = list(options) + if sort: options = sorted(list(options)) + if len(options) <= 0: raise RequirementError('generic_select() requires at least one option to operate.') + + for index, option in enumerate(options): + print(f"{index}: {option}") + + selected_option = input(input_text) + if selected_option.isdigit(): + selected_option = dict_o_disks[int(selected_option)-1] + elif selected_option in dict_o_disks: + pass # We gave a correct absolute value + else: + raise RequirementError(f'Selected option "{selected_option}" does not exist in available options: {options}') + + return selected_option + def select_disk(dict_o_disks): """ Asks the user to select a harddrive from the `dict_o_disks` selection. diff --git a/profiles/dekstop.py b/profiles/dekstop.py new file mode 100644 index 00000000..d9e88eb1 --- /dev/null +++ b/profiles/dekstop.py @@ -0,0 +1,32 @@ +# A desktop environment selector. + +import archinstall, os + +def _prep_function(*args, **kwargs): + """ + Magic function called by the importing installer + before continuing any further. It also avoids executing any + other code in this stage. So it's a safe way to ask the user + for more input before any other installer steps start. + """ + + supported_desktops = ['gnome', 'kde', 'awesome'] + dektop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') + + profile = archinstall.Profile(None, dektop) + # Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered. + with profile.load_instructions(namespace=f"{dektop}.py") as imported: + if hasattr(imported, '_prep_function'): + return imported._prep_function() + else: + print(f"Deprecated (??): {dektop} profile has no _prep_function() anymore") + +if __name__ == 'desktop': + print('The desktop.py profile should never be executed as a stand-alone.') + + """ + This "profile" is a meta-profile. + It will not return itself, there for this __name__ will never + be executed. Instead, whatever profile was selected will have + it's handle returned and that __name__ will be executed later on. + """ \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 90eff266576a5fc2fe9f690e835c876aa405fe6d Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 11:58:29 +0200 Subject: Reverted TTS implementation from 35913c4. Since blind people use screen readers for this functionality. Will have a look at http://www.linux-sppeakup.org/. --- archinstall/__init__.py | 1 - archinstall/lib/output.py | 6 +----- archinstall/lib/tts.py | 36 ------------------------------------ 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 archinstall/lib/tts.py diff --git a/archinstall/__init__.py b/archinstall/__init__.py index 8bce8047..ad4220f2 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -11,4 +11,3 @@ from .lib.locale_helpers import * from .lib.services import * from .lib.packages import * from .lib.output import * -from .lib.tss import * \ No newline at end of file diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index a2711f54..d1b418d9 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -1,5 +1,4 @@ import sys -from .tts import TTS # Found first reference here: https://stackoverflow.com/questions/7445658/how-to-detect-if-the-console-does-support-ansi-escape-codes-in-python # And re-used this: https://github.com/django/django/blob/master/django/core/management/color.py#L12 @@ -44,7 +43,4 @@ def log(*args, **kwargs): kwargs = {'bg' : 'black', 'fg': 'white', **kwargs} string = stylize_output(string, **kwargs) - print(string) - with TTS() as tts_instance: - if tts_instance.is_available: - tts_instance.speak(string.replace('-', '').strip().lstrip()) + print(string) \ No newline at end of file diff --git a/archinstall/lib/tts.py b/archinstall/lib/tts.py deleted file mode 100644 index d94fbf1e..00000000 --- a/archinstall/lib/tts.py +++ /dev/null @@ -1,36 +0,0 @@ -class TTS(): - def __init__(self): - try: - import pyttsx3 - self._available = True - except: - self._available = False - - @property - def available(self): - return self._available - @property - def is_available(self): - return self._available - - @property - def volume(self): - return self.engine.getProperty('volume') - - @volume.setter - def volume(self, percentage): - self.engine.setProperty('volume', percentage/100) - return self.volume - - - def speak(self, phrase): - if self.available: - self.engine.say("I will speak this text") - engine.runAndWait() - - def __enter__(self): - self.engine = pyttsx3.init() - return self - - def __exit__(self, *args, **kwargs): - self.engine.stop() \ No newline at end of file -- cgit v1.2.3-54-g00ecf From ec49a42f2bdd0917c7a0c5a3c2e224d49f554359 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 12:04:27 +0200 Subject: Wrong variable name (from a copy paste issue) --- archinstall/lib/user_interaction.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index e5ca01d3..0e3c2e64 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -25,8 +25,8 @@ def generic_select(options, input_text="Select one of the above by index or abso selected_option = input(input_text) if selected_option.isdigit(): - selected_option = dict_o_disks[int(selected_option)-1] - elif selected_option in dict_o_disks: + selected_option = options[int(selected_option)-1] + elif selected_option in options: pass # We gave a correct absolute value else: raise RequirementError(f'Selected option "{selected_option}" does not exist in available options: {options}') -- cgit v1.2.3-54-g00ecf From a73f0b0135f484079f88b9a242bf3b3c5bb1dda4 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 12:28:12 +0200 Subject: Added a session-storag. This is in an attempt to build away some magic functionality that might otherwise be hard to understand/maintain over a long period of time. Using this in profiles/desktop.py as a test. --- archinstall/__init__.py | 1 + archinstall/lib/storage.py | 1 + profiles/dekstop.py | 25 +++++++++++++++++++------ 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 archinstall/lib/storage.py diff --git a/archinstall/__init__.py b/archinstall/__init__.py index ad4220f2..a05b8e95 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -11,3 +11,4 @@ from .lib.locale_helpers import * from .lib.services import * from .lib.packages import * from .lib.output import * +from .lib.storage import * \ No newline at end of file diff --git a/archinstall/lib/storage.py b/archinstall/lib/storage.py new file mode 100644 index 00000000..2c621f83 --- /dev/null +++ b/archinstall/lib/storage.py @@ -0,0 +1 @@ +storage = {} \ No newline at end of file diff --git a/profiles/dekstop.py b/profiles/dekstop.py index d9e88eb1..e2d83169 100644 --- a/profiles/dekstop.py +++ b/profiles/dekstop.py @@ -13,6 +13,11 @@ def _prep_function(*args, **kwargs): supported_desktops = ['gnome', 'kde', 'awesome'] dektop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') + # Temporarly store the selected desktop profile + # in a session-safe location, since this module will get re-loaded + # the next time it gets executed. + archinstall.storage['_desktop_profile'] = desktop + profile = archinstall.Profile(None, dektop) # Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered. with profile.load_instructions(namespace=f"{dektop}.py") as imported: @@ -22,11 +27,19 @@ def _prep_function(*args, **kwargs): print(f"Deprecated (??): {dektop} profile has no _prep_function() anymore") if __name__ == 'desktop': - print('The desktop.py profile should never be executed as a stand-alone.') - """ This "profile" is a meta-profile. - It will not return itself, there for this __name__ will never - be executed. Instead, whatever profile was selected will have - it's handle returned and that __name__ will be executed later on. - """ \ No newline at end of file + There are no specific desktop-steps, it simply routes + the installer to whichever desktop environment/window manager was chosen. + + Maybe in the future, a network manager or similar things *could* be added here. + We should honor that Arch Linux does not officially endorse a desktop-setup, nor is + it trying to be a turn-key desktop distribution. + + There are plenty of desktop-turn-key-solutions based on Arch Linux, + this is therefor just a helper to get started + """ + + # TODO: Remove magic variable 'installation' and place it + # in archinstall.storage or archinstall.session/archinstall.installation + installation.install_profile(archinstall.storage['_desktop_profile']) \ No newline at end of file -- cgit v1.2.3-54-g00ecf From c6eb0386db861a2e02ea3c63094721f30ee74b01 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 12:31:39 +0200 Subject: Spelling error on a variable --- profiles/dekstop.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/dekstop.py b/profiles/dekstop.py index e2d83169..35a31c43 100644 --- a/profiles/dekstop.py +++ b/profiles/dekstop.py @@ -11,20 +11,20 @@ def _prep_function(*args, **kwargs): """ supported_desktops = ['gnome', 'kde', 'awesome'] - dektop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') + desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') # Temporarly store the selected desktop profile # in a session-safe location, since this module will get re-loaded # the next time it gets executed. archinstall.storage['_desktop_profile'] = desktop - profile = archinstall.Profile(None, dektop) + profile = archinstall.Profile(None, desktop) # Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered. - with profile.load_instructions(namespace=f"{dektop}.py") as imported: + with profile.load_instructions(namespace=f"{desktop}.py") as imported: if hasattr(imported, '_prep_function'): return imported._prep_function() else: - print(f"Deprecated (??): {dektop} profile has no _prep_function() anymore") + print(f"Deprecated (??): {desktop} profile has no _prep_function() anymore") if __name__ == 'desktop': """ -- cgit v1.2.3-54-g00ecf From 36868425877249d9bfd9664e617a6b7d8df81e1c Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 12:45:10 +0200 Subject: Spelling error on file --- profiles/dekstop.py | 45 --------------------------------------------- profiles/desktop.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 profiles/dekstop.py create mode 100644 profiles/desktop.py diff --git a/profiles/dekstop.py b/profiles/dekstop.py deleted file mode 100644 index 35a31c43..00000000 --- a/profiles/dekstop.py +++ /dev/null @@ -1,45 +0,0 @@ -# A desktop environment selector. - -import archinstall, os - -def _prep_function(*args, **kwargs): - """ - Magic function called by the importing installer - before continuing any further. It also avoids executing any - other code in this stage. So it's a safe way to ask the user - for more input before any other installer steps start. - """ - - supported_desktops = ['gnome', 'kde', 'awesome'] - desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') - - # Temporarly store the selected desktop profile - # in a session-safe location, since this module will get re-loaded - # the next time it gets executed. - archinstall.storage['_desktop_profile'] = desktop - - profile = archinstall.Profile(None, desktop) - # Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered. - with profile.load_instructions(namespace=f"{desktop}.py") as imported: - if hasattr(imported, '_prep_function'): - return imported._prep_function() - else: - print(f"Deprecated (??): {desktop} profile has no _prep_function() anymore") - -if __name__ == 'desktop': - """ - This "profile" is a meta-profile. - There are no specific desktop-steps, it simply routes - the installer to whichever desktop environment/window manager was chosen. - - Maybe in the future, a network manager or similar things *could* be added here. - We should honor that Arch Linux does not officially endorse a desktop-setup, nor is - it trying to be a turn-key desktop distribution. - - There are plenty of desktop-turn-key-solutions based on Arch Linux, - this is therefor just a helper to get started - """ - - # TODO: Remove magic variable 'installation' and place it - # in archinstall.storage or archinstall.session/archinstall.installation - installation.install_profile(archinstall.storage['_desktop_profile']) \ No newline at end of file diff --git a/profiles/desktop.py b/profiles/desktop.py new file mode 100644 index 00000000..35a31c43 --- /dev/null +++ b/profiles/desktop.py @@ -0,0 +1,45 @@ +# A desktop environment selector. + +import archinstall, os + +def _prep_function(*args, **kwargs): + """ + Magic function called by the importing installer + before continuing any further. It also avoids executing any + other code in this stage. So it's a safe way to ask the user + for more input before any other installer steps start. + """ + + supported_desktops = ['gnome', 'kde', 'awesome'] + desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ') + + # Temporarly store the selected desktop profile + # in a session-safe location, since this module will get re-loaded + # the next time it gets executed. + archinstall.storage['_desktop_profile'] = desktop + + profile = archinstall.Profile(None, desktop) + # Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered. + with profile.load_instructions(namespace=f"{desktop}.py") as imported: + if hasattr(imported, '_prep_function'): + return imported._prep_function() + else: + print(f"Deprecated (??): {desktop} profile has no _prep_function() anymore") + +if __name__ == 'desktop': + """ + This "profile" is a meta-profile. + There are no specific desktop-steps, it simply routes + the installer to whichever desktop environment/window manager was chosen. + + Maybe in the future, a network manager or similar things *could* be added here. + We should honor that Arch Linux does not officially endorse a desktop-setup, nor is + it trying to be a turn-key desktop distribution. + + There are plenty of desktop-turn-key-solutions based on Arch Linux, + this is therefor just a helper to get started + """ + + # TODO: Remove magic variable 'installation' and place it + # in archinstall.storage or archinstall.session/archinstall.installation + installation.install_profile(archinstall.storage['_desktop_profile']) \ No newline at end of file -- cgit v1.2.3-54-g00ecf From d95b9156817353436900b09d393c06dd05d46a9f Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 12:51:33 +0200 Subject: Logical issue with how I'm used to dealing with selecting list indexes. --- archinstall/lib/user_interaction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index 0e3c2e64..e01859b3 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -25,7 +25,7 @@ def generic_select(options, input_text="Select one of the above by index or abso selected_option = input(input_text) if selected_option.isdigit(): - selected_option = options[int(selected_option)-1] + selected_option = options[int(selected_option)] elif selected_option in options: pass # We gave a correct absolute value else: -- cgit v1.2.3-54-g00ecf