🐛 Fix(custom): fix s3 disableBucketPrefixToURL

Kuingsmile · Jan 31, 2024 · 321ef56 · 321ef56
1 parent 6b2e2dd
commit 321ef56
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "description": "Modified PicGo core, A tool for picture uploading",
   "author": {
     "name": "Kuingsmile",

diff --git a/src/plugins/uploader/awss3plist.ts b/src/plugins/uploader/awss3plist.ts
@@ -9,6 +9,16 @@ const handle = async (ctx: IPicGo): Promise<IPicGo> => {
     if (!userConfig) {
       throw new Error("Can't find amazon s3 uploader config")
     }
+    if (userConfig.disableBucketPrefixToURL === undefined) {
+      userConfig.disableBucketPrefixToURL = false
+    }
+    if (typeof userConfig.disableBucketPrefixToURL === "string") {
+      if (userConfig.disableBucketPrefixToURL.toLowerCase() === "true") {
+        userConfig.disableBucketPrefixToURL = true
+      } else if (userConfig.disableBucketPrefixToURL.toLowerCase() === "false") {
+        userConfig.disableBucketPrefixToURL = false
+      }
+    }
     if (userConfig.urlPrefix) {
       userConfig.urlPrefix = userConfig.urlPrefix.replace(/\/?$/, "")
       if (userConfig.pathStyleAccess && !userConfig.disableBucketPrefixToURL) {

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -461,7 +461,7 @@ export interface IAwsS3PListUserConfig {
   pathStyleAccess?: boolean
   rejectUnauthorized?: boolean
   acl?: string
-  disableBucketPrefixToURL?: boolean
+  disableBucketPrefixToURL?: boolean | string
 }
 /** PicGo 配置文件类型定义 */
 export interface IConfig {