PySimultan 0.5.8__py3-none-any.whl → 0.5.9__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.5.8'
+version = '0.5.9'

PySimultan2/data_model.py

@@ -532,6 +532,60 @@ class DataModel:
                                                           )
                                                  )
 
+    def add_resource_file(self,
+                          filename: Union[str, FileInfo, PythonFileInfo],
+                          target_dir: Union[ResourceDirectoryEntry, FileInfo, str] = None) -> ResourceEntry:
+
+        """
+        Add a file as resource to the project which already exists in the project folder
+        :param filename:
+        :param target_dir:
+        :return:
+        """
+
+        if isinstance(filename, str):
+            filename = FileInfo(filename)
+        elif isinstance(filename, PythonFileInfo):
+            filename = FileInfo(filename.full_path)
+
+        if target_dir is None:
+            # check if file is already in project folder
+            if not os.path.exists(os.path.join(str(self.project.ProjectUnpackFolder), filename.Name)):
+                raise FileNotFoundError(f'File {filename} not found in project folder {self.project.ProjectUnpackFolder}')
+
+            self.project.AddResourceFile(FileInfo(str(filename)),
+                                         self.project_data_manager)
+
+            full_filename = os.path.join(str(self.project.ProjectUnpackFolder), filename.Name)
+
+            return next(
+                (
+                    x for x in self.project_data_manager.AssetManager.Resources if x.CurrentFullPath == full_filename
+                )
+                , None
+            )
+
+        else:
+            if isinstance(target_dir, str):
+                target_dir = DirectoryInfo(target_dir)
+            elif isinstance(target_dir, ResourceDirectoryEntry):
+                target_dir = DirectoryInfo(target_dir.CurrentFullPath)
+            elif isinstance(target_dir, FileInfo):
+                pass
+
+            # check if file is already in project folder
+            if not os.path.exists(os.path.join(target_dir.FullPath, filename.Name)):
+                raise FileNotFoundError(f'File {filename} not found in project folder {target_dir.FullPath}')
+
+            self.project.AddResourceFile(
+                FileInfo(os.path.join(target_dir.FullPath, filename.Name)),
+                self.project_data_manager)
+
+            # get added resource
+            return next((x for x in self.project_data_manager.AssetManager.Resources if
+                         x.CurrentFullPath == os.path.join(target_dir.FullPath, filename.Name)), None)
+
+
     def add_resource(self,
                      filename: Union[str, FileInfo],
                      target_dir: Optional[Union[DirectoryInfo, ResourceDirectoryEntry, str]] = None,

PySimultan2/files.py

@@ -281,6 +281,21 @@ class FileInfo(object, metaclass=MetaMock):
         file_info.write_content(content)
         return file_info
 
+    @classmethod
+    def from_existing_file(cls,
+                           file_path: str,
+                           *args,
+                           **kwargs) -> FileInfo:
+
+        data_model = kwargs.get('data_model', config.get_default_data_model())
+        resource = data_model.add_resource_file(file_path)
+
+        return cls(resource_entry=resource,
+                   data_model=data_model,
+                   *args,
+                   **kwargs)
+
+
     def __init__(self, file_path=None, *args, **kwargs):
         """
         Custom file info object to be used with the with statement. This object is used to open a file and close it
@@ -475,7 +490,10 @@ class FileInfo(object, metaclass=MetaMock):
         :return: None
         """
         if self.resource_entry is not None:
+            if self.resource_entry.Key in self._cls_instances:
+                del self._cls_instances[self.resource_entry.Key]
             self.data_model.delete_resource(self.resource_entry)
+
         os.remove(self.file_path)
 
     def to_json(self) -> dict:

{pysimultan-0.5.8.dist-info → pysimultan-0.5.9.dist-info}/METADATA

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.5.8
+Version: 0.5.9
 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
 Author-email: Bühler Maximilian <maximilian.buehler@tuwien.ac.at>
-License: MIT
+License-Expression: MIT
+License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
@@ -166,6 +167,9 @@ print(instances[0].param_1)
 
 # Change Log
 
+## [0.5.8] - 2024-12-17
+- Added FileInfo.from_existing_file method to create FileInfo object from existing file in ProjectUnpackFolder
+
 ## [0.5.7] - 2024-12-09
 - Added support for different taxonomy for content
 - Added support for numpy np.float32, np.float64 and np.int32, np.int64

{pysimultan-0.5.8.dist-info → pysimultan-0.5.9.dist-info}/RECORD

@@ -1,9 +1,9 @@
 PySimultan2/CHANGELOG.md,sha256=BBfCqgFQeigrlRQdHAksDz70-0fLKjzWkHbfFjJ2eDg,361
-PySimultan2/__about__.py,sha256=I4Xkc80vf8gODt5O1ySRQPAixhhRNGFEyH4DQhuHlco,19
+PySimultan2/__about__.py,sha256=qqSUxPPY_oV00hMzjB1sl4cBwwVOu75QAU3g1azPtlc,19
 PySimultan2/__init__.py,sha256=PGVR1uhY01dF5tHyad-znURUZ_LVB95vsjId2BT0aJM,3245
-PySimultan2/data_model.py,sha256=YYtfcR6jvGztng6Be8Vw9FQ02cPkl8ATHTZMoIu1ABQ,34140
+PySimultan2/data_model.py,sha256=7rf1IT6jLKkCkpH9Zmkdy-wpPQXwt7wWl_RFw4sl2Co,36503
 PySimultan2/default_types.py,sha256=K-Eka5BCKk8DT3HU5761Ym_-ZFmu1_Dro0zW0LVGoHA,27157
-PySimultan2/files.py,sha256=BCETl4M8qedw7Bjt8QXvY6Rl3U6Lou36XqPY2ST1o9Q,22447
+PySimultan2/files.py,sha256=jvjGB_yLvJbXBhtxy7-l9nTK4voRiuimr-w8Cq7XtI0,23053
 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.8.dist-info/METADATA,sha256=MRNoaabziaKiIp2bEk0MBnDiFGyiEtyWWesmdgIf3V4,5963
-pysimultan-0.5.8.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-pysimultan-0.5.8.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.5.8.dist-info/RECORD,,
+pysimultan-0.5.9.dist-info/METADATA,sha256=WyBbt76L0Bt4PjMpNYG_baQKQzFZtNBZqu5e2_iKpdc,6136
+pysimultan-0.5.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pysimultan-0.5.9.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.5.9.dist-info/RECORD,,

{pysimultan-0.5.8.dist-info → pysimultan-0.5.9.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any