feat: new installation prompt, always overwrite

src/index.ts

@@ -5,30 +5,33 @@ import { createFileManagers } from './manager'
 import { debounce, showMessage } from './utils'
 
 const { activate, deactivate } = defineExtension(() => {
-  const { reload, rollback } = createFileManagers()
+  const { hasBakFile, reload, rollback } = createFileManagers()
 
-  useCommand(Meta.commands.reload, () => {
-    reload('UI style changed')
-  })
-  useCommand(Meta.commands.rollback, () => {
-    rollback('UI style rollback')
-  })
+  if (!hasBakFile()) {
+    showMessage(
+      'Seems like first time use or new version is installed, reload the configuration now?',
+      'Reload',
+      'Cancel',
+    )
+      .then<any>(item => item === 'Reload' && reload('UI style changed'))
+  }
+
+  useCommand(Meta.commands.reload, () => reload('UI style changed'))
+  useCommand(Meta.commands.rollback, () => rollback('UI style rollback'))
 
   const watchAndReload = debounce(
-    (fontChanged: boolean) => showMessage('Configuration changed, apply?', 'Apply', 'Cancel')
-      .then<any>(item => item === 'Apply' && reload('UI style changed', fontChanged)),
+    () => showMessage('Configuration changed, apply?', 'Apply', 'Cancel')
+      .then<any>(item => item === 'Apply' && reload('UI style changed')),
     1500,
   )
   const startWatch = () => {
     const cleanup1 = watch(
       () => editorConfig.fontFamily,
-      () => !config['font.monospace'] && watchAndReload(true),
+      () => !config['font.monospace'] && watchAndReload(),
     )
     const cleanup2 = watch(
       config,
-      (conf, oldConf) => watchAndReload(
-        conf['font.monospace'] !== oldConf['font.monospace'] || conf['font.sansSerif'] !== oldConf['font.sansSerif'],
-      ),
+      () => watchAndReload(),
     )
     return () => {
       cleanup1()

src/manager/base.ts

@@ -5,34 +5,30 @@ import { logger } from '../utils'
 
 export interface FileManager {
   hasBakFile: boolean
-  reload: (fontChanged: boolean) => Promise<void>
+  reload: () => Promise<void>
   rollback: () => Promise<void>
 }
 
 export abstract class BaseFileManager implements FileManager {
   constructor(
     private srcPath: string,
     private bakPath: string,
-  ) {
-    if (!this.hasBakFile) {
-      cpSync(this.srcPath, this.bakPath)
-      logger.info(`Create backup file [${this.bakPath}]`)
-    }
-  }
+  ) { }
 
   get hasBakFile() {
     return existsSync(this.bakPath)
   }
 
-  async reload(fontChanged: boolean) {
+  async reload() {
     if (!this.hasBakFile) {
-      logger.warn(`Backup file [${this.bakPath}] does not exist, skip reload`)
-    } else {
-      const newContent = await this.patch(fontChanged, () => readFileSync(this.bakPath, 'utf-8'))
-      if (newContent) {
-        writeFileSync(this.srcPath, newContent)
-        logger.info(`Config reload [${this.srcPath}]`)
-      }
+      logger.warn(`Backup file [${this.bakPath}] does not exist, backuping...`)
+      cpSync(this.srcPath, this.bakPath)
+      logger.info(`Create backup file [${this.bakPath}]`)
+    }
+    const newContent = await this.patch(readFileSync(this.bakPath, 'utf-8'))
+    if (newContent) {
+      writeFileSync(this.srcPath, newContent)
+      logger.info(`Config reload [${this.srcPath}]`)
     }
   }
 
@@ -45,5 +41,5 @@ export abstract class BaseFileManager implements FileManager {
     }
   }
 
-  abstract patch(fontChanged: boolean, content: () => string): Promisable<string | undefined>
+  abstract patch(content: string): Promisable<string>
 }

src/manager/css.ts

@@ -58,8 +58,8 @@ export class CssFileManager extends BaseFileManager {
     super(cssPath, cssBakPath)
   }
 
-  patch(_fontChanged: boolean, content: () => string): Promisable<string | undefined> {
-    return `${content()}
+  patch(content: string): Promisable<string> {
+    return `${content}
 ${banner}
 ${generateBackgroundCSS()}
 ${generateFontCSS()}

src/manager/index.ts

@@ -13,9 +13,10 @@ export function createFileManagers() {
     new WebViewFileManager(),
   ]
   return {
-    reload: (text: string, fontChanged = true) => runAndRestart(
+    hasBakFile: () => managers.every(m => m.hasBakFile),
+    reload: (text: string) => runAndRestart(
       text,
-      () => Promise.all(managers.map(m => m.reload(fontChanged))),
+      () => Promise.all(managers.map(m => m.reload())),
     ),
     rollback: (text: string) => runAndRestart(
       text,

src/manager/main.ts

@@ -10,11 +10,11 @@ export class MainFileManager extends BaseFileManager {
     super(mainPath, mainBakPath)
   }
 
-  patch(_fontChanged: boolean, content: () => string): Promisable<string | undefined> {
-    const backgroundColor = config.electron.backgroundColor || 'r.getBackgroundColor()'
-    return content().replace(
+  patch(content: string): Promisable<string> {
+    config.electron.backgroundColor ??= 'r.getBackgroundColor()'
+    return content.replace(
       entry,
-      `${JSON.stringify(config.electron).slice(1, -1)},backgroundColor:${backgroundColor}`,
+      JSON.stringify(config.electron).slice(1, -1),
     )
   }
 }

src/manager/renderer.ts

@@ -22,27 +22,23 @@ export class RendererFileManager extends BaseFileManager {
     super(rendererPath, rendererBakPath)
   }
 
-  patch(fontChanged: boolean, content: () => string): Promisable<string | undefined> {
-    if (!fontChanged) {
-      return undefined
-    }
-    let _content = content()
+  patch(content: string): Promisable<string> {
     let { monospace, sansSerif } = getFamilies()
     if (monospace) {
       monospace = escapeQuote(monospace)
-      _content = _content
+      content = content
         .replaceAll(VSC_DFAULT_MONO_FONT.win, monospace)
         .replaceAll(VSC_DFAULT_MONO_FONT.mac, monospace)
         .replaceAll(VSC_DFAULT_MONO_FONT.linux, monospace)
         .replaceAll(VSC_NOTEBOOK_MONO_FONT, monospace)
     }
     if (sansSerif) {
       sansSerif = escapeQuote(sansSerif)
-      _content = _content
+      content = content
         .replaceAll(VSC_DFAULT_SANS_FONT.win, sansSerif)
         .replaceAll(VSC_DFAULT_SANS_FONT.mac, sansSerif)
         .replaceAll(VSC_DFAULT_SANS_FONT.linux, sansSerif)
     }
-    return _content
+    return content
   }
 }

src/manager/webview.ts

@@ -42,9 +42,9 @@ export class WebViewFileManager extends BaseFileManager {
     super(webviewHTMLPath, webviewHTMLBakPath)
   }
 
-  patch(_fontChanged: boolean, content: () => string): Promisable<string | undefined> {
+  patch(content: string): Promisable<string> {
     return fixSha256(
-      content().replace(
+      content.replace(
         entry,
         `${entry}.replace('</body>', '</body><style>${getCSS()}</style>')`,
       ),