gearmulator

commit ebdc380905e1360032d38123476af009ce67a78f
parent 8c65f54b52f1b1a8c7809ea44993cc9261880342
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sun,  8 Sep 2024 15:34:42 +0200

use sftp instead of ftp / speed up uploads

Diffstat:
M
scripts/deploy.cmake
 | 
2
+-
M
scripts/rclone.cmake
 | 
33
+++++----------------------------

2 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/scripts/deploy.cmake b/scripts/deploy.cmake
@@ -16,5 +16,5 @@ if(UPLOAD_LOCAL)
 	copyArtefacts("dsp56300:deploy" "${FOLDER}" "${FILTER}")
 endif()
 if(UPLOAD_REMOTE)
-	copyArtefacts("dsp56300_ftp:builds" "${FOLDER}" "${FILTER}")
+	copyArtefacts("dsp56300_sftp:builds" "${FOLDER}" "${FILTER}")
 endif()
diff --git a/scripts/rclone.cmake b/scripts/rclone.cmake
@@ -10,37 +10,14 @@ if(NOT RCLONE_CONF)
 	endif()
 endif()
 
-set(postfix "_partial")
-
 macro(copyArtefacts TARGET FOLDER FILEFILTER)
 	set(RCLONE_RESULT 0)
-	file(GLOB files LIST_DIRECTORIES false "${ROOT_DIR}/*${FILEFILTER}*.zip" "${ROOT_DIR}/*${FILEFILTER}*.deb" "${ROOT_DIR}/*${FILEFILTER}*.rpm")
-	foreach(fileLocal ${files})
-		
-		file(SIZE ${fileLocal} fileSize)
-		if(${fileSize} GREATER 100)
-			file(RELATIVE_PATH remoteFile "${ROOT_DIR}" ${fileLocal})
-
-			file(RELATIVE_PATH remoteFile "${ROOT_DIR}" ${fileLocal})
-			set(remoteFileTemp "${remoteFile}${postfix}")
-
-			set(RCLONE_RESULT 0)
-			execute_process(COMMAND rclone -v --config ${RCLONE_CONF} copyto 
-				"${fileLocal}" "${TARGET}/${FOLDER}/${remoteFileTemp}"
-				COMMAND_ECHO STDOUT RESULT_VARIABLE RCLONE_RESULT WORKING_DIRECTORY ${ROOT_DIR})
-			if(RCLONE_RESULT)
-				message(FATAL_ERROR "Failed to execute rclone: " ${CMD_RESULT})
-			endif()
+	execute_process(COMMAND rclone --transfers 16 -v --config ${RCLONE_CONF} copy --include "/*${FILEFILTER}*.{zip,deb,rpm}" --min-size 8k ${ROOT_DIR}/ "${TARGET}/${FOLDER}/"
+		COMMAND_ECHO STDOUT RESULT_VARIABLE RCLONE_RESULT WORKING_DIRECTORY ${ROOT_DIR})
+	if(RCLONE_RESULT)
+		message(FATAL_ERROR "Failed to execute rclone: " ${CMD_RESULT})
+	endif()
 
-			set(RCLONE_RESULT 0)
-			execute_process(COMMAND rclone -v --config ${RCLONE_CONF} moveto 
-				"${TARGET}/${FOLDER}/${remoteFileTemp}" "${TARGET}/${FOLDER}/${remoteFile}"
-				COMMAND_ECHO STDOUT RESULT_VARIABLE RCLONE_RESULT WORKING_DIRECTORY ${ROOT_DIR})
-			if(RCLONE_RESULT)
-				message(FATAL_ERROR "Failed to execute rclone: " ${CMD_RESULT})
-			endif()
-		endif()
-	endforeach()
 endmacro()
 
 macro(copyDataFrom FROM TO)