PySimultan 0.5.4__py3-none-any.whl → 0.5.5__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.5.4'
+version = '0.5.5'

PySimultan2/files.py

@@ -129,7 +129,7 @@ def create_asset_from_string(filename: str,
 
         if target_dir is not None:
             if isinstance(target_dir, DirectoryInfo):
-                target_dir = target_dir.current_full_path
+                target_dir = target_dir.full_path
 
             resource = data_model.add_resource(filepath,
                                                target_dir=target_dir)
@@ -324,6 +324,11 @@ class FileInfo(object, metaclass=MetaMock):
         except Exception as e:
             return None
 
+    @property
+    def directory(self) -> DirectoryInfo:
+        return DirectoryInfo(resource_entry=self.resource_entry.Parent,
+                             data_model=self.data_model)
+
     @property
     def resource_entry(self) -> Union[ResourceFileEntry, ContainedResourceFileEntry, None]:
         if self._resource_entry is None:
@@ -505,14 +510,18 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
 
     def __init__(self,
                  path: Optional[str] = None,
+                 helper_file: Optional[FileInfo] = None,
+                 resource_entry: Optional[ResourceDirectoryEntry] = None,
                  *args,
                  **kwargs):
 
         self._resource_entry: Optional[ResourceDirectoryEntry] = None
+        self._helper_file: Optional[FileInfo] = None
         self.data_model: Optional[DataModel] = kwargs.get('data_model', None)
         self.path: str = path
 
-        self.resource_entry = kwargs.get('resource_entry', None)
+        self.resource_entry = resource_entry
+        self.helper_file = helper_file
 
     @property
     def tags(self) -> List[SimTaxonomyEntry]:
@@ -526,6 +535,17 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
     def relative_path(self) -> str:
         return self.resource_entry.CurrentRelativePath
 
+    @property
+    def helper_file(self) -> Optional[FileInfo]:
+        if self._helper_file is None:
+            self._helper_file = self.add_file('__dir_helper_file__')
+
+        return self._helper_file
+
+    @helper_file.setter
+    def helper_file(self, value):
+        self._helper_file = value
+
     @property
     def resource_entry(self) -> Optional[ResourceDirectoryEntry]:
         if self._resource_entry is None:
@@ -578,7 +598,7 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
                                                                                                              (
                                                                                                              ResourceFileEntry,
                                                                                                              ContainedResourceFileEntry)
-                                                                                                             )
+                                                                                                             ) and entry.Name != '__dir_helper_file__'
                 ]
 
     @property
@@ -610,4 +630,4 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
         add_tag_to_resource(self.resource_entry, tag)
 
     def __repr__(self):
-        return f'DirectoryInfo(key:{self.key}, hash: {hash(self)}; {self.full_path};)'
+        return f'DirectoryInfo(key:{self.key}, hash: {hash(self)}; {self.full_path})'

PySimultan2/utils.py

@@ -770,6 +770,13 @@ def get_resource_entry_value(obj: ResourceEntry,
                              data_model: DataModel = None,
                              object_mapper: PythonMapper = None) -> Union[FileInfo, DirectoryInfo]:
     if isinstance(obj, (ResourceFileEntry, ContainedResourceFileEntry, LinkedResourceFileEntry)):
+
+        if obj.Name == '__dir_helper_file__':
+            return DirectoryInfo(file_path=obj.Parent.CurrentFullPath,
+                                 resource_entry=obj.Parent,
+                                 helper_file=obj,
+                                 data_model=data_model)
+
         return FileInfo(file_path=obj.File.FullPath,
                         resource_entry=obj,
                         data_model=data_model)
@@ -1203,7 +1210,7 @@ def set_property_to_directory_info(value: DirectoryInfo,
         ref_asset_idx = None
 
     add_asset_to_component(component._wrapped_obj,
-                           value.resource_entry,
+                           value.helper_file.resource_entry,
                            '0',
                            tag=taxonomy_entry)
 

{pysimultan-0.5.4.dist-info → pysimultan-0.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.5.4
+Version: 0.5.5
 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.4.dist-info → pysimultan-0.5.5.dist-info}/RECORD

@@ -1,15 +1,15 @@
 PySimultan2/CHANGELOG.md,sha256=LeVHBC6dGDwDwgXipNrwgvgews9QkyjsqtYa_jiLMm0,217
-PySimultan2/__about__.py,sha256=N_0JaEMS7tHfCVPCoxXAr5ZZHHSVV9O6Uipd_gj4y00,19
+PySimultan2/__about__.py,sha256=vzEzJZ6JrU1XuEoNmBm-CHsw0z44e2mWFvuJveRe8YM,19
 PySimultan2/__init__.py,sha256=PGVR1uhY01dF5tHyad-znURUZ_LVB95vsjId2BT0aJM,3245
 PySimultan2/data_model.py,sha256=YYtfcR6jvGztng6Be8Vw9FQ02cPkl8ATHTZMoIu1ABQ,34140
 PySimultan2/default_types.py,sha256=K-Eka5BCKk8DT3HU5761Ym_-ZFmu1_Dro0zW0LVGoHA,27157
-PySimultan2/files.py,sha256=j3mGpu63h4BCDzyAZSfOIeylLysIUas3ac1MAeRhLXY,21709
+PySimultan2/files.py,sha256=BCETl4M8qedw7Bjt8QXvY6Rl3U6Lou36XqPY2ST1o9Q,22447
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
 PySimultan2/object_mapper.py,sha256=_SQye38NmIr4m_-X9CuvUJnVDBmjmUDdPH2bnaxpzKY,18546
 PySimultan2/simultan_object.py,sha256=akaSUZZWIVfwx1wT5EdOgRR2UeShUthX-LE2Uk6w8CQ,19058
 PySimultan2/taxonomy_maps.py,sha256=abMB2RSKEaliW-Ewegq-Inq9npHeOD1VVrMYoKJAlC0,8762
 PySimultan2/type_setter_lookup.py,sha256=px92E-BlnvY-11F-F7L7cOwbE1_L8FQVqi-23nJi5j4,3518
-PySimultan2/utils.py,sha256=2rVCg6rX4kI3H4ziOm4ki-akTBJJlBr1n_6-mGSes5M,66388
+PySimultan2/utils.py,sha256=TOrMMTh6n63VgjEGVX6j67_jhUx4ImFI39X61g0OegQ,66692
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=nbb9U2W3vFviVLxISLHRi2CVyLEM-3zIKvoZ1uSYs_8,23420
 PySimultan2/geometry/utils.py,sha256=J25YsK8sso_UL7xRusItQZvyjtvxdOsSPelBQYFABhY,8519
@@ -75,7 +75,7 @@ PySimultan2/resources/assimp.dll,sha256=HwfDwXqoPDTFRyoQpA3qmgZoUdFtziJkV5fNtktE
 PySimultan2/resources/componentmanager.user,sha256=hrzr1US4pqkFnLHXcvPkvrgGd7QvlxaV8mhS6fuikEs,760
 PySimultan2/resources/defaultsettings.xml,sha256=s6Tk1tubLz5UYqXZWpD42EDHzedemRY1nEneoIVcUfg,392
 PySimultan2/resources/setup.bat,sha256=fjvvYfVM6TalS-QTSiKAbAId5nTsk8kGGo06ba-wWaY,32
-pysimultan-0.5.4.dist-info/METADATA,sha256=rpPIvUKiZc-IY9kSfDo9wPpGJY5Hd0A31UXgbmnQ6kM,2665
-pysimultan-0.5.4.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-pysimultan-0.5.4.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.5.4.dist-info/RECORD,,
+pysimultan-0.5.5.dist-info/METADATA,sha256=vqTp0MfBHnJUxHyFF_DCVeAXKICkXCsiVvuRINKvZXw,2665
+pysimultan-0.5.5.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+pysimultan-0.5.5.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.5.5.dist-info/RECORD,,