PySimultan 0.5.9.1__tar.gz → 0.5.9.4__tar.gz

{pysimultan-0.5.9.1 → pysimultan-0.5.9.4}/.gitignore

@@ -15,6 +15,7 @@ build
 *.codxf
 *.grdxf
 ~*.simultan
+*.simultan
 *.simultanbackup
 simultan_exception*
 /PySimultan2/tests/resources/~*

{pysimultan-0.5.9.1 → pysimultan-0.5.9.4}/PKG-INFO

@@ -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 → pysimultan-0.5.9.4}/README.md

@@ -138,6 +138,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 → pysimultan-0.5.9.4}/src/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
 

pysimultan-0.5.9.4/src/PySimultan2/__about__.py

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

{pysimultan-0.5.9.1 → pysimultan-0.5.9.4}/src/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.4/tests/resources/new_test_file.txt

@@ -0,0 +1 @@
+This is the content of the file.

pysimultan-0.5.9.4/tests/resources/new_test_file2.txt

@@ -0,0 +1 @@
+This is the content of the file 2.

pysimultan-0.5.9.1/src/PySimultan2/__about__.py

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

pysimultan-0.5.9.1/tests/resources/new_test_file.txt

@@ -1 +0,0 @@
-This is the content of the file.

pysimultan-0.5.9.1/tests/resources/new_test_file2.txt

@@ -1 +0,0 @@
-This is the content of the file 2.