fix: build dir to .gridea

Change-Id: I0a39b89afafb443d5ae6a19435bce0c07a3237b7

Author: EryouHao

src/server/app.ts

@@ -31,12 +31,15 @@ export default class App {
 
   db: IApplicationDb
 
+  buildDir: string
+
   constructor(setting: IApplicationSetting) {
     this.mainWindow = setting.mainWindow
     this.app = setting.app
     this.baseDir = setting.baseDir
     this.appDir = path.join(this.app.getPath('documents'), 'gridea')
     this.previewServer = setting.previewServer
+    this.buildDir = path.join(this.app.getPath('home'), '.gridea', 'output')
 
     this.db = {
       posts: [],
@@ -202,6 +205,11 @@ export default class App {
         fse.writeFileSync(appConfigPath, jsonString)
       }
 
+      const buildDir = path.join(appConfigFolder, 'output')
+      if (!fse.pathExistsSync(buildDir)) {
+        fse.mkdirSync(buildDir)
+      }
+
       const appConfig = fse.readJsonSync(appConfigPath)
       this.appDir = appConfig.sourceFolder
 

src/server/deploy.ts

@@ -7,7 +7,7 @@ import GitProxy from './plugins/deploys/gitproxy'
 const git = require('isomorphic-git')
 
 export default class Deploy extends Model {
-  outputDir: string = `${this.appDir}/output`
+  outputDir: string = this.buildDir
 
   remoteUrl = ''
 
@@ -91,6 +91,7 @@ export default class Deploy extends Model {
   }
 
   async publish() {
+    await this.remoteDetect()
     this.db.themeConfig.domain = this.db.setting.domain
     let result = {
       success: true,
@@ -112,61 +113,6 @@ export default class Deploy extends Model {
     return result
   }
 
-  async firstPush() {
-    const { setting } = this.db
-    const localBranchs = {}
-    console.log('first push')
-
-    try {
-      await git.init({ fs, dir: this.outputDir })
-      await git.setConfig({
-        fs,
-        dir: this.outputDir,
-        path: 'user.name',
-        value: setting.username,
-      })
-      await git.setConfig({
-        fs,
-        dir: this.outputDir,
-        path: 'user.email',
-        value: setting.email,
-      })
-      await git.add({ fs, dir: this.outputDir, filepath: '.' })
-      await git.commit({
-        fs,
-        dir: this.outputDir,
-        message: `update from gridea: ${moment().format('YYYY-MM-DD HH:mm:ss')}`,
-      })
-      await git.addRemote({
-        fs, dir: this.outputDir, remote: 'origin', url: this.remoteUrl, force: true,
-      })
-
-      await this.checkCurrentBranch()
-      const pushRes = await git.push({
-        fs,
-        http: this.http,
-        dir: this.outputDir,
-        remote: 'origin',
-        ref: setting.branch,
-        force: true,
-      })
-      return {
-        success: true,
-        data: pushRes,
-        message: '',
-        localBranchs,
-      }
-    } catch (e) {
-      console.error(e)
-      return {
-        success: false,
-        data: localBranchs,
-        message: e.message,
-        localBranchs,
-      }
-    }
-  }
-
   async commonPush() {
     console.log('common push')
     const { setting } = this.db

src/server/interfaces/application.ts

@@ -30,5 +30,6 @@ export interface IApplication {
   app: any
   baseDir: string
   appDir: string
+  buildDir: string
   db: IApplicationDb
 }

src/server/model.ts

@@ -7,6 +7,8 @@ import { IApplicationDb, IApplication } from './interfaces/application'
 export default class Model {
   appDir: string
 
+  buildDir: string
+
   $setting: any
 
   $posts: any
@@ -19,6 +21,7 @@ export default class Model {
 
   constructor(appInstance: IApplication) {
     this.appDir = appInstance.appDir
+    this.buildDir = appInstance.buildDir
     this.db = appInstance.db
     this.mainWindow = appInstance.mainWindow
 

src/server/renderer.ts

@@ -23,7 +23,7 @@ Bluebird.promisifyAll(fs)
 const helper = new ContentHelper()
 
 export default class Renderer extends Model {
-  outputDir: string = `${this.appDir}/output`
+  outputDir: string = this.buildDir
 
   themePath: string = ''
 
@@ -622,17 +622,8 @@ export default class Renderer extends Model {
   }
 
   async clearOutputFolder() {
-    const { outputDir } = this
-    const files = fse.readdirSync(outputDir, { withFileTypes: true })
-    const needClearPath = files
-      .map(item => item.name)
-      .filter(junk.not)
-      .filter((name: string) => name !== '.git')
-    
     try {
-      needClearPath.forEach(async (name: string) => {
-        fse.removeSync(urlJoin(outputDir, name))
-      })
+      fse.emptyDirSync(this.outputDir)
     } catch (e) {
       console.log('Delete file error', e)
     }