Merge pull request #48 from cyverse/upload_rework

do not truncate, but remove before upload to overwrite
cyverse · Sep 18, 2024 · fd31dd1 · fd31dd1
2 parents aafeaeb + 1b06ab4
commit fd31dd1
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 104 deletions.
diff --git a/examples/download/download.go b/examples/download/download.go
@@ -67,7 +67,7 @@ func main() {
 
 	logger.Infof("iRODS path: %q", result.IRODSPath)
 	logger.Infof("Local path: %q", result.LocalPath)
-	logger.Infof("Checksum: %s, iRODS: %q, Local: %q", result.CheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), hex.EncodeToString(result.LocalCheckSum))
+	logger.Infof("Checksum: iRODS: %s:%q, Local: %s:%q", result.IRODSCheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), result.LocalCheckSumAlgorithm, hex.EncodeToString(result.LocalCheckSum))
 	logger.Infof("Size: iRODS: %d, Local: %d", result.IRODSSize, result.LocalSize)
 
 	fsinfo, err := os.Stat(destPath)

diff --git a/examples/download_parallel/download_parallel.go b/examples/download_parallel/download_parallel.go
@@ -67,7 +67,7 @@ func main() {
 
 	logger.Infof("iRODS path: %q", result.IRODSPath)
 	logger.Infof("Local path: %q", result.LocalPath)
-	logger.Infof("Checksum: %s, iRODS: %q, Local: %q", result.CheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), hex.EncodeToString(result.LocalCheckSum))
+	logger.Infof("Checksum: iRODS: %s:%q, Local: %s:%q", result.IRODSCheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), result.LocalCheckSumAlgorithm, hex.EncodeToString(result.LocalCheckSum))
 	logger.Infof("Size: iRODS: %d, Local: %d", result.IRODSSize, result.LocalSize)
 
 	fsinfo, err := os.Stat(destPath)

diff --git a/examples/download_parallel_resumable/download_parallel_resumable.go b/examples/download_parallel_resumable/download_parallel_resumable.go
@@ -67,7 +67,7 @@ func main() {
 
 	logger.Infof("iRODS path: %q", result.IRODSPath)
 	logger.Infof("Local path: %q", result.LocalPath)
-	logger.Infof("Checksum: %s, iRODS: %q, Local: %q", result.CheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), hex.EncodeToString(result.LocalCheckSum))
+	logger.Infof("Checksum: iRODS: %s:%q, Local: %s:%q", result.IRODSCheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), result.LocalCheckSumAlgorithm, hex.EncodeToString(result.LocalCheckSum))
 	logger.Infof("Size: iRODS: %d, Local: %d", result.IRODSSize, result.LocalSize)
 
 	fsinfo, err := os.Stat(destPath)

diff --git a/examples/download_resumable/download_resumable.go b/examples/download_resumable/download_resumable.go
@@ -67,7 +67,7 @@ func main() {
 
 	logger.Infof("iRODS path: %q", result.IRODSPath)
 	logger.Infof("Local path: %q", result.LocalPath)
-	logger.Infof("Checksum: %s, iRODS: %q, Local: %q", result.CheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), hex.EncodeToString(result.LocalCheckSum))
+	logger.Infof("Checksum: iRODS: %s:%q, Local: %s:%q", result.IRODSCheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), result.LocalCheckSumAlgorithm, hex.EncodeToString(result.LocalCheckSum))
 	logger.Infof("Size: iRODS: %d, Local: %d", result.IRODSSize, result.LocalSize)
 
 	fsinfo, err := os.Stat(destPath)

diff --git a/examples/upload/upload.go b/examples/upload/upload.go
@@ -77,7 +77,7 @@ func main() {
 
 	logger.Infof("iRODS path: %q", result.IRODSPath)
 	logger.Infof("Local path: %q", result.LocalPath)
-	logger.Infof("Checksum: %s, iRODS: %q, Local: %q", result.CheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), hex.EncodeToString(result.LocalCheckSum))
+	logger.Infof("Checksum: iRODS: %s:%q, Local: %s:%q", result.IRODSCheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), result.LocalCheckSumAlgorithm, hex.EncodeToString(result.LocalCheckSum))
 	logger.Infof("Size: iRODS: %d, Local: %d", result.IRODSSize, result.LocalSize)
 
 	ttaken := time.Since(tstart)

diff --git a/examples/upload_parallel/upload_parallel.go b/examples/upload_parallel/upload_parallel.go
@@ -67,7 +67,7 @@ func main() {
 
 	logger.Infof("iRODS path: %q", result.IRODSPath)
 	logger.Infof("Local path: %q", result.LocalPath)
-	logger.Infof("Checksum: %s, iRODS: %q, Local: %q", result.CheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), hex.EncodeToString(result.LocalCheckSum))
+	logger.Infof("Checksum: iRODS: %s:%q, Local: %s:%q", result.IRODSCheckSumAlgorithm, hex.EncodeToString(result.IRODSCheckSum), result.LocalCheckSumAlgorithm, hex.EncodeToString(result.LocalCheckSum))
 	logger.Infof("Size: iRODS: %d, Local: %d", result.IRODSSize, result.LocalSize)
 
 	fsentry, err := filesystem.Stat(destPath)