Merge pull request #444 from NebulousLabs/path-posix

use path.posix for siapath manipulation for consistent windows behavior
NebulousLabs · Oct 25, 2016 · a40a454 · a40a454
2 parents 740e5d3 + f2a5e8e
commit a40a454
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/plugins/Files/js/components/filelist.js b/plugins/Files/js/components/filelist.js
@@ -10,7 +10,7 @@ const FileList = ({files, selected, searchResults, path, showSearchField, action
 		if (path === '') {
 			return
 		}
-		let newpath = Path.join(path, '../')
+		let newpath = Path.posix.join(path, '../')
 		if (newpath === './') {
 			newpath = ''
 		}
@@ -61,7 +61,7 @@ const FileList = ({files, selected, searchResults, path, showSearchField, action
 		const onDoubleClick = (e) => {
 			e.stopPropagation()
 			if (file.type === 'directory') {
-				actions.setPath(Path.join(path, file.name))
+				actions.setPath(Path.posix.join(path, file.name))
 			}
 		}
 		return (

diff --git a/plugins/Files/js/sagas/files.js b/plugins/Files/js/sagas/files.js
@@ -97,7 +97,7 @@ function* getWalletBalanceSaga() {
 function* uploadFileSaga(action) {
 	try {
 		const filename = Path.basename(action.source)
-		const destpath = Path.join(action.siapath, filename)
+		const destpath = Path.posix.join(action.siapath, filename)
 		yield siadCall({
 			url: '/renter/upload/' + destpath,
 			method: 'POST',

diff --git a/plugins/Files/js/sagas/helpers.js b/plugins/Files/js/sagas/helpers.js
@@ -67,8 +67,8 @@ export const ls = (files, path) => {
 	let parsedFiles = Map()
 	fileList.forEach((file) => {
 		let type = 'file'
-		const relativePath = Path.relative(path, file.siapath)
-		let filename = Path.basename(relativePath)
+		const relativePath = Path.posix.relative(path, file.siapath)
+		let filename = Path.posix.basename(relativePath)
 		if (parsedFiles.has(filename)) {
 			return
 		}
@@ -78,7 +78,7 @@ export const ls = (files, path) => {
 		if (relativePath.indexOf('/') !== -1) {
 			type = 'directory'
 			filename = relativePath.split('/')[0]
-			siapath = Path.join(path, filename) + '/'
+			siapath = Path.posix.join(path, filename) + '/'
 			const subfiles = files.filter((subfile) => subfile.siapath.includes(siapath))
 			const totalFilesize = subfiles.reduce((sum, subfile) => sum + subfile.filesize, 0)
 			filesize = readableFilesize(totalFilesize)