Merge branch 'dev' into release

CHANGELOG.md

@@ -1,3 +1,32 @@
+## :tada: 2.7.1 (2024-01-15)
+
+
+### :sparkles: Features
+
+* **custom:** add manual page open setting ([e4f957d](https://github.com/Kuingsmile/piclist/commit/e4f957d))
+* **custom:** add new option to open download page when new version available ([bbbfbda](https://github.com/Kuingsmile/piclist/commit/bbbfbda)), closes [#128](https://github.com/Kuingsmile/piclist/issues/128)
+* **custom:** add options setting for webdav ([2dde06d](https://github.com/Kuingsmile/piclist/commit/2dde06d)), closes [#131](https://github.com/Kuingsmile/piclist/issues/131)
+* **custom:** add support for lskypro uploader ([531b387](https://github.com/Kuingsmile/piclist/commit/531b387))
+* **custom:** enable mozJPEG encoder by default ([98abeaa](https://github.com/Kuingsmile/piclist/commit/98abeaa))
+* **custom:** manual url will be based on lanaguage setting ([9338fc6](https://github.com/Kuingsmile/piclist/commit/9338fc6))
+* **custom:** support build-in lsky sync delete ([4c03260](https://github.com/Kuingsmile/piclist/commit/4c03260))
+* **custom:** support specific format option for image conversion ([9083a1c](https://github.com/Kuingsmile/piclist/commit/9083a1c)), closes [#124](https://github.com/Kuingsmile/piclist/issues/124)
+
+
+### :bug: Bug Fixes
+
+* **custom:** fix i18n error ([2a8c435](https://github.com/Kuingsmile/piclist/commit/2a8c435))
+* **custom:** fix sftp upload error when file name is the same ([269a7bf](https://github.com/Kuingsmile/piclist/commit/269a7bf)), closes [#129](https://github.com/Kuingsmile/piclist/issues/129)
+
+
+### :pencil: Documentation
+
+* **custom:** update docs ([7055f5b](https://github.com/Kuingsmile/piclist/commit/7055f5b))
+* **custom:** update FAQ ([fc0ac6c](https://github.com/Kuingsmile/piclist/commit/fc0ac6c))
+* **custom:** update new version changelog ([3e09dc4](https://github.com/Kuingsmile/piclist/commit/3e09dc4))
+
+
+
 # :tada: 2.7.0 (2023-12-28)
 
 

FAQ.md

@@ -10,7 +10,7 @@
 
 PicList项目fork自PicGo项目，基于PicGo进行了二次开发，同时核心功能内核PicGo-Core也进行了二次开发，重命名为[PicList-Core](https://github.com/Kuingsmile/PicList-Core)。
 
-PicList所有新功能的添加没有影响到PicGo的原有功能，所以你可以在PicList中使用PicGo的所有插件。同时仍然可以配合typora、obsidian等软件进行使用。
+PicList所有新功能的添加没有影响到PicGo的原有功能，所以你可以在PicList中使用PicGo的大部分插件。同时仍然可以配合typora、obsidian等软件进行使用。
 
 ## 2. 使用图床管理功能时，出现无法获取目录等错误
 
@@ -34,6 +34,7 @@ PicList所有新功能的添加没有影响到PicGo的原有功能，所以你
 - 多吉云
 - 华为云 OBS
 - Alist
+- 兰空图床
 
 ## 4. 能否支持上传视频文件
 
@@ -53,6 +54,9 @@ PicList本体支持了如下图床：
 - `Webdav`
 - `本地图床`
 - `SFTP`
+- `Telegra.ph`
+- `兰空图床`
+- `PicList(套娃)`
 
 PicList计划整合和优化现有插件，内置更多的常用图床。
 

FAQ_EN.md

@@ -34,6 +34,7 @@ Currently, the supported image hosting platforms are:
 - Doge Cloud
 - Huawei Cloud OBS
 - Alist
+- Lsky Pro
 
 ## 4. Is it possible to upload video files?
 
@@ -53,6 +54,9 @@ PicList itself supports the following image hosting platforms:
 - Webdav
 - Local path
 - SFTP
+- Telegra.ph
+- Lsky Pro
+- PicList (nested)
 
 PicList plans to integrate and optimize existing plugins and embed more commonly used image hosting platforms.
 

README.md

@@ -34,12 +34,12 @@ if you want to use PicList-core, please go to [https://github.com/Kuingsmile/Pic
 ## Features
 
 - Retains all the features of PicGo and is compatible with the vast majority of existing PicGo plugins, including integrations with software like Typora and Obsidian.
-- Added multiple built-in image hosting platforms, such as WebDav, local image hosting, SFTP and Telegra.ph. The original built-in imgur image host now also supports account login for uploading.
+- Added multiple built-in image hosting platforms, such as WebDav, Lsky Pro, local image hosting, SFTP and Telegra.ph. The original built-in imgur image host now also supports account login for uploading.
 - Within the album, you can synchronize the deletion of cloud images. This is supported across all built-in image hosts and multiple plugins.
 - The album now offers advanced search and sorting features, as well as batch URL modification.
 - Built-in tools for adding watermarks, compressing images, scaling images, rotating images, and converting image formats are now available. Advanced renaming is also supported.
 - Upload interface supports form upload files, can be shared by multiple computers
-- Configuration can be synchronized to Github or Gitee repositories.
+- Configuration can be synchronized to Github/Gitee/Gitea repositories.
 - Manages over ten types of image hosting platforms, allowing online viewing of cloud directories, file searching, batch uploading, batch downloading, file deletion, and more.
 - Support previewing multiple formats of files, including pictures, videos, plain text files and markdown files, etc. For the specific formats supported, please refer to [Supported file format list](https://github.com/Kuingsmile/PicList/blob/dev/supported_format.md)
 - Supports the use of regular expressions for batch renaming of cloud files.
@@ -60,7 +60,7 @@ Please install my matching plugin [VS-PicList](https://marketplace.visualstudio.
 
 **Typora 1.6.0-dev and above versions now support PicList natively**
 
-Now you need to set the upload service PicList and PicGo (app) to the installation path of PicList at the same time, which may be due to a bug in Typora.
+Now you need to set the upload service PicList and PicGo (app) to the installation path of PicList at the same time, it has been fixed in latest dev version.
 
 [download link](https://typora.io/releases/all)
 
@@ -148,6 +148,8 @@ docker-compose up -d
 |       Built-in SFTP        |          ✔️           |            ✔️             |
 |         Doge Cloud         |          ✔️           |            ✔️             |
 |    PicList(Lasso-Doll)     |          ✔️           |            ✔️             |
+|         Telegra.ph         |          ✔️           |            ×             |
+|          Lsky Pro          |          ✔️           |            ✔️             |
 
 |                                           Plugin                                           | Album cloud deletion |
 | :----------------------------------------------------------------------------------------: | :------------------: |

README_cn.md

@@ -34,12 +34,12 @@ PicList的内核使用的是原版PicGo-Core基础上修改的[PicList-core](htt
 ## 特色功能
 
 - 保留了PicGo的所有功能，兼容绝大部分已有的PicGo插件，包括和Typora、Obsidian等软件的搭配
-- 新增了多个内置图床，如WebDav、本地图床、SFTP和Telegra.ph等，原内置imgur图床额外支持登录账号上传
+- 新增了多个内置图床，如WebDav、兰空图床、本地图床、SFTP和Telegra.ph等，原内置imgur图床额外支持登录账号上传
 - 相册中可同步删除云端图片，支持所有内置图床和多个插件
 - 相册新增了高级搜索和排序，批量修改URL等功能
 - 内置水印添加、图片压缩、图片缩放、图片旋转和图片格式转换等功能，同时支持高级重命名
 - 上传接口支持表单上传文件，可多电脑共用
-- 支持配置同步至Github或Gitee仓库
+- 支持配置同步至Github/Gitee/Gitea仓库
 - 支持管理十余种图床，可以在线进行云端目录查看、文件搜索、批量上传、批量下载、删除文件等
 - 支持预览多种格式的文件，包括图片、视频、纯文本文件和markdown文件等，具体支持的格式请参考[支持的文件格式列表](https://github.com/Kuingsmile/PicList/blob/dev/supported_format.md)
 - 支持启用正则表达式的批量云端文件重命名
@@ -60,7 +60,7 @@ PicList的内核使用的是原版PicGo-Core基础上修改的[PicList-core](htt
 
 **Typora 1.6.0-dev以及以上版本现在已经原生支持PicList了** 
 
-目前Typora中需要同时设置上传服务PicList和PicGo（app）的路径为PicList的安装路径，这可能源于Typora的bug。
+目前Typora中需要同时设置上传服务PicList和PicGo（app）的路径为PicList的安装路径，已经在最新的Dev版本中修复。
 
 [下载地址](https://typora.io/releases/all)
 
@@ -148,6 +148,8 @@ docker-compose up -d
 |    内置SFTP    |     ✔️      |     ✔️      |
 |     多吉云     |     ✔️      |     ✔️      |
 | PicList(套娃)  |     ✔️      |     ✔️      |
+|   Telegra.ph   |     ✔️      |     x      |
+|    兰空图床    |     ✔️      |     ✔️      |
 
 |                                            插件                                            | 相册云删除 |
 | :----------------------------------------------------------------------------------------: | :--------: |

currentVersion.md

@@ -1,16 +1,15 @@
-Happy New Year! 🎉
-
 ✨ Features
 
-- 现在移除exif信息选项不再错误的处理svg图片
-- 添加了管理功能log文件和软件GUI界面log文件的快捷打开选项
-- 现在支持更多类型的文本文件预览
-- 现在移除配置前会进行额外的确认以避免误删除
-- 现在如果对应图床不支持重命名操作，不会再显示重命名按钮
-- 优化了管理界面文件浏览页的文字显示
-- 移除了赞助窗口~~
+- 新增内置兰空图床上传和删除支持
+- Webdav图床现在支持设置URL参数后缀
+- 现在支持指定每种图片格式对应的转换后格式
+- 现在默认启用mozJPEG编码器以减小文件体积
+- 现在打开手册页面会询问打开方式
+- 优化了重命名选项的提示
+- 更新提示窗口现在提供跳转至版本发布页手动下载的选项
 
 🐛 Bug Fixes
 
-- 修复了表单上传模式下，中文文件名乱码的问题
-- 修复了管理界面入口页的显示bug
+- 修复了sftp图床上传相同文件名的图片会报错的问题
+- 修复了imgur图床转换格式为webp时，文件名错误的问题
+- 修复了部分i18n错误的问题

currentVersion_en.md

@@ -1,16 +1,15 @@
-Happy New Year! 🎉
-
 ✨ Features
 
-- Now the option to remove exif information will no longer incorrectly process svg images
-- Added a shortcut to open the log file of the management function and the GUI interface log file
-- Now supports more types of text file preview
-- Now there will be extra confirmation before removing the configuration to avoid accidental deletion
-- Now if the corresponding image bed does not support the rename operation, the rename button will not be displayed
-- Optimized the text display of the file browsing page of the management interface
-- Removed the sponsorship window~~
+- Add built-in Lsky Pro image bed upload and delete support
+- Webdav image bed now supports setting URL parameter suffix
+- Now you can specify the converted format for each image format
+- Now enable the mozJPEG encoder by default to reduce file size
+- Now the open manual page will ask for the open method
+- Optimize the prompt of the rename option
+- The update prompt window now provides an option to jump to the version release page to download manually
 
 🐛 Bug Fixes
 
-- Fixed the problem of garbled Chinese file names in form upload mode
-- Fixed the display bug of the management interface entry page
+- Fixed the problem that uploading images with the same file name to the sftp image bed will report an error
+- Fixed the problem that the file name is incorrect when converting the format of the imgur image bed to webp
+- Fixed some i18n errors

package.json

@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "author": {
     "name": "Kuingsmile",
     "email": "[email protected]"
@@ -68,7 +68,7 @@
     "multer": "^1.4.5-lts.1",
     "node-ssh-no-cpu-features": "^1.0.1",
     "nodejs-file-downloader": "^4.12.1",
-    "piclist": "^1.7.0",
+    "piclist": "^1.7.6",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.0",
     "proxy-agent": "^5.0.0",

public/i18n/en.yml

@@ -50,6 +50,11 @@ TOOLBOX_CHECK_PROXY_PROXY_IS_NOT_WORKING: Proxy settings unavailable
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_TIPS: "The temporary folder path for clipboard pictures is: ${path}"
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_NOT_EXIST_TIPS: "The temporary folder for clipboard pictures does not exist: ${path}"
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_ERROR_TIPS: "Please create the folder yourself: ${path}"
+MANUAL_PAGE_OPEN_TIP: Please select the way to open the manual
+MANUAL_PAGE_OPEN_TIP_TITLE: Tips
+MANUAL_PAGE_OPEN_BY_BROWSER: Browser
+MANUAL_PAGE_OPEN_BY_BUILD_IN: Built-in
+MANUAL_PAGE_OPEN_SETTING_TIP: Select the way to open the manual
 
 # ---renderer i18n begin---
 
@@ -115,6 +120,7 @@ UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: Remove EXIF Info
 UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: Compression Quality
 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"}'
 UPLOAD_PAGE_IMAGE_PROCESS_ISFLIP: Whether to flip vertically
 UPLOAD_PAGE_IMAGE_PROCESS_ISFLOP: Whether to flip horizontally
 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: Resize to fixed size
@@ -169,7 +175,7 @@ SETTINGS_CLOSE_MINI_WINDOW_SYNC: Close Mini Window When open Main Window
 SETTINGS_CLOSE_MAIN_WINDOW_SYNC: Close Main Window When open Mini Window
 SETTINGS_ACCEPT_BETA_UPDATE: Accept Beta Update
 SETTINGS_LAUNCH_ON_BOOT: Launch On Boot
-SETTINGS_RENAME_BEFORE_UPLOAD: Rename Before Upload
+SETTINGS_RENAME_BEFORE_UPLOAD: Manual Rename
 SETTINGS_TIMESTAMP_RENAME: Timestamp Rename
 SETTINGS_ADVANCED_RENAME: Advanced Rename
 SETTINGS_ADVANCED_RENAME_ENABLE: Enable Advanced Rename

public/i18n/zh-CN.yml

@@ -50,6 +50,11 @@ TOOLBOX_CHECK_PROXY_PROXY_IS_NOT_WORKING: 代理设置不可用
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_TIPS: 剪贴板图片临时文件夹路径是：${path}
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_NOT_EXIST_TIPS: 剪贴板图片临时文件夹不存在：${path}
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_ERROR_TIPS: 请自行创建文件夹：${path}
+MANUAL_PAGE_OPEN_TIP: 请选择打开方式
+MANUAL_PAGE_OPEN_TIP_TITLE: Tips
+MANUAL_PAGE_OPEN_BY_BROWSER: 浏览器
+MANUAL_PAGE_OPEN_BY_BUILD_IN: 内置
+MANUAL_PAGE_OPEN_SETTING_TIP: 选择手册打开方式
 
 # ---renderer i18n begin---
 
@@ -115,6 +120,7 @@ UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: 是否移除EXIF信息
 UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 压缩质量
 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否转换格式
 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 转换目的格式
+UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT_SPECIFIC: '精细化转换格式, 请输入JSON格式，如: {"png": "jpg"}'
 UPLOAD_PAGE_IMAGE_PROCESS_ISFLIP: 是否进行垂直翻转
 UPLOAD_PAGE_IMAGE_PROCESS_ISFLOP: 是否进行水平翻转
 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸调整图片
@@ -171,7 +177,7 @@ SETTINGS_CLOSE_MINI_WINDOW_SYNC: 打开主窗口时关闭mini窗口
 SETTINGS_CLOSE_MAIN_WINDOW_SYNC: 打开mini窗口时关闭主窗口
 SETTINGS_ACCEPT_BETA_UPDATE: 接受Beta版本更新
 SETTINGS_LAUNCH_ON_BOOT: 开机自启
-SETTINGS_RENAME_BEFORE_UPLOAD: 上传前重命名
+SETTINGS_RENAME_BEFORE_UPLOAD: 手动重命名
 SETTINGS_TIMESTAMP_RENAME: 时间戳重命名
 SETTINGS_ADVANCED_RENAME: 高级重命名
 SETTINGS_ADVANCED_RENAME_ENABLE: 开启高级重命名

public/i18n/zh-TW.yml

@@ -50,6 +50,11 @@ TOOLBOX_CHECK_PROXY_PROXY_IS_NOT_WORKING: 代理設置不可用
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_TIPS: 剪貼板圖片臨時文件夾路徑是：${path}  
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_NOT_EXIST_TIPS: 剪貼板圖片臨時文件夾不存在：${path}
 TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_ERROR_TIPS: 請自行創建文件夾:${path}
+MANUAL_PAGE_OPEN_TIP: 請選擇打開方式
+MANUAL_PAGE_OPEN_TIP_TITLE: Tips
+MANUAL_PAGE_OPEN_BY_BROWSER: 瀏覽器
+MANUAL_PAGE_OPEN_BY_BUILD_IN: 內置
+MANUAL_PAGE_OPEN_SETTING_TIP: 選擇打開手冊方式
 
 # ---renderer i18n begin---
 
@@ -115,6 +120,7 @@ UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: 是否移除EXIF信息
 UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 壓縮質量
 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否轉換格式
 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 轉換目的格式
+UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT_SPECIFIC: '指定格式, 请输入JSON格式配置，如{"jpg":"png"}'
 UPLOAD_PAGE_IMAGE_PROCESS_ISFLIP: 是否進行垂直翻轉
 UPLOAD_PAGE_IMAGE_PROCESS_ISFLOP: 是否進行水平翻轉
 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸調整圖片
@@ -169,7 +175,7 @@ SETTINGS_CLOSE_MINI_WINDOW_SYNC: 開主窗口同步關閉mini窗口
 SETTINGS_CLOSE_MAIN_WINDOW_SYNC: 關mini窗口同步關閉主窗口
 SETTINGS_ACCEPT_BETA_UPDATE: 接受Beta版本更新
 SETTINGS_LAUNCH_ON_BOOT: 開機時啟動
-SETTINGS_RENAME_BEFORE_UPLOAD: 上傳前重新命名
+SETTINGS_RENAME_BEFORE_UPLOAD: 手动重新命名
 SETTINGS_TIMESTAMP_RENAME: 以時間戳命名
 SETTINGS_ADVANCED_RENAME: 高級命名
 SETTINGS_ADVANCED_RENAME_ENABLE: 啟用高級命名

src/main.ts

@@ -55,7 +55,10 @@ app.config.globalProperties.$builtInPicBed = [
   'github',
   'webdavplist',
   'local',
-  'sftpplist'
+  'sftpplist',
+  'telegraphplist',
+  'piclist',
+  'lskyplist'
 ]
 
 app.config.globalProperties.$$db = db

src/main/lifeCycle/index.ts

@@ -5,7 +5,8 @@ import {
   protocol,
   Notification,
   dialog,
-  screen
+  screen,
+  shell
 } from 'electron'
 import {
   createProtocol
@@ -84,7 +85,7 @@ autoUpdater.on('update-available', async (info: UpdateInfo) => {
   dialog.showMessageBox({
     type: 'info',
     title: T('FIND_NEW_VERSION'),
-    buttons: ['Yes', 'No'],
+    buttons: ['Yes', 'Go to download page'],
     message: T('TIPS_FIND_NEW_VERSION', {
       v: info.version
     }) + '\n\n' + updateLog,
@@ -93,6 +94,8 @@ autoUpdater.on('update-available', async (info: UpdateInfo) => {
   }).then((result) => {
     if (result.response === 0) {
       autoUpdater.downloadUpdate()
+    } else {
+      shell.openExternal('https://github.com/Kuingsmile/PicList/releases/latest')
     }
     db.set('settings.showUpdateTip', !result.checkboxChecked)
   }).catch((err) => {

src/main/server/index.ts

@@ -23,14 +23,12 @@ const multerStorage = multer.diskStorage({
     cb(null, serverTempDir)
   },
   filename: function (_req: any, file: { originalname: any }, cb: (arg0: null, arg1: any) => void) {
-    console.log(file.originalname)
     // eslint-disable-next-line no-control-regex
     if (!/[^\u0000-\u00ff]/.test(file.originalname)) {
       file.originalname = Buffer.from(file.originalname, 'latin1').toString(
         'utf8'
       )
     }
-    console.log(file.originalname)
     cb(null, file.originalname)
   }
 })

src/renderer/apis/allApi.ts

@@ -13,6 +13,7 @@ import DogeCloudApi from './dogecloud'
 import HuaweicloudApi from './huaweiyun'
 import AlistApi from './alist'
 import PiclistApi from './piclist'
+import LskyplistApi from './lskyplist'
 
 const apiMap: IStringKeyMap = {
   aliyun: AliyunApi,
@@ -29,7 +30,8 @@ const apiMap: IStringKeyMap = {
   dogecloud: DogeCloudApi,
   'huaweicloud-uploader': HuaweicloudApi,
   alist: AlistApi,
-  piclist: PiclistApi
+  piclist: PiclistApi,
+  lskyplist: LskyplistApi
 }
 
 export default class ALLApi {