GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-08 05:20:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Eugeny/tabby#8534 : skip yaml unacceptable kind of object to dump

Browse Source
This commit is contained in:
Clem 2023-07-07 15:06:47 +02:00
parent 6709217a86
commit 82a262026f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tabby-core/src/services/config.service.ts
View File

@ -205,7 +205,7 @@ export class ConfigService {
// Scrub undefined values
let cleanStore = JSON.parse(JSON.stringify(this._store))
cleanStore = await this.maybeEncryptConfig(cleanStore)
await this.platform.saveConfig(yaml.dump(cleanStore))
await this.platform.saveConfig(yaml.dump(cleanStore, {skipInvalid: true}))
this.emitChange()
}
@ -213,7 +213,7 @@ export class ConfigService {
* Reads config YAML as string
*/
readRaw (): string {
return yaml.dump(this._store)
return yaml.dump(this._store, {skipInvalid: true})
}
/**

4
tabby-settings/src/services/configSync.service.ts
View File

@ -97,7 +97,7 @@ export class ConfigSyncService {
data[part] = remoteData[part]
}
}
const content = yaml.dump(data)
const content = yaml.dump(data, {skipInvalid: true})
const result = await this.updateConfig(this.config.store.configSync.configID, {
content,
last_used_with_version: this.platform.getAppVersion(),
@ -154,7 +154,7 @@ export class ConfigSyncService {
}
private async writeConfigDataFromSync (data: any) {
await this.platform.saveConfig(yaml.dump(data))
await this.platform.saveConfig(yaml.dump(data, {skipInvalid: true}))
await this.config.load()
await this.config.save()
}