Merge branch 'dev' into release

.github/workflows/linux_build.yml

@@ -34,13 +34,6 @@ jobs:
       - name: Check out git repository
         uses: actions/checkout@v2
 
-      # step2: sign
-      - name: Install the Apple certificates
-        if: matrix.os == 'macos-11'
-        run: |
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
-
       # step3: install node env
       - name: Install Node.js
         uses: actions/setup-node@v2
@@ -52,20 +45,6 @@ jobs:
         run: |
           sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
 
-      # step3: yarn
-      - name: Yarn install macos
-        if: matrix.os == 'macos-11'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-          npm rebuild --platform=darwin --arch=arm64 sharp
-
-      - name: Yarn install windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-        
       - name: Yarn install linux
         if: matrix.os == 'ubuntu-latest'
         run: |

.github/workflows/mac_beta.yml

@@ -21,15 +21,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11]
+        os: [macos-12]
 
     steps:
       - name: Check out git repository
         uses: actions/checkout@v2
 
       # step2: sign
       - name: Install the Apple certificates
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
         run: |
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
@@ -47,7 +47,7 @@ jobs:
 
       # step3: yarn
       - name: Yarn install macos
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
         run: |
           yarn
           yarn global add xvfb-maybe

.github/workflows/mac_build.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11]
+        os: [macos-12]
 
     # create steps
     steps:
@@ -36,7 +36,7 @@ jobs:
 
       # step2: sign
       - name: Install the Apple certificates
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
         run: |
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
@@ -47,31 +47,14 @@ jobs:
         with:
           node-version: '16.x'
 
-      - name: Install system deps
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
-
       # step3: yarn
       - name: Yarn install macos
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
         run: |
           yarn
           yarn global add xvfb-maybe
           npm rebuild --platform=darwin --arch=arm64 sharp
 
-      - name: Yarn install windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-        
-      - name: Yarn install linux
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-
       - name: Build  & release app
         run: |
           yarn build

.github/workflows/main.yml

@@ -24,15 +24,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-11, windows-latest]
+        os: [ubuntu-latest, macos-12, windows-latest]
 
     steps:
       - name: Check out git repository
         uses: actions/checkout@v2
 
       # step2: sign
       - name: Install the Apple certificates
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
         run: |
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
@@ -50,7 +50,7 @@ jobs:
 
       # step3: yarn
       - name: Yarn install macos
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
         run: |
           yarn
           yarn global add xvfb-maybe

.github/workflows/mas.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11]
+        os: [macos-12]
 
     # create steps
     steps:
@@ -36,7 +36,7 @@ jobs:
 
       # step2: sign
       - name: Install the Apple certificates
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
         run: |
           PP_PATH=$RUNNER_TEMP/build/piclistmas.provisionprofile
           echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH

.github/workflows/win_build.yml

@@ -34,43 +34,17 @@ jobs:
       - name: Check out git repository
         uses: actions/checkout@v2
 
-      # step2: sign
-      - name: Install the Apple certificates
-        if: matrix.os == 'macos-11'
-        run: |
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
-
       # step3: install node env
       - name: Install Node.js
         uses: actions/setup-node@v2
         with:
           node-version: '16.x'
 
-      - name: Install system deps
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
-
-      # step3: yarn
-      - name: Yarn install macos
-        if: matrix.os == 'macos-11'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-          npm rebuild --platform=darwin --arch=arm64 sharp
-
       - name: Yarn install windows
         if: matrix.os == 'windows-latest'
         run: |
           yarn
           yarn global add xvfb-maybe
-        
-      - name: Yarn install linux
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
 
       - name: Build  & release app
         run: |

CHANGELOG.md

@@ -1,3 +1,37 @@
+## :tada: 2.8.6 (2024-05-26)
+
+
+### :sparkles: Features
+
+* **custom:** add ipc event handlers for mini window icon and set on top ([892a147](https://github.com/Kuingsmile/piclist/commit/892a147))
+* **custom:** improve speed of download config files ([e16737e](https://github.com/Kuingsmile/piclist/commit/e16737e))
+* **custom:** update manual source URL based on language configuration ([3587bc5](https://github.com/Kuingsmile/piclist/commit/3587bc5))
+* **custom:** update manual url for en language ([e6ee325](https://github.com/Kuingsmile/piclist/commit/e6ee325))
+* **custom:** write delete msg to log file ([16d6a19](https://github.com/Kuingsmile/piclist/commit/16d6a19))
+
+
+### :bug: Bug Fixes
+
+* **custom:** fix el-select option display problem ([4f95014](https://github.com/Kuingsmile/piclist/commit/4f95014))
+* **custom:** remove listener before unmount ([8b21e84](https://github.com/Kuingsmile/piclist/commit/8b21e84))
+
+
+### :pencil: Documentation
+
+* **custom:** prepare for 2.8.6 ([4887090](https://github.com/Kuingsmile/piclist/commit/4887090))
+
+
+### :zap: Performance Improvements
+
+* **custom:** improve the performance of clipboard watching ([4a0a882](https://github.com/Kuingsmile/piclist/commit/4a0a882))
+
+
+### :package: Chore
+
+* **custom:** update to macos-12 for action ([5eb3c9d](https://github.com/Kuingsmile/piclist/commit/5eb3c9d))
+
+
+
 ## :tada: 2.8.5 (2024-05-13)
 
 

FAQ_EN.md

@@ -4,7 +4,7 @@ This FAQ has been modified from PicGo's FAQ, and thanks to the author Molunerfin
 
 ## Common Questions
 
-> Please refer to [user manual](https://piclist.cn) for general configuration issues.
+> Please refer to [user manual](https://piclist.cn/en) for general configuration issues.
 
 ## 1. What is the relationship between PicList and PicGo?
 

currentVersion.md

@@ -1,14 +1,19 @@
 ### ✨ Features
 
-- 现在`upload`接口只传递`picbed`参数时，使用对应图床的默认配置，而不是`Default`配置
-- 优化了对smms图床的备用域名的处理逻辑
-- 内置aws S3图床现在设置权限时使用下拉选择框，同时`disableBucketPrefixToURL`现在修改为布尔类型
-- 高级重命名现在支持`{str-number}`格式，其中number为任意数字，新增`{ms}`（毫秒)的支持
-- 管理功能中，上传自定义重命名新增对`{h}`(小时)，`{i}`(分钟)，`{s}`（秒），，同时`{timestamp}`修改为毫秒，新增对`{str-number}`的支持
-- 管理功能中，阿里云图床新增对创建`oss-cn-wuhan(华南1-武汉)`地域存储桶的支持
-- 优化了重命名占位符说明页面的排版
-- Docker版本PicList-core现在修改时区为东八区
+- 现在从相册删除云端图片时的日志记录于日志文件中，而不是打印到控制台
+- 现在软件内窗口打开手册和打开图床手册时，会根据软件语言自动设置语言
+- 现在设置自定义mini窗口图标和保持置顶后会即时生效，不再需要重启软件
+- 优化了同步配置时的下载速度
+- 优化了监听剪贴板功能的性能表现
 
 ### 🐛 Bug Fixes
 
-- 修正了高级重命名中时间戳的说明，由秒修改为毫秒
+- 修复了第一次进入页面时，下拉选择项显示的默认值是后台值而非标签的问题
+- 修复了tray页面监听器没有正确移除的问题
+
+### 📦Chore
+
+- 优化了[官网](https://piclist.cn)的加载速度，添加了`配置文件结构`的说明
+- mac打包平台迁移至`macos-12`
+- 移除了已废弃的配置项相关的代码
+- 移除了管理配置中试剂未使用的`currentPicBedConfig`配置项

currentVersion_en.md

@@ -1,14 +1,19 @@
 ### ✨ Features
 
-- Now when the `upload` interface only passes the `picbed` parameter, the default configuration of the corresponding image bed is used instead of the `Default` configuration
-- Optimized the processing logic of the backup domain name of the smms image bed
-- The built-in aws S3 image bed now uses a drop-down box when setting permissions, and `disableBucketPrefixToURL` is now modified to a boolean type
-- Advanced renaming now supports the `{str-number}` format, where number is any number, and adds support for `{ms}` (milliseconds)
-- In the management function, the upload custom renaming adds support for `{h}` (hour), `{i}` (minute), `{s}` (second), and `{timestamp}` is modified to milliseconds, and adds support for `{str-number}`
-- In the management function, the Alibaba Cloud image bed adds support for creating `oss-cn-wuhan (South China 1-Wuhan)` regional storage buckets
-- Optimized the layout of the placeholder description page for renaming
-- The Docker version of PicList-core now changes the time zone to East Eight District
+- Now when deleting cloud images from the album, the log is recorded in the log file instead of being printed to the console
+- Now when opening the manual and the image bed manual in the software window, the language will be automatically set according to the software language
+- Now the custom mini window icon and keep top will take effect immediately after setting, no need to restart the software
+- Optimized the download speed of synchronizing configuration
+- Optimized the performance of listening to the clipboard function
 
 ### 🐛 Bug Fixes
 
-- Fixed the description of the timestamp in advanced renaming, changed from seconds to milliseconds
+- Fixed the problem that the default value displayed in the drop-down selection when entering the page for the first time is the background value rather than the label
+- Fixed the problem that the tray page listener was not correctly removed
+
+### 📦Chore
+
+- Optimized the loading speed of [official website](https://piclist.cn), added the description of `configuration file structure`
+- Mac packaging platform migrated to `macos-12`
+- Removed the code related to the deprecated configuration items
+- Removed the `currentPicBedConfig` configuration item that is not used in the management configuration

package.json

@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "author": {
     "name": "Kuingsmile",
     "email": "[email protected]"

public/i18n/en.yml

@@ -54,7 +54,7 @@ TOOLBOX_CHECK_CLIPBOARD_FILE_PATH_ERROR_TIPS: "Please create the folder yourself
 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_BY_BUILD_IN: Built-in Window
 MANUAL_PAGE_OPEN_SETTING_TIP: Select the way to open the manual
 
 # ---renderer i18n begin---

public/i18n/zh-CN.yml

@@ -54,7 +54,7 @@ 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_BY_BUILD_IN: 内置窗口
 MANUAL_PAGE_OPEN_SETTING_TIP: 选择手册打开方式
 
 # ---renderer i18n begin---

public/i18n/zh-TW.yml

@@ -54,7 +54,7 @@ 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_BY_BUILD_IN: 內置窗口s
 MANUAL_PAGE_OPEN_SETTING_TIP: 選擇打開手冊方式
 
 # ---renderer i18n begin---

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

@@ -140,7 +140,7 @@ async function deleteSFTPFile (config: ISftpPlistConfig, fileName: string) {
     client.close()
     return deleteResult
   } catch (err: any) {
-    console.error(err)
+    picgo.log.error(err)
     return false
   }
 }

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

@@ -38,7 +38,7 @@ import { configPaths } from '~/universal/utils/configPaths'
 const waitForRename = (window: BrowserWindow, id: number): Promise<string|null> => {
   return new Promise((resolve) => {
     const windowId = window.id
-    ipcMain.once(`${RENAME_FILE_NAME}${id}`, (evt: Event, newName: string) => {
+    ipcMain.once(`${RENAME_FILE_NAME}${id}`, (_: Event, newName: string) => {
       resolve(newName)
       window.close()
     })