remove try block

* remove try block and trap for explicit entry earlier
abraunegg · Jun 28, 2019 · 7cf73a2 · 7cf73a2
1 parent 8449b45
commit 7cf73a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/sync.d b/src/sync.d
@@ -2058,7 +2058,6 @@ final class SyncEngine
 											writeln("");
 											try {
 												response = session.upload(path, parent.driveId, parent.id, baseName(path));
-												writeln(" done.");
 											} catch (OneDriveException e) {
 												// error uploading file
 												log.vlog("Upload failed with OneDriveException: ", e.msg);
@@ -2067,17 +2066,22 @@ final class SyncEngine
 												log.vlog("Upload failed with File Exception: ", e.msg);
 												return;
 											}
+											writeln(" done.");
 										}
 									} else {
 										// OneDrive Business Account - always use a session to upload
 										writeln("");
 										try {
 											response = session.upload(path, parent.driveId, parent.id, baseName(path));
-											writeln(" done.");
 										} catch (OneDriveException e) {
 											// error uploading file
+											log.vlog("Upload failed with OneDriveException: ", e.msg);
+											return;
+										} catch (FileException e) {
+											log.vlog("Upload failed with File Exception: ", e.msg);
 											return;
 										}
+										writeln(" done.");
 									}
 								}
 

diff --git a/src/upload.d b/src/upload.d
@@ -39,13 +39,14 @@ struct UploadSession
 				])
 			];
 
-		try {
-			// Try to create the upload session for this file
-			session = onedrive.createUploadSession(parentDriveId, parentId, filename, eTag, fileSystemInfo);
+		// Try to create the upload session for this file
+		session = onedrive.createUploadSession(parentDriveId, parentId, filename, eTag, fileSystemInfo);
+
+		if ("uploadUrl" in session){
 			session["localPath"] = localPath;
 			save();
 			return upload();
-		} catch (OneDriveException e) {
+		} else {
 			// there was an error
 			log.vlog("Create file upload session failed ... skipping file upload");
 			// return upload() will return a JSONValue response, create an empty JSONValue response to return