Skip to content

Commit

Permalink
fix: config init should before request
Browse files Browse the repository at this point in the history
  • Loading branch information
@terwer
terwer committed Mar 23, 2024
1 parent 9e15e43 commit 616d73f
Show file tree
Hide file tree
Showing 8 changed files with 507 additions and 250 deletions.
2 changes: 1 addition & 1 deletion libs/Universal-PicGo-Core/src/core/UniversalPicGo.ts
View file
Expand Up @@ -93,10 +93,10 @@ class UniversalPicGo extends EventEmitter implements IPicGo {
afterUploadPlugins: new LifecyclePlugins("afterUploadPlugins"),
}
this.initConfigPath()
this.initConfig()
// this.cmd = new Commander(this)
this.pluginHandler = new PluginHandler(this)
this.requestWrapper = new PicGoRequestWrapper(this)
this.initConfig()
this.init()

this.log.info("UniversalPicGo inited")
Expand Down
25 changes: 22 additions & 3 deletions libs/Universal-PicGo-Core/src/index.ts
View file
Expand Up @@ -3,12 +3,31 @@ import { ExternalPicgo } from "./core/ExternalPicgo"
import ConfigDb from "./db/config"
import PluginLoaderDb from "./db/pluginLoder"
import ExternalPicgoConfigDb from "./db/externalPicGo"
import { eventBus } from "./utils/eventBus"
import { currentWin, hasNodeEnv, parentWin, win } from "universal-picgo-store"
import { PicgoTypeEnum, IBusEvent } from "./utils/enums"
import { IPicGo, IImgInfo, IPicgoDb, IConfig, IExternalPicgoConfig, IPicBedType } from "./types"
import {
IPicGo,
IImgInfo,
IPicgoDb,
IConfig,
IExternalPicgoConfig,
IPicBedType,
IUploaderConfigItem,
IUploaderConfigListItem,
} from "./types"

export { UniversalPicGo, ExternalPicgo }
export { UniversalPicGo, ExternalPicgo, eventBus }
export { ConfigDb, PluginLoaderDb, ExternalPicgoConfigDb }
export { PicgoTypeEnum, IBusEvent }
export { win, currentWin, parentWin, hasNodeEnv }
export { type IPicGo, type IImgInfo, type IPicgoDb, type IConfig, type IExternalPicgoConfig, type IPicBedType }
export {
type IPicGo,
type IImgInfo,
type IPicgoDb,
type IConfig,
type IExternalPicgoConfig,
type IPicBedType,
type IUploaderConfigItem,
type IUploaderConfigListItem,
}
17 changes: 17 additions & 0 deletions libs/Universal-PicGo-Core/src/types/index.d.ts
View file
Expand Up @@ -592,4 +592,21 @@ interface IPicBedType {
type: string
name: string
visible: boolean
}

/**
* 某个PicGO平台配置列表
*/
interface IUploaderConfigItem {
configList: IUploaderConfigListItem[]
defaultId: string
}

type IUploaderConfigListItem = IStringKeyMap & IUploaderListItemMetaInfo

interface IUploaderListItemMetaInfo {
_id: string
_configName: string
_updatedAt: number
_createdAt: number
}
260 changes: 131 additions & 129 deletions libs/zhi-siyuan-picgo/src/lib/picgoHelper.ts
View file
Expand Up @@ -8,9 +8,18 @@
*/

import _ from "lodash-es"
import { IBusEvent, IConfig, IPicBedType, IPicGo } from "universal-picgo"
import { getRawData } from "./utils/utils"
import {
eventBus,
IBusEvent,
IConfig,
IPicBedType,
IPicGo,
IUploaderConfigItem,
IUploaderConfigListItem,
} from "universal-picgo"
import { getRawData, trimValues } from "./utils/utils"
import { readonly } from "vue"
import IdUtil from "./utils/idUtil"

/**
* picgo 工具类
Expand Down Expand Up @@ -72,7 +81,7 @@ class PicgoHelper {
Object.keys(cfg).forEach((name: string) => {
const rawCfg = getRawData(cfg)
_.set(this.reactiveCfg, name, rawCfg[name])
this.ctx.emit(IBusEvent.CONFIG_CHANGE, {
eventBus.emit(IBusEvent.CONFIG_CHANGE, {
configName: name,
value: rawCfg[name],
})
Expand Down Expand Up @@ -130,23 +139,21 @@ class PicgoHelper {
return visiablePicBeds
}

// /**
// * 获取可用的图床列表名称
// *
// * @param ctx
// */
// public static getVisiablePicBedNames(ctx: IPicGo): string[] {
// const picBeds = this.getPicBeds(ctx)
// return picBeds
// .map((item: IPicBedType) => {
// if (item.visible) {
// return item.name
// }
// return null
// })
// .filter((item: any) => item) as string[]
// }
//
/**
* 获取可用的图床列表名称
*/
public getVisiablePicBedNames(): string[] {
const picBeds = this.getPicBeds()
return picBeds
.map((item: IPicBedType) => {
if (item.visible) {
return item.name
}
return null
})
.filter((item: any) => item) as string[]
}

/**
* 根据图床数据获取可用的图床列表名称
*
Expand All @@ -170,115 +177,110 @@ class PicgoHelper {
return this.getPicgoConfig("picBed.uploader") || this.getPicgoConfig("picBed.current") || "smms"
}

// public static getUploaderConfigList(ctx: IPicGo, cfg: IConfig, type: string): IUploaderConfigItem {
// if (!type) {
// return {
// configList: [] as IUploaderConfigListItem[],
// defaultId: "",
// }
// }
// const currentUploaderConfig = this.getPicgoConfig(cfg, `uploader.${type}`) ?? {}
// let configList = currentUploaderConfig.configList
// let defaultId = currentUploaderConfig.defaultId || ""
// if (!configList) {
// const res = this.upgradeUploaderConfig(ctx, cfg, type)
// configList = res.configList
// defaultId = res.defaultId
// }
//
// const configItem = {
// configList,
// defaultId,
// }
// // console.warn("获取当前图床配置列表：", configItem)
// return configItem
// }
//
// /**
// * 选择当前图床
// *
// * @param ctx
// * @param cfg
// * @param type 当前图床类型
// * @param id 当前图床配置ID
// * @author terwer
// * @since 0.7.0
// */
// public static selectUploaderConfig = (ctx: IPicGo, cfg: IConfig, type: string, id: string) => {
// const { configList } = this.getUploaderConfigList(ctx, cfg, type)
// const config = configList.find((item) => item._id === id)
// if (config) {
// ctx.saveConfig({
// [`uploader.${type}.defaultId`]: id,
// [`picBed.${type}`]: config,
// })
// }
//
// return config
// }
//
// /**
// * 设置默认图床
// *
// * @param ctx
// * @param type
// */
// public static setDefaultPicBed(ctx: IPicGo, type: string) {
// this.savePicgoConfig(ctx, {
// "picBed.current": type,
// "picBed.uploader": type,
// })
// }
//
// // ===================================================================================================================
//
// /**
// * upgrade old uploader config to new format
// *
// * @param ctx
// * @param cfg
// * @param type type
// * @author terwer
// * @since 0.7.0
// */
// private static upgradeUploaderConfig = (ctx: IPicGo, cfg: IConfig, type: string) => {
// const uploaderConfig = this.getPicgoConfig(cfg, `picBed.${type}`) ?? {}
// if (!uploaderConfig._id) {
// Object.assign(uploaderConfig, this.completeUploaderMetaConfig(uploaderConfig))
// }
//
// const uploaderConfigList = [uploaderConfig]
// this.savePicgoConfig(ctx, {
// [`uploader.${type}`]: {
// configList: uploaderConfigList,
// defaultId: uploaderConfig._id,
// },
// [`picBed.${type}`]: uploaderConfig,
// })
// return {
// configList: uploaderConfigList as IUploaderConfigListItem[],
// defaultId: uploaderConfig._id as string,
// }
// }
//
// /**
// * 增加配置元数据
// *
// * @param originData 原始数据
// */
// private static completeUploaderMetaConfig(originData: any) {
// return Object.assign(
// {
// _configName: "Default",
// },
// trimValues(originData),
// {
// _id: IdUtil.newUuid(),
// _createdAt: Date.now(),
// _updatedAt: Date.now(),
// }
// )
// }
public getUploaderConfigList(type: string): IUploaderConfigItem {
if (!type) {
return {
configList: [] as IUploaderConfigListItem[],
defaultId: "",
}
}
const currentUploaderConfig = this.getPicgoConfig(`uploader.${type}`, {})
let configList = currentUploaderConfig.configList
let defaultId = currentUploaderConfig.defaultId || ""
if (!configList) {
const res = this.upgradeUploaderConfig(type)
configList = res.configList
defaultId = res.defaultId
}

const configItem = {
configList,
defaultId,
}
// console.warn("获取当前图床配置列表：", configItem)
return configItem
}

/**
* 选择当前图床
*
* @param type 当前图床类型
* @param id 当前图床配置ID
* @author terwer
* @since 0.7.0
*/
public selectUploaderConfig = (type: string, id: string) => {
const { configList } = this.getUploaderConfigList(type)
const config = configList.find((item: any) => item._id === id)
if (config) {
this.savePicgoConfig({
[`uploader.${type}.defaultId`]: id,
[`picBed.${type}`]: config,
})
}

return config
}

/**
* 设置默认图床
*
* @param type
*/
public setDefaultPicBed(type: string) {
this.savePicgoConfig({
"picBed.current": type,
"picBed.uploader": type,
})
}

// ===================================================================================================================

/**
* upgrade old uploader config to new format
*
* @param type type
* @author terwer
* @since 0.7.0
*/
private upgradeUploaderConfig = (type: string) => {
const uploaderConfig = this.getPicgoConfig(`picBed.${type}`, {})
if (!uploaderConfig._id) {
Object.assign(uploaderConfig, this.completeUploaderMetaConfig(uploaderConfig))
}

const uploaderConfigList = [uploaderConfig]
this.savePicgoConfig({
[`uploader.${type}`]: {
configList: uploaderConfigList,
defaultId: uploaderConfig._id,
},
[`picBed.${type}`]: uploaderConfig,
})
return {
configList: uploaderConfigList as IUploaderConfigListItem[],
defaultId: uploaderConfig._id as string,
}
}

/**
* 增加配置元数据
*
* @param originData 原始数据
*/
private completeUploaderMetaConfig(originData: any) {
return Object.assign(
{
_configName: "Default",
},
trimValues(originData),
{
_id: IdUtil.newUuid(),
_createdAt: Date.now(),
_updatedAt: Date.now(),
}
)
}
}

export { PicgoHelper }
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -22,6 +22,6 @@
"devDependencies": {
"@terwer/commit-config-custom": "^1.0.9",
"@terwer/eslint-config-custom": "^1.3.6",
"turbo": "^1.12.5"
"turbo": "^1.13.0"
}
}
2 changes: 1 addition & 1 deletion packages/picgo-plugin-app/src/components/setting/picgo/BundledPicgoSetting.vue
View file
Expand Up @@ -41,7 +41,7 @@ const formData = reactive({
<template>
<div>
<el-form-item :label="t('setting.cors.title')" :required="!isInSiyuanOrSiyuanNewWin()">
<el-input v-model="formData.cfg.picBed.proxy" :placeholder="t('setting.cors.title.tip')" />
<el-input v-model="formData.cfg.picBed.proxy" :placeholder="t('setting.cors.title.tip')"/>
<div>
<a href="https://blog.terwer.space/static/20240312140915-rvxrqp2" target="_blank">
{{ t("setting.picgo.refer.to.here") }}
Expand Down

0 comments on commit 616d73f

Please sign in to comment.