Merge branch 'recovery-environment'

* recovery-environment: (44 commits)
  Update metadata for new release
  Rationalize report initialization
  Rationalize setting font parameters and organize imports
  Move output directory field above the source field
  Fix warning
  Rewrite SysdiagnoseMethod to write logs as JSONL. Fixes #34
  Unified logs are collected manually in order to have more data. Fixes #23
  Formatting
  Clarified wording and removed reference to DMG format in the GUI
  Sysdiagnose produces a ZIP file now. Fixes #31
  Better description for recovery environment
  Better descriptions and new order for methods. Fixes #32
  Copy temporary DMG (move does not make sense)
  Encourage the user to acquire the Data volume on APFS - Fixes #33
  Clean up hyperlink code + bypass corner case (no space left on device)
  Fix browser for Intel-based macOS recovery
  Show timezone in acquisition date and time
  Adaptive link control to allow opening a website from the recovery environment
  Caffeinate the "moving DMG" phase
  Formatting
  ...

Author: Lazza

Fuji.spec

@@ -3,14 +3,17 @@
 import importlib
 import subprocess
 import sys
+from os import remove
 from pathlib import Path
-from shutil import copy, move
+from shutil import copy, copytree, move
+
+import dmgbuild
 
 sys.path.insert(0, ".")
 meta = importlib.import_module("meta")
 
 
-a = Analysis(
+a = Analysis( # type: ignore
     ["fuji.py"],
     pathex=[],
     binaries=[],
@@ -23,9 +26,9 @@ a = Analysis(
     noarchive=False,
     optimize=0,
 )
-pyz = PYZ(a.pure)
+pyz = PYZ(a.pure) # type: ignore
 
-exe = EXE(
+exe = EXE( # type: ignore
     pyz,
     a.scripts,
     [],
@@ -43,7 +46,7 @@ exe = EXE(
     entitlements_file=None,
     icon=["packaging/Fuji.icns"],
 )
-coll = COLLECT(
+coll = COLLECT( # type: ignore
     exe,
     a.binaries,
     a.datas,
@@ -52,24 +55,90 @@ coll = COLLECT(
     upx_exclude=[],
     name="Fuji",
 )
-app = BUNDLE(
+app = BUNDLE( # type: ignore
     coll,
     name="Fuji.app",
     icon="./packaging/Fuji.icns",
     bundle_identifier="com.andrealazzarotto.fuji",
     version=meta.VERSION,
 )
 
-executable_path = Path("./dist/Fuji.app/Contents/MacOS")
+# Add language file for recovery environment
+app_bundle_path = Path("./dist/Fuji.app")
+copytree("./recovery/en.lproj", app_bundle_path / "Contents" / "Resources" / "en.lproj")
+
+executable_path = app_bundle_path / "Contents" / "MacOS"
 move(executable_path / "Fuji", executable_path / "Fuji.bin")
 copy("./packaging/Fuji.sh", executable_path / "Fuji")
 
-dmg_path = "./dist/FujiApp.dmg"
-print("Building", dmg_path)
-result = subprocess.call(
-    ["dmgbuild", "-s", "./packaging/dmgbuild.py", "FujiApp", dmg_path]
+dmg_path = f"./dist/FujiApp-{meta.VERSION}.dmg"
+temp_dmg_path = f"./dist/FujiApp-{meta.VERSION}-temp.dmg"
+volume_name = meta.VOLUME_NAME
+
+print("Building temporary DMG", temp_dmg_path)
+try:
+    dmgbuild.build_dmg(
+        temp_dmg_path,
+        volume_name,
+        settings_file="packaging/dmgbuild.py",
+    )
+except Exception as e:
+    print(e)
+    print("DMG build failed")
+    sys.exit(1)
+
+print("Exporting final DMG", dmg_path)
+
+# Attach temporary image and get mount point
+attach_process = subprocess.Popen(
+    [
+        "hdiutil",
+        "attach",
+        "-nobrowse",
+        "-noverify",
+        "-noautoopen",
+        "-owners",
+        "off",
+        temp_dmg_path,
+    ],
+    stdout=subprocess.PIPE,
+    stderr=subprocess.PIPE,
 )
-if result == 0:
-    print("Done")
+stdout, stderr = attach_process.communicate()
+if attach_process.returncode != 0:
+    print("Failed to attach DMG:", stderr.decode().strip())
+    sys.exit(1)
+
+mount_point = None
+for line in stdout.decode().splitlines():
+    if f"/Volumes/{volume_name}" in line:
+        mount_point = line.split("\t")[-1]
+        break
+
+# Make the mounted file system "read-only"
+if mount_point:
+    print("Making mounted image read-only")
+    subprocess.call(["chmod", "-R", "a-w", mount_point])
+
+    # Detach the mounted image
+    subprocess.call(["hdiutil", "detach", mount_point])
 else:
-    print("Failed!!!")
+    print("Mount point not found.")
+    sys.exit(1)
+
+# Convert to zlib-compressed image
+subprocess.call(
+    [
+        "hdiutil",
+        "convert",
+        temp_dmg_path,
+        "-format",
+        "UDZO",
+        "-ov",
+        "-o",
+        dmg_path,
+    ]
+)
+remove(temp_dmg_path)
+
+print("Done!")