progress bar support for Mac for all classes, documentation changes. gdrive tests missing Mac+Win

Author: ThomasMaul

Documentation/Classes/FileTransfer_Dropbox.md

@@ -296,8 +296,6 @@ Allows to show a progress bar during long running operations or to get informed
 
 The callback method is called whenever a new progress message is available from dbxcli and get's 3 parameter passed. The given ID, the progress text and the completeness ratio from 0-100%.
 
-Note: only useable on Windows.
-
 #### Example
 
 ```4D

Documentation/Classes/FileTransfer_GDrive.md

@@ -89,14 +89,14 @@ All function returns a result object
 #### Description
 Upload one file to server.
 
-If file already exists it is overwritten.  
+If file already exists another instance is created. It could make sense to delete existing files (or use deleteFile even if the file is not existing)  
 If source or target contains spaces, encapsulate with quotes (char(34)).
 
 After uploading a file, the result object returns false or true. 
 
 ## download
 
-### .download(source: Text; target: Text; {fileID: text; {{fileQuery: text}}) -> result : Object
+### .download(source: Text; target: Text; {fileID: text; {fileQuery: text}}) -> result : Object
 |Parameter|Type||Description|
 |---------|--- |:---:|------|
 |source|Text|->|path to remote file|
@@ -136,7 +136,7 @@ If the query returns 2 or more documents with the same name (but different locat
 #### Description
 Upload one file to server and import it as Google document.
 
-If file already exists it is overwritten.  
+If file already exists another instance is created. It could make sense to delete existing files (or use deleteFile even if the file is not existing)  
 If source or target contains spaces, encapsulate with quotes (char(34)).
 
 After uploading a file, the result object returns false or true. 
@@ -190,6 +190,40 @@ By passing the type, this can be overwritten. The import/converting follow this
 |application/vnd.ms-powerpoint|application/vnd.google-apps.presentation|
 |text/tab-separated-values|application/vnd.google-apps.spreadsheet|
 
+## export
+
+### .export(source: Text; target: Text; {fileID: text; {mime: text}}) -> result : Object
+|Parameter|Type||Description|
+|---------|--- |:---:|------|
+|source|Text|->|path to remote file|
+|target|Text|->|POSIX path to local file|
+|fileID|Text|->|optional: Google file ID|
+|mime|Text|->|optional: overwrite mime|
+|result|Object|<-|result object|  
+
+#### Description
+Download one document from server, automatically convert to local file type.
+
+If file already exists it is overwritten.  
+If source or target contains spaces, encapsulate with quotes (char(34)).
+
+After downloading a file, the result object returns false or true. 
+
+Specify file with name (source) for comfort or compatibility with Dropbox/cURL class.
+Better/Faster to specify file by Google ID.
+Pass either ID or source, only one.
+
+|From|To|
+|---------|---------|
+|application/vnd.google-apps.document|application/rtf, application/vnd.oasis.opendocument.text, text/html, application/pdf, application/epub+zip, application/zip, application/vnd.openxmlformats-officedocument.wordprocessingml.document, text/plain|
+|application/vnd.google-apps.spreadsheet|application/x-vnd.oasis.opendocument.spreadsheet, text/tab-separated-values, application/pdf, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, text/csv, application/zip, application/vnd.oasis.opendocument.spreadsheet|
+|application/vnd.google-apps.jam|application/pdf|
+|application/vnd.google-apps.script|application/vnd.google-apps.script+json|
+|application/vnd.google-apps.presentation|application/vnd.oasis.opendocument.presentation, application/pdf, application/vnd.openxmlformats-officedocument.presentationml.presentation, text/plain|
+|application/vnd.google-apps.form|application/zip|
+|application/vnd.google-apps.drawing|image/svg+xml, image/png, application/pdf, image/jpeg|
+|application/vnd.google-apps.site|text/plain|
+
 
 ## getDirectoryListing
 
@@ -206,11 +240,11 @@ result.data contains unfiltered answer from server.
 result.list contains collection, each representing one file/directory.
 
 The answer is parsed and .list collection contains:
-- revision  // file revision, for folders "-"
-- size      // file size, such as "76 KiB" or "315 MiB", for folder "-"
-- date      // date, such as "1 year ago", "3 days ago", for folders "-"
-- path      // full path to download/access  "/filename.pdf"
-
+- Id  // file Id, identifier for all other commands
+- path      // file name
+- type      // document type, such as doc, pdf, dir
+- Size      // size, such as 1.0 KB
+- date      // date, such as 2022-03-02 14:27:36
 
 ## createDirectory
 
@@ -281,13 +315,13 @@ Moves a file on remote server to another directory (and/or rename it)
 |result|Object|<-|result object|  
 
 #### Description
-Allows to pass any valid Dropbox dbxcli command and execute it. Result is returned directly.
+Allows to pass any valid gdrive command and execute it. Result is returned directly.
 
 ## Settings commands
 
 ## .version()
 
-###.version() -> result : object
+### .version() -> result : object
 |Parameter|Type||Description|
 |---------|--- |:---:|------|
 |result|Object|<-|result object| 
@@ -296,9 +330,9 @@ Allows to pass any valid Dropbox dbxcli command and execute it. Result is return
 returns in result.data version information from cURL.
 
 Example:
-dbxcli version: v3.0.0  
-SDK version: 5.4.0  
-Spec version: 097e9ba
+gdrive: 2.1.1  
+Golang: go1.17.8  
+OS/Arch: darwin/amd64  
 
 
 ## setPath
@@ -309,10 +343,10 @@ Spec version: 097e9ba
 |Path|Text|->|Path to local dbxcli installation|
 
 #### Description
-Allows to use another dbxcli installation. 
+Allows to use another gdrive installation. 
 
 Precompiled versions for Mac and Windows can be downloaded from:
-[dbxcli](https://github.com/dropbox/dbxcli)
+[gdrive](https://github.com/prasmussen/gdrive/releases)
 
 
 ## setAsyncMode
@@ -352,7 +386,7 @@ Return object contains:
 |terminated|boolean|true if command finished execution|
 |responseError|Text|error message if command failed|
 |response|Text|message if command succeeded|
-|exitCode|Text|exit code returned by dbxcli|
+|exitCode|Text|exit code returned by gdrive|
 |errors|collection|optional: execution errors received by 4D|
 
 ## wait
@@ -380,9 +414,7 @@ The command returns after given wait time or before if execution is finished.
 #### Description
 Allows to show a progress bar during long running operations or to get informed when command execution is complete.
 
-The callback method is called whenever a new progress message is available from dbxcli and get's 3 parameter passed. The given ID, the progress text and the completeness ratio from 0-100%.
-
-Note: only useable on Windows.
+The callback method is called whenever a new progress message is available from gdrive and get's 3 parameter passed. The given ID, the progress text and the completeness ratio from 0-100%.
 
 #### Example
 

Documentation/Classes/FileTransfer_curl.md

@@ -464,8 +464,6 @@ Allows to show a progress bar during long running operations or to get informed
 
 The callback method is called whenever a new progress message is available from cURL and get's 3 parameter passed. The given ID, the progress text and the completeness ratio from 0-100%.
 
-Note: only useable on Windows.
-
 #### Example
 
 ```4D

Project/Sources/Classes/FileTransfer_Dropbox.4dm

@@ -142,9 +142,9 @@ Function _parseDirListing($success : Object)
 
 Function _runWorker($para : Text)->$result : Object
 	If (This:C1470._Callback#Null:C1517)
-		$workerpara:=cs:C1710.SystemWorkerProperties.new(This:C1470.onData; This:C1470._Callback; This:C1470._CallbackID)
+		$workerpara:=cs:C1710.SystemWorkerProperties.new("dropbox"; This:C1470.onData; This:C1470._Callback; This:C1470._CallbackID)
 	Else 
-		$workerpara:=cs:C1710.SystemWorkerProperties.new(This:C1470.onData)
+		$workerpara:=cs:C1710.SystemWorkerProperties.new("dropbox"; This:C1470.onData)
 	End if 
 
 	If ((This:C1470._Path) && (This:C1470._Path#""))

Project/Sources/Classes/FileTransfer_GDrive.4dm

@@ -3,9 +3,12 @@ Class constructor()
 	If (Is macOS:C1572)
 		This:C1470._return:=Char:C90(10)
 		This:C1470._Path:="/opt/homebrew/bin/gdrive"
+		$path:=Get 4D folder:C485(Current resources folder:K5:16)+"gdrive"+Folder separator:K24:12+"gdrive"
+		This:C1470._Path:=Convert path system to POSIX:C1106($path)
 	Else 
 		This:C1470._return:=Char:C90(10)  //Char(13)+Char(10)
-		This:C1470._Path:="gdrive.exe"
+		$path:=Get 4D folder:C485(Current resources folder:K5:16)+"gdrive"+Folder separator:K24:12+"gdrive.exe"
+		This:C1470._Path:=Convert path system to POSIX:C1106($path)
 	End if 
 	This:C1470._workerpath:=""  // needed for export
 
@@ -73,9 +76,10 @@ Function getDirectoryListing($targetpath : Text; $ID : Text; $max : Integer)->$s
 Function upload($sourcepath : Text; $targetpath : Text)->$success : Object
 	//$sourcepath just file name for local directory, else full path in POSIX syntax
 	// targetpath is full remote path (starting with /, ending with file name
+	// delete files before if you want to overwrite them, else you get a 2nd instance with same name
 	ASSERT:C1129($sourcepath#""; "source path must not be empty")
 	//ASSERT($targetpath#""; "target path must not be empty")
-	$success:=This:C1470.__uploadSub($sourcepath; $targetpath)
+	$success:=This:C1470._uploadSub($sourcepath; $targetpath)
 
 Function _uploadSub($sourcepath : Text; $targetpath : Text; $mime : Text)->$success : Object
 	// need to find target file name (for --name parameter) and target folder (to find --parent ID)
@@ -355,9 +359,9 @@ Function _parseDirListing($success : Object)
 
 Function _runWorker($para : Text)->$result : Object
 	If (This:C1470._Callback#Null:C1517)
-		$workerpara:=cs:C1710.SystemWorkerProperties.new(This:C1470.onData; This:C1470._Callback; This:C1470._CallbackID)
+		$workerpara:=cs:C1710.SystemWorkerProperties.new("gdrive"; This:C1470.onData; This:C1470._Callback; This:C1470._CallbackID)
 	Else 
-		$workerpara:=cs:C1710.SystemWorkerProperties.new(This:C1470.onData)
+		$workerpara:=cs:C1710.SystemWorkerProperties.new("gdrive"; This:C1470.onData)
 	End if 
 
 	If ((This:C1470._Path) && (This:C1470._Path#""))

Project/Sources/Classes/FileTransfer_curl.4dm

@@ -289,9 +289,9 @@ Function _buildURL()->$url : Text
 
 Function _runWorker($para : Text)->$result : Object
 	If (This:C1470._Callback#Null:C1517)
-		$workerpara:=cs:C1710.SystemWorkerProperties.new(This:C1470.onData; This:C1470._Callback; This:C1470._CallbackID)
+		$workerpara:=cs:C1710.SystemWorkerProperties.new("curl"; This:C1470.onData; This:C1470._Callback; This:C1470._CallbackID)
 	Else 
-		$workerpara:=cs:C1710.SystemWorkerProperties.new(This:C1470.onData)
+		$workerpara:=cs:C1710.SystemWorkerProperties.new("curl"; This:C1470.onData)
 	End if 
 
 	If ((This:C1470._curlPath) && (This:C1470._curlPath#""))

Project/Sources/Classes/SystemWorkerProperties.4dm

@@ -1,9 +1,10 @@
-Class constructor($data : Object; $callback : 4D:C1709.Function; $callbackID : Text)
+Class constructor($type : Text; $data : Object; $callback : 4D:C1709.Function; $callbackID : Text)
+	This:C1470.type:=$type
 	This:C1470.encoding:="UTF-8"
 	This:C1470.dataType:="text"
 	This:C1470.hideWindow:=True:C214
 	This:C1470.data:=$data
-	If (Count parameters:C259>1)
+	If (Count parameters:C259>2)
 		This:C1470.callback:=$callback
 		This:C1470.callbackID:=$callbackID
 		ASSERT:C1129(Value type:C1509($callback)=Is object:K8:27; "Callback must be of type function")
@@ -26,20 +27,30 @@ Function onDataError($systemworker : Object; $data : Object)
 		This:C1470.data.text+=$data.data
 		//This._createFile("onDataError"; This.data.text)  // debug
 		If (This:C1470.callback#Null:C1517)
-			$pos:=Position:C15(This:C1470._return; This:C1470.data.text)
-			If ($pos>0)
-				If ($pos=Length:C16(This:C1470.data.text))  // Dropbox
-					CALL WORKER:C1389("FileTransferProgress"; This:C1470.callback.source; This:C1470.callbackID; This:C1470.data.text; -1)
-					This:C1470.data.text:=""
-				Else   // Curl
+			Case of 
+				: (This:C1470.type="gdrive")
+					$pos:=Position:C15(Char:C90(13); This:C1470.data.text)
+					If ($pos>0)
+						CALL WORKER:C1389("FileTransferProgress"; This:C1470.callback.source; This:C1470.callbackID; Substring:C12(This:C1470.data.text; 1; $pos-1); -1)
+						This:C1470.data.text:=Substring:C12(This:C1470.data.text; $pos+1)
+					End if 
+				: (This:C1470.type="dropbox")
+					$pos:=Position:C15(This:C1470._return; This:C1470.data.text)
+					If ($pos>0)
+						If ($pos=Length:C16(This:C1470.data.text))  // Dropbox
+							CALL WORKER:C1389("FileTransferProgress"; This:C1470.callback.source; This:C1470.callbackID; This:C1470.data.text; -1)
+							This:C1470.data.text:=""
+						End if 
+					End if 
+				Else 
+					$pos:=Position:C15(This:C1470._return; This:C1470.data.text)
 					$message:=Substring:C12(This:C1470.data.text; 1; $pos-1)
 					This:C1470.data.text:=Substring:C12(This:C1470.data.text; $pos+1)
 					$progress:=Num:C11(Substring:C12($message; 1; 3))
 					If ($progress#0)
 						CALL WORKER:C1389("FileTransferProgress"; This:C1470.callback.source; This:C1470.callbackID; $message; $progress)
 					End if 
-				End if 
-			End if 
+			End case 
 		End if 
 	End if 
 

Project/Sources/Methods/ProgressCallback.4dm

@@ -1,24 +1,27 @@
-//%attributes = {}
-#DECLARE($ID : Text; $message : Text; $value : Integer)
-// called from cs.FileTransfer if callback is set via .useCallback()
-
-// $ID is set through code - $message comes from curl
-
-var ProgressBarID : Integer
-
-If ((ProgressBarID=0) && ($value#100))
-	ProgressBarID:=Progress New
-	Progress SET TITLE(ProgressBarID; $ID)
-End if 
-
-If (ProgressBarID#0)
-	Case of 
-		: ($value=100)
-			Progress QUIT(ProgressBarID)
-			ProgressBarID:=0
-		: ($value<0)
-			Progress SET MESSAGE(ProgressBarID; $message)
-		Else 
-			Progress SET PROGRESS(ProgressBarID; $value/100)
-	End case 
-End if 
+//%attributes = {}
+#DECLARE($ID : Text; $message : Text; $value : Integer)
+// called from cs.FileTransfer if callback is set via .useCallback()
+
+// $ID is set through code - $message comes from curl
+
+var ProgressBarID : Integer
+
+If ((ProgressBarID=0) && ($value#100))
+	ProgressBarID:=Progress New
+	Progress SET TITLE(ProgressBarID; $ID)
+End if 
+
+If (ProgressBarID#0)
+	Case of 
+		: ($value=100)
+			Progress QUIT(ProgressBarID)
+			ProgressBarID:=0
+		: ($value<0)
+			$message2:=Replace string:C233($message; " "; "")  // ignore totally empty messages, happens with gdrive
+			If ($message2#"")
+				Progress SET MESSAGE(ProgressBarID; $message)
+			End if 
+		Else 
+			Progress SET PROGRESS(ProgressBarID; $value/100)
+	End case 
+End if 

Project/Sources/Methods/test_GDrive.4dm

@@ -52,11 +52,11 @@ If (False:C215)
 	End if 
 End if 
 
-If (False:C215)
+If (True:C214)
 	$ftp.useCallback(Formula:C1597(ProgressCallback); "ProgressCallback")
-	$source:=System folder:C487(Desktop:K41:16)+"result.pdf"
+	$source:=System folder:C487(Desktop:K41:16)+"4d.dmg"
 	$source:=Convert path system to POSIX:C1106($source)
-	$target:="/Firma/test/test2.pdf"
+	$target:="/Firma/test/test2.dmg"
 	$result:=$ftp.upload($source; $target)
 	If ($result.success)
 		$answer:=$result.data

Project/Sources/Methods/test_dropbox.4dm

@@ -44,13 +44,13 @@ If (False:C215)
 End if 
 
 
-If (True:C214)
-	$ftp.useCallback(Formula:C1597(ProgressCallback); "Download 4D.dmg")
+If (False:C215)
+	$ftp.useCallback(Formula:C1597(ProgressCallback); "uploading 4D.dmg")
 	$ftp.setAsyncMode(True:C214)
 
-	$source:=System folder:C487(Desktop:K41:16)+"Heap.pdf"
+	$source:=System folder:C487(Desktop:K41:16)+"4d.dmg"
 	$source:=Convert path system to POSIX:C1106($source)
-	$target:="/Firma/test2.pdf"
+	$target:="/Firma/4d.dmg"
 	$result:=$ftp.upload($source; $target)
 
 	// async, so we need to loop...
@@ -65,6 +65,27 @@ If (True:C214)
 
 End if 
 
+If (True:C214)
+	$ftp.useCallback(Formula:C1597(ProgressCallback); "uploading 4D.dmg")
+	//$ftp.setAsyncMode(True)
+	
+	$source:=System folder:C487(Desktop:K41:16)+"4d.dmg"
+	$source:=Convert path system to POSIX:C1106($source)
+	$target:="/Firma/4d.dmg"
+	$result:=$ftp.upload($source; $target)
+	
+	// async, so we need to loop...
+	// normally we are supposed to do something else and either
+	// check from time to time or to use the callback method to inform us (percent=100)
+	//Repeat 
+	//$ftp.wait(1)  // needed while our process is running
+	//// wait is not needed if a form would be open or if a worker would handle the job
+	//$status:=$ftp.status()
+	
+	//Until (Bool($status.terminated))
+	
+End if 
+
 If (False:C215)
 	$target:="/Firma/newdir"
 	$result:=$ftp.createDirectory($target)