Add macos packaging.

Author: JoeZiminski

datashuttle/datashuttle.spec

@@ -5,12 +5,26 @@
 from pathlib import Path
 from subprocess import CompletedProcess
 from typing import Dict, List, Literal
+import sys
+import os
 
 from datashuttle.configs.config_class import Configs
 from datashuttle.utils import utils
 from datashuttle.utils.custom_types import TopLevelFolder
 
 
+def get_rclone_name() -> str:
+    """
+    """
+    if getattr(sys, 'frozen', False):
+        # PyInstaller: binary extracted to _MEIPASS
+        rclone_bin = os.path.join(sys._MEIPASS, 'rclone.exe' if sys.platform.startswith('win') else 'rclone')
+    else:
+        # Normal Python execution: use PATH or fixed path
+        rclone_bin = 'rclone'  # or provide full path if needed
+
+    return rclone_bin
+
 def call_rclone(command: str, pipe_std: bool = False) -> CompletedProcess:
     """Call rclone with the specified command.
 
@@ -27,7 +41,8 @@ def call_rclone(command: str, pipe_std: bool = False) -> CompletedProcess:
     subprocess.CompletedProcess with `stdout` and `stderr` attributes.
 
     """
-    command = "rclone " + command
+    command = f"{get_rclone_name()} {command}"
+
     if pipe_std:
         output = subprocess.run(
             command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True
@@ -56,7 +71,7 @@ def call_rclone_through_script(command: str) -> CompletedProcess:
     """
     system = platform.system()
 
-    command = "rclone " + command
+    command = f"{get_rclone_name()} {command}"
 
     if system == "Windows":
         suffix = ".bat"

datashuttle/utils/rclone.py

@@ -4,6 +4,7 @@ import os
 import sys
 import platform
 from glob import glob
+from pathlib import Path
 
 # Include .tcss files
 tcss_files = [
@@ -28,7 +29,7 @@ if not os.path.isfile(rclone_src):
 binaries = [(rclone_src, '.')]
 
 a = Analysis(
-    ['datashuttle_launcher.py'],
+    ['datashuttle_launcher.py'],  # terminal_launcher
     pathex=[os.path.abspath('..')],
     binaries=binaries,
     datas=tcss_files,
@@ -52,14 +53,27 @@ pyz = PYZ(a.pure)
 exe = EXE(
     pyz,
     a.scripts,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
+    [],
+    exclude_binaries=True,
     name='datashuttle',
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,
     upx=True,
     console=True,
-    onefile=True,  # <-- enables one-file mode
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
 )
+
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='datashuttle'
+)

package/datashuttle.spec

@@ -0,0 +1,6 @@
+TODO:
+1) write package script for macOS and organise code and outputs properly.
+2) go back to windows and rework everything
+3) text on linux
+
+

package/notes.txt

@@ -0,0 +1,40 @@
+import platform
+import shutil
+import subprocess
+import zipfile
+from pathlib import Path
+import packaging_utils
+import requests
+
+WEZTERM_VERSION = packaging_utils.get_wezterm_version()
+WEZTERM_FOLDERNAME = f"WezTerm-macos-{WEZTERM_VERSION}"
+WEZTERM_URL = f"https://github.com/wezterm/wezterm/releases/download/{WEZTERM_VERSION}/{WEZTERM_FOLDERNAME}.zip"
+
+# Paths
+project_root = Path(__file__).parent
+vendored_dir = project_root / "_vendored"
+
+if not (vendored_dir / WEZTERM_FOLDERNAME).exists():
+    packaging_utils.download_wezterm(vendored_dir, WEZTERM_FOLDERNAME)
+
+if (build_path := project_root / "build").exists():
+    shutil.rmtree(build_path)
+
+if (dist_path := project_root / "dist").exists():
+    shutil.rmtree(dist_path)
+
+# Step 2: Run PyInstaller builds
+subprocess.run(f"pyinstaller {project_root / 'datashuttle.spec'}", shell=True)
+subprocess.run(f"pyinstaller {project_root / 'terminal_launcher_macos.spec'}", shell=True)
+
+app_macos_path = project_root / "dist" / "Datashuttle.app" / "Contents" / "Resources"
+
+shutil.copytree(vendored_dir / f"{WEZTERM_FOLDERNAME}", app_macos_path / "_vendored" / f"{WEZTERM_FOLDERNAME}")
+
+shutil.copytree(project_root / "dist" / "datashuttle" / "_internal", app_macos_path.parent / "Resources" / "_internal")
+
+shutil.copy(project_root / "dist" / "datashuttle" / "datashuttle", app_macos_path.parent / "Resources")
+
+shutil.copy(
+    project_root / "wezterm_config.lua", app_macos_path.parent / "Resources" / "_vendored" / WEZTERM_FOLDERNAME
+)

package/package_macos.py

@@ -1,48 +1,37 @@
+import platform
 import shutil
 import subprocess
 import zipfile
 from pathlib import Path
 
 import requests
+import packaging_utils
 
 # Constants
-WEZTERM_VERSION = "20240203-110809-5046fc22"
+WEZTERM_VERSION = packaging_utils.get_wezterm_version()
 WEZTERM_FOLDERNAME = f"WezTerm-windows-{WEZTERM_VERSION}"
 WEZTERM_URL = f"https://github.com/wezterm/wezterm/releases/download/{WEZTERM_VERSION}/{WEZTERM_FOLDERNAME}.zip"
 
 # Paths
 project_root = Path(__file__).parent
-base_path = Path.cwd()
 vendored_dir = base_path / "_vendored"
-wezterm_extracted_dir = vendored_dir / f"WezTerm-windows-{WEZTERM_VERSION}"
-wezterm_zip_path = vendored_dir / f"{WEZTERM_FOLDERNAME}.zip"
 
-# Step 1: Download and extract WezTerm if missing
-if not wezterm_extracted_dir.exists():
-    print("⬇ Downloading WezTerm...")
-    vendored_dir.mkdir(parents=True, exist_ok=True)
-    with requests.get(WEZTERM_URL, stream=True) as response:
-        response.raise_for_status()
-        with open(wezterm_zip_path, "wb") as f:
-            for chunk in response.iter_content(8192):
-                f.write(chunk)
+packaging_utils.download_wezterm(vendored_dir, WEZTERM_FOLDERNAME)
 
-    print("📦 Extracting WezTerm...")
-    with zipfile.ZipFile(wezterm_zip_path, "r") as zipf:
-        zipf.extractall(vendored_dir)
-    wezterm_zip_path.unlink()  # Optional: clean up ZIP
-    print("✅ WezTerm ready.")
-else:
-    print("✅ WezTerm already present. Skipping download.")
+if (build_path := project_root / "build").exists():
+    shutil.rmtree(build_path)
+
+if (dist_path := project_root / "dist").exists():
+    shutil.rmtree(dist_path)
+
+# Step 2: Run PyInstaller builds
+subprocess.run(f"pyinstaller {project_root / 'datashuttle.spec'}", shell=True)
+subprocess.run(f"pyinstaller {project_root / 'terminal_launcher.spec'}", shell=True)
 
 shutil.copy(
     base_path / "wezterm_config.lua", vendored_dir / WEZTERM_FOLDERNAME
 )
 
-# Step 2: Run PyInstaller builds
-subprocess.run(f"pyinstaller {project_root / 'datashuttle.spec'}")
-subprocess.run(f"pyinstaller {project_root / 'terminal_launcher.spec'}")
-
 # Step 3: Copy WezTerm into dist/_vendored
 dist_dir = base_path / "dist"
 terminal_launcher_dist_dir = dist_dir / "terminal_launcher"
@@ -63,3 +52,4 @@
         shutil.copy2(item, target)
 
 shutil.rmtree(terminal_launcher_dist_dir)
+

package/package.py package/package_windows.pypackage/package.py renamed to package/package_windows.py

@@ -0,0 +1,32 @@
+import requests
+import zipfile
+import subprocess
+
+def get_wezterm_version():
+    return "20240203-110809-5046fc22"
+
+def download_wezterm(vendored_dir, wezterm_foldername):
+    """
+    """
+    wezterm_url = f"https://github.com/wezterm/wezterm/releases/download/{get_wezterm_version()}/{wezterm_foldername}.zip"
+
+    wezterm_extracted_dir = vendored_dir / wezterm_foldername
+    wezterm_zip_path = vendored_dir / f"{wezterm_foldername}.zip"
+
+    # Step 1: Download and extract WezTerm if missing
+    if not wezterm_extracted_dir.exists():
+        print("⬇ Downloading WezTerm...")
+        vendored_dir.mkdir(parents=True, exist_ok=True)
+        with requests.get(wezterm_url, stream=True) as response:
+            response.raise_for_status()
+            with open(wezterm_zip_path, "wb") as f:
+                for chunk in response.iter_content(8192):
+                    f.write(chunk)
+
+        print("📦 Extracting WezTerm with system unzip...")
+        subprocess.run(["unzip", "-q", str(wezterm_zip_path), "-d", str(vendored_dir)], check=True)
+
+        wezterm_zip_path.unlink()  # Optional: clean up ZIP
+        print("✅ WezTerm ready.")
+    else:
+        print("✅ WezTerm already present. Skipping download.")