fixing many errors because of new dependencies + fix webdav sync

4 files changed, 32 insertions, 16 deletions

diff --git a/server/keywords/keywords_db_manager.js b/server/keywords/keywords_db_manager.js
index a79a67a..25e494a 100644
--- a/server/keywords/keywords_db_manager.js
+++ b/server/keywords/keywords_db_manager.js
@@ -100,7 +100,7 @@ KeywordsDBManager.prototype.mergeDB = function (path, callback) {
                 }
                 if (hasChanged) {
                     dataJson["data"].sort(keysrt('time'))
-                    require("mkdirp")(getParentFolderFromPath(db.path), function () {
+                    require("mkdirp")(getParentFolderFromPath(db.path)).then(made => {
                         lockFile.lock('recent.lock', {
                             wait: 10000
                         }, function (er) {
@@ -135,7 +135,7 @@ KeywordsDBManager.prototype.actionArray = function (items, callback) {
                 };
                 fullDB["data"].push(item);
             }
-            require("mkdirp")(getParentFolderFromPath(db.path), function () {
+            require("mkdirp")(getParentFolderFromPath(db.path)).then(made => {
                 // opts is optional, and defaults to {} 
 
                 console.logDebug("writing")
diff --git a/server/recent/local_recent_db_manager.js b/server/recent/local_recent_db_manager.js
index 5205b89..8e88891 100644
--- a/server/recent/local_recent_db_manager.js
+++ b/server/recent/local_recent_db_manager.js
@@ -32,7 +32,7 @@ LocalRecentDBManager.prototype.actionArray = function (items, callback) {
             };
             fullDB["data"].push(item);
         }
-        require("mkdirp")(getParentFolderFromPath(db.path), function () {
+        require("mkdirp")(getParentFolderFromPath(db.path)).then(made => {
             // opts is optional, and defaults to {} 
 
             console.logDebug("writing")
@@ -74,7 +74,7 @@ LocalRecentDBManager.prototype.action = function (path, action, time, callback)
 
             fullDB["data"].push(item);
             console.logDebug(JSON.stringify(item))
-            require("mkdirp")(getParentFolderFromPath(db.path), function () {
+            require("mkdirp")(getParentFolderFromPath(db.path)).then(made => {
                 // opts is optional, and defaults to {} 
 
                 console.logDebug("writing")
@@ -134,7 +134,7 @@ LocalRecentDBManager.prototype.mergeDB = function (path, callback) {
                 }
                 dataJson["data"] = dataJson["data"].sort(keysrt('time'))
                 if (hasChanged) {
-                    require("mkdirp")(getParentFolderFromPath(db.path), function () {
+                    require("mkdirp")(getParentFolderFromPath(db.path)).then(made => {
                         // opts is optional, and defaults to {} 
                         lockFile.lock('recent.lock', {
                             wait: 10000
diff --git a/server/settings_helper.js b/server/settings_helper.js
index 8989614..dc715f8 100644
--- a/server/settings_helper.js
+++ b/server/settings_helper.js
@@ -78,21 +78,31 @@ SettingsHelper.prototype.getRemoteWebdavPath = function () {
 
 
 SettingsHelper.prototype.setRemoteWebdavPath = function (path) {
-
-    return store.set("remote_webdav_path", path)
+    if(path == undefined)
+        store.delete("remote_webdav_path")
+    else
+        return store.set("remote_webdav_path", path)
 }
 
 SettingsHelper.prototype.setRemoteWebdavAddr = function (addr) {
-
-    return store.set("remote_webdav_addr", addr)
+    if(addr == undefined)
+        store.delete("remote_webdav_addr")
+    else
+        return store.set("remote_webdav_addr", addr)
 }
 
 SettingsHelper.prototype.setRemoteWebdavUsername = function (username) {
-    return store.set("remote_webdav_username", username)
+    if(username == undefined)
+        store.delete("remote_webdav_username")
+    else
+        return store.set("remote_webdav_username", username)
 }
 
 SettingsHelper.prototype.setRemoteWebdavPassword = function (password) {
-    return store.set("remote_webdav_password", password)
+    if(password == undefined)
+        store.delete("remote_webdav_password")
+    else
+        return store.set("remote_webdav_password", password)
 }
 
 SettingsHelper.prototype.displayFrame = function () {
diff --git a/server/sync/sync.js b/server/sync/sync.js
index bd016ad..9ec7b43 100644
--- a/server/sync/sync.js
+++ b/server/sync/sync.js
@@ -16,15 +16,21 @@ var Sync = function (onSyncStart, onSyncEnd) {
 
 }
 Sync.prototype.connect = function () {
-    var createClient = require("webdav");
+    const { AuthType, createClient }  = require("webdav");
+       
     var sync = this;
     console.logDebug("connecting with " + sync.settingsHelper.getRemoteWebdavUsername())
-
+    const username = sync.settingsHelper.getRemoteWebdavUsername()
+    const password = sync.settingsHelper.getRemoteWebdavPassword()
     this.client = createClient(
         sync.settingsHelper.getRemoteWebdavAddr(),
-        sync.settingsHelper.getRemoteWebdavUsername(),
-        sync.settingsHelper.getRemoteWebdavPassword()
-    );
+        {
+            username,
+            password
+        }
+        
+    )
+   
 
 
 }