feat: 🎸 支持使用 upic 上传图床

Author: maqi1520

src-tauri/capabilities/migrated.json

@@ -22,6 +22,22 @@
       "allow": [{ "path": "**" }]
     },
     "shell:default",
+    {
+      "identifier": "shell:allow-execute",
+      "allow": [
+        {
+          "name": "exec-sh",
+          "cmd": "sh",
+          "args": [
+            "-c",
+            {
+              "validator": "\\S+"
+            }
+          ],
+          "sidecar": false
+        }
+      ]
+    },
     "dialog:allow-save",
     "dialog:allow-message",
     "dialog:allow-open",

src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["*"],"permissions":["path:default","event:default","window:default","window:allow-start-dragging","webview:allow-print","app:default","image:default","resources:default","menu:default","tray:default","shell:allow-open","fs:default","fs:write-all",{"identifier":"fs:scope","allow":[{"path":"**"}]},"shell:default","dialog:allow-save","dialog:allow-message","dialog:allow-open","dialog:allow-confirm","os:allow-platform","os:allow-version","os:allow-os-type","os:allow-family","os:allow-arch","os:allow-exe-extension","os:allow-locale","os:allow-hostname","window:allow-start-dragging","window:allow-set-fullscreen","window:allow-minimize","window:allow-close","window:allow-maximize","updater:default","process:default","clipboard-manager:default","clipboard-manager:allow-write-text"]}}
+{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["*"],"permissions":["path:default","event:default","window:default","window:allow-start-dragging","webview:allow-print","app:default","image:default","resources:default","menu:default","tray:default","shell:allow-open","fs:default","fs:write-all",{"identifier":"fs:scope","allow":[{"path":"**"}]},"shell:default",{"identifier":"shell:allow-execute","allow":[{"args":["-c",{"validator":"\\S+"}],"cmd":"sh","name":"exec-sh","sidecar":false}]},"dialog:allow-save","dialog:allow-message","dialog:allow-open","dialog:allow-confirm","os:allow-platform","os:allow-version","os:allow-os-type","os:allow-family","os:allow-arch","os:allow-exe-extension","os:allow-locale","os:allow-hostname","window:allow-start-dragging","window:allow-set-fullscreen","window:allow-minimize","window:allow-close","window:allow-maximize","updater:default","process:default","clipboard-manager:default","clipboard-manager:allow-write-text"]}}

src/components/SettingModal.tsx

@@ -28,9 +28,8 @@ const data = [
 const uploadOptions = [
   { value: 'none', name: 'None' },
   { value: 'PicGo', name: 'PicGo' },
+  { value: 'uPic', name: 'uPic(only for mac)' },
   { value: 'custom', name: 'Custom' },
-  { value: 'uPic', name: 'uPic(develop)' },
-  { value: 'Picsee', name: 'Picsee(develop)' },
 ]
 
 export default function SettingModal() {
@@ -118,6 +117,9 @@ export default function SettingModal() {
               <Input defaultValue={config?.command} name="command" />
             </div>
           </div>
+          <div className="pl-28 text-xs mt-1 text-gray-500">
+            {t('图床设置选择 custom，会将本地图片路径传递在自定义命令后')}
+          </div>
 
           <div className="mt-4">
             <div className="text-sm text-gray-500 dark:text-white flex items-center">

src/lib/tauri.ts

@@ -155,7 +155,10 @@ export const uploadImage = async (blob) => {
     fileName = `/img/${time}.png`
   }
   await writeFile(`${dirPath}${fileName}`, contents)
-  return `./img/${time}.png`
+  return {
+    path: `./img/${time}.png`,
+    fullPath: `${dirPath}${fileName}`,
+  }
 }
 
 export const downloadFile = async (fileName: string, content: string) => {

src/monaco/pasteImage.js

@@ -1,9 +1,12 @@
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
-import { uploadImage } from '@/lib/bindings'
+import { uploadImage, remove } from '@/lib/bindings'
 import { getItem } from '@/utils/storage'
+import { Command } from '@tauri-apps/plugin-shell'
 
 const codeToUpload = {
-  none: uploadImage,
+  none: async (blob) => {
+    return uploadImage(blob).path
+  },
   PicGo: async () => {
     try {
       const res = await fetch('http://127.0.0.1:36677/upload', {
@@ -14,11 +17,40 @@ const codeToUpload = {
       return '上传失败'
     }
   },
-  uPic: async () => {
-    return '上传失败'
+  uPic: async (blob) => {
+    // 上传图片
+    const res = await uploadImage(blob)
+    try {
+      let result = await Command.create('exec-sh', [
+        '-c',
+        `/Applications/uPic.app/Contents/MacOS/uPic -o url -u ${escape(
+          res.fullPath
+        )}`,
+      ]).execute()
+
+      // 上传成功后删除图片
+      await remove(res.fullPath)
+      return result?.stdout.split('Output URL:')[1]?.trim()
+    } catch (error) {
+      return '上传失败'
+    }
   },
-  custom: async () => {
-    return '上传失败'
+  custom: async (blob, command) => {
+    // 上传图片
+    const res = await uploadImage(blob)
+    try {
+      let result = await Command.create('exec-sh', [
+        '-c',
+        `${command} ${escape(res.fullPath)}`,
+      ]).execute()
+      // 上传成功后删除图片
+      await remove(res.fullPath)
+
+      return result?.stdout?.trim() || '执行失败'
+    } catch (error) {
+      console.log('error', error)
+      return '上传失败'
+    }
   },
 }
 
@@ -38,7 +70,10 @@ export function listenPaste(editor) {
             upload: 'none',
             command: '',
           }
-          const fileName = await codeToUpload[config.upload](blob)
+          const fileName = await codeToUpload[config.upload](
+            blob,
+            config.command
+          )
 
           editor.executeEdits('', [
             {

src/utils/locales/en/translation.json

@@ -66,5 +66,6 @@
   "Downloading": "Downloading",
   "Continue": "Continue",
   "Cancel": "Cancel",
-  "Support HTML": "Support HTML"
+  "Support HTML": "Support HTML",
+  "图床设置选择 custom，会将本地图片路径传递在自定义命令后": "Upload Picture select custom, will pass the local image path after the custom command"
 }

src/utils/locales/zh-CN/translation.json

@@ -66,5 +66,6 @@
   "Downloading": "下载中",
   "Continue": "确认",
   "Cancel": "取消",
-  "Support HTML": "支持HTML"
+  "Support HTML": "支持HTML",
+  "图床设置选择 custom，会将本地图片路径传递在自定义命令后": "图床设置选择 custom，会将本地图片路径传递在自定义命令后"
 }