unitytk 0.0.13__tar.gz → 0.0.14__tar.gz

{unitytk-0.0.13/unitytk.egg-info → unitytk-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitytk
-Version: 0.0.13
+Version: 0.0.14
 Summary: A modular Python toolkit for Unity interaction.
 Author-email: Ryan Simpson <m3trik@outlook.com>
 License: MIT
@@ -8,14 +8,16 @@ Project-URL: Homepage, https://github.com/m3trik/unitytk
 Project-URL: Repository, https://github.com/m3trik/unitytk
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pythontk>=0.7.71
+Requires-Dist: pythontk>=0.12.0
 Dynamic: license-file
 
 [![Tests](https://img.shields.io/badge/Tests-146%20passed-brightgreen.svg)](../test/)
+![Platform](https://img.shields.io/badge/Platform-Windows%2C%20Linux-lightgrey.svg)
 
 # unitytk
 

{unitytk-0.0.13 → unitytk-0.0.14}/docs/README.md

@@ -1,4 +1,5 @@
 [![Tests](https://img.shields.io/badge/Tests-146%20passed-brightgreen.svg)](../test/)
+![Platform](https://img.shields.io/badge/Platform-Windows%2C%20Linux-lightgrey.svg)
 
 # unitytk
 

{unitytk-0.0.13 → unitytk-0.0.14}/pyproject.toml

@@ -12,9 +12,17 @@ requires-python = ">=3.9"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
 ]
-dependencies = ["pythontk>=0.7.71"]
+# The floor is HAND-RATCHETED: unitytk is off-chain from m3trik/push.ps1, so no
+# release cascade bumps it.
+# pythontk 0.12.0, the release this one ships and was tested with. The hard
+# minimum is 0.8.84: UnityFinder.find_editors scans through
+# `AppLauncher.scan_install_dirs` (new in 0.8.72) and needs its pattern order to
+# be a priority (0.8.84), so the Hub's chosen install location wins over the
+# default. Below 0.8.72 the scan fails, is logged, and no editor is found.
+dependencies = ["pythontk>=0.12.0"]
 
 [project.urls]
 Homepage = "https://github.com/m3trik/unitytk"

{unitytk-0.0.13 → unitytk-0.0.14}/test/test_asset_delivery.py

@@ -6,7 +6,7 @@ import shutil
 import tempfile
 import unittest
 
-from pythontk.core_utils.app_handoff import HandoffRequest, Payload
+from pythontk import HandoffRequest, Payload
 from unitytk.asset_delivery import (
     CopyToAssetsDeliverer,
     FileToUnityBridge,

{unitytk-0.0.13 → unitytk-0.0.14}/test/test_base_test.py

@@ -356,7 +356,7 @@ class SuiteOptionsTest(unittest.TestCase):
 
 
 class TestAssetsTest(unittest.TestCase):
-    """Fixture resolution, including the one-release legacy-name alias map."""
+    """Fixture resolution: a plain join under ``UNITYTK_TEST_ASSETS``."""
 
     def setUp(self):
         import tempfile
@@ -368,41 +368,15 @@ class TestAssetsTest(unittest.TestCase):
         patcher.start()
         self.addCleanup(patcher.stop)
 
-    def _touch(self, *parts):
-        path = os.path.join(self.root, *parts)
-        os.makedirs(os.path.dirname(path), exist_ok=True)
-        with open(path, "w", encoding="utf-8") as fh:
-            fh.write("x")
-        return path
-
     def test_path_joins_under_the_root(self):
         self.assertEqual(
             TestAssets.path("a", "b.fbx"), os.path.join(self.root, "a", "b.fbx")
         )
 
-    def test_alias_map_is_not_empty(self):
-        self.assertTrue(TestAssets.LEGACY_ALIASES)
-
-    def test_legacy_name_resolves_when_only_it_is_staged(self):
-        """An already-staged asset tree keeps working for one release."""
-        for new_parts, legacy_parts in TestAssets.LEGACY_ALIASES.items():
-            with self.subTest(asset=new_parts):
-                staged = self._touch(*legacy_parts)
-                try:
-                    self.assertEqual(
-                        os.path.normcase(TestAssets.path(*new_parts)),
-                        os.path.normcase(staged),
-                    )
-                finally:
-                    os.remove(staged)
-
-    def test_new_name_wins_when_both_are_staged(self):
-        new_parts, legacy_parts = next(iter(TestAssets.LEGACY_ALIASES.items()))
-        self._touch(*legacy_parts)
-        fresh = self._touch(*new_parts)
-        self.assertEqual(
-            os.path.normcase(TestAssets.path(*new_parts)), os.path.normcase(fresh)
-        )
+    def test_the_one_release_alias_map_is_gone(self):
+        """Deleted 2026-09-23, as its own note asked: nothing maps a neutral
+        fixture name to a legacy one, so ``path`` is the plain join above."""
+        self.assertFalse(hasattr(TestAssets, "LEGACY_ALIASES"))
 
     def test_unset_root_cannot_exist_under_either_guard(self):
         from pathlib import Path
@@ -566,17 +540,13 @@ class PublicHygieneTest(unittest.TestCase):
     The absolute studio paths, vendor name and person name went 2026-08-15; the
     program identifiers went 2026-08-17. This is the guard that keeps them out.
     Markdown is deliberately NOT scanned: ``CHANGELOG.md`` records what factually
-    happened and ``CLAUDE.md`` has to document the legacy asset names so a user
-    can rename an already-staged tree.
+    happened. Since the one-release alias map went (2026-09-23), no Python or C#
+    file may name the legacy assets -- ``base_test.py`` included.
     """
 
     #: Program identifiers that must not appear as code identifiers.
     PROGRAM_RE = re.compile(r"C-?130|C5M|FCR", re.IGNORECASE)
 
-    #: The one file allowed to name the legacy assets: the deprecation alias
-    #: map, which exists precisely so the old names keep resolving.
-    ALIAS_HOME = "base_test.py"
-
     def test_no_module_filename_carries_a_program_identifier(self):
         offenders = [
             os.path.relpath(p, REPO_ROOT)
@@ -587,7 +557,7 @@ class PublicHygieneTest(unittest.TestCase):
 
     def test_no_program_identifier_in_python_or_cs_source(self):
         offenders = []
-        for path in _source_files(".py", ".cs", exclude=(self.ALIAS_HOME,)):
+        for path in _source_files(".py", ".cs"):
             with open(path, encoding="utf-8", errors="replace") as fh:
                 for lineno, line in enumerate(fh, 1):
                     if self.PROGRAM_RE.search(line):
@@ -596,22 +566,6 @@ class PublicHygieneTest(unittest.TestCase):
                         )
         self.assertEqual(offenders, [], f"program identifier in source: {offenders}")
 
-    def test_the_alias_map_is_the_only_home_for_the_legacy_names(self):
-        """base_test may name them -- but only inside LEGACY_ALIASES."""
-        legacy = [part for parts in TestAssets.LEGACY_ALIASES.values() for part in parts]
-        self.assertTrue(
-            any(self.PROGRAM_RE.search(p) for p in legacy),
-            "the alias map should be carrying the legacy program-identified names",
-        )
-        path = os.path.join(os.path.dirname(base_test.__file__), self.ALIAS_HOME)
-        with open(path, encoding="utf-8") as fh:
-            source = fh.read()
-        start = source.index("LEGACY_ALIASES")
-        end = source.index("@classmethod", start)
-        outside = source[:start] + source[end:]
-        hits = sorted({m.group(0) for m in self.PROGRAM_RE.finditer(outside)})
-        self.assertEqual(hits, [], f"legacy identifier outside the alias map: {hits}")
-
 
 if __name__ == "__main__":
     unittest.main()

{unitytk-0.0.13 → unitytk-0.0.14}/test/test_keyed_visibility.py

@@ -40,9 +40,7 @@ FBX_PATH = asset_path("fixture_keyed_visibility.fbx")
 
 #: Name the FBX is copied to inside the Unity project. Fixed rather than
 #: derived from FBX_PATH so the C# "Assets/<name>" literal and the importer
-#: allowlist stay true whichever name the fixture carries on disk (see
-#: base_test.TestAssets.LEGACY_ALIASES, which keeps the pre-2026-08-17
-#: fixture names resolving for one release).
+#: allowlist stay true whatever the fixture file on disk is called.
 FBX_ASSET_NAME = "fixture_keyed_visibility.fbx"
 
 # Template CS files — need RenderEffectsController for the importer
@@ -87,18 +85,11 @@ EXPECTED_VISIBILITY_OBJECTS = [
 # Unity finder
 # ---------------------------------------------------------------------------
 def _find_unity_exe() -> str:
-    hub = r"C:\Program Files\Unity\Hub\Editor"
-    if not os.path.isdir(hub):
-        return ""
-    versions = sorted(
-        [d for d in os.listdir(hub) if os.path.isdir(os.path.join(hub, d))],
-        reverse=True,
-    )
-    for v in versions:
-        exe = os.path.join(hub, v, "Editor", "Unity.exe")
-        if os.path.isfile(exe):
-            return exe
-    return ""
+    """The newest installed Unity Editor, found the way the product finds it
+    (every Hub install location, on every OS), or ""."""
+    from unitytk.launcher import UnityLauncher
+
+    return UnityLauncher().executable_path or ""
 
 
 # ---------------------------------------------------------------------------

{unitytk-0.0.13 → unitytk-0.0.14}/test/test_launcher.py

@@ -15,34 +15,70 @@ from unitytk.launcher import UnityFinder, UnityLauncher
 
 
 class TestUnityLauncher(UnityTkTestCase):
-    @patch("unitytk.launcher.UnityFinder.get_hub_editor_path")
-    @patch("os.listdir")
-    @patch("os.path.isdir")
-    @patch("os.path.exists")
-    @patch("platform.system")
-    def test_find_editors_windows(
-        self, mock_system, mock_exists, mock_isdir, mock_listdir, mock_get_hub
-    ):
-        """Verify that find_editors correctly identifies Unity executables on Windows."""
-        mock_system.return_value = "windows"
-        mock_get_hub.return_value = "C:\\Hub"
-        mock_listdir.return_value = ["2021.1.0f1", "2022.2.0b1"]
-
-        # Mock isdir behavior: return True if path contains the mocked versions
-        mock_isdir.return_value = True
-
-        # Mock existence: Hub exists, and the Unity.exe inside the version folders exist
-        mock_exists.side_effect = lambda p: (
-            True if p == "C:\\Hub" or "Unity.exe" in p else False
+    def test_find_editors_windows(self):
+        """Windows: <Hub>/<ver>/Editor/Unity.exe, found through the shared
+        install scan (a real tree -- no listdir/exists mocks to drift from it).
+        A version folder without the binary is not an editor."""
+        import tempfile
+
+        with tempfile.TemporaryDirectory() as hub:
+            for version in ("2021.1.0f1", "2022.2.0b1"):
+                exe = os.path.join(hub, version, "Editor", "Unity.exe")
+                os.makedirs(os.path.dirname(exe))
+                open(exe, "w").close()
+            os.makedirs(os.path.join(hub, "2023.1.0f1", "Editor"))  # no binary
+            with patch("platform.system", return_value="Windows"), patch(
+                "unitytk.launcher.UnityFinder.get_hub_editor_paths", return_value=[hub]
+            ):
+                editors = UnityFinder.find_editors()
+
+        self.assertEqual(sorted(editors), ["2021.1.0f1", "2022.2.0b1"])
+        self.assertEqual(
+            os.path.normpath(editors["2021.1.0f1"]),
+            os.path.join(hub, "2021.1.0f1", "Editor", "Unity.exe"),
         )
 
-        editors = UnityFinder.find_editors()
-
-        self.assertIn("2021.1.0f1", editors)
-        self.assertIn("2022.2.0b1", editors)
+    def test_find_editors_reads_the_hubs_install_location_on_linux(self):
+        """Linux: ~/Unity/Hub/Editor/<ver>/Editor/Unity, and the location picked
+        in the Hub's preferences (secondaryInstallPath.json, where new installs
+        go) -- scanned first, on every OS. Only the default was ever read."""
+        import json
+        import tempfile
+
+        with tempfile.TemporaryDirectory() as home:
+            default = os.path.join(home, "Unity", "Hub", "Editor")
+            custom = os.path.join(home, "editors")
+            config = os.path.join(home, ".config", "UnityHub")
+            for root, version in ((default, "2022.3.1f1"), (custom, "6000.0.1f1")):
+                exe = os.path.join(root, version, "Editor", "Unity")
+                os.makedirs(os.path.dirname(exe))
+                open(exe, "w").close()
+            os.makedirs(config)
+            with open(os.path.join(config, "secondaryInstallPath.json"), "w") as f:
+                json.dump(custom, f)
+            env = {"HOME": home, "XDG_CONFIG_HOME": os.path.join(home, ".config")}
+
+            def expanduser(path):
+                # A LEADING "~" only, as the real one: the scan expands every
+                # pattern, and a Windows temp dir can hold one mid-path (the
+                # 8.3 name C:\Users\RUNNER~1 on GitHub's runners).
+                return home + path[1:] if path.startswith("~") else path
+
+            with patch("platform.system", return_value="Linux"), patch.dict(
+                os.environ, env
+            ), patch("os.path.expanduser", expanduser):
+                self.assertEqual(
+                    [os.path.normpath(r) for r in UnityFinder.get_hub_editor_paths()],
+                    [custom, default],
+                )
+                editors = {
+                    v: os.path.normpath(e) for v, e in UnityFinder.find_editors().items()
+                }
+        self.assertEqual(
+            editors["6000.0.1f1"], os.path.join(custom, "6000.0.1f1", "Editor", "Unity")
+        )
         self.assertEqual(
-            editors["2021.1.0f1"],
-            os.path.join("C:\\Hub", "2021.1.0f1", "Editor", "Unity.exe"),
+            editors["2022.3.1f1"], os.path.join(default, "2022.3.1f1", "Editor", "Unity")
         )
 
     @patch("unitytk.launcher.UnityFinder.find_editors")

{unitytk-0.0.13 → unitytk-0.0.14}/test/test_multi_section_audio_integration.py

@@ -23,9 +23,6 @@ Source files (resolved under ``UNITYTK_TEST_ASSETS``; unset -> the suite skips):
     FBX:   $UNITYTK_TEST_ASSETS/audio_files/fixture_multi_section_audio.fbx
     Audio: $UNITYTK_TEST_ASSETS/audio_files/fixture_audio_clips/  (73 MP3s)
 
-Pre-2026-08-17 fixture names still resolve for one release --
-``base_test.TestAssets.LEGACY_ALIASES``.
-
 The FBX contains:
     - ``audio_manifest`` string attributes on 3 objects (sections A, B, C)
       with frame:eventName pairs whose names match the MP3 stems.
@@ -66,7 +63,7 @@ AUDIO_DIR = asset_path("audio_files", "fixture_audio_clips")
 
 #: Name the FBX is copied to inside the Unity project. Fixed rather than
 #: derived from FBX_PATH so the C# "Assets/<name>" literal below stays true
-#: whichever name the fixture carries on disk (see TestAssets.LEGACY_ALIASES).
+#: whatever the fixture file on disk is called.
 FBX_ASSET_NAME = "fixture_multi_section_audio.fbx"
 
 # Expected counts (from binary scan 2026-02-24)

{unitytk-0.0.13 → unitytk-0.0.14}/test/test_shadow_plane_integration.py

@@ -115,11 +115,10 @@ cmds.file(
 )
 mel.eval("FBXExportEmbeddedTextures -v false")
 
-# Third scenario: a schema-v2 fixture that pins the ENGINE's runtime placement
-# against the DCC's baked keys through a real FBX import. The producer still
-# publishes v1, so the v2 payload is hand-built from the rigs' own stamped
-# attrs (the contract's field semantics: mayatk/docs/shadow_rig_morphing.md).
-# Two rigs on two asymmetrically placed targets: a positional locator and a
+# Third scenario: the v2 record the producer publishes pins the ENGINE's
+# runtime placement against the DCC's baked keys through a real FBX import
+# (the contract's field semantics: mayatk/docs/shadow_rig_morphing.md). Two
+# rigs on two asymmetrically placed targets: a positional locator and a
 # directionalLight at an asymmetric rotation (so a wrong axis cannot hide).
 from mayatk.core_utils._core_utils import CoreUtils
 
@@ -136,33 +135,12 @@ rig_pt = ShadowRig.create([drum], source_name="pointSrc", light_pos=(-2.0, 7.0,
 rig_sun.bake(1, 3)
 rig_pt.bake(1, 3)
 FbxUtils.publish()
+v2_payload = ptk.SceneRecords.SHADOWS.load(DataNodes)
 
 
 def _leaf(node):
     return CoreUtils.leaf_name(node)
 
-
-def _record(rig, source_type):
-    plane = rig.shadow_plane
-    g = lambda attr: float(cmds.getAttr(f"{plane}.{attr}"))
-    return {
-        "name": _leaf(plane), "type": "projected",
-        "texture": os.path.basename(rig.texture_path), "intensity": 1.0,
-        "source": _leaf(rig.light), "source_type": source_type,
-        "source_size": 0.0, "source_angle": 0.0, "follow_source": True,
-        "contact": _leaf(rig.contact_locator), "ground": g("groundHeight"),
-        "radius": g("footprintRadius"), "height": g("objectHeight"),
-        "max_stretch": g("maxStretch"),
-        "canvas": [g("canvasU0"), g("canvasU1"), g("canvasW0"), g("canvasW1")],
-    }
-
-
-v2_payload = {"version": 2, "unit_scale": 0.01,
-              "planes": [_record(rig_sun, "directional"), _record(rig_pt, "point")]}
-DataNodes.write(
-    ptk.Scope.DELIVERABLE, ShadowRig.SHADOW_METADATA, json.dumps(v2_payload)
-)
-
 cmds.currentTime(1)
 
 
@@ -486,6 +464,14 @@ class TestShadowPlaneIntegration(unittest.TestCase):
         recs = {p["name"]: p for p in meta.get("planes", [])}
         self.assertIn("Box_shadow", recs, f"shadow_metadata missing: {meta}")
         self.assertEqual(recs["Box_shadow"]["texture"], "Box_shadow.png")
+        # The producer publishes the schema ShadowPlaneController reads (v2),
+        # in Maya's centimetres; the runtime fixture below ships that record.
+        self.assertEqual(meta.get("version"), 2)
+        self.assertAlmostEqual(meta.get("unit_scale"), 0.01, places=6)
+        fixture = r["fixture"]
+        published = {p["name"] for p in (fixture["payload"] or {}).get("planes", [])}
+        for key in ("sun", "point"):
+            self.assertIn(fixture[key]["plane"], published)
         self.assertTrue(r["embedded_fbx_exists"], "embedded FBX export failed")
         self.assertEqual(r["embedded_texture"], "Box_keyLight_shadow.png")
 

{unitytk-0.0.13 → unitytk-0.0.14}/test/test_shared_material_standalone.py

@@ -57,18 +57,11 @@ SHARED_MAT_NAME = "shared_mat"
 
 
 def _find_unity_exe() -> str:
-    hub = r"C:\Program Files\Unity\Hub\Editor"
-    if not os.path.isdir(hub):
-        return ""
-    versions = sorted(
-        [d for d in os.listdir(hub) if os.path.isdir(os.path.join(hub, d))],
-        reverse=True,
-    )
-    for v in versions:
-        exe = os.path.join(hub, v, "Editor", "Unity.exe")
-        if os.path.isfile(exe):
-            return exe
-    return ""
+    """The newest installed Unity Editor, found the way the product finds it
+    (every Hub install location, on every OS), or ""."""
+    from unitytk.launcher import UnityLauncher
+
+    return UnityLauncher().executable_path or ""
 
 
 def _prerequisites_ok() -> bool:

{unitytk-0.0.13 → unitytk-0.0.14}/test/test_standalone_enduser.py

@@ -44,9 +44,8 @@ AUDIO_DIR = asset_path("audio_files", "fixture_audio_clips")
 
 #: Name the FBX is copied to inside the Unity project, and the name the
 #: importer allowlist is written against. Fixed rather than derived from
-#: FBX_PATH so the C# "Assets/<name>" literals stay true whichever name the
-#: fixture carries on disk (base_test.TestAssets.LEGACY_ALIASES keeps the
-#: pre-2026-08-17 fixture names resolving for one release).
+#: FBX_PATH so the C# "Assets/<name>" literals stay true whatever the
+#: fixture file on disk is called.
 FBX_ASSET_NAME = "fixture_multi_section_audio.fbx"
 
 #: Subfolder the all-in-one deployment scenario builds under Assets/.
@@ -87,19 +86,11 @@ MAX_KEYS_PER_CURVE = 30
 
 
 def _find_unity_exe() -> str:
-    """Find the latest Unity Editor executable via Hub default path."""
-    hub = r"C:\Program Files\Unity\Hub\Editor"
-    if not os.path.isdir(hub):
-        return ""
-    versions = sorted(
-        [d for d in os.listdir(hub) if os.path.isdir(os.path.join(hub, d))],
-        reverse=True,
-    )
-    for v in versions:
-        exe = os.path.join(hub, v, "Editor", "Unity.exe")
-        if os.path.isfile(exe):
-            return exe
-    return ""
+    """The newest installed Unity Editor, found the way the product finds it
+    (every Hub install location, on every OS), or ""."""
+    from unitytk.launcher import UnityLauncher
+
+    return UnityLauncher().executable_path or ""
 
 
 def _sources_ok() -> bool:

{unitytk-0.0.13 → unitytk-0.0.14}/unitytk/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.13"
+__version__ = "0.0.14"
 
 from .launcher import UnityLauncher, UnityFinder
 from .scene_builder import SceneBuilder

{unitytk-0.0.13 → unitytk-0.0.14}/unitytk/launcher.py

@@ -1,4 +1,6 @@
 """Locate installed Unity Editor versions and launch the Editor or a Standalone Player."""
+import glob
+import json
 import os
 import re
 import platform
@@ -7,10 +9,11 @@ from typing import Optional, List, Dict, Tuple
 import subprocess
 
 try:
-    from pythontk import AppLauncher
+    from pythontk import AppLauncher, UserConfig
 except ImportError:
     # Fallback for when pythontk is not fully bootstrapped or direct import needed
     from pythontk.core_utils.app_launcher import AppLauncher
+    from pythontk.core_utils.user_config import UserConfig
 
 logger = logging.getLogger(__name__)
 
@@ -31,62 +34,94 @@ LICENSE_FAILURE_MARKERS = (
 class UnityFinder:
     """Helper class to locate Unity installations."""
 
+    #: Where the editor binary sits inside a Hub version folder, per OS
+    #: (``platform.system().lower()``). The version folder is that many levels
+    #: above the binary.
+    EDITOR_BINARY = {
+        "windows": ("Editor", "Unity.exe"),
+        "darwin": ("Unity.app", "Contents", "MacOS", "Unity"),
+        "linux": ("Editor", "Unity"),
+    }
+
     @staticmethod
     def get_hub_editor_path() -> Optional[str]:
         """Returns the default Unity Hub Editor installation directory."""
         system = platform.system().lower()
         if system == "windows":
-            return r"C:\Program Files\Unity\Hub\Editor"
+            program_files = os.environ.get("ProgramFiles", r"C:\Program Files")
+            return os.path.join(program_files, "Unity", "Hub", "Editor")
         elif system == "darwin":  # macOS
             return "/Applications/Unity/Hub/Editor"
         elif system == "linux":
             return os.path.expanduser("~/Unity/Hub/Editor")
         return None
 
+    @staticmethod
+    def _hub_config_dir() -> Optional[str]:
+        """Unity Hub's own config folder (where it records a custom install path)."""
+        system = platform.system().lower()
+        if system == "windows":
+            base = os.environ.get("APPDATA")
+            return os.path.join(base, "UnityHub") if base else None
+        if system == "darwin":
+            return os.path.expanduser("~/Library/Application Support/UnityHub")
+        if system == "linux":
+            return os.path.join(UserConfig.xdg_home("config"), "UnityHub")
+        return None
+
+    @staticmethod
+    def get_hub_editor_paths() -> List[str]:
+        """Every folder the Hub installs editors into: the location chosen in the
+        Hub's preferences (``secondaryInstallPath.json``, where new installs go)
+        first, then the default -- on every OS."""
+        roots: List[str] = []
+        config = UnityFinder._hub_config_dir()
+        if config:
+            try:
+                with open(
+                    os.path.join(config, "secondaryInstallPath.json"), encoding="utf-8"
+                ) as f:
+                    custom = json.load(f)
+                if isinstance(custom, str) and custom:
+                    roots.append(custom)
+            except (OSError, ValueError):
+                pass
+        default = UnityFinder.get_hub_editor_path()
+        if default and default not in roots:
+            roots.append(default)
+        return roots
+
     @staticmethod
     def find_editors() -> Dict[str, str]:
         """
-        Scans default Hub locations for installed Unity Editors.
+        Scans every Hub install location for installed Unity Editors.
 
         Returns:
             Dict[str, str]: A dictionary of {version: executable_path}.
         """
-        hub_path = UnityFinder.get_hub_editor_path()
-        if not hub_path or not os.path.exists(hub_path):
-            logger.warning(f"Unity Hub path not found: {hub_path}")
+        roots = [r for r in UnityFinder.get_hub_editor_paths() if os.path.isdir(r)]
+        if not roots:
+            logger.warning(
+                f"Unity Hub editor folder not found: {UnityFinder.get_hub_editor_paths()}"
+            )
             return {}
 
-        found_editors = {}
-        system = platform.system().lower()
+        tail = UnityFinder.EDITOR_BINARY.get(platform.system().lower())
+        if tail is None:
+            return {}
 
-        # Look for subdirectories (versions)
+        # The ecosystem's install scan, not a hand-rolled listdir: one pattern
+        # per root, in root priority (the Hub's chosen location, then the
+        # default), each ranked newest first. The first root holding a version
+        # wins it.
+        found_editors: Dict[str, str] = {}
         try:
-            versions = [
-                d
-                for d in os.listdir(hub_path)
-                if os.path.isdir(os.path.join(hub_path, d))
-            ]
-            for version in versions:
-                editor_dir = os.path.join(hub_path, version)
-                exe_path = None
-
-                if system == "windows":
-                    candidate = os.path.join(editor_dir, "Editor", "Unity.exe")
-                    if os.path.exists(candidate):
-                        exe_path = candidate
-                elif system == "darwin":
-                    candidate = os.path.join(
-                        editor_dir, "Unity.app", "Contents", "MacOS", "Unity"
-                    )
-                    if os.path.exists(candidate):
-                        exe_path = candidate
-                elif system == "linux":
-                    candidate = os.path.join(editor_dir, "Editor", "Unity")
-                    if os.path.exists(candidate):
-                        exe_path = candidate
-
-                if exe_path:
-                    found_editors[version] = exe_path
+            patterns = [os.path.join(glob.escape(root), "*", *tail) for root in roots]
+            for exe_path in AppLauncher.scan_install_dirs(patterns):
+                version_dir = exe_path
+                for _ in tail:
+                    version_dir = os.path.dirname(version_dir)
+                found_editors.setdefault(os.path.basename(version_dir), exe_path)
         except Exception as e:
             logger.error(f"Error scanning for Unity Editors: {e}")
 

{unitytk-0.0.13 → unitytk-0.0.14/unitytk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitytk
-Version: 0.0.13
+Version: 0.0.14
 Summary: A modular Python toolkit for Unity interaction.
 Author-email: Ryan Simpson <m3trik@outlook.com>
 License: MIT
@@ -8,14 +8,16 @@ Project-URL: Homepage, https://github.com/m3trik/unitytk
 Project-URL: Repository, https://github.com/m3trik/unitytk
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pythontk>=0.7.71
+Requires-Dist: pythontk>=0.12.0
 Dynamic: license-file
 
 [![Tests](https://img.shields.io/badge/Tests-146%20passed-brightgreen.svg)](../test/)
+![Platform](https://img.shields.io/badge/Platform-Windows%2C%20Linux-lightgrey.svg)
 
 # unitytk
 

unitytk-0.0.14/unitytk.egg-info/requires.txt

@@ -0,0 +1 @@
+pythontk>=0.12.0

unitytk-0.0.13/unitytk.egg-info/requires.txt

@@ -1 +0,0 @@
-pythontk>=0.7.71