fix: integration bugs

remove non-linux browsers
fix applications path
handle case where the wine binary is stored as the path rather than the sigil

Tested:
- debian 12 snap firefox
- install correctly switch to -devel
- (install failed due to a fuse issue, unrelated)

- debian 12 flatpak firefox
- install correctly switch to -devel
- (installed failed due to running out of space in VM)

- debian 13 Dooble correctly switched to -devel
- aborted install once text was obsered

- debian 13 Opera correctly switched to -devel
- aborted install once text was obsered

- debian 13 Chromium correctly switched to -devel
- aborted install once text was obsered

- debian 13 Qutebrowser correctly switched to -devel
- aborted install once text was obsered

- debian 13 Vivaldi correctly switched to -devel
- aborted install once text was obsered

- debian 13 Brave correctly switched to -devel
- aborted install once text was obsered

- debian 13 Falkon correctly switched to -devel
- aborted install once text was obsered

- debian 13 Google Chrome correctly switched to -devel
- aborted install once text was obsered

- debian 12 Chromium correctly switched to -devel
- install success
- logged in
- got to the "Download your Logos Library page"

Author: ctrlaltf24

ou_dedetai/config.py

@@ -814,7 +814,7 @@ def install_dir(self, value: Optional[str | Path]):
     def installer_binary_dir(self) -> str:
         if self._overrides.installer_binary_dir is not None:
             return self._overrides.installer_binary_dir
-        return f"{self.install_dir}/data/bin"
+        return f"{self.install_dir}/{constants.RELATIVE_BINARY_DIR}"
 
     @property
     def _logos_appdata_dir(self) -> Optional[str]:
@@ -1061,6 +1061,17 @@ def wine_appimage_recommended_url(self) -> str:
         else:
             return versions.latest.download_url
 
+    @property
+    def wine_appimage_beta_url(self) -> Optional[str]:
+        """URL to beta appimage.
+        
+        Talks to the network if required"""
+        versions = self._network.wine_appimage_versions()
+        if versions.pre_release is None:
+            return None
+        else:
+            return versions.pre_release.download_url
+    
     @property
     def wine_appimage_beta_file_name(self) -> Optional[str]:
         """Returns the file name of the recommended appimage with extension"""

ou_dedetai/constants.py

@@ -72,6 +72,9 @@ def get_runmode() -> str:
 DEFAULT_APP_WINE_LOG_PATH = os.path.expanduser(f"{STATE_DIR}/wine.log")
 DEFAULT_APP_LOG_PATH = os.path.expanduser(f"{STATE_DIR}/{BINARY_NAME}.log")
 NETWORK_CACHE_PATH = f"{CACHE_DIR}/network.json"
+
+RELATIVE_BINARY_DIR = "data/bin"
+
 DEFAULT_WINEDEBUG = "err+all"
 LEGACY_CONFIG_FILES = [
     # If the user didn't have XDG_CONFIG_HOME set before, but now does.

ou_dedetai/installer.py

@@ -40,13 +40,46 @@ def ensure_choices(app: App):
 
     app.status("Install is running…")
 
+def ensure_install_dirs(app: App):
+    app.installer_step_count += 1
+    ensure_choices(app=app)
+    app.installer_step += 1
+    app.status("Ensuring installation directories…")
+    wine_dir = Path("")
+
+    bin_dir = Path(app.conf.installer_binary_dir)
+    bin_dir.mkdir(parents=True, exist_ok=True)
+    logging.debug(f"> {bin_dir} exists?: {bin_dir.is_dir()}")
+
+    logging.debug(f"> {app.conf.install_dir=}")
+    logging.debug(f"> {app.conf.installer_binary_dir=}")
+
+    wine_dir = Path(f"{app.conf.wine_prefix}")
+    wine_dir.mkdir(parents=True, exist_ok=True)
+
+    logging.debug(f"> {wine_dir} exists: {wine_dir.is_dir()}")
+    logging.debug(f"> {app.conf.wine_prefix=}")
+
+
+def ensure_sys_deps(app: App):
+    app.installer_step_count += 1
+    ensure_install_dirs(app=app)
+    app.installer_step += 1
+    app.status("Ensuring system dependencies are met…")
+
+    if not app.conf.skip_install_system_dependencies:
+        utils.install_dependencies(app)
+        logging.debug("> Done.")
+    else:
+        logging.debug("> Skipped.")
+
 
 def check_for_known_bugs(app: App):
     """Checks for any known bug conditions and recommends user action.
     This is a best-effort check
     """
     app.installer_step_count += 1
-    ensure_choices(app=app)
+    ensure_sys_deps(app=app)
     app.installer_step += 1
 
     # Begin workaround #435
@@ -66,43 +99,47 @@ def check_for_known_bugs(app: App):
         )
         if result:
             command_output: str = result.stdout
-            command_output = command_output.strip().lower()
+            desktop_file_name = command_output.strip()
+            command_output = desktop_file_name.lower()
 
             # Abbr. list from https://en.wikipedia.org/wiki/Chromium_(web_browser)#Browsers_based_on_Chromium
             # Known chromium based .desktops:
             # chromium_chromium.desktop - Debian Chromium (.deb and snap)
             # google-chrome and com.google.Chrome.desktop - Debian Google Chrome
             # brave-browser.desktop and com.brave.Browser.desktop - Debian Brave
             # vivaldi-stable.desktop - Debian Vivaldi
+            # dooble.desktop - Debian Dooble
+            # opera.desktop - Debian Opera
+            # org.qutebrowser.qutebrowser.desktop - Debian Qutebrowser
+            # org.kde.falkon.desktop - Debian Falkon
             if (
                "chromium" in command_output
                or "chrome" in command_output
                or "brave" in command_output
                or "vivaldi" in command_output
                or "dooble" in command_output
-               or "dooble" in command_output
                or "falkon" in command_output
-               or "otter" in command_output
                or "qutebrowser" in command_output
-               or "supermium" in command_output
-               or "ecosia" in command_output
-               or "edge" in command_output
                or "opera" in command_output
-               or "puffin" in command_output
             ):
                chromium_detected = True
 
             # Now check the .desktop's Exec line for either "flatpak" or "/snap/bin" if either are found, fail as well.
             xdg_data_dirs = os.getenv("XDG_DATA_DIRS", "/usr/local/share:/usr/share")
 
+            found: bool = False
+
             for xdg_data_dir in xdg_data_dirs.split(":"):
-                desktop_file_path = (Path(xdg_data_dir) / command_output)
+                desktop_file_path = (Path(xdg_data_dir) / "applications" / desktop_file_name)
                 if desktop_file_path.exists():
+                    found = True
                     lines = desktop_file_path.read_text().splitlines()
                     lines = list(filter(lambda line: line.lower().startswith("exec="), lines))
                     if any("/snap/bin" in line or "flatpak" in line for line in lines):
                         snap_or_flatpak_detected = True
-                break
+            
+            if not found:
+                logging.warning("Cannot find the desktop file in question")
     except subprocess.CalledProcessError as e:
         logging.warning(
             "Failed to check if chromium will be used - "
@@ -118,53 +155,22 @@ def check_for_known_bugs(app: App):
         if app.conf.wine_binary == constants.WINE_RECOMMENDED_SIGIL:
             logging.info("Switching user to the beta wine branch due to issue #435")
             app.conf.wine_binary = constants.WINE_BETA_SIGIL
+        elif app.conf.wine_binary == constants.WINE_BETA_SIGIL:
+            # No need to do anything
+            pass
         else:
             logging.warning("Sign In button may not launch the browser due to issue #435")
 
     # End workaround #435
 
 
-def ensure_install_dirs(app: App):
+def ensure_appimage_download(app: App):
     app.installer_step_count += 1
     try:
         check_for_known_bugs(app=app)
     except Exception:
         logging.exception("Failed to check for known bugs - assuming everything is fine and continuing install.")
     app.installer_step += 1
-    app.status("Ensuring installation directories…")
-    wine_dir = Path("")
-
-    bin_dir = Path(app.conf.installer_binary_dir)
-    bin_dir.mkdir(parents=True, exist_ok=True)
-    logging.debug(f"> {bin_dir} exists?: {bin_dir.is_dir()}")
-
-    logging.debug(f"> {app.conf.install_dir=}")
-    logging.debug(f"> {app.conf.installer_binary_dir=}")
-
-    wine_dir = Path(f"{app.conf.wine_prefix}")
-    wine_dir.mkdir(parents=True, exist_ok=True)
-
-    logging.debug(f"> {wine_dir} exists: {wine_dir.is_dir()}")
-    logging.debug(f"> {app.conf.wine_prefix=}")
-
-
-def ensure_sys_deps(app: App):
-    app.installer_step_count += 1
-    ensure_install_dirs(app=app)
-    app.installer_step += 1
-    app.status("Ensuring system dependencies are met…")
-
-    if not app.conf.skip_install_system_dependencies:
-        utils.install_dependencies(app)
-        logging.debug("> Done.")
-    else:
-        logging.debug("> Skipped.")
-
-
-def ensure_appimage_download(app: App):
-    app.installer_step_count += 1
-    ensure_sys_deps(app=app)
-    app.installer_step += 1
     if (
         app.conf.faithlife_product_version != '9' 
         and not str(app.conf.wine_binary).lower().endswith('appimage')
@@ -175,12 +181,29 @@ def ensure_appimage_download(app: App):
 
     downloaded_file = None
     appimage_path = app.conf.wine_appimage_recommended_file_name 
+    download_url = app.conf.wine_appimage_recommended_url
+
+    if (
+        app.conf.wine_binary == constants.WINE_BETA_SIGIL
+        or (
+            app.conf.wine_appimage_beta_file_name is not None 
+            # It was set to this manually.
+            and app.conf.wine_binary == f"{constants.RELATIVE_BINARY_DIR}/{app.conf.wine_appimage_beta_file_name}"
+        )
+    ):
+        if (
+            app.conf.wine_appimage_beta_file_name is not None
+            and app.conf.wine_appimage_beta_url is not None
+        ):
+            appimage_path = app.conf.wine_appimage_beta_file_name
+            download_url = app.conf.wine_appimage_beta_url
+
     filename = Path(appimage_path).name
     downloaded_file = utils.get_downloaded_file_path(app.conf.download_dir, filename)
     if not downloaded_file:
         downloaded_file = f"{app.conf.download_dir}/{filename}"
     network.logos_reuse_download(
-        app.conf.wine_appimage_recommended_url,
+        download_url,
         filename,
         app.conf.download_dir,
         app=app,