Merge pull request #3793 from dailyrandomphoto/fix-save-database

fix(save_database): should not clear database when use 'hexo new', 'hexo --help'
hexojs · Nov 2, 2019 · 0d8a832 · 0d8a832
2 parents 764f6d2 + bc9748f
commit 0d8a832
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/plugins/filter/before_exit/save_database.js b/lib/plugins/filter/before_exit/save_database.js
@@ -1,7 +1,7 @@
 'use strict';
 
 function saveDatabaseFilter() {
-  if (!this.env.init) return;
+  if (!this.env.init || !this._dbLoaded) return;
 
   return this.database.save().then(() => {
     this.log.debug('Database saved');

diff --git a/test/scripts/filters/save_database.js b/test/scripts/filters/save_database.js
@@ -11,6 +11,7 @@ describe('Save database', () => {
 
   it('default', () => {
     hexo.env.init = true;
+    hexo._dbLoaded = true;
 
     return saveDatabase().then(() => fs.exists(dbPath)).then(exist => {
       exist.should.be.true;
@@ -20,6 +21,16 @@ describe('Save database', () => {
 
   it('do nothing if hexo is not initialized', () => {
     hexo.env.init = false;
+    hexo._dbLoaded = true;
+
+    return saveDatabase().then(() => fs.exists(dbPath)).then(exist => {
+      exist.should.be.false;
+    });
+  });
+
+  it('do nothing if database is not loaded', () => {
+    hexo.env.init = true;
+    hexo._dbLoaded = false;
 
     return saveDatabase().then(() => fs.exists(dbPath)).then(exist => {
       exist.should.be.false;