arkparse 0.4.2__tar.gz → 0.4.4__tar.gz

{arkparse-0.4.2 → arkparse-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparse
-Version: 0.4.2
+Version: 0.4.4
 Summary: A package to parse and modify ark save files
 Project-URL: Homepage, https://github.com/VincentHenauGithub/ark-save-parser
 Author-email: Vincent Henau <vincent.henau.github@gmail.com>

{arkparse-0.4.2 → arkparse-0.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arkparse"
-version = "0.4.2"
+version = "0.4.4"
 dependencies = [
     "rcon>=2.4.9",
     "numpy>=2.3.2",

{arkparse-0.4.2 → arkparse-0.4.4}/src/arkparse/api/structure_api.py

@@ -108,6 +108,7 @@ class StructureApi:
 
         structures = {}
 
+        ArkSaveLogger.api_log(f"Parsing structure objects into structure models, total objects to parse: {len(objects)}")
         for key, obj in objects.items():
             obj : ArkGameObject = obj
             if obj is None:
@@ -306,10 +307,7 @@ class StructureApi:
     def get_all_with_inventory(self) -> Dict[UUID, StructureWithInventory]:
         structures = self.get_all()
         result = {}
-
-        for key, obj in structures.items():
-            if isinstance(obj, StructureWithInventory):
-                result[key] = obj
+        result = {key: obj for key, obj in structures.items() if isinstance(obj, StructureWithInventory)}
 
         return result
     

{arkparse-0.4.2 → arkparse-0.4.4}/src/arkparse/object_model/misc/inventory.py

@@ -17,12 +17,13 @@ from ...utils.json_utils import DefaultJsonEncoder
 
 @dataclass
 class Inventory(ParsedObjectBase):
-    items: Dict[UUID, InventoryItem]
+    _items: Dict[UUID, InventoryItem]
+    item_classes: Dict[UUID, str]
     started_empty: bool = False
     def __init__(self, uuid: UUID, save: AsaSave = None):
         super().__init__(uuid, save=save)
-        self.items = {}
-
+        self._items = {}
+        self.item_classes = {}
         if self.object is None:
             ArkSaveLogger.error_log(f"Inventory object with UUID {uuid} could not be loaded from save, not found")
             return
@@ -30,17 +31,39 @@ class Inventory(ParsedObjectBase):
         item_arr = self.object.get_array_property_value("InventoryItems")
         for item in item_arr:
             item_uuid = UUID(item.value)
-            item = InventoryItem(item_uuid, save=save)
-            if item.object is None:
-                ArkSaveLogger.warning_log(f"Inventory item {item_uuid} could not be loaded from save, not found")
-            else:
-                is_engram = item.object.get_property_value("bIsEngram")
-                if is_engram is None or not is_engram:
-                    self.items[item_uuid] = item
+            item_class = self.save.get_class_of_uuid(item_uuid)
+            self.item_classes[item_uuid] = item_class
+
+    @property
+    def items(self) -> Dict[UUID, InventoryItem]:
+        if len(self._items) != len(self.item_classes):
+            self._items = {}
+            item_arr = self.object.get_array_property_value("InventoryItems")
+            for item in item_arr:
+                item_uuid = UUID(item.value)
+                if item_uuid not in self._items.keys():
+                    self._items[item_uuid] = InventoryItem(item_uuid, self.save)
+        return self._items
 
     @property
     def number_of_items(self):
         return len(self.items)
+    
+    def get_items_of_class(self, class_name: str) -> Dict[UUID, InventoryItem]:
+        result = {}
+        for item_uuid, item_class in self.item_classes.items():
+            if item_class == class_name:
+                result[item_uuid] = self.get_item(item_uuid)
+        return result
+    
+    def get_item(self, uuid: UUID) -> InventoryItem:
+        if uuid in self.item_classes.keys():
+            if uuid in self._items.keys():
+                return self._items[uuid]
+            else:
+                item = InventoryItem(uuid, self.save)
+                self._items[uuid] = item
+                return item
 
     def add_item(self, item: UUID, store: bool = True):
         if len(self.items) == 0:

{arkparse-0.4.2 → arkparse-0.4.4}/src/arkparse/object_model/structures/structure_with_inventory.py

@@ -16,6 +16,7 @@ class StructureWithInventory(Structure):
     max_item_count: int
 
     _inventory: Inventory
+    _bps_in_inventory: Optional[set[str]] = None
 
     def __init__(self, uuid: UUID, save: AsaSave, bypass_inventory: bool = False):
         self._inventory = None

{arkparse-0.4.2 → arkparse-0.4.4}/src/arkparse/parsing/ark_property.py

@@ -423,7 +423,6 @@ class ArkProperty:
                 ArkSaveLogger.warning_log(f"Skipping to the end of the struct, type: {array_content_type}")
                 bb.set_position(data_start_position + data_size)
                 bb.structured_print(to_default_file=True)
-                input("Press Enter to continue...")
                 ArkSaveLogger.open_hex_view(True)
 
             # if array_content_type == "PrimalCharacterStatusValueModifier":
@@ -524,12 +523,12 @@ class ArkProperty:
                     UNSUPPORTED_STRUCTS.append(struct_type)
                 
                 # uncomment the lines below if you want to make objects of unknown structs
-                ArkSaveLogger.parser_log(f"Reading struct {struct_type} as array")
-                bb.structured_print(to_default_file=True)
-                bb.store()
-                ArkSaveLogger.error_log(f"Unsupported struct type {struct_type} in array")
-                ArkSaveLogger.open_hex_view(True)
-                raise ValueError(f"Unsupported struct type {struct_type}")
+                # ArkSaveLogger.parser_log(f"Reading struct {struct_type} as array")
+                # bb.structured_print(to_default_file=True)
+                # bb.store()
+                # ArkSaveLogger.error_log(f"Unsupported struct type {struct_type} in array")
+                # ArkSaveLogger.open_hex_view(True)
+                # raise ValueError(f"Unsupported struct type {struct_type}")
 
         ArkSaveLogger.parser_log(f"Reading struct {struct_type} with data size {data_size} as property list at position {bb.get_position()}")
         # Fallback: struct as property list

{arkparse-0.4.2 → arkparse-0.4.4}/src/arkparse/saves/asa_save.py

@@ -58,6 +58,9 @@ class AsaSave:
             return False
         return True
 
+    def get_class_of_uuid(self, obj_uuid: uuid.UUID) -> Optional[str]:
+        return self.save_connection.get_class_of_uuid(obj_uuid)
+
     def _get_game_time_params(self):
         config: GameObjectReaderConfiguration = GameObjectReaderConfiguration()
         config.blueprint_name_filter = lambda name: name is not None and "daycycle" in name.lower()

{arkparse-0.4.2 → arkparse-0.4.4}/src/arkparse/saves/save_connection.py

@@ -19,6 +19,8 @@ class SaveConnection:
     nr_parsed = 0
     faulty_objects = 0
 
+    failed_parses: Dict[str, int] = {}
+
     def __init__(self, save_context: SaveContext, path: Path = None, contents: bytes = None, read_only: bool = False):
 
         # create temp copy of file
@@ -113,6 +115,12 @@ class SaveConnection:
         if self.connection:
             self.connection.close()
 
+    def get_class_of_uuid(self, obj_uuid: uuid.UUID) -> Optional[str]:
+        bin = self.get_game_obj_binary(obj_uuid)
+        reader = ArkBinaryParser(bin, self.save_context)
+        class_name, string_name = ArkGameObject.read_name(obj_uuid, reader)
+        return class_name
+
     def list_all_items_in_db(self):
         query = "SELECT key, value FROM game"
         with self.connection as conn:
@@ -402,6 +410,14 @@ class SaveConnection:
                     ArkSaveLogger.exit_struct()
                     continue
 
+                if SaveConnection.failed_parses.get(class_name, 0) >= 5:
+                    if SaveConnection.failed_parses[class_name] == 5:
+                        ArkSaveLogger.warning_log(f"Skipping parsing of class {class_name} due to previous errors")
+                    SaveConnection.failed_parses[class_name] += 1
+                    ArkSaveLogger.exit_struct()
+                    self.faulty_objects += 1
+                    continue
+
                 if class_name not in objects:
                     objects.append(class_name)
                 
@@ -482,14 +498,18 @@ class SaveConnection:
             else:
                 byte_buffer.structured_print(to_default_file=True)
                 ArkSaveLogger.warning_log(f"Error parsing non-standard object of type {class_name}")
-            
-            ArkSaveLogger.error_log("Reparsing with logging:")
-            ArkSaveLogger.set_log_level(ArkSaveLogger.LogTypes.PARSER, True)
-            try:
-                ArkGameObject(obj_uuid, class_name, byte_buffer)
-            except Exception as _:
-                ArkSaveLogger.set_log_level(ArkSaveLogger.LogTypes.PARSER, False)
-                ArkSaveLogger.open_hex_view(True)
+
+            SaveConnection.failed_parses[class_name] = SaveConnection.failed_parses.get(class_name, 0) + 1
+            ArkSaveLogger.warning_log(f"Failed parses for this class: {SaveConnection.failed_parses[class_name]}")
+
+            if SaveConnection.failed_parses[class_name] == 1:
+                ArkSaveLogger.error_log("Reparsing with logging:")
+                ArkSaveLogger.set_log_level(ArkSaveLogger.LogTypes.PARSER, True)
+                try:
+                    ArkGameObject(obj_uuid, class_name, byte_buffer)
+                except Exception as _:
+                    ArkSaveLogger.set_log_level(ArkSaveLogger.LogTypes.PARSER, False)
+                    ArkSaveLogger.open_hex_view(True)
 
             if reraise:
                 raise Exception(f"Error parsing object {obj_uuid} of type {class_name}: {e}")