From cb886e9bca69d4a24b36d72bdeb7e026efadc510 Mon Sep 17 00:00:00 2001
From: terwer <youweics@163.com>
Date: Sun, 12 Feb 2023 01:47:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20#319=20PicGO=E5=9B=BE=E5=BD=A2=E5=8C=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2-=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=89=93=E5=BC=80PicGO=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picgo/setting/PicgoConfigSetting.vue      | 20 +++++++---
 locales/en_US.ts                              |  1 +
 locales/zh_CN.ts                              |  1 +
 utils/otherlib/picgoUtil.js                   | 38 ++++++++++++++++++-
 4 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/components/picgo/setting/PicgoConfigSetting.vue b/components/picgo/setting/PicgoConfigSetting.vue
index 1aee7259..8abd1861 100644
--- a/components/picgo/setting/PicgoConfigSetting.vue
+++ b/components/picgo/setting/PicgoConfigSetting.vue
@@ -28,12 +28,19 @@
     <el-form label-width="125px">
       <!-- 打开PicGO配置文件 -->
       <el-form-item :label="$t('setting.picgo.picgo.open.config.file')">
-        <el-button @click="handleOpenFile"
+        <el-button @click="handleOpenFile('picgo.cfg.json')"
           >{{ $t("setting.picgo.picgo.click.to.open") }}
         </el-button>
       </el-form-item>
 
-      <!-- 图床开个、、开关 -->
+      <!-- 打开PicGO日志文件 -->
+      <el-form-item :label="$t('setting.picgo.setting.log.file')">
+        <el-button @click="handleOpenFile('picgo.log')"
+          >{{ $t("setting.picgo.picgo.click.to.open") }}
+        </el-button>
+      </el-form-item>
+
+      <!-- 图床开关 -->
       <el-form-item :label="$t('setting.picgo.picgo.choose.showed.picbed')">
         <el-checkbox-group
           v-model="form.showPicBedList"
@@ -105,9 +112,10 @@ function handleShowPicBedListChange(val: ICheckBoxValueType[]) {
   logger.debug("保存启用的图床", list)
 }
 
-const handleOpenFile = () => {
-  const picgoCfgPath = picgoUtil.getPicgoCfgPath()
-  siyuanBrowserUtil.openPath(picgoCfgPath)
+const handleOpenFile = (filename) => {
+  const picgoCfgfile = picgoUtil.getPicgoCfgFile(filename)
+  logger.warn("即将打开文件=>", picgoCfgfile)
+  siyuanBrowserUtil.openPath(picgoCfgfile)
 }
 
 const handleAutoRename = (val: ICheckBoxValueType) => {
@@ -118,7 +126,7 @@ const handleAutoRename = (val: ICheckBoxValueType) => {
 
 async function initData() {
   const config = picgoUtil.getPicgoConfig()
-  logger.warn("PicGO setting initData=>", initData)
+  logger.debug("PicGO setting initData=>", config)
   if (config !== undefined) {
     const settings = config.settings || {}
     // 重命名默认开启，防止图片路径问题
diff --git a/locales/en_US.ts b/locales/en_US.ts
index 2908cab7..b02740c7 100644
--- a/locales/en_US.ts
+++ b/locales/en_US.ts
@@ -452,4 +452,5 @@ export default {
   "setting.picgo.setting.timestamp.rename": "Timestamp rename",
   "setting.picgo.setting.close": "Close",
   "setting.picgo.setting.open": "Open",
+  "setting.picgo.setting.log.file": "Log file",
 }
diff --git a/locales/zh_CN.ts b/locales/zh_CN.ts
index cba5cced..dac22f55 100644
--- a/locales/zh_CN.ts
+++ b/locales/zh_CN.ts
@@ -451,4 +451,5 @@ export default {
   "setting.picgo.setting.timestamp.rename": "时间戳重命名",
   "setting.picgo.setting.close": "关",
   "setting.picgo.setting.open": "开",
+  "setting.picgo.setting.log.file": "日志文件",
 }
diff --git a/utils/otherlib/picgoUtil.js b/utils/otherlib/picgoUtil.js
index a00b34e1..71f7e41a 100644
--- a/utils/otherlib/picgoUtil.js
+++ b/utils/otherlib/picgoUtil.js
@@ -370,6 +370,20 @@ export const deleteUploaderConfig = (type, id) => {
   }
 }
 
+/**
+ * PicGO配置根路径
+ */
+const getPicgoBasedir = () => {
+  const syWin = siyuanBrowserUtil.getSiyuanWindow()
+  const picgo = syWin?.SyPicgo?.getPicgoObj()
+
+  if (!picgo) {
+    return "[PicGO未挂载]"
+  }
+
+  return picgo.baseDir
+}
+
 /**
  * PicGO配置文件路径
  */
@@ -381,8 +395,23 @@ const getPicgoCfgPath = () => {
     return "[PicGO未挂载]"
   }
 
-  const picgo_cfg_070 = picgo.configPath
-  return picgo_cfg_070
+  return picgo.configPath
+}
+
+/**
+ * 获取配置文件
+ * @param filename 文件名
+ */
+const getPicgoCfgFile = (filename) => {
+  const syWin = siyuanBrowserUtil.getSiyuanWindow()
+  const syPicgo = syWin?.SyPicgo
+  const picgo = syPicgo?.getPicgoObj()
+
+  if (!picgo) {
+    return "[PicGO未挂载]"
+  }
+
+  return syPicgo.combinePath(picgo.baseDir, filename)
 }
 
 /**
@@ -407,6 +436,11 @@ const picgoUtil = {
   // upload
   uploadByPicGO,
 
+  // /Users/terwer/Library/Application Support/sy-picgo/
+  getPicgoBasedir,
+  // /Users/terwer/Library/Application Support/sy-picgo/picgo.cfg.json
   getPicgoCfgPath,
+  // /Users/terwer/Library/Application Support/sy-picgo/[filename]
+  getPicgoCfgFile,
 }
 export default picgoUtil