PySimultan 0.5.9.1__py3-none-any.whl → 0.5.9.4__py3-none-any.whl

PySimultan2/CHANGELOG.md

@@ -1,3 +1,6 @@
+Version 0.5.9.4 (31.12.2024)
+- Fixed bug in DirectoryInfo where __dir__helper_file__ was not found if already existing
+
 Version 0.5.7 (11.12.2024)
 - Added get_orientation_to_volume method to SimultanFace which returns the orientation of the face to the volume
 

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.5.9.1'
+version = '0.5.9.4'

PySimultan2/files.py

@@ -666,14 +666,54 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
         else:
             return None
 
-    def add_sub_directory(self, name: str) -> DirectoryInfo:
-        return DirectoryInfo(path=os.path.join(self.resource_entry.current_relative_path, name),
+    def add_sub_directory(self, dirname: str) -> DirectoryInfo:
+
+        existing = next((x for x in self.sub_directories if x.resource_entry.current_relative_path == dirname), None)
+        if existing is not None:
+            return existing
+
+        return DirectoryInfo(path=os.path.join(self.resource_entry.current_relative_path, dirname),
                              data_model=self.data_model)
 
+    def get_sub_directory(self,
+                          dirname: str,
+                          create=False) -> Optional[DirectoryInfo]:
+        """
+        Get a sub directory by name.
+        :param dirname: directory name, relative to self.relative_path
+        :param create:
+        :return:
+        """
+
+        logger.debug(f'Getting sub directory in {self.relative_path}: {dirname}')
+        res = next((x for x in self.sub_directories if x.resource_entry.Name == dirname), None)
+        if not res and create:
+            logger.debug(f'Creating sub directory in {self.relative_path}: {dirname}')
+            res = self.add_sub_directory(dirname)
+
+        return res
+
+    def get_file(self, filename: str) -> Optional[FileInfo]:
+        resource = next((x for x in self.files if x.resource_entry.Name == filename), None)
+        if resource is not None:
+            return FileInfo(resource_entry=entry,
+                            data_model=self.data_model)
+        else:
+            return None
+
     def add_file(self,
                  filename: str,
                  content: Optional[str] = None) -> FileInfo:
 
+        if Path(self.full_path).joinpath(filename).exists():
+            return FileInfo.from_existing_file(str(Path(self.full_path).joinpath(filename)), data_model=self.data_model)
+
+
+        if self.resource_entry.Children:
+            file = self.get_file(filename)
+            if file is not None:
+                return file
+
         if content is not None:
             return FileInfo.from_string(filename=filename,
                                         content=content,

{pysimultan-0.5.9.1.dist-info → pysimultan-0.5.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.5.9.1
+Version: 0.5.9.4
 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
@@ -167,6 +167,9 @@ print(instances[0].param_1)
 
 # Change Log
 
+## [0.5.9.4] - 2024-12-31
+- Fixed bug in DirectoryInfo where \_\_dir_helper_file__ was not found if already existing
+
 ## [0.5.8] - 2024-12-17
 - Added FileInfo.from_existing_file method to create FileInfo object from existing file in ProjectUnpackFolder
 

{pysimultan-0.5.9.1.dist-info → pysimultan-0.5.9.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
-PySimultan2/CHANGELOG.md,sha256=BBfCqgFQeigrlRQdHAksDz70-0fLKjzWkHbfFjJ2eDg,361
-PySimultan2/__about__.py,sha256=PQD8y6NqxgcQTWZ0_8DSXDPWyJXVggB0QOB-reyq7bY,21
+PySimultan2/CHANGELOG.md,sha256=oibgN_OC1p98_zVtpae5CtPZNLLnpQYd3XGIN0ztniU,484
+PySimultan2/__about__.py,sha256=wcBZdv_01RfwUsYaNCg6k1n5X_r_lKL6F-5kjjNQTv0,21
 PySimultan2/__init__.py,sha256=42YM_zQUXdEjbjmgBI0nWJWsr_G6zNe7TxfFmS37mJk,3275
 PySimultan2/data_model.py,sha256=UcscVLbBaEu9UhV2iaGJnrqX51G5PyEQuoXrz41Hq9g,36126
 PySimultan2/default_types.py,sha256=K-Eka5BCKk8DT3HU5761Ym_-ZFmu1_Dro0zW0LVGoHA,27157
-PySimultan2/files.py,sha256=qx3I9WVW3se2qbWfN9QYQXL8kV2jZjd7HZpRGANm3-U,26040
+PySimultan2/files.py,sha256=b9Eii3RPx_zKuD09XUndcUrZPEOjYVf1jv2iWDXoWCo,27608
 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
@@ -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.9.1.dist-info/METADATA,sha256=r7-W3hsJ4lhzjWrkvdGUonwCEu7rXALauh6621n73uM,6138
-pysimultan-0.5.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pysimultan-0.5.9.1.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.5.9.1.dist-info/RECORD,,
+pysimultan-0.5.9.4.dist-info/METADATA,sha256=zr46P9K9fw5lYkhxEOCHTx7jToKoKxNi_GHX_ATlJOA,6256
+pysimultan-0.5.9.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pysimultan-0.5.9.4.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.5.9.4.dist-info/RECORD,,