[fix] bug fixes

hbl917070 · Dec 22, 2023 · de5c165 · de5c165
1 parent 1154ebf
commit de5c165
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/Www/scss/MainWindow/_MainExif.scss b/Www/scss/MainWindow/_MainExif.scss
@@ -16,17 +16,18 @@
     display: flex;
     align-items: center;
 
+    // 上面的頁籤按鈕
     .mainExifTabs {
       flex: 1;
       width: 100%;
-      // height: 33px;
-      // margin-bottom: -3px;
+      height: 33px;
+      margin-bottom: -3px;
       overflow-x: visible;
       overflow-y: hidden;
       position: relative;
       display: none;
-      //border-bottom: 1px solid var(--color-blue20);
-
+
+      // 頁籤按鈕下面的水平線
       &::before {
         content: "";
         position: absolute;
@@ -100,7 +101,7 @@
     }
   }
 
-  //相關檔案
+  // 相關檔案
   .mainExifRelated {
     padding: 0 5px;
     margin-top: 5px;

diff --git a/Www/ts/MainWindow/MainExif.ts b/Www/ts/MainWindow/MainExif.ts
@@ -317,7 +317,7 @@ class MainExif {
 				}
 				else if (name === "Comment" || name === "User Comment" || name === "Windows XP Comment" || name === "Image Description") {
 
-					// Stable Diffusion webui 輸出的jpg或webp
+					// Stable Diffusion webui 輸出的 jpg 或 webp
 					if (value.includes("Steps: ") && value.includes("Seed: ")) {
 						ar.push({
 							group: "PNG-tEXt",
@@ -329,7 +329,7 @@ class MainExif {
 						let jsonF = Lib.jsonStrFormat(value);
 						if (jsonF.ok) { // 解析欄位
 							if (value.startsWith(`{"prompt":`)) { // ComfyUI
-								comfyuiPrompt = (JSON.parse(value)["prompt"]);
+								comfyuiPrompt = JSON.parse(value)["prompt"];
 							}
 						}
 					}
@@ -460,6 +460,11 @@ class MainExif {
 				let collapseDom = getCollapseDom("ComfyUI Data", false);
 
 				if (comfyuiPrompt !== undefined) {
+					if (typeof comfyuiPrompt === "object") { // 從 mp4 提取出來的 Prompt 是 json，所以要轉回 string
+						try {
+							comfyuiPrompt = JSON.stringify(comfyuiPrompt);
+						} catch { }
+					}
 					collapseDom.domContent.appendChild(getItemDom("Prompt", comfyuiPrompt));
 				}
 				if (comfyuiWorkflow !== undefined) {

diff --git a/Www/ts/MainWindow/MainWindow.ts b/Www/ts/MainWindow/MainWindow.ts
@@ -692,14 +692,9 @@ class MainWindow {
                 }
 
             } else {
-                let arFile = [];
-                for (let i = 0; i < args.length; i++) {
-                    arFile.push(Lib.GetFileName(args[i]));
-                }
-                let dirPath = Lib.GetDirectoryName(args[0]);
-                if (dirPath !== null) {
-                    await fileLoad.loadFiles(dirPath, arFile); // 載入多張圖片
-                }
+
+                await fileLoad.loadFiles(args); // 載入多張圖片
+
             }
 
             // 在圖片載入完成後，更新「用其他APP開啟檔案」的列表

diff --git a/Www/ts/MainWindow/Script.ts b/Www/ts/MainWindow/Script.ts
@@ -1075,14 +1075,8 @@ class ScriptOpen {
         if (arFile.length === 1) {
             this.M.fileLoad.loadFile(arFile[0]);
         }
-        if (arFile.length > 1) {
-            let arName = [];
-            for (let i = 0; i < arFile.length; i++) {
-                arName.push(Lib.GetFileName(arFile[i]));
-            }
-            let dirPath = Lib.GetDirectoryName(arFile[0]);
-            if (dirPath == null) { return; }
-            this.M.fileLoad.loadFiles(dirPath, arName);
+        else {
+            this.M.fileLoad.loadFiles(arFile);
         }
     }
 
@@ -1133,6 +1127,16 @@ class ScriptOpen {
         WV_RunApp.ProcessStart(exePath, `"${path}"`, true, false);
     }
 
+    /** 解析多幀圖片 */
+    public async showFrames(path?: string) {
+        if (path === undefined) {
+            path = this.M.fileLoad.getFilePath(); // 目前顯示的檔案
+        }
+        let exePath = await WV_Window.GetAppPath();
+        await this.M.saveSetting();
+        WV_RunApp.ProcessStart(exePath, `showFrames "${path}"`, true, false);
+    }
+
     /** 在檔案總管顯示 */
     public async revealInFileExplorer(path?: string) {
         if (path === undefined) {