Merge branch 'dev' into release

CHANGELOG.md

@@ -1,3 +1,26 @@
+## :tada: 2.9.5 (2024-11-16)
+
+
+### :sparkles: Features
+
+* **custom:** add support for sink ([b843278](https://github.com/Kuingsmile/piclist/commit/b843278)), closes [#254](https://github.com/Kuingsmile/piclist/issues/254)
+* **custom:** optimize short url ([fd5316a](https://github.com/Kuingsmile/piclist/commit/fd5316a)), closes [#252](https://github.com/Kuingsmile/piclist/issues/252)
+* **custom:** support use presigned url for image preview ([4209838](https://github.com/Kuingsmile/piclist/commit/4209838)), closes [#265](https://github.com/Kuingsmile/piclist/issues/265)
+
+
+### :bug: Bug Fixes
+
+* **custom:** await RPC call for download directory selection ([2079faa](https://github.com/Kuingsmile/piclist/commit/2079faa))
+* **custom:** quality must be an int between 1-100 ([cd48b24](https://github.com/Kuingsmile/piclist/commit/cd48b24))
+
+
+### :pencil: Documentation
+
+* **custom:** prepare for 2.9.5 ([c5aaa37](https://github.com/Kuingsmile/piclist/commit/c5aaa37))
+* **custom:** update FAQ ([a9eed2d](https://github.com/Kuingsmile/piclist/commit/a9eed2d))
+
+
+
 ## :tada: 2.9.4 (2024-10-22)
 
 

FAQ.md

@@ -1,20 +1,20 @@
 # FAQ
 
-该FAQ修改自PicGo的FAQ，感谢PicGo的作者Molunerfinn。
+本 FAQ 修改自 PicGo 的 FAQ，感谢 PicGo 的作者 Molunerfinn。
 
 ## 常见问题
 
 > 常规配置问题请参考 [官方文档](https://piclist.cn)
 
-## 1. PicList和PicGo有什么关系？
+## 1. PicList 和 PicGo 有什么关系？
 
-PicList项目fork自PicGo项目，基于PicGo进行了二次开发，同时核心功能内核PicGo-Core也进行了二次开发，重命名为[PicList-Core](https://github.com/Kuingsmile/PicList-Core)。
+PicList 项目是从 PicGo 项目 fork 而来，基于 PicGo 进行了二次开发。同时，核心功能内核 PicGo-Core 也进行了二次开发，并重命名为 [PicList-Core](https://github.com/Kuingsmile/PicList-Core)。
 
-PicList所有新功能的添加没有影响到PicGo的原有功能，所以你可以在PicList中使用PicGo的大部分插件。同时仍然可以配合typora、obsidian等软件进行使用。
+PicList 添加的所有新功能未影响 PicGo 的原有功能，因此你可以在 PicList 中使用 PicGo 的大部分插件。同时，仍然可以配合 Typora、Obsidian 等软件使用。
 
 ## 2. 使用图床管理功能时，出现无法获取目录等错误
 
-请查看日志文件 `manage.log`，此外，各平台的API调用基本都有每小时次数限制，如果出现错误，请稍后再试。
+请查看日志文件 `manage.log`。此外，各平台的 API 调用基本都有每小时次数限制，如果出现错误，请稍后再试。
 
 ## 3. 支持哪些图床远端同步删除
 
@@ -40,7 +40,7 @@ PicList所有新功能的添加没有影响到PicGo的原有功能，所以你
 
 可以，通过新添加的图床管理功能，你可以上传任意格式的文件，包括视频文件。同时，在管理界面内上传时，使用分片上传/流式上传等方式，相对于PicGo内置的转换为base64的方式，上传更快，更稳定。
 
-## 5. 能否支持某某某图床
+## 5. 能否支持xxx图床
 
 PicList本体支持了如下图床：
 
@@ -57,6 +57,7 @@ PicList本体支持了如下图床：
 - `SFTP`
 - `兰空图床`
 - `PicList(套娃)`
+- `高级自定义图床`
 
 PicList计划整合和优化现有插件，内置更多的常用图床。
 
@@ -91,7 +92,7 @@ GitHub 服务器和国内 GFW 的问题会导致有时上传成功，有时上
 
 ## 11. macOS系统安装完PicList显示「文件已损坏」或者安装完打开没有反应
 
-请升级PicList 1.4.1或以上版本，自1.4.1开始，PicList已经经过Apple的签名，不会再出现这种情况。
+请升级至 PicList 1.4.1 或以上版本。
 
 ## 12. 水印没有正常添加
 

FAQ_EN.md

@@ -57,6 +57,7 @@ PicList itself supports the following image hosting platforms:
 - SFTP
 - Lsky Pro
 - PicList (nested)
+- Advanced custom image hosting
 
 PicList plans to integrate and optimize existing plugins and embed more commonly used image hosting platforms.
 
@@ -92,7 +93,7 @@ Or right-click on the icon of PicList in the Docker bar to find the menu of "Ope
 
 ## 11. After installing PicList on macOS, it shows "The file is damaged" or there is no response after installing and opening
 
-Please upgrade PicList to version 1.4.1 or above. Starting from 1.4.1, PicList has been signed by Apple and will not have this problem again.
+Please upgrade PicList to version 1.4.1 or above.
 
 ## 12. Watermark is not added normally
 

currentVersion.md

@@ -1,10 +1,15 @@
 ### ✨ Features
 
-- 优化了第二图床的上传逻辑，现在会使用相同文件名和压缩方式
-- 移除了telegra.ph图床（官方现已关闭匿名上传功能）
-- 默认上传快捷键修改为`Ctrl+Alt+U`，避免与vscode命令面板冲突
+- 优化了短链接处理逻辑：
+  - 现在相册界面中复制链接时会得到相同的短链接，而不是每次重新获取
+  - 现在开启短链接时上传结果通知会正确显示
+  - 现在开启短链接时上传接口会返回短链接
+- 管理界面新增使用预签名链接显示预览图片选项
+- 现在图片压缩质量只允许设置1-100之间的正整数
+- 新增对短链项目[Sink](https://github.com/ccbikai/Sink)的支持
 
 ### 🐛 Bug Fixes
 
-- 修复了webdav图床链接拼接错误的问题
-- 修复了开启云删除时部分第三方图床图片无法批量删除的问题
+- 修复了管理页面设置项界面中，部分没有tooltip的选项依旧会显示图标的问题
+- 修复了在管理页面无法修改下载文件夹的问题
+- 修复了对HEIC图片无法转换格式的问题

currentVersion_en.md

@@ -1,10 +1,15 @@
 ### ✨ Features
-
-- Optimize the upload logic of the second image bed, now it will use the same file name and compression method
-- Removed telegra.ph image bed (officially closed anonymous upload function)
-- The default upload shortcut key is changed to `Ctrl+Alt+U` to avoid conflicts with the vscode command panel
+
+- Optimized the short link processing logic:
+  - Now when copying links in the album interface, the same short link will be obtained, instead of reacquiring it each time
+  - Now the upload result notification will be displayed correctly when the short link is enabled
+  - Now the upload interface will return a short link when the short link is enabled
+- Added the option to display preview images using presigned links in the management interface
+- Now the image compression quality only allows setting positive integers between 1-100
+- Added support for the short link project [Sink](https://github.com/ccbikai/Sink)
 
 ### 🐛 Bug Fixes
 
-- Fixed the problem of incorrect splicing of webdav image bed links
-- Fixed the problem that some third-party image bed pictures cannot be deleted in batches when cloud deletion is enabled
+- Fixed the issue where some options without tooltips in the management page settings interface would still display icons
+- Fixed the issue where the download folder could not be modified in the management page
+- Fixed the issue where HEIC images could not be converted

package.json

@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "2.9.4",
+  "version": "2.9.5",
   "author": {
     "name": "Kuingsmile",
     "email": "[email protected]"
@@ -67,7 +67,7 @@
     "multer": "^1.4.5-lts.1",
     "node-ssh-no-cpu-features": "^2.0.0",
     "nodejs-file-downloader": "^4.12.1",
-    "piclist": "^1.9.6",
+    "piclist": "^1.9.7",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
     "proxy-agent": "^5.0.0",

public/i18n/en.yml

@@ -121,7 +121,7 @@ UPLOAD_PAGE_IMAGE_PROCESS_WMCOLOR: Watermark Color, Please select from the color
 UPLOAD_PAGE_IMAGE_PROCESS_WMPATH: Watermark Image Path (leave blank to use default image)
 UPLOAD_PAGE_IMAGE_PROCESS_WMPOSITION: Watermark Position
 UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: Remove EXIF Info
-UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: Compression Quality
+UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: Compression Quality(1-100)
 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: Convert Format
 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: Destination Format
 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT_SPECIFIC: 'Specific Format, Please enter in json format, e.g. {"png": "jpg"}'
@@ -263,6 +263,8 @@ SETTINGS_SHORT_URL_C1N_TOKEN: C1N Token
 SETTINGS_SHORT_URL_YOURLS_DOMAIN: YOURLS domain
 SETTINGS_SHORT_URL_YOURLS_SIGNATURE: YOURLS signature
 SETTINGS_SHORT_URL_CF_WORKER_HOST: Cloudflare Worker Host
+SETTINGS_SHORT_SINK_DOMAIN: sink domain
+SETTINGS_SHORT_SINK_TOKEN: sink token
 SETTINGS_DELETE_LOCAL_FILE_AFTER_UPLOAD: Delete local file after upload
 SETTINGS_SYNC_CONFIG: Settings Sync Configuration
 SETTINGS_SYNC_CONFIG_TITLE: Sync Settings
@@ -390,6 +392,7 @@ MANAGE_SETTING_CLEAR_CACHE_TIPS: After clearing, the file list will be reloaded
 MANAGE_SETTING_CLEAR_CACHE_PROMPT: Are you sure you want to clear the file list cache database?
 MANAGE_SETTING_CLEAR_CACHE_BUTTON: Clear
 MANAGE_SETTING_ISSHOWTHUMBNAIL_TITLE: Display the original image instead of format icon (requires public access permissions)
+MANAGE_SETTING_ISUSEPRESIGNEDURL_TITLE: Use presigned URL for image display
 MANAGE_SETTING_ISSHOWLIST_TITLE: Default display mode for the file list
 MANAGE_SETTING_ISSHOWLIST_ON: List
 MANAGE_SETTING_ISSHOWLIST_OFF: Card

public/i18n/zh-CN.yml

@@ -121,7 +121,7 @@ UPLOAD_PAGE_IMAGE_PROCESS_WMCOLOR: 水印颜色,请从取色器中选择
 UPLOAD_PAGE_IMAGE_PROCESS_WMPATH: 水印图片路径(留空使用默认图片)
 UPLOAD_PAGE_IMAGE_PROCESS_WMPOSITION: 水印位置
 UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: 是否移除EXIF信息
-UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 压缩质量
+UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 压缩质量(1-100)
 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否转换格式
 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 转换目的格式
 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT_SPECIFIC: '精细化转换格式, 请输入JSON格式，如: {"png": "jpg"}'
@@ -266,6 +266,8 @@ SETTINGS_SHORT_URL_C1N_TOKEN: C1N Token
 SETTINGS_SHORT_URL_YOURLS_DOMAIN: YOURLS域名
 SETTINGS_SHORT_URL_YOURLS_SIGNATURE: YOURLS signature
 SETTINGS_SHORT_URL_CF_WORKER_HOST: Cloudflare Worker域名
+SETTINGS_SHORT_SINK_DOMAIN: sink域名
+SETTINGS_SHORT_SINK_TOKEN: sink token
 SETTINGS_DELETE_LOCAL_FILE_AFTER_UPLOAD: 上传后删除本地文件
 SETTINGS_SYNC_CONFIG: 设置配置同步
 SETTINGS_SYNC_CONFIG_TITLE: 同步设置
@@ -392,6 +394,7 @@ MANAGE_SETTING_CLEAR_CACHE_TIPS: 清空后下次进入新目录时将会重新
 MANAGE_SETTING_CLEAR_CACHE_PROMPT: 确定要清空文件列表缓存数据库吗?
 MANAGE_SETTING_CLEAR_CACHE_BUTTON: 清空
 MANAGE_SETTING_ISSHOWTHUMBNAIL_TITLE: 图片显示为原图而非默认文件格式图标(需要存储桶可公开访问)
+MANAGE_SETTING_ISUSEPRESIGNEDURL_TITLE: 使用预签名URL预览图片
 MANAGE_SETTING_ISSHOWLIST_TITLE: 文件列表默认显示方式
 MANAGE_SETTING_ISSHOWLIST_ON: 列表
 MANAGE_SETTING_ISSHOWLIST_OFF: 卡片

public/i18n/zh-TW.yml

@@ -121,7 +121,7 @@ UPLOAD_PAGE_IMAGE_PROCESS_WMCOLOR: 水印顏色，請從取色器中選擇
 UPLOAD_PAGE_IMAGE_PROCESS_WMPATH: 水印圖片路徑（留空使用預設圖片）
 UPLOAD_PAGE_IMAGE_PROCESS_WMPOSITION: 水印位置
 UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: 是否移除EXIF信息
-UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 壓縮質量
+UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 壓縮質量(1-100)
 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否轉換格式
 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 轉換目的格式
 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT_SPECIFIC: '指定格式, 请输入JSON格式配置，如{"jpg":"png"}'
@@ -264,6 +264,8 @@ SETTINGS_SHORT_URL_C1N_TOKEN: C1N Token
 SETTINGS_SHORT_URL_YOURLS_DOMAIN: YOURLS域名
 SETTINGS_SHORT_URL_YOURLS_SIGNATURE: YOURLS signature
 SETTINGS_SHORT_URL_CF_WORKER_HOST: Cloudflare Worker Host
+SETTINGS_SHORT_SINK_DOMAIN: sink域名
+SETTINGS_SHORT_SINK_TOKEN: sink token
 SETTINGS_DELETE_LOCAL_FILE_AFTER_UPLOAD: 上傳後刪除本地檔案
 SETTINGS_SYNC_CONFIG: 設置同步配置
 SETTINGS_SYNC_CONFIG_TITLE: 同步設置
@@ -390,6 +392,7 @@ MANAGE_SETTING_CLEAR_CACHE_TIPS: 清空後下次進入新目錄時將會重新
 MANAGE_SETTING_CLEAR_CACHE_PROMPT: 確定要清空檔案列表快取資料庫嗎？
 MANAGE_SETTING_CLEAR_CACHE_BUTTON: 清空
 MANAGE_SETTING_ISSHOWTHUMBNAIL_TITLE: 顯示圖片的原始圖像而非預設的檔案格式圖示(需要存儲桶公開訪問權限)
+MANAGE_SETTING_ISUSEPRESIGNEDURL_TITLE: 使用預簽名URL预览圖片
 MANAGE_SETTING_ISSHOWLIST_TITLE: 檔案列表預設顯示方式
 MANAGE_SETTING_ISSHOWLIST_ON: 列表
 MANAGE_SETTING_ISSHOWLIST_OFF: 卡片

src/main/apis/app/system/index.ts

@@ -326,15 +326,21 @@ export function createTray(tooltip: string) {
           if (deleteLocalFile) {
             await fs.remove(rawInput[i])
           }
-          pasteText.push(await pasteTemplate(pasteStyle, imgs[i], db.get(configPaths.settings.customLink)))
+          const [pasteTextItem, shortUrl] = await pasteTemplate(
+            pasteStyle,
+            imgs[i],
+            db.get(configPaths.settings.customLink)
+          )
+          imgs[i].shortUrl = shortUrl
+          pasteText.push(pasteTextItem)
           const isShowResultNotification =
             db.get(configPaths.settings.uploadResultNotification) === undefined
               ? true
               : !!db.get(configPaths.settings.uploadResultNotification)
           if (isShowResultNotification) {
             const notification = new Notification({
               title: T('UPLOAD_SUCCEED'),
-              body: imgs[i].imgUrl!
+              body: shortUrl || imgs[i].imgUrl!
               // icon: files[i]
             })
             setTimeout(() => {

src/main/apis/app/uploader/apis.ts

@@ -54,15 +54,17 @@ export const uploadClipboardFiles = async (): Promise<IStringKeyMap> => {
     if (img.length > 0) {
       const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)
       const pasteStyle = db.get(configPaths.settings.pasteStyle) || IPasteStyle.MARKDOWN
-      handleCopyUrl(await pasteTemplate(pasteStyle, img[0], db.get(configPaths.settings.customLink)))
+      const [pastedText, shortUrl] = await pasteTemplate(pasteStyle, img[0], db.get(configPaths.settings.customLink))
+      img[0].shortUrl = shortUrl
+      handleCopyUrl(pastedText)
       const isShowResultNotification =
         db.get(configPaths.settings.uploadResultNotification) === undefined
           ? true
           : !!db.get(configPaths.settings.uploadResultNotification)
       if (isShowResultNotification) {
         const notification = new Notification({
           title: T('UPLOAD_SUCCEED'),
-          body: img[0].imgUrl!
+          body: shortUrl || img[0].imgUrl!
           // icon: img[0].imgUrl
         })
         setTimeout(() => {
@@ -128,15 +130,21 @@ export const uploadChoosedFiles = async (
             picgo.log.error(err)
           })
       }
-      pasteText.push(await pasteTemplate(pasteStyle, imgs[i], db.get(configPaths.settings.customLink)))
+      const [pasteTextItem, shortUrl] = await pasteTemplate(
+        pasteStyle,
+        imgs[i],
+        db.get(configPaths.settings.customLink)
+      )
+      imgs[i].shortUrl = shortUrl
+      pasteText.push(pasteTextItem)
       const isShowResultNotification =
         db.get(configPaths.settings.uploadResultNotification) === undefined
           ? true
           : !!db.get(configPaths.settings.uploadResultNotification)
       if (isShowResultNotification) {
         const notification = new Notification({
           title: T('UPLOAD_SUCCEED'),
-          body: imgs[i].imgUrl!
+          body: shortUrl || imgs[i].imgUrl!
           // icon: files[i].path
         })
         setTimeout(() => {