From 5657ed3151ed528ef6b5a998acde6a1bde79214f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92=E8=B5=AB=E8=90=9D?= Date: Thu, 9 Mar 2023 18:11:19 +0800 Subject: [PATCH 1/5] :bug: Fix: fix yml bug --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02f25e1..1dba096 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,21 +57,21 @@ jobs: # step3: yarn - name: Yarn install macos - if: matrix.os = 'macos-11' + 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' + if: matrix.os == 'windows-latest' run: | yarn yarn global add xvfb-maybe npm rebuild --platform=win32 --arch=ia32 sharp - name: Yarn install linux - if: matrix.os = 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' run: | yarn yarn global add xvfb-maybe From a46b0923c15e36ddeaf0b5d64cc19ccc899cd4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92=E8=B5=AB=E8=90=9D?= Date: Fri, 10 Mar 2023 10:11:42 +0800 Subject: [PATCH 2/5] :sparkles: Feature: add remove exif info ISSUES CLOSED: #18 --- package.json | 2 +- src/renderer/pages/PicGoSetting.vue | 11 ++++++++++- src/renderer/pages/Upload.vue | 11 ++++++++++- yarn.lock | 8 ++++---- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 8a85585..e3730ea 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "mime-types": "^2.1.35", "mitt": "^3.0.0", "nodejs-file-downloader": "^4.10.6", - "piclist": "^0.3.0", + "piclist": "^0.3.1", "pinia": "^2.0.32", "pinia-plugin-persistedstate": "^3.1.0", "qiniu": "^7.8.0", diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index 2a2a94b..c442570 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -637,6 +637,13 @@ + + + ({ isReSizeByPercent: false, reSizePercent: 50, isRotate: false, - rotateDegree: 0 + rotateDegree: 0, + isRemoveExif: false }) function closeDialog () { @@ -824,6 +832,7 @@ async function initForm () { compressForm.reSizePercent = compress.reSizePercent ?? 50 compressForm.isRotate = compress.isRotate ?? false compressForm.rotateDegree = compress.rotateDegree ?? 0 + compressForm.isRemoveExif = compress.isRemoveExif ?? false } if (watermark) { waterMarkForm.isAddWatermark = watermark.isAddWatermark ?? false diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue index ffc8252..abb95af 100644 --- a/src/renderer/pages/Upload.vue +++ b/src/renderer/pages/Upload.vue @@ -228,6 +228,13 @@ + + + ({ isReSizeByPercent: false, reSizePercent: 50, isRotate: false, - rotateDegree: 0 + rotateDegree: 0, + isRemoveExif: false }) function closeDialog () { @@ -418,6 +426,7 @@ async function initData () { compressForm.reSizePercent = compress.reSizePercent ?? 50 compressForm.isRotate = compress.isRotate ?? false compressForm.rotateDegree = compress.rotateDegree ?? 0 + compressForm.isRemoveExif = compress.isRemoveExif ?? false } if (watermark) { waterMarkForm.isAddWatermark = watermark.isAddWatermark ?? false diff --git a/yarn.lock b/yarn.lock index 3aea4a3..b4ee4b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10989,10 +10989,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@^0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/piclist/-/piclist-0.3.0.tgz#54cdc2273058e5181619aec06c141d1759ccbcc4" - integrity sha512-cmNWKY/whYO/RFDDmwnTkc5ojlp+4fDvrYzo/moZbwIIJWsgMZlnMpMFthAjJVfk3hAGHQrsJHxY2IZuMVg66w== +piclist@^0.3.1: + version "0.3.1" + resolved "https://registry.npmjs.org/piclist/-/piclist-0.3.1.tgz#afc77aa481f7bd755956fed6ae77fcbba9976ac0" + integrity sha512-Qf6lGTqQmISHXVdMP4Yip02S27gTyKuOgoT7EdFtMpcPRZQNJxqpOZDJag7AtmuKscdrfB8Frsc1GttIoLe74A== dependencies: "@picgo/i18n" "^1.0.0" "@picgo/store" "^2.0.4" From 34826a70bd116232b5ec6952e2eedcc039a6f34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92=E8=B5=AB=E8=90=9D?= Date: Fri, 10 Mar 2023 11:09:27 +0800 Subject: [PATCH 3/5] :package: Chore: update build workflow --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1dba096..9194172 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,7 +68,6 @@ jobs: run: | yarn yarn global add xvfb-maybe - npm rebuild --platform=win32 --arch=ia32 sharp - name: Yarn install linux if: matrix.os == 'ubuntu-latest' From c4df0dbe6eb01630d54bc7a724c96cec735402d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92=E8=B5=AB=E8=90=9D?= Date: Fri, 10 Mar 2023 11:16:58 +0800 Subject: [PATCH 4/5] :hammer: Refactor: remove sharp --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index e3730ea..2568aed 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,6 @@ "pinia-plugin-persistedstate": "^3.1.0", "qiniu": "^7.8.0", "qrcode.vue": "^3.3.3", - "sharp": "^0.31.3", "shell-path": "2.1.0", "upyun": "^3.4.6", "uuid": "^9.0.0", From 1371e95f9d9b2325dc84773a70acd63bf2f59dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92=E8=B5=AB=E8=90=9D?= Date: Sun, 12 Mar 2023 23:10:22 +0800 Subject: [PATCH 5/5] :bug: Fix: fix webdav path error when setting to root dir --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2568aed..1b1fabc 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "mime-types": "^2.1.35", "mitt": "^3.0.0", "nodejs-file-downloader": "^4.10.6", - "piclist": "^0.3.1", + "piclist": "^0.3.2", "pinia": "^2.0.32", "pinia-plugin-persistedstate": "^3.1.0", "qiniu": "^7.8.0", diff --git a/yarn.lock b/yarn.lock index b4ee4b0..91eff8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10989,10 +10989,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@^0.3.1: - version "0.3.1" - resolved "https://registry.npmjs.org/piclist/-/piclist-0.3.1.tgz#afc77aa481f7bd755956fed6ae77fcbba9976ac0" - integrity sha512-Qf6lGTqQmISHXVdMP4Yip02S27gTyKuOgoT7EdFtMpcPRZQNJxqpOZDJag7AtmuKscdrfB8Frsc1GttIoLe74A== +piclist@^0.3.2: + version "0.3.2" + resolved "https://registry.npmjs.org/piclist/-/piclist-0.3.2.tgz#fd4354f8134fb1fa31acd7d583ae60259d7cd137" + integrity sha512-TLQnf9fdGbeSBshAFRfpYUKak/1YT53GqkOnFjpdLotnx2OL6NWrRB5xtnqmnNXYQ4QhCBiOCYDaGZVWjHam7w== dependencies: "@picgo/i18n" "^1.0.0" "@picgo/store" "^2.0.4"