libreflow.extensions.sk.export-psd-layers 1.1.2__tar.gz → 1.1.4__tar.gz

{libreflow_extensions_sk_export_psd_layers-1.1.2 → libreflow_extensions_sk_export_psd_layers-1.1.4}/CHANGELOG.md

@@ -19,6 +19,26 @@ Types of changes
 
 ## [Unreleased]
 
+## [1.1.4] - 2025-05-09
+
+### Fixed
+
+* The exported image will now have the correct filename
+
+## [1.1.3] - 2025-04-30
+
+### Changed
+
+* Action renamed to "Export" in actions submenu
+
+### Added
+
+* BG Color projects will be exported as a png 
+
+### Fixed
+
+* Faster no_chara export in ExportPSDPreview
+
 ## [1.1.2] - 2025-04-25
 
 ### Fixed

{libreflow_extensions_sk_export_psd_layers-1.1.2/src/libreflow.extensions.sk.export_psd_layers.egg-info → libreflow_extensions_sk_export_psd_layers-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libreflow.extensions.sk.export_psd_layers
-Version: 1.1.2
+Version: 1.1.4
 Home-page: https://gitlab.com/lfs.coop/libreflow/libreflow_launcher
 Author: Thomas Thiebaut
 Author-email: autor@les-fees-speciales.coop
@@ -50,6 +50,26 @@ Types of changes
 
 ## [Unreleased]
 
+## [1.1.4] - 2025-05-09
+
+### Fixed
+
+* The exported image will now have the correct filename
+
+## [1.1.3] - 2025-04-30
+
+### Changed
+
+* Action renamed to "Export" in actions submenu
+
+### Added
+
+* BG Color projects will be exported as a png 
+
+### Fixed
+
+* Faster no_chara export in ExportPSDPreview
+
 ## [1.1.2] - 2025-04-25
 
 ### Fixed

{libreflow_extensions_sk_export_psd_layers-1.1.2 → libreflow_extensions_sk_export_psd_layers-1.1.4}/src/libreflow/extensions/sk/export_psd_layers/__init__.py

@@ -21,6 +21,7 @@ class ExportPSDLayers(flow.Action):
 
     _file = flow.Parent()
     _files = flow.Parent(2)
+    _task = flow.Parent(3)
     _shot = flow.Parent(5)
     _sequence = flow.Parent(7)
 
@@ -38,6 +39,13 @@ class ExportPSDLayers(flow.Action):
         )
 
     def needs_dialog(self):
+        msg = ""
+        if self._task.name() == "bg_layout":
+            msg = "<b>Layout : Photoshop Project layers will be exported separately</b>"
+        elif self._task.name() == "bg_color":
+            msg = "<b>BG Color : Photoshop Project will be exported as a single image</b>"
+        
+        self.message.set(msg)
         return True
 
     def get_buttons(self):
@@ -74,6 +82,66 @@ class ExportPSDLayers(flow.Action):
         self._files.touch()
 
         return revision
+    
+    def get_default_file(self):
+        mng = self.root().project().get_task_manager()
+        default_files = mng.default_files.get()
+        for file_name, task_names in default_files.items():
+            if 'bg_color.png' in file_name:
+                task = default_files[file_name][0]
+                file_mapped_name = file_name.replace(".", '_')
+                break
+
+        dft_task = mng.default_tasks[task]
+        if not dft_task.files.has_mapped_name(file_mapped_name): # check default file
+            # print(f'Scene Builder - default task {task_name} has no default file {filename} -> use default template')
+            return None
+
+        dft_file = dft_task.files[file_mapped_name]
+        return dft_file
+    
+    def _ensure_file(self, name, format, path_format, source_revision):
+        mapped_name = "%s_%s" % (name, format)
+
+        file = None
+        
+        if not self._files.has_mapped_name(mapped_name):
+            if format:
+                file = self._files.add_file(
+                name=name,
+                extension=format,
+                tracked=True,
+                default_path_format=path_format,
+            )
+            else:
+                file = self._files.add_folder(name, tracked=True)
+        else:
+            file = self._files[mapped_name]
+
+        revision_name = self.revision.get()
+
+        if not file.has_revision(revision_name):
+            r = file.add_revision(revision_name)
+            file.set_current_user_on_revision(revision_name)
+        else:
+            r = file.get_revision(revision_name)
+
+        r.comment.set(source_revision.comment.get())
+        
+        file.ensure_last_revision_oid()
+
+        r.set_sync_status("Available")
+
+        img_path = r.get_path().replace("\\", "/")
+
+        if not os.path.exists(img_path):
+            os.makedirs(os.path.dirname(img_path), exist_ok=True)
+        else:
+            os.remove(img_path)
+
+        self._files.touch()
+        
+        return r
 
     def run(self, button):
         if button == "Cancel":
@@ -91,55 +159,100 @@ class ExportPSDLayers(flow.Action):
 
         # Get revisions
         source_revision = self._file.get_revision(self.revision.get())
-        render_revision = self.ensure_render_folder_revision()
 
         # Open photoshop file
         psb = PSDImage.open(source_revision.get_path())
 
-        # JSON structure for layers order
-        layers_data = {
-            "from": os.path.basename(source_revision.get_path()),
-            "layers": [],
-            "hidden_layers": []
-        }
 
-        # Export image layers
-        if os.path.exists(render_revision.get_path()) is False:
-            os.makedirs(render_revision.get_path())
-        
-        folder_name = os.path.basename(render_revision.get_path())
-
-        for layer in reversed(psb):
-            # Remove invalid characters
-            layer_name = layer.name
-            match_invalid = re.search(r"[~\"#%&*:<>?/\\{|}]+", layer.name)
-            if match_invalid:
-                layer_name = layer_name.replace(match_invalid.group(0), '')
-
-            output_path = os.path.join(
-                render_revision.get_path(),
-                "{folder}-{layer}.png".format(folder=folder_name, layer=layer_name),
-            )
+        ############# BG LAYOUT PROCESS #############
 
-            session.log_info(log_format.format(message=f'Exporting layer {layer_name}'))
+        if self._task.name() == "bg_layout" :
 
-            image = layer.composite(viewport=psb.bbox)
-            image.save(output_path)
+            render_revision = self.ensure_render_folder_revision()
+            # JSON structure for layers order
+            layers_data = {
+                "from": os.path.basename(source_revision.get_path()),
+                "layers": [],
+                "hidden_layers": []
+            }
 
-            # Push layer in correct JSON data
-            layers_data["layers" if layer.visible else "hidden_layers"].append(
-                layer_name
-            )
-        
-        # Export JSON data
-        json_object = json.dumps(layers_data)
-        json_path = os.path.join(render_revision.get_path(), "layers.json")
-        
-        session.log_info(log_format.format(message='Saving layers.json'))
-        with open(json_path, "w") as outfile:
-            outfile.write(json_object)
+            # Export image layers
+            if os.path.exists(render_revision.get_path()) is False:
+                os.makedirs(render_revision.get_path())
+            
+            folder_name = os.path.basename(render_revision.get_path())
+
+            for layer in reversed(psb):
+                # Remove invalid characters
+                layer_name = layer.name
+                match_invalid = re.search(r"[~\"#%&*:<>?/\\{|}]+", layer.name)
+                if match_invalid:
+                    layer_name = layer_name.replace(match_invalid.group(0), '')
+
+                output_path = os.path.join(
+                    render_revision.get_path(),
+                    "{folder}-{layer}.png".format(folder=folder_name, layer=layer_name),
+                )
+
+                session.log_info(log_format.format(message=f'Exporting layer {layer_name}'))
+
+                image = layer.composite(viewport=psb.bbox)
+                image.save(output_path)
+
+                # Push layer in correct JSON data
+                layers_data["layers" if layer.visible else "hidden_layers"].append(
+                    layer_name
+                )
+            
+            # Export JSON data
+            json_object = json.dumps(layers_data)
+            json_path = os.path.join(render_revision.get_path(), "layers.json")
+            
+            session.log_info(log_format.format(message='Saving layers.json'))
+            with open(json_path, "w") as outfile:
+                outfile.write(json_object)
+            
+            session.log_info(log_format.format(message='Export complete'))
         
-        session.log_info(log_format.format(message='Export complete'))
+        ############# BG COLOR PROCESS #############
+    
+        if self._task.name() == "bg_color" :
+
+            default_file = self.get_default_file()
+
+            if default_file is not None:
+                                    
+                render_revision = self._ensure_file(
+                        name="bg_color",
+                        format="png",
+                        path_format=default_file.path_format.get(),
+                        source_revision=source_revision
+                    )
+
+                output_path = render_revision.get_path()
+
+                info_layer = psb.find("INFO")
+                if info_layer : info_layer.visible = False 
+
+                LO_layer = psb.find("REF_LAYOUT")
+                if LO_layer : LO_layer.visible = False 
+
+                DES_layer = psb.find("REF_DESIGN")
+                if DES_layer : DES_layer.visible = False
+
+                chara_layer = psb.find("character")
+                if chara_layer : chara_layer.visible = False 
+
+                utils_layer = psb.find("_utils")
+                if utils_layer : utils_layer.visible = False 
+
+                image = psb.composite(force=True)
+                image.save(output_path)
+
+                session.log_info(log_format.format(message='Export complete'))
+
+            else:
+                self.root().session().log_error("[Export PSD] BG Color Image default file do not exist")
 
         return self.get_result(close=True)
 
@@ -382,12 +495,22 @@ class ExportPSDPreview(flow.Action):
 
         output_path = f"{os.path.splitext(file_path)[0]}_no_chara.png"
 
-        image = psb.composite(
-            layer_filter=lambda layer: layer.is_visible()
-            and "character" not in layer.name
-            and "INFO" not in layer.name
-            and "REF" not in layer.name
-        )
+        info_layer = psb.find("INFO")
+        if info_layer : info_layer.visible = False 
+
+        LO_layer = psb.find("REF_LAYOUT")
+        if LO_layer : LO_layer.visible = False 
+
+        DES_layer = psb.find("REF_DESIGN")
+        if DES_layer : DES_layer.visible = False
+
+        chara_layer = psb.find("character")
+        if chara_layer : chara_layer.visible = False 
+
+        utils_layer = psb.find("_utils")
+        if utils_layer : utils_layer.visible = False 
+
+        image = psb.composite(force=True)
 
         image.save(output_path)
 
@@ -577,6 +700,7 @@ def export_psd_layers(parent):
     if isinstance(parent, TrackedFile):
         r = flow.Child(ExportPSDLayers)
         r.name = "export_layers"
+        r.ui(label="Export")
         r.index = 50
         return r
 

{libreflow_extensions_sk_export_psd_layers-1.1.2 → libreflow_extensions_sk_export_psd_layers-1.1.4}/src/libreflow/extensions/sk/export_psd_layers/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-04-25T13:00:12+0200",
+ "date": "2025-05-09T17:15:06+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "1ec678249c80d17d3ebf3b7fc8bd986c62201092",
- "version": "1.1.2"
+ "full-revisionid": "23f431f22442d9b3740d494451f0bf983da044ab",
+ "version": "1.1.4"
 }
 '''  # END VERSION_JSON
 

{libreflow_extensions_sk_export_psd_layers-1.1.2 → libreflow_extensions_sk_export_psd_layers-1.1.4/src/libreflow.extensions.sk.export_psd_layers.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libreflow.extensions.sk.export_psd_layers
-Version: 1.1.2
+Version: 1.1.4
 Home-page: https://gitlab.com/lfs.coop/libreflow/libreflow_launcher
 Author: Thomas Thiebaut
 Author-email: autor@les-fees-speciales.coop
@@ -50,6 +50,26 @@ Types of changes
 
 ## [Unreleased]
 
+## [1.1.4] - 2025-05-09
+
+### Fixed
+
+* The exported image will now have the correct filename
+
+## [1.1.3] - 2025-04-30
+
+### Changed
+
+* Action renamed to "Export" in actions submenu
+
+### Added
+
+* BG Color projects will be exported as a png 
+
+### Fixed
+
+* Faster no_chara export in ExportPSDPreview
+
 ## [1.1.2] - 2025-04-25
 
 ### Fixed