arkparser 0.7.3__tar.gz → 0.7.4__tar.gz

{arkparser-0.7.3 → arkparser-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparser
-Version: 0.7.3
+Version: 0.7.4
 Summary: Pure Python parser for ARK: Survival Evolved and ARK: Survival Ascended save files
 Author: Vertyco
 License-Expression: MIT

{arkparser-0.7.3 → arkparser-0.7.4}/arkparser/export.py

@@ -2699,12 +2699,18 @@ def _allocate_profiles(
     profiles: list[Profile],
     file_tribe_ids: set[int],
     member_index: dict[int, int],
+    tribe_members: dict[int, set[int]],
 ) -> tuple[dict[int, int], dict[int, list[int]]]:
     """Allocate each profile to one tribe id (ContentContainer.cs:760-790).
 
-    Priority: explicit profile tribe id when it names an existing tribe ->
-    the tribe whose member list contains the player -> a solo tribe keyed on
-    the player id. Returns ``(player_id -> tribe_id, tribe_id -> [player_id])``.
+    Priority: explicit profile tribe id when it names an existing tribe AND
+    that tribe's member roster still lists the player -> the tribe whose
+    member list contains the player -> a solo tribe keyed on the player id.
+    The roster check diverges from live legacy on purpose: the game leaves
+    ``TribeID`` stale in the profile of a member removed while offline, and
+    honoring it unconditionally re-attaches ex-members (rosters then exceed
+    the server tribe cap). The ``.arktribe`` member list is authoritative.
+    Returns ``(player_id -> tribe_id, tribe_id -> [player_id])``.
     """
     profile_tribeid: dict[int, int] = {}
     players_by_tribe: dict[int, list[int]] = {}
@@ -2713,7 +2719,7 @@ def _allocate_profiles(
         if not pid:
             continue
         explicit = _int(prof.raw_tribe_id)
-        if explicit and explicit in file_tribe_ids:
+        if explicit and explicit in file_tribe_ids and pid in tribe_members.get(explicit, ()):
             target = explicit
         elif pid in member_index:
             target = member_index[pid]
@@ -2754,6 +2760,7 @@ def _assemble_tribes(save: t.Any) -> dict[str, t.Any]:
     logs: dict[int, list[str]] = {}
     member_index: dict[int, int] = {}
     member_name: dict[int, str] = {}
+    tribe_members: dict[int, set[int]] = {}
     order: list[int] = []
     for sid, sname in (
         (_UNCLAIMED_TRIBE_ID, "[ASV Unclaimed]"),
@@ -2773,12 +2780,15 @@ def _assemble_tribes(save: t.Any) -> dict[str, t.Any]:
         logs[tid] = log_entries
         for pid, mname in members:
             member_index.setdefault(pid, tid)
+            tribe_members.setdefault(tid, set()).add(pid)
             if mname:
                 member_name.setdefault(pid, mname)
     file_tribe_ids = set(rich) | {_UNCLAIMED_TRIBE_ID, _ABANDONED_TRIBE_ID}
     profiles = _profile_entries(save)
     profile_active = _profile_actives(profiles, save)
-    profile_tribeid, players_by_tribe = _allocate_profiles(profiles, file_tribe_ids, member_index)
+    profile_tribeid, players_by_tribe = _allocate_profiles(
+        profiles, file_tribe_ids, member_index, tribe_members
+    )
     for prof in profiles:
         pid = _int(prof.player_id)
         target = profile_tribeid.get(pid)

{arkparser-0.7.3 → arkparser-0.7.4}/arkparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparser
-Version: 0.7.3
+Version: 0.7.4
 Summary: Pure Python parser for ARK: Survival Evolved and ARK: Survival Ascended save files
 Author: Vertyco
 License-Expression: MIT

{arkparser-0.7.3 → arkparser-0.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arkparser"
-version = "0.7.3"
+version = "0.7.4"
 description = "Pure Python parser for ARK: Survival Evolved and ARK: Survival Ascended save files"
 readme = "README.md"
 license = "MIT"

{arkparser-0.7.3 → arkparser-0.7.4}/tests/test_export.py

@@ -3,6 +3,7 @@
 import datetime as dt
 import os
 import shutil
+import typing as t
 from pathlib import Path
 
 import pytest
@@ -157,6 +158,39 @@ def test_export_tribes_active_never_future() -> None:
     assert rec["active"] is None
 
 
+def test_allocate_profiles_ignores_stale_profile_tribe_id() -> None:
+    """A profile whose TribeID names a tribe that no longer lists the player
+    in its member roster must NOT be allocated to that tribe (the game leaves
+    TribeID stale in profiles of members removed while offline). It falls
+    through to a solo tribe keyed on the player id."""
+    from arkparser.export import _allocate_profiles
+
+    current = t.cast(Profile, type("P", (), {"player_id": 1, "raw_tribe_id": 555})())
+    stale = t.cast(Profile, type("P", (), {"player_id": 987, "raw_tribe_id": 555})())
+    member_index = {1: 555, 2: 555}
+    tribe_members = {555: {1, 2}}
+    profile_tribeid, players_by_tribe = _allocate_profiles(
+        [current, stale], {555}, member_index, tribe_members
+    )
+    assert profile_tribeid[1] == 555
+    assert profile_tribeid[987] == 987
+    assert players_by_tribe[555] == [1]
+    assert players_by_tribe[987] == [987]
+
+
+def test_allocate_profiles_member_list_still_wins_without_explicit_id() -> None:
+    """A profile with no usable TribeID but present in a tribe's roster is
+    still allocated to that tribe via the member-list fallback."""
+    from arkparser.export import _allocate_profiles
+
+    prof = t.cast(Profile, type("P", (), {"player_id": 2, "raw_tribe_id": 0})())
+    profile_tribeid, players_by_tribe = _allocate_profiles(
+        [prof], {555}, {2: 555}, {555: {2}}
+    )
+    assert profile_tribeid[2] == 555
+    assert players_by_tribe[555] == [2]
+
+
 def test_export_tribe_logs_uses_tribe_parser(ase_tribe_path: Path) -> None:
     tribe = Tribe.load(ase_tribe_path)
     exported = export_tribe_logs(type("Holder", (), {"tribes": [tribe]})())