Merge branch 'gilbertchen:master' into master

Author: facboy

duplicacy/duplicacy_main.go

@@ -2263,7 +2263,7 @@ func main() {
 	app.Name = "duplicacy"
 	app.HelpName = "duplicacy"
 	app.Usage = "A new generation cloud backup tool based on lock-free deduplication"
-	app.Version = "3.2.4" + " (" + GitCommit + ")"
+	app.Version = "3.2.5" + " (" + GitCommit + ")"
 
 	// Exit with code 2 if an invalid command is provided
 	app.CommandNotFound = func(context *cli.Context, command string) {

src/duplicacy_oneclient.go

@@ -456,7 +456,7 @@ func (client *OneDriveClient) MoveFile(path string, parent string) error {
 	url := client.APIURL + "/root:/" + path
 
 	parentReference := make(map[string]string)
-	parentReference["path"] = "/root:/" + parent
+	parentReference["path"] = "/drive/root:/" + parent
 
 	parameters := make(map[string]interface{})
 	parameters["parentReference"] = parentReference

src/duplicacy_onestorage.go

@@ -204,7 +204,7 @@ func (storage *OneDriveStorage) GetFileInfo(threadIndex int, filePath string) (e
 
 // DownloadFile reads the file at 'filePath' into the chunk.
 func (storage *OneDriveStorage) DownloadFile(threadIndex int, filePath string, chunk *Chunk) (err error) {
-	readCloser, _, err := storage.client.DownloadFile(storage.storageDir + "/" + filePath)
+	readCloser, _, err := storage.client.DownloadFile(storage.storageDir + "/" + storage.convertFilePath(filePath))
 	if err != nil {
 		return err
 	}