Quick fix for broken path

lukasz-wronski · Dec 5, 2018 · a5d2c1d · a5d2c1d
1 parent c5f6cab
commit a5d2c1d
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -72,8 +72,8 @@ Use at your own risk - I do not guarantee that it will work correctly!
 ------
 
 ## Version history
-- 0.3.6
-    - Added [ Fix for broken uploadOnSave and subdirectories not adding properly]
+- 0.3.7
+    - Added [ Fix for broken uploadOnSave and subdirectories not adding properly](https://github.com/lukasz-wronski/vscode-ftp-sync/pull/264)
 - 0.3.5
     - Added [ Various enhancements (SCP Support, bug fixes, list command)](https://github.com/lukasz-wronski/vscode-ftp-sync/pull/237)
     - Added [ List commands](https://github.com/lukasz-wronski/vscode-ftp-sync/pull/215)

diff --git a/modules/dirpick.js b/modules/dirpick.js
@@ -14,7 +14,7 @@ var dirpick = function(callback, currentDir) {
 	var selectListPrefix = currentDir != "." ? ".." : "";
 	var options = [{ label: path.join(selectListPrefix, path.basename(currentDir)), description: "Choose this folder"}];
 
-	getDirectories(path.join(ftpconfig.rootPath().path, currentDir)).forEach(function(dir) {
+	getDirectories(path.join(ftpconfig.rootPath(), currentDir)).forEach(function(dir) {
 		options.push(path.join(selectListPrefix, path.basename(currentDir), dir));
 	})
 

diff --git a/modules/downloadcurrent-command.js b/modules/downloadcurrent-command.js
@@ -18,12 +18,12 @@ module.exports = function(fileUrl, getFtpSync) {
 		return;
 	}
 
-	if (!ftpconfig.rootPath().path) {
+	if (!ftpconfig.rootPath()) {
 		vscode.window.showErrorMessage("Ftp-sync: Cannot init ftp-sync without opened folder");
 		return;
 	}
 
-	if (filePath.indexOf(ftpconfig.rootPath().path) < 0) {
+	if (filePath.indexOf(ftpconfig.rootPath()) < 0) {
 		vscode.window.showErrorMessage("Ftp-sync: Selected file is not a part of the workspace.");
 		return;
 	}
@@ -36,7 +36,7 @@ module.exports = function(fileUrl, getFtpSync) {
 
 	var fileName = path.basename(filePath);
 	var downloadStatus = vscode.window.setStatusBarMessage("Ftp-sync: Downloading " + fileName + " from FTP server...", STATUS_TIMEOUT);
-	getFtpSync().downloadFile(filePath, ftpconfig.rootPath().path, function(err) {
+	getFtpSync().downloadFile(filePath, ftpconfig.rootPath(), function(err) {
 		downloadStatus.dispose();
 		if (err)
 			vscode.window.showErrorMessage("Ftp-sync: Downloading " + fileName + " failed: " + err);

diff --git a/modules/ftp-config.js b/modules/ftp-config.js
@@ -6,16 +6,16 @@ var upath = require("upath");
 
 module.exports = {
 	rootPath: function() {
-		return vscode.workspace.workspaceFolders[0].uri;
+		return vscode.workspace.workspaceFolders[0].uri.fsPath;
 	},
 	getConfigPath: function() {
 		return this.getConfigDir() + "/ftp-sync.json";
 	},
 	getConfigDir: function() {
-		return this.rootPath().path  + "/.vscode";
+		return this.rootPath()  + "/.vscode";
 	},
 	getGeneratedDir: function() {
-		return upath.join(this.rootPath().path, this.generatedFiles.path);
+		return upath.join(this.rootPath(), this.generatedFiles.path);
 	},
 	defaultConfig: {
 		remotePath: "./",

diff --git a/modules/init-command.js b/modules/init-command.js
@@ -4,7 +4,7 @@ var fs = require('fs');
 
 module.exports = function() {
 
-	if(!ftpconfig.rootPath().path) {
+	if(!ftpconfig.rootPath()) {
 		vscode.window.showErrorMessage("Ftp-sync: Cannot init ftp-sync without opened folder");
 		return;
 	}

diff --git a/modules/list-command.js b/modules/list-command.js
@@ -20,12 +20,12 @@ module.exports = function(fileUrl, getFtpSync) {
 		return;
 	}
 
-  if (!ftpconfig.rootPath().path) {
+  if (!ftpconfig.rootPath()) {
     vscode.window.showErrorMessage('Ftp-sync: Cannot init ftp-sync without opened folder');
     return;
   }
 
-  if (filePath.indexOf(ftpconfig.rootPath().path) < 0) {
+  if (filePath.indexOf(ftpconfig.rootPath()) < 0) {
     vscode.window.showErrorMessage('Ftp-sync: Selected file is not a part of the workspace.');
     return;
   }
@@ -36,7 +36,7 @@ module.exports = function(fileUrl, getFtpSync) {
     return;
   }
 
-  let remotePath = getFatherPath(filePath.replace(ftpconfig.rootPath().path, config.remotePath));
+  let remotePath = getFatherPath(filePath.replace(ftpconfig.rootPath(), config.remotePath));
   function listAllFiles(filesRemotePath) {
     getFtpSync().ListRemoteFilesByPath(filesRemotePath, function(err, files) {
       if (err) {
@@ -136,7 +136,7 @@ function getLabel(file) {
 }
 function getLocalPath(fileRemotePath) {
   return {
-    fsPath: fileRemotePath.replace(ftpconfig.getConfig().remotePath, ftpconfig.rootPath().path)
+    fsPath: fileRemotePath.replace(ftpconfig.getConfig().remotePath, ftpconfig.rootPath())
   };
 }
 function getFatherPath(son) {

diff --git a/modules/on-save.js b/modules/on-save.js
@@ -7,7 +7,7 @@ var upath = require("upath");
 
 module.exports = function(document, getFtpSync, skipOnSaveCheck) {
 
-	if(document.uri.fsPath.indexOf(ftpconfig.rootPath().path) < 0)
+	if(document.uri.fsPath.indexOf(ftpconfig.rootPath()) < 0)
 		return;
 
 	var config = ftpconfig.getConfig();
@@ -40,7 +40,7 @@ module.exports = function(document, getFtpSync, skipOnSaveCheck) {
 	var fileName = path.basename(document.uri.fsPath);
 	var uploadingStatus = vscode.window.setStatusBarMessage("Ftp-sync: Uploading " + fileName + " to FTP server...");
 
-	getFtpSync().uploadFile(document.uri.fsPath, ftpconfig.rootPath().path, function(err) {
+	getFtpSync().uploadFile(document.uri.fsPath, ftpconfig.rootPath(), function(err) {
 		uploadingStatus.dispose();
 		if(err)
 			vscode.window.showErrorMessage("Ftp-sync: Uploading " + fileName + " failed: " + err);

diff --git a/modules/sync-command.js b/modules/sync-command.js
@@ -12,7 +12,7 @@ module.exports = function(isUpload, getSyncHelper) {
 
 	var showSyncSummary = function(sync, options) {
 		var syncJson = JSON.stringify(sync, null, 4);
-		var filePath = path.normalize(ftpconfig.rootPath().path + "/.vscode/sync-summary-" + Math.floor(Date.now() / 1000) + ".json");
+		var filePath = path.normalize(ftpconfig.rootPath() + "/.vscode/sync-summary-" + Math.floor(Date.now() / 1000) + ".json");
 		var uri = vscode.Uri.parse("untitled:" + filePath);
         var prepareSyncDocument = vscode.workspace.openTextDocument(uri);
 		prepareSyncDocument.then(function(document) {
@@ -103,8 +103,8 @@ module.exports = function(isUpload, getSyncHelper) {
 			if(!result) return;
 			var syncOptions = {
 				remotePath: path.join(getSyncHelper().getConfig().remote, dirPath),
-				localPath: path.join(ftpconfig.rootPath().path, dirPath),
-				rootPath: ftpconfig.rootPath().path,
+				localPath: path.join(ftpconfig.rootPath(), dirPath),
+				rootPath: ftpconfig.rootPath(),
 				upload: isUpload,
 				mode: result.mode
 			};

diff --git a/modules/uploadcurrent-command.js b/modules/uploadcurrent-command.js
@@ -17,12 +17,12 @@ module.exports = function(fileUrl, getFtpSync) {
 		return;
 	}
 
-	if(!ftpconfig.rootPath().path) {
+	if(!ftpconfig.rootPath()) {
 		vscode.window.showErrorMessage("Ftp-sync: Cannot init ftp-sync without opened folder");
 		return;
 	}
 
-	if(filePath.indexOf(ftpconfig.rootPath().path) < 0) {
+	if(filePath.indexOf(ftpconfig.rootPath()) < 0) {
 		vscode.window.showErrorMessage("Ftp-sync: Selected file is not a part of the workspace.");
 		return;
 	}
@@ -36,7 +36,7 @@ module.exports = function(fileUrl, getFtpSync) {
 	var fileName = path.basename(filePath);
 	var uploadingStatus = vscode.window.setStatusBarMessage("Ftp-sync: Uploading " + fileName + " to FTP server...", STATUS_TIMEOUT);
 
-	getFtpSync().uploadFile(filePath, ftpconfig.rootPath().path, function(err) {
+	getFtpSync().uploadFile(filePath, ftpconfig.rootPath(), function(err) {
 		uploadingStatus.dispose();
 		if(err)
 			vscode.window.showErrorMessage("Ftp-sync: Uploading " + fileName + " failed: " + err);