Add more Mac OS X software

mihaip · mihaip · commit 119000a268bb · 2025-02-06T20:57:37.000-08:00
To handle older disk images, we extract the partition with dmg2img and repackage it as a dmg so that modern macOS can mount it (we can't use machfs to read the bare partition because it doesn't support HFS+). Updates #357
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 /build
 /dist
 /XADMaster-build
+/dmg2img
 
 # misc
 .DS_Store
diff --git a/Library/Networking/NetNewsWire 1.0.2.json b/Library/Networking/NetNewsWire 1.0.2.json
@@ -0,0 +1,6 @@
+{
+    "src_url": "https://download.macintoshgarden.org/apps/NetNewsWireLite1.0.2.dmg_.sit",
+    "src_dmg": "NetNewsWire.dmg",
+    "needs_dmg2img": true,
+    "needs_mac_os_x": true
+}
diff --git a/Library/Networking/NetNewsWire Lite 1.0.2.zip b/Library/Networking/NetNewsWire Lite 1.0.2.zip
diff --git a/Library/Networking/OmniWeb 4.0.6.json b/Library/Networking/OmniWeb 4.0.6.json
@@ -0,0 +1,5 @@
+{
+    "src_url": "https://download.macintoshgarden.org/apps/OmniWeb-4.0.6_0.dmg",
+    "needs_dmg2img": true,
+    "needs_mac_os_x": true
+}
diff --git a/Library/Networking/OmniWeb 5.1.3.json b/Library/Networking/OmniWeb 5.1.3.json
@@ -0,0 +1,4 @@
+{
+    "src_url": "https://download.macintoshgarden.org/apps/OmniWeb-5.1.3_0.dmg",
+    "needs_mac_os_x": true
+}
diff --git a/Library/Networking/Watson 1.7.5.json b/Library/Networking/Watson 1.7.5.json
@@ -0,0 +1,5 @@
+{
+    "src_url": "https://download.macintoshgarden.org/apps/Watson_1.7.5.dmg_.zip",
+    "src_dmg": "Watson_1.7.5.dmg",
+    "needs_mac_os_x": true
+}
diff --git a/Library/Productivity/OmniGraffle 2.1.1.json b/Library/Productivity/OmniGraffle 2.1.1.json
@@ -0,0 +1,4 @@
+{
+    "src_url": "https://download.macintoshgarden.org/apps/OmniGraffle-2.1.1_0.dmg",
+    "needs_mac_os_x": true
+}
diff --git a/Library/Productivity/OmniGraffle Pro 3.2.4.json b/Library/Productivity/OmniGraffle Pro 3.2.4.json
@@ -0,0 +1,4 @@
+{
+    "src_url": "https://downloads.omnigroup.com/software/MacOSX/10.2/OmniGrafflePro-3.2.4.dmg",
+    "needs_mac_os_x": true
+}
diff --git a/Library/Productivity/OmniOutliner 2.2.6.json b/Library/Productivity/OmniOutliner 2.2.6.json
@@ -0,0 +1,4 @@
+{
+    "src_url": "https://downloads.omnigroup.com/software/MacOSX/10.1/OmniOutliner-2.2.6.dmg",
+    "needs_mac_os_x": true
+}
diff --git a/Library/Utilities/OmniDiskSweeper 1.0.json b/Library/Utilities/OmniDiskSweeper 1.0.json
@@ -0,0 +1,5 @@
+{
+    "src_url": "https://download.macintoshgarden.org/apps/OmniDiskSweeper-1.0.dmg",
+    "needs_dmg2img": true,
+    "needs_mac_os_x": true
+}
diff --git a/Library/Utilities/OmniDiskSweeper 1.4.json b/Library/Utilities/OmniDiskSweeper 1.4.json
@@ -0,0 +1,4 @@
+{
+    "src_url": "https://download.macintoshgarden.org/apps/OmniDiskSweeper-1.4_0.dmg",
+    "needs_mac_os_x": true
+}
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Dependencies can be installed with:
 ```
 npm install
 pip3 install -r requirements.txt
-npm run build-xadmaster
+npm run build-tools
 sudo -v ; curl https://rclone.org/install.sh | sudo bash
 ```
 
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
         "import-cd-roms": "scripts/import-cd-roms.py",
         "import-library": "scripts/import-library.py",
         "load-placeholder-stickies-file": "scripts/load-placeholder-stickies-file.py",
-        "build-xadmaster": "scripts/build-xadmaster.sh",
+        "build-tools": "scripts/build-tools.sh",
         "start": "vite",
         "build": "vite build",
         "preview": "vite preview --host",
diff --git a/scripts/build-tools.sh b/scripts/build-tools.sh
@@ -2,9 +2,11 @@
 
 set -e
 
+# Build the lsar and uaar tools from the XADMaster
 # Assumes that the https://github.com/mihaip/XADMAster and
 # https://github.com/MacPaw/universal-detector submodules have been fetched.
 
+echo "Building lsar and unar tools from XADMaster..."
 ROOT_DIR="`dirname "${BASH_SOURCE[0]}"`/.."
 XADMASTER_PROJECT="${ROOT_DIR}/XADMaster/XADMaster.xcodeproj"
 XADMASTER_DESTINATION_DIR="${ROOT_DIR}/XADMaster-build"
@@ -13,3 +15,22 @@ mkdir -p "${XADMASTER_DESTINATION_DIR}"
 XADMASTER_DESTINATION_DIR=`realpath "${XADMASTER_DESTINATION_DIR}"`
 xcodebuild -scheme lsar -project "${XADMASTER_PROJECT}" -configuration Release SYMROOT="${XADMASTER_DESTINATION_DIR}"
 xcodebuild -scheme unar -project "${XADMASTER_PROJECT}" -configuration Release SYMROOT="${XADMASTER_DESTINATION_DIR}"
+
+# Build the dmg2img tool. This has no modifications so we can just use
+# the upstream version.
+DMG2IMG_DIR="${ROOT_DIR}/dmg2img"
+DMG2IMG_REPO="https://github.com/Lekensteyn/dmg2img.git"
+
+echo "Building dmg2img tool..."
+if [ ! -d "${DMG2IMG_DIR}" ]; then
+    git clone "${DMG2IMG_REPO}" "${DMG2IMG_DIR}"
+fi
+
+if [ ! -f "${DMG2IMG_DIR}/dmg2img" ]; then
+    pushd "${DMG2IMG_DIR}"
+    make dmg2img
+    popd
+fi
+
+
+echo "Done!"
diff --git a/scripts/import-disks.py b/scripts/import-disks.py
@@ -82,7 +82,7 @@ def import_manifests() -> ImportFolders:
         elif src_ext in [".hqx", ".sit", ".bin", ".zip", ".gz"]:
             if not os.path.exists(paths.LSAR_PATH):
                 sys.stderr.write("    Skipping archive import, lsar not found "
-                                 "(build it with npm run build-xadmaster)\n")
+                                 "(build it with npm run build-tools)\n")
                 continue
             folder = import_archive(manifest_json)
         elif src_ext in [".dmg"]:
@@ -105,15 +105,17 @@ def import_manifests() -> ImportFolders:
 
 def import_disk_image(
         manifest_json: typing.Dict[str, typing.Any]) -> machfs.Folder:
-    return import_disk_image_data(urls.read_url(manifest_json["src_url"]),
+    return import_disk_image_data(urls.read_url_to_path(manifest_json["src_url"]),
                                   manifest_json)
 
 
 def import_disk_image_data(
-        data: bytes, manifest_json: typing.Dict[str,
+        image_path: str, manifest_json: typing.Dict[str,
                                                 typing.Any]) -> machfs.Folder:
     v = machfs.Volume()
-    v.read(data)
+    with open(image_path, "rb") as f:
+        v.read(f.read())
+
     if "src_folder" in manifest_json:
         folder = v[manifest_json["src_folder"]]
         clear_folder_window_position(folder)
@@ -194,10 +196,8 @@ def get_lsar_entry(
 
         if "src_image" in manifest_json:
             try:
-                with open(
-                        os.path.join(tmp_dir_path, manifest_json["src_image"]),
-                        "rb") as f:
-                    return import_disk_image_data(f.read(), manifest_json)
+                image_path = os.path.join(tmp_dir_path, manifest_json["src_image"])
+                return import_disk_image_data(image_path, manifest_json)
             except FileNotFoundError:
                 sys.stderr.write("Directory contents:\n")
                 for f in os.listdir(tmp_dir_path):
@@ -213,11 +213,10 @@ def get_lsar_entry(
             folder = machfs.Folder()
             for src_image in manifest_json["src_images"]:
                 try:
-                    with open(os.path.join(tmp_dir_path, src_image),
-                              "rb") as f:
-                        image_folder = import_disk_image_data(
-                            f.read(), manifest_json)
-                        folder[src_image] = image_folder
+                    image_path = os.path.join(tmp_dir_path, src_image)
+                    image_folder = import_disk_image_data(
+                        image_path, manifest_json)
+                    folder[src_image] = image_folder
                 except FileNotFoundError:
                     sys.stderr.write("Directory contents:\n")
                     for f in os.listdir(tmp_dir_path):
@@ -353,6 +352,29 @@ def import_dmg(
     return root_folder
 
 def import_dmg_folder(manifest_json: typing.Dict[str, typing.Any], archive_path: str, root_folder: machfs.Folder) -> None:
+    if manifest_json.get("needs_dmg2img"):
+        with tempfile.TemporaryDirectory() as tmp_dir_path:
+            img_path = os.path.join(tmp_dir_path, "image.img")
+            dmg2img_code = subprocess.call([
+                paths.DMG2IMG_PATH, "-silent",
+                "-i", archive_path, "-o", img_path
+            ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+            if dmg2img_code != 0:
+                assert False, "Could not convert .dmg to .img: %s (cached at %s):" % (
+                    src_url, archive_path)
+            dmg_path = os.path.join(tmp_dir_path, "image.dmg")
+            hdiutil_code = subprocess.call([
+                    paths.HDIUTIL_PATH, "convert", img_path, "-format", "UFBI",
+                    "-o", dmg_path,
+                ], stdout=subprocess.DEVNULL)
+            if hdiutil_code != 0:
+                assert False, "Could not convert .img: %s (cached at %s):" % (
+                    src_url, img_path)
+            manifest_json_clone = copy.deepcopy(manifest_json)
+            del manifest_json_clone["needs_dmg2img"]
+            return import_dmg_folder(manifest_json_clone, dmg_path, root_folder)
+
     src_url = manifest_json["src_url"]
 
     def normalize(name: str) -> str:
@@ -400,6 +422,8 @@ def normalize(name: str) -> str:
                         folder = folder[folder_name]
                 for file_name in file_names:
                     file_path = os.path.join(dir_path, file_name)
+                    if os.path.islink(file_path):
+                        continue
                     file = machfs.File()
                     with open(file_path, "rb") as f:
                         file.data = f.read()
@@ -411,10 +435,17 @@ def normalize(name: str) -> str:
 
                     update_file_from_xattr(file, file_path)
 
+                    try:
+                        normalize(file_name).encode("macroman")
+                    except UnicodeEncodeError:
+                        # Skip over files that can't be encoded in MacRoman.
+                        continue
+
                     folder[normalize(file_name)] = file
         finally:
             hdiutil_code = subprocess.call([
-                paths.HDIUTIL_PATH, "detach", tmp_dir_path])
+                paths.HDIUTIL_PATH, "detach", tmp_dir_path],
+                stdout=subprocess.DEVNULL)
             if hdiutil_code != 0:
                 assert False, "Could not unmount .dmg: %s (cached at %s):" % (
                     src_url, archive_path)
@@ -450,7 +481,6 @@ def update_folder_from_xattr(folder: machfs.Folder, folder_path: str) -> None:
 }
 
 MAC_OS_X_ZIP_PATHS = {
-    "Networking/NetNewsWire Lite 1.0.2",
 }
 
 def import_zips() -> ImportFolders:
diff --git a/scripts/paths.py b/scripts/paths.py
@@ -13,4 +13,5 @@
 XADMASTER_PATH = os.path.join(ROOT_DIR, "XADMaster-build", "Release")
 UNAR_PATH = os.path.join(XADMASTER_PATH, "unar")
 LSAR_PATH = os.path.join(XADMASTER_PATH, "lsar")
+DMG2IMG_PATH = os.path.join(ROOT_DIR, "dmg2img", "dmg2img")
 HDIUTIL_PATH = "/usr/bin/hdiutil"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +    "src_url": "https://download.macintoshgarden.org/apps/OmniWeb-5.1.3_0.dmg",
 +    "needs_mac_os_x": true
 +}