Merge pull request #417 from terwer/dev

fix: clipboard upload not work for external picgo
terwer · Apr 23, 2024 · 572a934 · 572a934
2 parents 0a0d8ff + b80eb2b
commit 572a934
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/libs/Universal-PicGo-Core/src/core/ExternalPicgo.ts b/libs/Universal-PicGo-Core/src/core/ExternalPicgo.ts
@@ -66,10 +66,6 @@ class ExternalPicgo {
       input = newInput
     }
 
-    if (input?.length === 0) {
-      throw new Error(`cannot not find valid image`)
-    }
-
     this.requestUrl = this.db.get("extPicgoApiUrl") ?? this.requestUrl
     let ret: IImgInfo[] = []
 

diff --git a/libs/Universal-PicGo-Core/src/plugins/uploader/aliyun/node.ts b/libs/Universal-PicGo-Core/src/plugins/uploader/aliyun/node.ts
@@ -29,8 +29,8 @@ const handleNode = async (ctx: IPicGo): Promise<IPicGo> => {
   })
 
   const imgList = ctx.output
-  const customUrl = aliYunOptions.customUrl
-  const path = aliYunOptions.path
+  const customUrl = aliYunOptions.customUrl || ""
+  const path = aliYunOptions.path || ""
 
   for (const img of imgList) {
     if (img.fileName) {

diff --git a/libs/Universal-PicGo-Core/src/plugins/uploader/aliyun/web.ts b/libs/Universal-PicGo-Core/src/plugins/uploader/aliyun/web.ts
@@ -58,8 +58,8 @@ const handleWeb = async (ctx: IPicGo): Promise<IPicGo> => {
   }
 
   const imgList = ctx.output
-  const customUrl = aliYunOptions.customUrl
-  const path = aliYunOptions.path
+  const customUrl = aliYunOptions.customUrl || ""
+  const path = aliYunOptions.path || ""
   for (const img of imgList) {
     if (img.fileName) {
       let image = img.buffer

diff --git a/libs/Universal-PicGo-Core/src/plugins/uploader/awss3.ts b/libs/Universal-PicGo-Core/src/plugins/uploader/awss3.ts
@@ -22,10 +22,10 @@ const handle = async (ctx: IPicGo): Promise<IPicGo> => {
       client,
       index: idx,
       bucketName: userConfig.bucketName,
-      path: formatPath(item, userConfig.uploadPath),
+      path: formatPath(item, userConfig.uploadPath || ""),
       item: item,
       acl: userConfig.acl || "public-read",
-      customUrl: userConfig.customUrl,
+      customUrl: userConfig.customUrl || "",
       corsProxy: userConfig.corsProxy,
     })
   )

diff --git a/libs/Universal-PicGo-Core/src/plugins/uploader/github.ts b/libs/Universal-PicGo-Core/src/plugins/uploader/github.ts
@@ -13,6 +13,7 @@ import mime from "mime-types"
 import { ILocalesKey } from "../../i18n/zh-CN"
 import { bufferToBase64 } from "../../utils/common"
 import { IBuildInEvent } from "../../utils/enums"
+import { browserPathJoin } from "../../utils/browserUtils"
 
 const postOptions = (fileName: string, options: IGithubConfig, data: any): AxiosRequestConfig => {
   const path = options.path || ""
@@ -66,9 +67,12 @@ const handle = async (ctx: IPicGo): Promise<IPicGo> => {
             delete img.base64Image
             delete img.buffer
             if (githubOptions.customUrl) {
-              img.imgUrl = `${githubOptions.customUrl}/${encodeURI(githubOptions.path)}${encodeURIComponent(
-                img.fileName
-              )}`
+              let imgUrl = githubOptions.customUrl
+              if (githubOptions.path) {
+                imgUrl = browserPathJoin(imgUrl, encodeURI(githubOptions.path))
+              }
+              imgUrl = browserPathJoin(imgUrl, encodeURIComponent(img.fileName))
+              img.imgUrl = imgUrl
             } else {
               img.imgUrl = body.content.download_url
             }

diff --git a/libs/Universal-PicGo-Core/src/plugins/uploader/gitlab.ts b/libs/Universal-PicGo-Core/src/plugins/uploader/gitlab.ts
@@ -24,7 +24,8 @@ const postOptions = (userConfig: IGitlabConfig, base64Image: string, fileName: s
   }
 
   const repo = encodeURIComponent(userConfig.repo)
-  const filepath = encodeURIComponent(userConfig.path + fileName)
+  const userPath = userConfig.path || ""
+  const filepath = encodeURIComponent(userPath + fileName)
   return {
     method: "POST",
     url: `${userConfig.url}/api/v4/projects/${repo}/repository/files/${filepath}`,

diff --git a/libs/Universal-PicGo-Core/src/plugins/uploader/qiniu/index.ts b/libs/Universal-PicGo-Core/src/plugins/uploader/qiniu/index.ts
@@ -79,7 +79,7 @@ const handle = async (ctx: IPicGo): Promise<IPicGo> => {
           delete img.base64Image
           delete img.buffer
           const baseUrl = qiniuOptions.url
-          const options = qiniuOptions.options
+          const options = qiniuOptions.options || ""
           img.imgUrl = browserPathJoin(baseUrl, body.key, options)
         } else {
           ctx.emit(IBuildInEvent.NOTIFICATION, {

diff --git a/libs/Universal-PicGo-Core/src/plugins/uploader/tcyun.ts b/libs/Universal-PicGo-Core/src/plugins/uploader/tcyun.ts
@@ -69,7 +69,7 @@ const postOptions = (
   version: string
 ): AxiosRequestConfig => {
   const area = options.area
-  const path = options.path
+  const path = options.path || ""
   if (!options.version || options.version === "v4") {
     return {
       method: "POST",