Add support for Logos v39+ (#263)

via an mst to modify the msi at runtime allowing it to fail to install the LogosStub.MSIX but continue installation. LogosStub is not needed (it was just used for URL redirection on windows).

Author: jg00dman

ou_dedetai.spec

@@ -6,7 +6,7 @@ a = Analysis(
     pathex=[],
     #binaries=[('/usr/bin/tclsh8.6', '.')],
     binaries=[],
-    datas=[('ou_dedetai/img/*icon.png', 'ou_dedetai/img')],
+    datas=[('ou_dedetai/img/*icon.png', 'ou_dedetai/img'),('ou_dedetai/assets/LogosStubFailOK.mst', 'assets')],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},

ou_dedetai/assets/LogosStubFailOK.mst

@@ -1,10 +1,23 @@
 import logging
 import os
+import sys
+
 from pathlib import Path
 
 # This is relative to this file itself
 APP_IMAGE_DIR = Path(__file__).parent / "img"
 
+# Are we running from binary or src?
+if getattr(sys, 'frozen', False):
+    # We are running inside a PyInstaller bundle
+    BUNDLE_DIR = Path(sys._MEIPASS)
+else:
+    # We are running in normal development mode
+    BUNDLE_DIR = Path(__file__).resolve().parent
+
+# Now define an assets directory that works in both modes:
+APP_ASSETS_DIR = BUNDLE_DIR / 'assets'
+
 # Define app name variables.
 APP_NAME = 'Ou Dedetai'
 BINARY_NAME = 'oudedetai'

ou_dedetai/constants.py

@@ -184,6 +184,7 @@ def ensure_product_installer_download(app: App):
     logging.debug(f"> '{downloaded_file}' exists?: {Path(downloaded_file).is_file()}")  # noqa: E501
 
 
+
 def ensure_wineprefix_init(app: App):
     app.installer_step_count += 1
     ensure_product_installer_download(app=app)
@@ -292,6 +293,14 @@ def ensure_product_installed(app: App):
     app.conf._installed_faithlife_product_release = None
 
     # Clean up temp files, etc.
+    mst_destination = Path(app.conf.install_dir) / "data/wine64_bottle/drive_c/LogosStubFailOK.mst"
+    if mst_destination and mst_destination.is_file():
+        try:
+            mst_destination.unlink()
+            logging.debug(f"Deleted MST file: {mst_destination}")
+        except Exception as e:
+            logging.warning(f"Could not delete MST file: {e}")
+            
     utils.clean_all()
 
     logging.debug(f"> {app.conf.logos_exe=}")

ou_dedetai/installer.py

@@ -568,12 +568,12 @@ def _get_faithlife_product_releases(
         # if len(releases) == 5:
         #    break
 
-    # Logos 39+ doesn't install
-    filtered_releases = utils.filter_versions(releases, 39, 1)
-    logging.debug(f"Available releases: {', '.join(releases)}")
-    logging.debug(f"Filtered releases: {', '.join(filtered_releases)}")
+    #Filtering not needed at the moment but left here in case we want it later.
+    #filtered_releases = utils.filter_versions(releases, 40, 1)
+    #logging.debug(f"Available releases: {', '.join(releases)}")
+    #logging.debug(f"Filtered releases: {', '.join(filtered_releases)}")
 
-    return filtered_releases
+    return releases
 
 
 def update_lli_binary(app: App):

ou_dedetai/network.py

@@ -9,6 +9,7 @@
 import tempfile
 from typing import Optional
 
+from ou_dedetai import constants
 from ou_dedetai.app import App
 
 from . import network
@@ -271,13 +272,35 @@ def disable_winemenubuilder(app: App, wine64_binary: str):
 
 def install_msi(app: App):
     app.status(f"Running MSI installer: {app.conf.faithlife_installer_name}.")
-    # Execute the .MSI
+    # Define the Wine executable and initial arguments for msiexec
     wine_exe = app.conf.wine64_binary
-    exe_args = ["/i", f"{app.conf.install_dir}/data/{app.conf.faithlife_installer_name}"] #noqa: E501
+    exe_args = ["/i", f"{app.conf.install_dir}/data/{app.conf.faithlife_installer_name}"]  # noqa: E501
+
+    # Add passive mode if specified
     if app.conf._overrides.faithlife_install_passive is True:
-        exe_args.append('/passive')
+        exe_args.append("/passive")
+
+    # Add MST transform if needed
+    release_version = app.conf.installed_faithlife_product_release or app.conf.faithlife_product_version  # noqa: E501
+    if release_version is not None and utils.check_logos_release_version(release_version, 39, 1):
+        # Define source and destination for the MST file
+        mst_source = constants.APP_ASSETS_DIR / "LogosStubFailOK.mst"
+        mst_destination = Path(app.conf.install_dir) / "data/wine64_bottle/drive_c/LogosStubFailOK.mst"
+        
+        # Copy the MST file if it doesn't already exist
+        if not mst_destination.is_file():
+            shutil.copy(mst_source, mst_destination)
+        logging.debug(f"MST present: {mst_destination.is_file()}")
+
+        # Hard-code the Windows path for the MST file
+        transform_winpath = r"C:\LogosStubFailOK.mst"
+        exe_args.append(f'TRANSFORMS="{transform_winpath}"')
+        logging.debug(f"Hard-coded TRANSFORMS path added: {transform_winpath}")
+
+    # Log the msiexec command and run the process
     logging.info(f"Running: {wine_exe} msiexec {' '.join(exe_args)}")
     process = run_wine_proc(wine_exe, app, exe="msiexec", exe_args=exe_args)
+            
     return process