fix delete note folder

2 files changed, 11 insertions, 5 deletions

diff --git a/server/note/NoteUtils.js b/server/note/NoteUtils.js
index 9461f8d..c13223c 100644
--- a/server/note/NoteUtils.js
+++ b/server/note/NoteUtils.js
@@ -11,10 +11,15 @@ NoteUtils.getNoteRelativePath = function (rootPath, notePath) {
 }
 NoteUtils.deleteNote = function (notePath, callback) {
     console.log("delete " + notePath)
-    var fs = require('fs');
-    fs.unlink(ettingsHelper.getNotePath() + "/" + notePath, function () {
-        var db = new RecentDBManager(settingsHelper.getNotePath() + "/quickdoc/recentdb/" + settingsHelper.getAppUid())
-        db.removeFromDB(notePath, callback);
+    if (!notePath.endsWith("sqd")) {
+        callback(true, undefined)
+        return;
+    }
+    console.log("delete " + notePath)
+
+    var rimraf = require("rimraf");
+    rimraf(settingsHelper.getNotePath() + "/" + notePath, function () {
+        callback(false, undefined)
     })
 }
 
diff --git a/server/server.js b/server/server.js
index 1443907..65e247f 100644
--- a/server/server.js
+++ b/server/server.js
@@ -483,9 +483,10 @@ var handle = function (method, path, data, callback) {
                     callback(true, "")
                     return;
                 }
-                fs.unlink(settingsHelper.getNotePath() + toDelete, function () {
+                NoteUtils.deleteNote(toDelete, function () {
                     callback(false)
                 })
+
                 return;
             case "/note/open/0/media":
                 console.logDebug("deleting " + args["media"])