PySimultan 0.5.9__tar.gz → 0.5.9.3__tar.gz

{pysimultan-0.5.9 → pysimultan-0.5.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.5.9
+Version: 0.5.9.3
 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.9.3/src/PySimultan2/__about__.py

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

{pysimultan-0.5.9 → pysimultan-0.5.9.3}/src/PySimultan2/__init__.py

@@ -29,6 +29,7 @@ def setup_logging():
 
     logger = colorlog.getLogger('PySimultan')
     logger.addHandler(handler)
+    logger.setLevel('DEBUG')
 
     return logger
 

{pysimultan-0.5.9 → pysimultan-0.5.9.3}/src/PySimultan2/data_model.py

@@ -538,7 +538,7 @@ class DataModel:
 
         """
         Add a file as resource to the project which already exists in the project folder
-        :param filename:
+        :param filename: path to the file or FileInfo object
         :param target_dir:
         :return:
         """
@@ -550,20 +550,12 @@ class DataModel:
 
         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)
+            if not filename.FullName.startswith(str(self.project.ProjectUnpackFolder)) and 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}')
 
-            return next(
-                (
-                    x for x in self.project_data_manager.AssetManager.Resources if x.CurrentFullPath == full_filename
-                )
-                , None
-            )
+            key = self.project_data_manager.AssetManager.AddResourceEntry(filename)
+            return self.project_data_manager.AssetManager.GetResource(key)
 
         else:
             if isinstance(target_dir, str):
@@ -577,14 +569,8 @@ class DataModel:
             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)
-
+            key = self.project_data_manager.AssetManager.AddResourceEntry(os.path.join(target_dir.FullPath, filename.Name))
+            return self.project_data_manager.AssetManager.GetResource(key)
 
     def add_resource(self,
                      filename: Union[str, FileInfo],

{pysimultan-0.5.9 → pysimultan-0.5.9.3}/src/PySimultan2/files.py

@@ -12,13 +12,14 @@ import tempfile
 from typing import List, Union, Optional
 import shutil
 import zipfile
+from pathlib import Path
 # from System.IO import FileInfo  # public FileInfo (string fileName);
 
 from SIMULTAN.Data.Assets import ResourceEntry, ResourceFileEntry, ContainedResourceFileEntry, Asset, ResourceDirectoryEntry
 from SIMULTAN.Data.Taxonomy import SimTaxonomyEntry, SimTaxonomyEntryReference, SimTaxonomy
 from SIMULTAN.Data.Components import SimComponent, ComponentMapping
 
-from System.IO import DirectoryInfo
+from System.IO import DirectoryInfo as SystemDirectoryInfo
 
 # from .config import default_data_model
 
@@ -291,7 +292,6 @@ class FileInfo(object, metaclass=MetaMock):
         resource = data_model.add_resource_file(file_path)
 
         return cls(resource_entry=resource,
-                   data_model=data_model,
                    *args,
                    **kwargs)
 
@@ -526,6 +526,46 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
     def get_by_key(cls, key: int) -> Optional[DirectoryInfo]:
         return cls._cls_instances.get(key, None)
 
+    @classmethod
+    def from_existing_directory(cls,
+                                directory_path: str,
+                                add_files: bool = True,
+                                add_sub_directories: bool = True,
+                                *args,
+                                **kwargs) -> DirectoryInfo:
+
+        data_model = kwargs.get('data_model', config.get_default_data_model())
+
+        if not directory_path.startswith(str(data_model.project.ProjectUnpackFolder)):
+            directory_path = os.path.join(str(data_model.project.ProjectUnpackFolder), directory_path)
+
+        res = data_model.project_data_manager.AssetManager.CreateResourceDirIn(os.path.basename(directory_path),
+                                                     SystemDirectoryInfo(os.path.dirname(directory_path)),
+                                                     '')
+
+        resource = data_model.project_data_manager.AssetManager.GetResource(res.Item1)
+
+        directory_info = cls(resource_entry=resource,
+                             *args,
+                             **kwargs)
+
+
+        if add_files:
+            directory_info.add_all_contained_files()
+
+            # for file in os.listdir(directory_path):
+            #     file_path = os.path.join(directory_path, file)
+            #     data_model.add_resource_file(file_path, target_dir=resource)
+
+        if add_sub_directories:
+            directory_info.add_all_contained_directories()
+
+            # for sub_dir in os.listdir(directory_path):
+            #     sub_dir_path = os.path.join(directory_path, sub_dir)
+            #     data_model.add_resource_directory(sub_dir_path, parent_directory=resource)
+
+        return directory_info
+
     def __init__(self,
                  path: Optional[str] = None,
                  helper_file: Optional[FileInfo] = None,
@@ -626,14 +666,50 @@ 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 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,
@@ -644,6 +720,31 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
             return FileInfo(resource_entry=new_resource,
                             data_model=self.data_model)
 
+    def add_all_contained_files(self):
+        for file in os.listdir(self.full_path):
+            full_filename = os.path.join(self.full_path, file)
+            if Path(full_filename).is_file():
+
+                if full_filename in (x.current_full_path for x in self.resource_entry.Children):
+                    continue
+                else:
+                    logger.info(f'Adding file: {full_filename} to resources')
+                    FileInfo.from_existing_file(full_filename, data_model=self.data_model)
+
+    def add_all_contained_directories(self):
+        for file in os.listdir(self.full_path):
+            full_filename = os.path.join(self.full_path, file)
+            if Path(full_filename).is_dir():
+                if full_filename in (x.current_full_path for x in self.resource_entry.Children):
+                    continue
+                else:
+                    logger.info(f'Adding directory: {full_filename} to resources')
+                    DirectoryInfo.from_existing_directory(full_filename, data_model=self.data_model)
+
+        for directory in self.sub_directories:
+            directory.add_all_contained_files()
+            directory.add_all_contained_directories()
+
     def add_tag(self, tag: SimTaxonomyEntry) -> None:
         add_tag_to_resource(self.resource_entry, tag)
 

pysimultan-0.5.9/src/PySimultan2/__about__.py

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