Merge branch 'dev' into release

CHANGELOG.md

@@ -1,3 +1,18 @@
+## :tada: 2.9.6 (2024-12-04)
+
+
+### :bug: Bug Fixes
+
+* **custom:** fix auto name bug ([84be430](https://github.com/Kuingsmile/piclist/commit/84be430))
+* **custom:** fix plugin search bug ([3455c08](https://github.com/Kuingsmile/piclist/commit/3455c08)), closes [#269](https://github.com/Kuingsmile/piclist/issues/269)
+
+
+### :pencil: Documentation
+
+* **custom:** prepare for new version ([a6a2f9a](https://github.com/Kuingsmile/piclist/commit/a6a2f9a))
+
+
+
 ## :tada: 2.9.5 (2024-11-16)
 
 

currentVersion.md

@@ -1,15 +1,4 @@
-### ✨ Features
-
-- 优化了短链接处理逻辑：
-  - 现在相册界面中复制链接时会得到相同的短链接，而不是每次重新获取
-  - 现在开启短链接时上传结果通知会正确显示
-  - 现在开启短链接时上传接口会返回短链接
-- 管理界面新增使用预签名链接显示预览图片选项
-- 现在图片压缩质量只允许设置1-100之间的正整数
-- 新增对短链项目[Sink](https://github.com/ccbikai/Sink)的支持
-
 ### 🐛 Bug Fixes
 
-- 修复了管理页面设置项界面中，部分没有tooltip的选项依旧会显示图标的问题
+- 修复了自动重命名和剪贴板文件命名缺失秒数的问题
-- 修复了在管理页面无法修改下载文件夹的问题
+- 修复了插件查询失效的问题
-- 修复了对HEIC图片无法转换格式的问题

currentVersion_en.md

@@ -1,15 +1,4 @@
-### ✨ Features
-  
-- 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 issue where some options without tooltips in the management page settings interface would still display icons
+- Fix the problem of missing seconds in automatic renaming and clipboard file naming
-- Fixed the issue where the download folder could not be modified in the management page
+- Fix the problem of invalid plugin query
-- Fixed the issue where HEIC images could not be converted

package.json

@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "2.9.5",
+  "version": "2.9.6",
   "author": {
     "name": "Kuingsmile",
     "email": "pkukuing@gmail.com"
@@ -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.7",
+    "piclist": "^1.9.8",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
     "proxy-agent": "^5.0.0",

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

@@ -84,7 +84,7 @@ class Uploader {
             ctx.output.map(async (item, index) => {
               let name: undefined | string | null
               const fileName = autoRename
-                ? `${dayjs().add(index, 'ms').format('YYYYMMDDHHmmSSS')}${item.extname}`
+                ? `${dayjs().add(index, 'ms').format('YYYYMMDDHHmmssSSS')}${item.extname}`
                 : item.fileName
               if (rename) {
                 const window = windowManager.create(IWindowList.RENAME_WINDOW)!
@@ -122,7 +122,7 @@ class Uploader {
 
     const buffer = nativeImage.toPNG()
     const baseDir = picgo.baseDir
-    const fileName = `${dayjs().format('YYYYMMDDHHmmSSS')}.png`
+    const fileName = `${dayjs().format('YYYYMMDDHHmmssSSS')}.png`
     const filePath = path.join(baseDir, CLIPBOARD_IMAGE_FOLDER, fileName)
     await writeFile(filePath, buffer)
     return filePath

src/renderer/pages/Plugin.vue

@@ -413,23 +413,24 @@ function _getSearchResult(val: string) {
 }
 
 function handleSearchResult(item: INPMSearchResultObject) {
-  const name = handleStreamlinePluginName(item.package.name)
+  const pkg = item.package
+  const name = handleStreamlinePluginName(pkg.name)
   let gui = false
-  if (item.package.keywords && item.package.keywords.length > 0) {
+  if (pkg.keywords && pkg.keywords.length > 0) {
-    if (item.package.keywords.includes('picgo-gui-plugin')) {
+    if (pkg.keywords.includes('picgo-gui-plugin')) {
       gui = true
     }
   }
   return {
     name,
-    fullName: item.package.name,
+    fullName: pkg.name,
-    author: item.package.author.name,
+    author: pkg.author?.name || pkg.publisher?.username || 'unknown',
-    description: item.package.description,
+    description: pkg.description,
-    logo: `https://cdn.jsdelivr.net/npm/${item.package.name}/logo.png`,
+    logo: `https://cdn.jsdelivr.net/npm/${pkg.name}/logo.png`,
     config: {},
-    homepage: item.package.links ? item.package.links.homepage : '',
+    homepage: pkg.links ? pkg.links.homepage : '',
-    hasInstall: pluginNameList.value.some(plugin => plugin === item.package.name),
+    hasInstall: pluginNameList.value.some(plugin => plugin === pkg.name),
-    version: item.package.version,
+    version: pkg.version,
     gui,
     ing: false // installing or uninstalling
   }

src/universal/types/types.d.ts

@@ -227,6 +227,9 @@ interface INPMSearchResultObject {
     author: {
       name: string
     }
+    publisher: {
+      username: string
+    }
     links: {
       npm: string
       homepage: string

yarn.lock

@@ -11956,10 +11956,10 @@ performance-now@^2.1.0:
   resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-piclist@^1.9.7:
+piclist@^1.9.8:
-  version "1.9.7"
+  version "1.9.8"
-  resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.9.7.tgz#f34714248c8b72b009626fd7feaa25ac663a0bb4"
+  resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.9.8.tgz#09eaa51a2c71a0a1db0b2d48feed6c99caf796e2"
-  integrity sha512-52cRCmGZx3jK9unzK4CAmgzIhOOYrfI71wvdigXjNnWGwfVjhxgWj8UkTLSZ9zPRJXzrOLmJvck30UhWUElBsg==
+  integrity sha512-tti3aMsv0/x/UjVCAwvJ+IAPwjH205qUmu4gK/IoSHHR7rV+CVn4dFFcGLSiBasyv0UYm2SlTTRgG4q9Ri2V2w==
   dependencies:
     "@aws-sdk/client-s3" "3.421.0"
     "@aws-sdk/lib-storage" "3.421.0"