PySimultan 0.6.0.8__tar.gz → 0.6.1__tar.gz

{pysimultan-0.6.0.8 → pysimultan-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.6.0.8
+Version: 0.6.1
 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.6.0.8 → pysimultan-0.6.1}/src/PySimultan2/CHANGELOG.md

@@ -1,5 +1,5 @@
-Version 0.6.0.7 (16.02.2024)
-- Fixed Asset creation and deletion bugs
+Version 0.6.1 (24.02.2024)
+- Bugfixes in default_types and File/Directory handling
 
 Version 0.6.0.3 (23.01.2024)
 - Added sub_classes and super_classes to SimultanObject

pysimultan-0.6.1/src/PySimultan2/__about__.py

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

{pysimultan-0.6.0.8 → pysimultan-0.6.1}/src/PySimultan2/data_model.py

@@ -1,4 +1,5 @@
 import atexit
+import pathlib
 import os
 import shutil
 from uuid import uuid4
@@ -528,6 +529,17 @@ class DataModel:
             if isinstance(target_dir, SystemFileInfo):
                 target_dir = target_dir.FullPath
 
+            if target_dir.startswith(self.project.ProjectUnpackFolder.FullPath):
+                return self.project.AddEmptyResource(SystemFileInfo(os.path.join(target_dir, str(filename))))
+            else:
+                return self.project.AddEmptyResource(SystemFileInfo(os.path.join(
+                    self.project.ProjectUnpackFolder.FullPath,
+                    target_dir,
+                    str(filename))
+                )
+                )
+
+
             return self.project.AddEmptyResource(FileInfo(
                 os.path.join(target_dir, str(filename))
                                                           )
@@ -595,6 +607,9 @@ class DataModel:
 
             if not act_filename.startswith(self.project.ProjectUnpackFolder.FullPath) and target_dir is None:
                 target_dir_str = self.project.ProjectUnpackFolder.FullPath
+            elif act_filename.startswith(self.project.ProjectUnpackFolder.FullPath):
+                target_dir_str = ''
+
             elif target_dir is not None:
                 if isinstance(target_dir, ResourceDirectoryEntry):
                     target_dir_str = target_dir.CurrentFullPath
@@ -626,7 +641,7 @@ class DataModel:
             if target_dir is None:
                 resource = self.project.CopyResourceAsContainedFileEntry(filename,
                                                                          self.project.ProjectUnpackFolder,
-                                                                         '1')
+                                                                         '{0} ({1})')
             else:
                 if isinstance(target_dir, str):
                     target_dir = DirectoryInfo(target_dir)
@@ -685,40 +700,102 @@ class DataModel:
         self.get_file_infos.cache_clear()
         return success
 
+    def get_existing_resource_directory_entry(self,
+                                              full_path: str) -> ResourceDirectoryEntry:
+        return self.project_data_manager.AssetManager.GetResource(DirectoryInfo(full_path))
+
     def create_resource_directory(self,
                                   name: str,
-                                  parent_directory: DirectoryInfo=None,
+                                  parent_directory: Union[DirectoryInfo, str, pathlib.Path]=None,
+                                  create_parents: bool = True,
                                   collision_name_format: str = '{0} ({1})') -> ResourceEntry:
 
-        # check if directory already exists
         if parent_directory is None:
-            full_path = os.path.join(self.project.ProjectUnpackFolder.FullPath, name)
+            if name.startswith(self.project.ProjectUnpackFolder.FullPath):
+                full_path = name
+            else:
+                full_path = os.path.join(self.project.ProjectUnpackFolder.FullPath, name)
         else:
-            full_path = os.path.join(parent_directory.FullPath, name)
-
-        def get_existing(full_file_path: str):
-            new_directory = self.project_data_manager.AssetManager.GetResource(DirectoryInfo(full_path))
-            if new_directory is None:
-                res = self.project_data_manager.AssetManager.CreateResourceDirIn(os.path.basename(full_path),
-                                                                                 DirectoryInfo(
-                                                                                     os.path.dirname(
-                                                                                         full_path)),
-                                                                                 '0')
-
-                new_directory = self.project_data_manager.AssetManager.GetResource(res.Item1)
-            return new_directory
-
-        if os.path.exists(full_path):
-            new_directory = get_existing(full_path)
-            return new_directory
+            if isinstance(parent_directory, str):
+                if not parent_directory.startswith(self.project.ProjectUnpackFolder.FullPath):
+                    full_path = os.path.join(self.project.ProjectUnpackFolder.FullPath, parent_directory, name)
+                else:
+                    full_path = parent_directory
+            elif isinstance(parent_directory, DirectoryInfo):
+                full_path = os.path.join(parent_directory.FullPath, name)
+            elif isinstance(parent_directory, pathlib.Path):
+                full_path = os.path.join(parent_directory, name)
+
+
+        existing_resource_directory = self.get_existing_resource_directory_entry(str(full_path))
+        if existing_resource_directory is not None:
+            return existing_resource_directory
+
+        if str(pathlib.Path(full_path).parents[0]) == self.project.ProjectUnpackFolder.FullPath:
+            # create directory in ProjectUnpackFolder
+            resource_directory_entry = self.get_existing_resource_directory_entry(full_path)
+            if resource_directory_entry is not None:
+                return resource_directory_entry
+            else:
+                new_resource_entry = self.project.CreateResourceDirIn(
+                    str(
+                        pathlib.Path(full_path).relative_to(pathlib.Path(self.project.ProjectUnpackFolder.FullPath))
+                    ),
+                    None,
+                    collision_name_format)
+                if new_resource_entry not in self.project_data_manager.AssetManager.Resources:
+                    self.project_data_manager.AssetManager.AddResourceEntry(new_resource_entry)
+                return new_resource_entry
+        else:
+            if parent_directory is None:
+                parent = None
+                for i in reversed(range(pathlib.Path(full_path).parents.__len__())):
+                    parent = pathlib.Path(full_path).parents[i]
+                    if str(parent) in self.project.ProjectUnpackFolder.FullPath:
+                        continue
+                    if not os.path.exists(parent):
+                        if create_parents:
+                            parent_directory = self.create_resource_directory(parent.name,
+                                                                        parent_directory=parent.parents[0],
+                                                                        create_parents=False)
+                        else:
+                            raise FileNotFoundError(f'Parent directory {parent} does not exist')
+                    else:
+                        parent_directory = self.get_existing_resource_directory_entry(str(parent))
 
         if parent_directory is None:
-            new_directory = self.project.CreateResourceDirIn(name, None, collision_name_format)
-        if parent_directory is not None:
-            new_directory = self.project.CreateResourceDirIn(name, parent_directory, collision_name_format)
-
-        return new_directory
+            new_resource_entry = self.project.CreateResourceDirIn(
+                str(
+                    pathlib.Path(full_path).relative_to(pathlib.Path(self.project.ProjectUnpackFolder.FullPath))
+                ),
+                parent_directory,
+                collision_name_format)
+            self.project_data_manager.AssetManager.AddResourceEntry(new_resource_entry)
+            return new_resource_entry
+        else:
+            if isinstance(parent_directory, pathlib.Path):
+                target = str(pathlib.Path(full_path).relative_to(parent_directory))
+                parent_directory_target = DirectoryInfo(str(parent_directory))
+            elif isinstance(parent_directory, str):
+                target = str(pathlib.Path(full_path).relative_to(pathlib.Path(parent_directory)))
+                parent_directory_target = DirectoryInfo(parent_directory)
+            elif isinstance(parent_directory, DirectoryInfo):
+                target = str(pathlib.Path(full_path).relative_to(pathlib.Path(parent_directory.CurrentFullPath)))
+                parent_directory_target = parent_directory
+            elif isinstance(parent_directory, ResourceDirectoryEntry):
+                target = str(pathlib.Path(full_path).relative_to(pathlib.Path(parent_directory.CurrentFullPath)))
+                parent_directory_target = DirectoryInfo(parent_directory.CurrentFullPath)
 
+            else:
+                raise ValueError(f'Parent directory {parent_directory} not found')
+
+            new_resource_entry = self.project.CreateResourceDirIn(
+                target,
+                parent_directory_target,
+                collision_name_format)
+            if new_resource_entry.manager is None:
+                self.project_data_manager.AssetManager.AddResourceEntry(new_resource_entry)
+            return new_resource_entry
 
     def add_table(self, table: SimMultiValueBigTable):
         self.project_data_manager.ValueManager.Add(table)

{pysimultan-0.6.0.8 → pysimultan-0.6.1}/src/PySimultan2/default_types.py

@@ -686,5 +686,22 @@ class ComponentDictionary(SimultanObject):
         }
         }
 
+    def get_raw_attr(self, attr: Optional[str] = None, text_or_key: Optional[str] = None):
+        if attr is not None:
+            content = self._taxonomy_map.get_content_by_property_name(attr)
+            if content is None:
+                content = Content(text_or_key=f'__dict_key__{attr}',
+                                  property_name=attr,
+                                  type=None,
+                                  unit=None,
+                                  documentation=f'Property {attr} in ComponentDictionary',
+                                  component_policy=self.component_policy)
+                self._taxonomy_map.add_content(content)
+
+            return get_component_taxonomy_entry(self._wrapped_obj, content.text_or_key)
+
+        if text_or_key is not None:
+            return get_component_taxonomy_entry(self._wrapped_obj, text_or_key)
+
 
 component_dict_map = ComponentDictionary._taxonomy_map

{pysimultan-0.6.0.8 → pysimultan-0.6.1}/src/PySimultan2/files.py

@@ -301,12 +301,17 @@ class FileInfo(object, metaclass=MetaMock):
         data_model = kwargs.get('data_model', config.get_default_data_model())
 
         if target_dir is not None:
-            full_path = os.path.join(target_dir.full_path, filename)
+            if isinstance(target_dir, DirectoryInfo):
+                full_path = os.path.join(target_dir.full_path, filename)
+            elif isinstance(target_dir, ResourceDirectoryEntry):
+                full_path = os.path.join(target_dir.CurrentFullPath, filename)
+            elif isinstance(target_dir, str):
+                full_path = os.path.join(target_dir, filename)
         else:
-            full_path = os.path.join(data_model.project.ProjectUnpackFolder, filename)
-
-
-
+            if not filename.startswith(str(data_model.project.ProjectUnpackFolder)):
+                full_path = os.path.join(str(data_model.project.ProjectUnpackFolder), filename)
+            else:
+                full_path = filename
 
         if os.path.isfile(full_path):
             # check if resource entry exists

{pysimultan-0.6.0.8 → pysimultan-0.6.1}/src/PySimultan2/utils.py

@@ -1375,7 +1375,7 @@ def set_property_to_dict(value: dict,
                 return
 
     if component_idx is not None:
-        component = component._wrapped_obj.Components.Items[component_idx].Component
+        sub_component = component._wrapped_obj.Components.Items[component_idx].Component
 
         if 'ComponentDictionary' in [x.Target.Key for x in component.Slots]:
             if not hasattr(component, '_object_mapper'):
@@ -1395,7 +1395,6 @@ def set_property_to_dict(value: dict,
             component_dict.update(value)
             return component_dict
         else:
-            component._data_model.remove_subcomponent(component)
             component._wrapped_obj.Components.RemoveItem(component_idx)
         component_idx = None
     if ref_component_idx is not None:

{pysimultan-0.6.0.8 → pysimultan-0.6.1}/tests/test_directory_and_files.py

@@ -19,6 +19,11 @@ def test_files_and_directory_creation():
     new_directory_info = DirectoryInfo(path='directory_info_dir',
                                        data_model=new_data_model)
 
+
+    new_directory_info = DirectoryInfo(path='not_existing_dir/directory_to_create',
+                                       data_model=new_data_model)
+
+
     print(new_data_model.file_directories)
 
     print(new_directory_info.resource_entry)
@@ -148,7 +153,12 @@ def test_load_component_with_directory():
     mapper.clear()
 
 
+def test_complex_file_and_directory_info():
+    pass
+
+
 if __name__ == '__main__':
-    # test_files_and_directory_creation()
+    test_files_and_directory_creation()
+    test_complex_file_and_directory_info()
     test_component_with_directory()
     test_load_component_with_directory()

pysimultan-0.6.0.8/src/PySimultan2/__about__.py

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