PySimultan 0.5.9.5__tar.gz → 0.5.9.6__tar.gz

{pysimultan-0.5.9.5 → pysimultan-0.5.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.5.9.5
+Version: 0.5.9.6
 Project-URL: Documentation, https://github.com/Bühler Maximilian/PySimultan2#readme
 Project-URL: Issues, https://github.com/Bühler Maximilian/PySimultan2/issues
 Project-URL: Source, https://github.com/Bühler Maximilian/PySimultan2

pysimultan-0.5.9.6/src/PySimultan2/__about__.py

@@ -0,0 +1 @@
+version = '0.5.9.6'

{pysimultan-0.5.9.5 → pysimultan-0.5.9.6}/src/PySimultan2/data_model.py

@@ -587,18 +587,33 @@ class DataModel:
 
             del_copy = False
 
-            existing_files = [x.Name for x in self.project_data_manager.AssetManager.Resources]
+            existing_files = [x.current_full_path for x in self.project_data_manager.AssetManager.Resources]
             try:
                 act_filename = filename.replace('\\', os.sep)
             except TypeError:
                 act_filename = filename
 
-            if os.path.basename(act_filename) in existing_files:
+            if not act_filename.startswith(self.project.ProjectUnpackFolder.FullPath) and target_dir is None:
+                target_dir_str = self.project.ProjectUnpackFolder.FullPath
+            elif target_dir is not None:
+                if isinstance(target_dir, ResourceDirectoryEntry):
+                    target_dir_str = target_dir.CurrentFullPath
+                elif isinstance(target_dir, SystemFileInfo):
+                    target_dir_str = target_dir.FullPath
+                elif isinstance(target_dir, str):
+                    target_dir_str = target_dir
+                elif isinstance(target_dir, DirectoryInfo):
+                    target_dir_str = target_dir.FullPath
+
+            full_filename = os.path.join(target_dir_str, os.path.basename(act_filename))
+
+            if full_filename in existing_files:
                 # create copy with running counter in temp dir and use this file:
                 counter = 1
                 while True:
                     new_filename = os.path.basename(filename) + f'({str(counter)})'
-                    if new_filename not in existing_files and not os.path.exists(new_filename):
+                    full_filename = os.path.join(target_dir_str, new_filename)
+                    if full_filename not in existing_files and not os.path.exists(new_filename):
                         break
                     counter += 1
                 shutil.copy(filename, os.path.join(os.path.dirname(filename),  new_filename))
@@ -860,7 +875,18 @@ class DataModel:
 
     @lru_cache()
     def get_file_infos(self) -> list[PythonFileInfo]:
-        return [PythonFileInfo(resource_entry=asset) for asset in self.assets]
+        file_infos = []
+        for asset in self.assets:
+            if isinstance(asset, ResourceFileEntry):
+                file_infos.append(PythonFileInfo(resource_entry=asset))
+        return file_infos
+
+    def get_directory_infos(self) -> list[PythonDirectoryInfo]:
+        dir_infos = []
+        for asset in self.assets:
+            if isinstance(asset, ResourceDirectoryEntry):
+                dir_infos.append(PythonDirectoryInfo(resource_entry=asset, data_model=self))
+        return dir_infos
 
     def get_file_info_by_key(self,
                              key: int) -> Optional[PythonFileInfo]:

{pysimultan-0.5.9.5 → pysimultan-0.5.9.6}/src/PySimultan2/default_types.py

@@ -17,6 +17,9 @@ from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolPara
                                       SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
                                       SimSlot, SimComponentVisibility, SimChildComponentEntry, SimDefaultSlots,
                                       SimParameterOperations, SimComponentReference)
+
+from SIMULTAN.Data.Assets import DocumentAsset
+
 from .files import FileInfo
 
 from . import config
@@ -562,9 +565,14 @@ class ComponentDictionary(SimultanObject):
         for ref_asset in self._wrapped_obj.ReferencedAssets.Items:
             for tag in ref_asset.Resource.Tags:
                 key = tag.Target.Key.replace('__dict_key__', '')
-                comp_dict[key] = get_obj_value(ref_asset.Target,
-                                               data_model=self._data_model,
-                                               object_mapper=self._object_mapper)
+                if isinstance(ref_asset, DocumentAsset):
+                    comp_dict[key] = get_obj_value(ref_asset.Resource,
+                                                   data_model=self._data_model,
+                                                   object_mapper=self._object_mapper)
+                else:
+                    comp_dict[key] = get_obj_value(ref_asset.Target,
+                                                   data_model=self._data_model,
+                                                   object_mapper=self._object_mapper)
 
         object.__setattr__(self, '_dict', comp_dict)
 

pysimultan-0.5.9.5/src/PySimultan2/__about__.py

@@ -1 +0,0 @@
-version = '0.5.9.5'