Campaign to Save the CLI

cli.py

@@ -0,0 +1,201 @@
+# import logging
+import queue
+import threading
+
+import config
+import control
+import installer
+import logos
+# import msg
+import wine
+import utils
+
+
+class CLI:
+    def __init__(self):
+        config.DIALOG = "cli"
+        self.running = True
+        self.choice_q = queue.Queue()
+        self.input_q = queue.Queue()
+        self.input_event = threading.Event()
+        self.choice_event = threading.Event()
+        self.logos = logos.LogosManager(app=self)
+
+    def backup(self):
+        control.backup()
+
+    def edit_config(self):
+        control.edit_config()
+
+    def get_winetricks(self):
+        control.set_winetricks()
+
+    def install_app(self):
+        self.thread = utils.start_thread(
+            installer.ensure_launcher_shortcuts,
+            app=self
+        )
+        self.user_input_processor()
+
+    def install_d3d_compiler(self):
+        wine.install_d3d_compiler()
+
+    def install_dependencies(self):
+        utils.check_dependencies()
+
+    def install_fonts(self):
+        wine.install_fonts()
+
+    def install_icu(self):
+        wine.install_icu_data_files()
+
+    def remove_index_files(self):
+        control.remove_all_index_files()
+
+    def remove_install_dir(self):
+        control.remove_install_dir()
+
+    def remove_library_catalog(self):
+        control.remove_library_catalog()
+
+    def restore(self):
+        control.restore()
+
+    def run_indexing(self):
+        self.logos.index()
+
+    def run_installed_app(self):
+        self.logos.start()
+
+    def run_winetricks(self):
+        wine.run_winetricks()
+
+    def set_appimage(self):
+        utils.set_appimage_symlink(app=self)
+
+    def stop(self):
+        self.running = False
+
+    def toggle_app_logging(self):
+        self.logos.switch_logging()
+
+    def update_latest_appimage(self):
+        utils.update_to_latest_recommended_appimage()
+
+    def update_self(self):
+        utils.update_to_latest_lli_release()
+
+    def user_input_processor(self, evt=None):
+        while self.running:
+            prompt = None
+            question = None
+            options = None
+            choice = None
+            # Wait for next input queue item.
+            self.input_event.wait()
+            self.input_event.clear()
+            prompt = self.input_q.get()
+            if prompt is None:
+                return
+            if prompt is not None and isinstance(prompt, tuple):
+                question = prompt[0]
+                options = prompt[1]
+            if question is not None and options is not None:
+                # Convert options list to string.
+                default = options[0]
+                options[0] = f"{options[0]} [default]"
+                optstr = ', '.join(options)
+                choice = input(f"{question}: {optstr}: ")
+                if len(choice) == 0:
+                    choice = default
+            if choice is not None and choice.lower() == 'exit':
+                self.running = False
+            if choice is not None:
+                self.choice_q.put(choice)
+                self.choice_event.set()
+
+
+# NOTE: These subcommands are outside the CLI class so that the class can be
+# instantiated at the moment the subcommand is run. This lets any CLI-specific
+# code get executed along with the subcommand.
+def backup():
+    CLI().backup()
+
+
+def create_shortcuts():
+    # TODO: This takes surprisingly long because it walks through all the
+    # installer steps to confirm everything up to the shortcuts. Can this be
+    # shortcutted?
+    CLI().install_app()
+
+
+def edit_config():
+    CLI().edit_config()
+
+
+def get_winetricks():
+    CLI().get_winetricks()
+
+
+def install_app():
+    CLI().install_app()
+
+
+def install_d3d_compiler():
+    CLI().install_d3d_compiler()
+
+
+def install_dependencies():
+    CLI().install_dependencies()
+
+
+def install_fonts():
+    CLI().install_fonts()
+
+
+def install_icu():
+    CLI().install_icu()
+
+
+def remove_index_files():
+    CLI().remove_index_files()
+
+
+def remove_install_dir():
+    CLI().remove_install_dir()
+
+
+def remove_library_catalog():
+    CLI().remove_library_catalog()
+
+
+def restore():
+    CLI().restore()
+
+
+def run_indexing():
+    CLI().run_indexing()
+
+
+def run_installed_app():
+    CLI().run_installed_app()
+
+
+def run_winetricks():
+    CLI().run_winetricks()
+
+
+def set_appimage():
+    CLI().set_appimage()
+
+
+def toggle_app_logging():
+    CLI().toggle_app_logging()
+
+
+def update_latest_appimage():
+    CLI().update_latest_appimage()
+
+
+def update_self():
+    CLI().update_self()

control.py

@@ -211,6 +211,7 @@ def copy_data(src_dirs, dst_dir):
 
 def remove_install_dir():
     folder = Path(config.INSTALLDIR)
+    # FIXME: msg.cli_question needs additional arg
     if (
         folder.is_dir()
         and msg.cli_question(f"Delete \"{folder}\" and all its contents?")

gui_app.py

@@ -759,7 +759,8 @@ def set_appimage(self, evt=None):
         appimage_filename = self.open_file_dialog("AppImage", "AppImage")
         if not appimage_filename:
             return
-        config.SELECTED_APPIMAGE_FILENAME = appimage_filename
+        # config.SELECTED_APPIMAGE_FILENAME = appimage_filename
+        config.APPIMAGE_FILE_PATH = appimage_filename
         utils.start_thread(utils.set_appimage_symlink, app=self)
 
     def get_winetricks(self, evt=None):