Mac feature complete

Author: ThomasMaul

.gitignore

@@ -0,0 +1,8 @@
+*.4dd
+*.4DIndx
+*.Match
+Logs
+Project/DerivedData
+*symbols.txt
+userPreferences.*
+Libraries/

Data/data.4DD

@@ -1,10 +1,16 @@
 {
 	"methods": {
 		"test": {
-			"timeStamp": "2022-02-02T15:58:23.373Z"
+			"timeStamp": "2022-02-07T11:21:35.129Z"
+		},
+		"Worker_ProgressBar": {
+			"timeStamp": "2022-02-03T11:10:33.458Z"
 		},
 		"ErrorHandler": {
-			"timeStamp": "2022-01-31T12:46:05.903Z"
+			"timeStamp": "2022-02-03T10:50:18.425Z"
+		},
+		"ProgressCallback": {
+			"timeStamp": "2022-02-07T10:10:51.936Z"
 		}
 	}
 }

Data/data.journal

@@ -1,13 +1,15 @@
 Class constructor($hostname : Text; $username : Text; $password : Text; $protocoll : Text)
 	ASSERT:C1129($hostname#""; "Hostname must not be empty")
-	$col:=New collection:C1472("ftp"; "ftps")
+	$col:=New collection:C1472("ftp"; "ftps"; "sftp")
 	ASSERT:C1129($col.indexOf($protocoll)>=0; "Unsupported protocoll")
 	This:C1470._host:=$hostname
 	This:C1470._user:=$username
 	This:C1470._password:=$password
 	This:C1470._protocoll:=$protocoll
 	This:C1470.onData:=New object:C1471("text"; "")
+	This:C1470._noProgress:=True:C214
 
+	//MARK: Settings
 Function validate()->$success : Object
 	$url:=This:C1470._buildURL()
 	$url+="/"
@@ -44,12 +46,29 @@ Function setActiveMode($active : Boolean; $IP : Text)
 		This:C1470._ActiveModeIP:=$IP
 	End if 
 
+Function setRange($range : Text)
+	// 0-99 or -500 (last 500) , 500-  (starting with 500 till end)
+	This:C1470._range:=$range
+	
 Function setCurlPrefix($prefix : Text)
 	// allows to set any parameters directly after curl
 	This:C1470._prefix:=$prefix
 
+Function setCurlPath($path : Text)
+	This:C1470._curlPath:=$path
+	
+Function enableProgressData($enable : Boolean)
+	This:C1470._noProgress:=Not:C34($enable)
 
+Function useCallback($callback : 4D:C1709.Function; $ID : Text)
+	ASSERT:C1129(Value type:C1509($callback)=Is object:K8:27; "Callback must be of type function")
+	ASSERT:C1129(OB Instance of:C1731($callback; 4D:C1709.Function); "Callback must be of type function")
+	ASSERT:C1129($ID#""; "Callback ID Method must not be empty")
+	This:C1470._Callback:=$callback
+	This:C1470._CallbackID:=$ID
+	This:C1470._noProgress:=False:C215
 
+	//MARK: FileTransfer
 Function upload($sourcepath : Text; $targetpath : Text; $append : Boolean)->$success : Object
 	//$sourcepath just file name for local directory, else full path in POSIX syntax
 	// targetpath is remote path. / for same name as local file in default dir, else /dir/ or /dir/newname.txt
@@ -82,12 +101,12 @@ target needs to be folder, ending with /
 	ASSERT:C1129($targetpath#""; "target path must not be empty")
 	$url:=This:C1470._buildURL()
 	If ((This:C1470._AutoCreateLocalDir#Null:C1517) && (This:C1470._AutoCreateLocalDir))
-		$url:="--create-dirs "+$url
+		$url:=" --create-dirs "+$url
 	End if 
 	If ($targetpath="@/")
 		$url:=" --output-dir "+$targetpath+" --remote-name-all "+$url+$sourcepath
 	Else 
-		$url:=" -o "+$targetpath+$url+$sourcepath
+		$url:=" -o "+$targetpath+" "+$url+$sourcepath
 	End if 
 	$success:=This:C1470._runWorker($url)
 
@@ -144,7 +163,7 @@ Function renameFile($sourcepath : Text; $targetpath : Text)->$success : Object
 	End if 
 
 
-	
+	// MARK: Internal helper calls
 Function _parseDirListing($success : Object)
 	$col:=Split string:C1554($success.data; Char:C90(10); sk ignore empty strings:K86:1)
 	$success.list:=New collection:C1472
@@ -179,31 +198,58 @@ Function _parseDirListing($success : Object)
 	End for each 
 
 Function _buildURL()->$url : Text
-	$url:="ftp://"
-	If (This:C1470._user#"")
-		$url+=This:C1470._user+":"+This:C1470._password+"@"
-	End if 
-	$url+=This:C1470._host
-	If (This:C1470._protocoll="ftps")
-		$url:="-ssl "+$url
+	Case of 
+		: ((This:C1470._protocoll="ftps") | (This:C1470._protocoll="ftp"))
+			$url:="ftp://"
+			If (This:C1470._user#"")
+				$url+=This:C1470._user+":"+This:C1470._password+"@"
+			End if 
+			$url+=This:C1470._host
+			If (This:C1470._protocoll="ftps")
+				$url:="-ssl "+$url
+			End if 
+		: (This:C1470._protocoll="sftp")
+			$url:="sftp://"
+			If (This:C1470._user#"")
+				$url+=This:C1470._user+":"+This:C1470._password+"@"
+			End if 
+			$url+=This:C1470._host
+		Else 
+			ASSERT:C1129(True:C214; "unsupported protocoll")
+	End case 
+	
+	
+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)
+	Else 
+		$workerpara:=cs:C1710.SystemWorkerProperties.new(This:C1470.onData)
 	End if 
 
-Function _runWorker($para : Text; $async : Boolean)->$result : Object
-	$workerpara:=cs:C1710.SystemWorkerProperties.new(This:C1470.onData)
+	If ((This:C1470._curlPath) && (This:C1470._curlPath#""))
+		$path:=This:C1470._curlPath
+	Else 
+		$path:="curl"
+	End if 
 
-	$path:="curl"
-	If (This:C1470._prefix#Null:C1517)
-		$path+=(" "+This:C1470._prefix)
+	If ((This:C1470._noProgress#Null:C1517) && (This:C1470._noProgress))
+		$path+=" --no-progress-meter"
 	End if 
 	If (This:C1470._connectTimeout#Null:C1517)
 		$path+=" --connect-timeout "+String:C10(This:C1470._connectTimeout)
 	End if 
 	If (This:C1470._maxTime#Null:C1517)
 		$path+=" --max-time "+String:C10(This:C1470._maxTime)
 	End if 
+	If (This:C1470._range#Null:C1517)
+		$path+=" --range "+This:C1470._range
+	End if 
 	If ((This:C1470._ActiveMode#Null:C1517) && (This:C1470._ActiveMode))  // default passive
 		$path+=" --ftp-port "+This:C1470.ActiveModeIP
 	End if 
+	If (This:C1470._prefix#Null:C1517)
+		$path+=(" "+This:C1470._prefix)
+	End if 
 
 	$command:=$path+" "+$para
 	var $worker : 4D:C1709.SystemWorker
@@ -233,4 +279,5 @@ Function _runWorker($para : Text; $async : Boolean)->$result : Object
 	ON ERR CALL:C155($old)
 
 
+	
 

Project/DerivedData/methodAttributes.json

@@ -1,20 +1,28 @@
-Class constructor($data : Object)
+Class constructor($data : Object; $callback : 4D:C1709.Function; $callbackID : Text)
 	This:C1470.encoding:="UTF-8"
-	This:C1470.dataType:="text"  // lowercase
+	This:C1470.dataType:="text"
 	This:C1470.hideConsole:=True:C214
 	This:C1470.data:=$data
-	
-	
-	
+	If (Count parameters:C259>1)
+		This:C1470.callback:=$callback
+		This:C1470.callbackID:=$callbackID
+		ASSERT:C1129(Value type:C1509($callback)=Is object:K8:27; "Callback must be of type function")
+		ASSERT:C1129(OB Instance of:C1731($callback; 4D:C1709.Function); "Callback must be of type function")
+		ASSERT:C1129($callbackID#""; "Callback ID Method must not be empty")
+	End if 
 
 Function onResponse($systemworker : Object; $data : Object)
 
+	
 Function onData($systemworker : Object; $data : Object)
 	If (Value type:C1509($data.data)=38)  // blob
 
 	Else 
 		If (String:C10($data.data)#"")
 			This:C1470.data.text:=This:C1470.data.text+$data.data
+			If (This:C1470.callback#Null:C1517)
+				CALL WORKER:C1389("FileTransferProgress"; This:C1470.callback.source; This:C1470.callbackID; $data.data; 0)
+			End if 
 		End if 
 	End if 
 

Project/Sources/Classes/FileTransfer.4dm

@@ -1,2 +1,3 @@
 //%attributes = {}
 // do nothing, just to fetch errors
+// used in cs.FileTransfer._runWorker()

Project/Sources/Classes/SystemWorkerProperties.4dm

@@ -0,0 +1,5 @@
+//%attributes = {}
+#DECLARE($ID : Text; $message : Text; $value : Integer)
+// called from cs.FileTransfer if callback is set via .useCallback()
+
+MESSAGE:C88($id+" - "+$message+" - "+String:C10($value))

Project/Sources/Methods/ErrorHandler.4dm

@@ -0,0 +1,11 @@
+//%attributes = {}
+// Cooperative Process to display Progress Bar
+
+#DECLARE($job : Text; $info : Text; $value : Integer)
+
+Case of 
+	: ($job="init")
+		Progress New(
+		
+	: ($job="close")
+End case 

Project/Sources/Methods/ProgressCallback.4dm

@@ -5,9 +5,13 @@ $credentialspath:=Get 4D folder:C485(Database folder:K5:14)
 $folder:=Folder:C1567($credentialspath; fk platform path:K87:2)
 $credentialsfile:=$folder.parent.file("credentials.txt").getText()
 $credentials:=JSON Parse:C1218($credentialsfile)
+If (False:C215)
+	$credentials.url:="192.168.10.54:3421"
+End if 
 
 var $ftp : cs:C1710.FileTransfer
-$ftp:=cs:C1710.FileTransfer.new($credentials.url; $credentials.user; $credentials.pass; "ftp")
+$ftp:=cs:C1710.FileTransfer.new($credentials.url; $credentials.user; $credentials.pass; "sftp")
+$ftp.setCurlPath("/opt/homebrew/opt/curl/bin/curl")
 $ftp.setConnectTimeout(5)
 
 If (False:C215)
@@ -17,7 +21,7 @@ If (False:C215)
 	End if 
 End if 
 
-If (False:C215)
+If (True:C214)
 	$result:=$ftp.validate()
 	If ($result.success)
 
@@ -26,6 +30,8 @@ If (False:C215)
 	End if 
 End if 
 
+
+
 If (False:C215)
 	$source:=System folder:C487(Desktop:K41:16)+"test2.txt"
 	$source:=Convert path system to POSIX:C1106($source)
@@ -45,14 +51,16 @@ If (False:C215)
 	End if 
 End if 
 
-If (False:C215)
+If (True:C214)
 	$result:=$ftp.getDirectoryListing("/")
 	If ($result.success)
 		$list:=$result.list
 	End if 
 End if 
 
 If (False:C215)
+	//$ftp.useCallback(Formula(ProgressCallback); "ProgressCallback")
+	
 	$source:="/test2.txt"
 	$target:=System folder:C487(Desktop:K41:16)+"newtest2.txt"
 	$target:=Convert path system to POSIX:C1106($target)
@@ -62,8 +70,13 @@ If (False:C215)
 	End if 
 End if 
 
-If (False:C215)
+If (True:C214)
+	//$ftp.useCallback(Formula(ProgressCallback); "ProgressCallback")
 	$source:="/test[1-3].txt"
+	$source:="/large/4D.dmg"
+	$source:="/large/FileZilla.bz2"
+	$ftp.setRange("-100")
+	
 	$target:=System folder:C487(Desktop:K41:16)+"neu"+Folder separator:K24:12
 	$target:=Convert path system to POSIX:C1106($target)
 	$result:=$ftp.download($source; $target)
@@ -95,13 +108,25 @@ If (False:C215)
 	End if 
 End if 
 
-If (True:C214)
+If (False:C215)
 	$result:=$ftp.renameFile("/test3.txt"; "/test2.txt")
 	If ($result.success)
 		$list:=$result.list
 	End if 
 End if 
 
+
+If (True:C214)
+	$source:=System folder:C487(Desktop:K41:16)+"neu"+Folder separator:K24:12+"test[1-3].txt"
+	$source:=Convert path system to POSIX:C1106($source)
+	$ftp.setAutoCreateRemoteDirectory(True:C214)
+	$ftp.setAutoCreateLocalDirectory(True:C214)
+	$result:=$ftp.upload($source; "/meinfolder/"; True:C214)
+	If ($result.success)
+		$answer:=$result.data
+	End if 
+End if 
+
 /* test
 
 test upload with 1-100].txt"