Merge pull request #2 from AbdullahAlfaraj/master

stable diffusion

Author: omah147

README.md

@@ -26,6 +26,7 @@ With Auto-Photoshop-StableDiffusion-Plugin, you can directly use the capabilitie
 	- [prompt shortcut:](#prompt-shortcut)
 	- [Rule of thumbs:](#rule-of-thumbs)
 - [FAQ and Known Issues](#faq-and-known-issues)
+	- [What Photoshop version do I need to run the plugin?](#what-photoshop-version-do-i-need-to-run-the-plugin) 
 	- [Plugin Load Failed](#plugin-load-failed)
 		- [No application are connected to the service](#no-application-are-connected-to-the-service)
 		- [Load command failed in App with ID PS and Version X.X.X](#load-command-failed-in-app-with-id-ps-and-version-xxx)
@@ -162,6 +163,8 @@ as long as you have defined the relationsip in the prompt library tab
 * Don't open multiple photoshop documents. For now, this will break the plugin. Only work on one project at a time.
 
 # FAQ and Known Issues
+## What Photoshop version do I need to run the plugin?
+The minimum Photoshop version that the plugin supports is Photoshop v24
 
 ## Plugin Load Failed
 There are a few issues that can result in this error, please follow the instructions for the corresponding error message in the UDT logs
@@ -170,7 +173,7 @@ There are a few issues that can result in this error, please follow the instruct
 This error occurs when Photoshop is not started before the plugin is attempted to be loaded. Simply start photoshop then restart UXP and load the plugin
 
 ### Load command failed in App with ID PS and Version X.X.X
-This error occurs when the version of Photoshop is mistmatched with the expected version of the plugin. This may be solved by editing the [manifest.json](manifest.json) file on line 8 to match your version of Photoshop. 
+This error occurs when the version of Photoshop is mistmatched with the expected version of the plugin. This may be solved by editing the [manifest.json](manifest.json) file on line 8 to match your version of Photoshop.
 ```
 "host": [
     {
@@ -179,6 +182,7 @@ This error occurs when the version of Photoshop is mistmatched with the expected
     }
   ],
 ```
+However, if you later upgraded your Photoshop to v24 or higher. you may need to change minVersion back to  ```"minVersion": "24.0.0"``` for the plugin to function correctly.
 
 ## Exception in ASGI application / Expecting value: line 1 column 1
 This error occurs due to mismatched expectations between the plugin and the Automatic1111 backend. 

export_png.js

@@ -1,3 +1,7 @@
+const { executeAsModal } = require('photoshop').core
+const storage = require('uxp').storage
+const fs = storage.localFileSystem
+const formats = require("uxp").storage.formats;
 async function exportPngCommand () {
   const batchPlay = require('photoshop').action.batchPlay
   // const result = await batchPlay { _obj: “exportSelectionAsFileTypePressed”}
@@ -33,12 +37,189 @@ async function exportPng () {
   try {
     await executeAsModal(exportPngCommand)
   } catch (e) {
-    console.log('exportPng error:', e)
+    console.warn('exportPng error:', e)
   }
 }
 
 
+const readPng = async (image_name) => {
+  // image_name = 'test.png'
+  try {
+    await executeAsModal(
+      async (control) => {
+        // const tempFolder = await fs.getTemporaryFolder() ;
+        const pluginFolder = await fs.getPluginFolder()
+        
+        let init_images_dir = await pluginFolder.getEntry("./server/python_server/init_images")
+        // let init_images_dir = await pluginFolder.getEntry(
+        //   './server/python_server/init_images'
+        // )
+        const file = await init_images_dir.createFile(image_name, {overwrite: true}) ;
+
+        const currentDocument = app.activeDocument ;
+        await currentDocument.saveAs.png(
+          file,
+          {
+            compression: 6,
+          },
+          true
+        ) ;
+
+        // const arrayBuffer = await file.read({format: formats.binary}) ;
+        // console.log(arrayBuffer, 'arrayBuffer') ;
+      }, 
+
+      {'commandName': 'readPng'}
+    ) ;
+  } catch(e) {
+    console.warn(e) ;
+  }
+} ;
+
+const psapi = require('./psapi')
+async function newExportPng (layer,image_name) {
+  //store layers we want to export in variables
+  // let layerToExports =
+  // create new document
+  // duplicate the layers to the new documnet
+  //select the layer channel selectLayerChannelCommand
+  //document.crop
+  //export using readPng()
+
+  try {
+    //get the active layers
+    // const layersToExport = app.activeDocument.activeLayers
+    
+    //create new document
+    let exportDoc = await executeAsModal(async ()=>{
+      
+      return await app.documents.add
+    })
+
+    // for (layer of layersToExport) {
+      await executeAsModal(async () => {
+        console.log(layer.id)
+        const dupLayer = await layer.duplicate(exportDoc)
+        await psapi.selectLayers([dupLayer])
+        await psapi.selectLayerChannelCommand()
+        const selection_info = await psapi.getSelectionInfoExe()
+        await exportDoc.crop(selection_info)
+        // export_image_name = `${layer.name}.png`
+        await readPng(image_name)
+        // await exportDoc.closeWithoutSaving()
+      })
+    // }
+  } catch (e) {
+    console.warn(e)
+  }
+}
+
+  
+    
+
+
+
+///////////////////////Start method 3///////////////////////
+//My saveFolder is assigned as a global var earlier in the plugin
+// var saveFolder = await require("uxp").storage.localFileSystem.getFolder();
+// var saveFolder = await require("uxp").storage.localFileSystem.getPluginFolder();
+
+// // Again, my variable here is global and assigned earlier. The value is changed during a batch loop for each file.
+// var saveFile = await saveFolder.createFile("fileName.png");  
+
+// You need to assign a token before saving.  
+// const saveFileToken = await require("uxp").storage.localFileSystem.createSessionToken(saveFile);  
+
+//To save the file
+// await savePNG(saveFileToken); 
+
+/* 
+The save function is batchPlay.  This is the only way I found to control the compression type. I could get the DOM to save as PNG. However, I could never get it to control the compressions type for PNG. That may be possible with the DOM but not documented... not sure.
+
+For the save function, if running UXP AP1 version 1 then use "wait" for modalBehavior. This was a workaround for a PS bug that was causing issues with "fail".  
+
+If running on UXP API version 2 then use "execute" for modalBahavior, or remove the options and use {} so the options go to default.
+*/
+async function savePNG(saveDataTemp){
+  
+  const batchPlay = require("photoshop").action.batchPlay;
+  
+
+    async function savePNGCommand(){
+  
+    
+    var saveFolder = await require("uxp").storage.localFileSystem.getPluginFolder();
+  
+    // Again, my variable here is global and assigned earlier. The value is changed during a batch loop for each file.
+    var saveFile = await saveFolder.createFile("fileName.png");  
+    
+    const saveData = await require("uxp").storage.localFileSystem.createSessionToken(saveFile);  
+
+const result = await batchPlay(
+[
+   {
+      "_obj": "save",
+      "as": {
+         "_obj": "PNGFormat",
+         "method": {
+            "_enum": "PNGMethod",
+            "_value": "quick"
+         },
+         "PNGInterlaceType": {
+            "_enum": "PNGInterlaceType",
+            "_value": "PNGInterlaceNone"
+         },
+         "PNGFilter": {
+            "_enum": "PNGFilter",
+            "_value": "PNGFilterAdaptive"
+         },
+         "compression": 6
+      },
+      "in": {
+         "_path": saveData,
+         "_kind": "local"
+      },
+      "saveStage": {
+         "_enum": "saveStageType",
+         "_value": "saveBegin"
+      },
+      "_isCommand": false,
+      "_options": {
+         "dialogOptions": "dontDisplay"
+      }
+   }
+],{
+   "synchronousExecution": true,
+   "modalBehavior": "execute"
+});    
+
+}
+await executeAsModal(async ()=>{
+  savePNGCommand()
+});
+}    
+
+
+
+
+
+
+
+
+
+
+////////////////////End method 3////////////////////////////
+
+
+
+
+
+
+
 
 module.exports = {
-  exportPng
+  exportPng,
+  readPng,
+  savePNG,
+  newExportPng
     };

helper.js

@@ -70,7 +70,7 @@ async function getSelectionInfo () {
         }
       ],
       {
-        synchronousExecution: false,
+        synchronousExecution: true,
         modalBehavior: 'execute'
       }
     )
@@ -92,7 +92,7 @@ async function getSelectionInfo () {
     // console.dir({selection_info})
     return selection_info
   } catch (e) {
-    console.log('selection info error', e)
+    console.warn('selection info error', e)
   }
 }
 
@@ -135,7 +135,7 @@ async function reselectBatchPlay(selectionInfo){
       }
     ],
     {
-      synchronousExecution: false,
+      synchronousExecution: true,
       modalBehavior: 'execute'
     }
   )
@@ -144,7 +144,7 @@ async function reselectBatchPlay(selectionInfo){
 async function reselect(selectionInfo){
 await executeAsModal(async () => {
   reselectBatchPlay(selectionInfo)
-})
+},  {'commandName': 'reselect'})
 
 }
 
@@ -173,7 +173,7 @@ async function unSelect () {
       }
     ],
     {
-      synchronousExecution: false,
+      synchronousExecution: true,
       modalBehavior: 'execute'
     }
   )
@@ -236,7 +236,7 @@ async function layerToSelection () {
 
     console.log('unSelect')
 
-    await executeAsModal(unSelect)
+    await executeAsModal(unSelect,  {'commandName': 'unSelect'})
 
      //scale layer
      async function scaleLayer (executionContext) {
@@ -248,7 +248,7 @@ async function layerToSelection () {
         console.log('scale_x_y_ratio:', scale_x_ratio, scale_y_ratio)
         activeLayer.scale(scale_x_ratio, scale_y_ratio)
       }
-      await executeAsModal(scaleLayer)
+      await executeAsModal(scaleLayer,  {'commandName': 'scaleLayer'})
 
 
     async function moveLayerExe (layerToMove, selection_info) {
@@ -261,11 +261,11 @@ async function layerToSelection () {
     const activeLayer = await getActiveLayer()
     await executeAsModal(async () => {
       await moveLayerExe(activeLayer, selection_info)
-    })
+    },  {'commandName': 'moveLayerExe'})
 
     reselect(selection_info)
   } catch (e) {
-    console.log(e)
+    console.warn(e)
   }
 
   //   await executeAsModal(layerToSelectionHelper)