libreflow.extensions.sk.export-psd-layers 1.1.5__tar.gz → 1.1.7__tar.gz

{libreflow_extensions_sk_export_psd_layers-1.1.5 → libreflow_extensions_sk_export_psd_layers-1.1.7}/CHANGELOG.md

@@ -19,6 +19,17 @@ Types of changes
 
 ## [Unreleased]
 
+### Added
+
+* Warning message when publishing regarding resolution and colour depth.
+* Message in the window when creating a new working copy.
+
+## [1.1.6] - 2025-08-07
+
+### Fixed
+
+* Export resized to psd canvas - makes the action less prone to crash from a lack of RAM
+
 ## [1.1.5] - 2025-07-03
 
 ### Fixed

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libreflow.extensions.sk.export_psd_layers
-Version: 1.1.5
+Version: 1.1.7
 Home-page: https://gitlab.com/lfs.coop/libreflow/libreflow_launcher
 Author: Thomas Thiebaut
 Author-email: autor@les-fees-speciales.coop
@@ -50,6 +50,17 @@ Types of changes
 
 ## [Unreleased]
 
+### Added
+
+* Warning message when publishing regarding resolution and colour depth.
+* Message in the window when creating a new working copy.
+
+## [1.1.6] - 2025-08-07
+
+### Fixed
+
+* Export resized to psd canvas - makes the action less prone to crash from a lack of RAM
+
 ## [1.1.5] - 2025-07-03
 
 ### Fixed

{libreflow_extensions_sk_export_psd_layers-1.1.5 → libreflow_extensions_sk_export_psd_layers-1.1.7}/src/libreflow/extensions/sk/export_psd_layers/__init__.py

@@ -12,8 +12,16 @@ from libreflow.baseflow.file import (
     FileRevisionNameChoiceValue,
     UploadPNGToKitsu,
     PublishAndRenderPlayblast,
+    PublishFileAction,
+    UploadAfterPublishValue,
+    CreateWorkingCopyAction,
 )
 from psd_tools import PSDImage
+from psd_tools.psd import PSD
+
+from libreflow.baseflow.task import Task
+from libreflow.baseflow.task_manager import CreateTaskDefaultFiles
+from libreflow.baseflow.users import PresetValue, PresetSessionValue, PresetChoiceValue
 
 
 class ExportPSDLayers(flow.Action):
@@ -182,9 +190,31 @@ class ExportPSDLayers(flow.Action):
             
             folder_name = os.path.basename(render_revision.get_path())
 
+            # frame_bbox = (0, 0, 0, 0)
+
+            # frame_layer = psb.find("white")
+
+            # if frame_layer is None:
+            #     raise Exception("FRAME LAYER NOT FOUND")
+            # else:
+            #     frame_bbox = frame_layer.bbox
+
+            #     if frame_bbox == (0, 0, 0, 0):
+            #         raise Exception("Frame Layer has no bounding box")
+
+            #     # Substract by 10pixels (width and height) in order to remove border margin
+            #     # frame_bbox = (
+            #     #     frame_bbox[0] + 5,
+            #     #     frame_bbox[1] + 5,
+            #     #     frame_bbox[2] - 5,
+            #     #     frame_bbox[3] - 5,
+            #     # )
+            
+            # print(frame_bbox)
+
             for layer in reversed(psb):
                 # Remove invalid characters
-                layer_name = layer.name
+                layer_name = layer.name.replace(' ','-')
                 match_invalid = re.search(r"[~\"#%&*:<>?/\\{|}]+", layer.name)
                 if match_invalid:
                     layer_name = layer_name.replace(match_invalid.group(0), '')
@@ -196,10 +226,8 @@ class ExportPSDLayers(flow.Action):
 
                 session.log_info(log_format.format(message=f'Exporting layer {layer_name}'))
 
-                print(layer.visible)
                 if not layer.visible:
                     layer.visible = True
-                    print(layer.visible)
                     # psb.save(source_revision.get_path())
 
                 # Push layer in correct JSON data
@@ -207,7 +235,7 @@ class ExportPSDLayers(flow.Action):
                     layer_name
                 )
 
-                image = layer.composite(viewport=psb.bbox)
+                image = layer.composite(viewport=psb.viewbox)
                 image.save(output_path)
 
             
@@ -253,7 +281,7 @@ class ExportPSDLayers(flow.Action):
                 utils_layer = psb.find("_utils")
                 if utils_layer : utils_layer.visible = False 
 
-                image = psb.composite(force=True)
+                image = psb.composite(viewport=psb.viewbox,force=True)
                 image.save(output_path)
 
                 session.log_info(log_format.format(message='Export complete'))
@@ -404,6 +432,10 @@ class ExportPSDLayersBatch(flow.Action):
 class PublishandExportPSD(PublishAndRenderPlayblast):
     ICON = ('icons.libreflow', 'publish')
 
+    _shot = flow.Parent(5)
+    _sequence = flow.Parent(7)
+    _film = flow.Parent(9)
+
     def allow_context(self, context):
         return (
             context
@@ -411,7 +443,56 @@ class PublishandExportPSD(PublishAndRenderPlayblast):
             and self._file.format.get() in ["psd", "psb"]
         )
 
+    def get_bg_layout(self):
+        source_file = None
+        shot_entity = (
+            self.root()
+            .project()
+            .films[self._film.name()]
+            .sequences[self._sequence.name()]
+            .shots[self._shot.name()]
+        )
+
+        bg_layout_task = shot_entity.tasks["bg_layout"]
+        if bg_layout_task.files.has_file("bg_layout", "psb"):
+            # Get the file path as parent
+            source_file = bg_layout_task.files["bg_layout_psb"].get_head_revision()
+
+        return source_file
+
     def get_buttons(self):
+        msg = "<h2>Publish and Export Preview</h2>"
+
+        if "bg_color" in self._file.name():
+            bg_layout_file = self.get_bg_layout()
+            bg_layout_psb = PSDImage.open(bg_layout_file.get_path())
+            working_copy_path = self._file.get_working_copy().get_path()
+            psb = PSDImage.open(working_copy_path)
+
+            if psb.size != bg_layout_psb.size:
+                msg += (f"""<h3><font color=#D66500>
+                    Does not conform to the size of bg_layout.
+                    </font></h3>
+                    <h4><font color=#D66500>
+                    BG_layout size = {bg_layout_psb.size}
+                    </font></h4>
+                    """)
+
+            if psb.depth != 16:
+                msg += (
+                    "<h3><font color=#D66500>"
+                    "This file is not in 16-bit format."
+                    "</font></h3>"
+                    "<h4><font color=#D66500>"
+                    "To convert to 16 Bits/Channel, choose `Image  > Mode > 16 Bits/Channel`."
+                    "</font></h4>"
+                )
+
+                self.message.set(msg)
+                return ["Cancel"]
+
+        self.message.set(msg)
+
         return ["Publish and Export Preview", "Cancel"]
 
     def _configure_and_render(self, revision_name, upload_after_publish):
@@ -492,7 +573,7 @@ class ExportPSDPreview(flow.Action):
 
         output_path = f"{os.path.splitext(file_path)[0]}.png"
 
-        image = psb.composite()
+        image = psb.composite(viewport=psb.viewbox)
         image.save(output_path)
 
         return output_path
@@ -517,7 +598,7 @@ class ExportPSDPreview(flow.Action):
         utils_layer = psb.find("_utils")
         if utils_layer : utils_layer.visible = False 
 
-        image = psb.composite(force=True)
+        image = psb.composite(viewport=psb.viewbox,force=True)
 
         image.save(output_path)
 
@@ -548,7 +629,7 @@ class ExportPSDPreview(flow.Action):
                 frame_bbox[3] - 5,
             )
 
-        image = psb.composite()
+        image = psb.composite(viewport=psb.viewbox)
         image = image.crop(frame_bbox)
         image.save(output_path)
 
@@ -688,6 +769,129 @@ class UploadPSDPreview(UploadPNGToKitsu):
         rev.set_status("on_kitsu")
 
 
+class PublishPSDFile(PublishFileAction):
+
+    _task = flow.Parent(3)
+    _shot = flow.Parent(5)
+    _sequence = flow.Parent(7)
+    _film = flow.Parent(9)
+
+    def __init__(self, name, parent):
+        super(PublishPSDFile, self).__init__(parent, name)
+
+    def get_bg_layout(self):
+        source_file = None
+        shot_entity = (
+            self.root()
+            .project()
+            .films[self._film.name()]
+            .sequences[self._sequence.name()]
+            .shots[self._shot.name()]
+        )
+
+        bg_layout_task = shot_entity.tasks["bg_layout"]
+        if bg_layout_task.files.has_file("bg_layout", "psb"):
+            # Get the file path as parent
+            source_file = bg_layout_task.files["bg_layout_psb"].get_head_revision()
+
+        return source_file
+
+    def get_buttons(self):
+        self.check_default_values()
+
+        msg = "<h2>Publish</h2>"
+
+        working_copies = self._file.get_working_copies()
+        if working_copies:
+            user_names = [wc.user.get() for wc in working_copies]
+            user_names = ["<b>" + n + "</b>" for n in user_names]
+            msg += (
+                "<h3><font color=#D66500><br>"
+                "This file is currently being edited by one or more users ({})."
+                "</font></h3>".format(", ".join(user_names))
+            )
+
+        if "bg_color" in self._file.name():
+            bg_layout_file = self.get_bg_layout()
+            bg_layout_psb = PSDImage.open(bg_layout_file.get_path())
+            working_copy_path = self._file.get_working_copy().get_path()
+            psb = PSDImage.open(working_copy_path)
+
+            if psb.size != bg_layout_psb.size:
+                msg += f"""<h3><font color=#D66500>
+                    Does not conform to the size of bg_layout.
+                    </font></h3>
+                    <h4><font color=#D66500>
+                    BG_layout size = {bg_layout_psb.size}
+                    </font></h4>
+                    """
+
+            if psb.depth != 16:
+                msg += (
+                    "<h3><font color=#D66500>"
+                    "This file is not in 16-bit format."
+                    "</font></h3>"
+                    "<h4><font color=#D66500>"
+                    "To convert to 16 Bits/Channel, choose `Image  > Mode > 16 Bits/Channel`."
+                    "</font></h4>"
+                )
+
+                self.message.set(msg)
+                return ["Cancel"]
+
+        self.message.set(msg)
+
+        return ["Publish", "Cancel"]
+
+class CreateWorkingCopy(CreateWorkingCopyAction):
+    def __init__(self, parent, name):
+        super(CreateWorkingCopy, self).__init__(parent, name)
+
+    def get_buttons(self):
+        msg = "<h3>Create a working copy</h3>"
+
+        if "bg_color" in self._task.name() and "psb" in self._file.name():
+            msg += """<h3>
+                Remember to change the colour depth to <u>16 bits</u> in Photoshop.
+                </h3>
+                <h4>
+                To convert to 16 Bits/Channel, choose <u>`Image  > Mode > 16 Bits/Channel`</u>.
+                </h4>"""
+
+        # Buttons for Use Base File mode
+        if self.use_base_file:
+            msg += f"<font color=#FFA34D>WARNING: You should start working on this file \
+                    from the latest version of {self.base_file_name} in {self.from_task} task.</font>"
+            self.message.set(msg)
+            return ["Create from base file", "Create from scratch", "Cancel"]
+
+        if self._file.has_working_copy(from_current_user=True):
+            msg += "<font color=#FFA34D>WARNING: You already have a working copy to your name. \
+                    Choosing to create a new one will overwrite your changes.</font>"
+
+        self.message.set(msg)
+
+        self.from_revision.revert_to_default()
+
+        return ["Create", "Create from scratch", "Cancel"]
+
+
+def publish_psd_file(parent):
+    if isinstance(parent, TrackedFile) and "psb" in parent.name():
+        r = flow.Child(PublishPSDFile).ui(label="Publish")
+        r.name = "publish_action"
+        r.index = 25
+        return r
+
+
+def create_working_copy(parent):
+    if isinstance(parent, TrackedFile) and "psb" in parent.name():
+        r = flow.Child(CreateWorkingCopy).ui(label="Create working copy")
+        r.name = "create_working_copy_action"
+        r.index = 25
+        return r
+
+
 def publish_and_export_preview(parent):
     if isinstance(parent, TrackedFile):
         r = flow.Child(PublishandExportPSD)
@@ -735,5 +939,7 @@ def install_extensions(session):
             export_psd_preview,
             upload_preview,
             publish_and_export_preview,
+            publish_psd_file,
+            create_working_copy,
         ]
     }

{libreflow_extensions_sk_export_psd_layers-1.1.5 → libreflow_extensions_sk_export_psd_layers-1.1.7}/src/libreflow/extensions/sk/export_psd_layers/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-07-03T17:25:38+0200",
+ "date": "2025-08-19T09:27:05+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "ef5d828b8c776569fef82bba9bde41a979a15415",
- "version": "1.1.5"
+ "full-revisionid": "b1b744a86ee00adf6e955054c0c0088b9bce95a0",
+ "version": "1.1.7"
 }
 '''  # END VERSION_JSON
 

{libreflow_extensions_sk_export_psd_layers-1.1.5 → libreflow_extensions_sk_export_psd_layers-1.1.7/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.5
+Version: 1.1.7
 Home-page: https://gitlab.com/lfs.coop/libreflow/libreflow_launcher
 Author: Thomas Thiebaut
 Author-email: autor@les-fees-speciales.coop
@@ -50,6 +50,17 @@ Types of changes
 
 ## [Unreleased]
 
+### Added
+
+* Warning message when publishing regarding resolution and colour depth.
+* Message in the window when creating a new working copy.
+
+## [1.1.6] - 2025-08-07
+
+### Fixed
+
+* Export resized to psd canvas - makes the action less prone to crash from a lack of RAM
+
 ## [1.1.5] - 2025-07-03
 
 ### Fixed