Merge branch '2411-check-copyright'

[arvados.git] / sdk / go / crunchrunner / upload.go

diff --git a/sdk/go/crunchrunner/upload.go b/sdk/go/crunchrunner/upload.go
index 06a6678e5c43bfc2d8f23d21a9dda05ed7af5b50..fd24908ad6a7e9e49721c0ed33980ce096c7e34a 100644 (file)
--- a/sdk/go/crunchrunner/upload.go
+++ b/sdk/go/crunchrunner/upload.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package main
 
 import (
@@ -130,8 +134,8 @@ func (m *ManifestWriter) WalkFunc(path string, info os.FileInfo, err error) erro
 
        stream.offset += count
 
-       stream.ManifestStream.FileTokens = append(stream.ManifestStream.FileTokens,
-               fmt.Sprintf("%v:%v:%v", fileStart, count, fn))
+       stream.ManifestStream.FileStreamSegments = append(stream.ManifestStream.FileStreamSegments,
+               manifest.FileStreamSegment{uint64(fileStart), uint64(count), fn})
 
        return nil
 }
@@ -189,11 +193,11 @@ func (m *ManifestWriter) ManifestText() string {
                        buf.WriteString(" ")
                        buf.WriteString(b)
                }
-               for _, f := range v.FileTokens {
+               for _, f := range v.FileStreamSegments {
                        buf.WriteString(" ")
-                       f = strings.Replace(f, " ", "\\040", -1)
-                       f = strings.Replace(f, "\n", "", -1)
-                       buf.WriteString(f)
+                       name := strings.Replace(f.Name, " ", "\\040", -1)
+                       name = strings.Replace(name, "\n", "", -1)
+                       buf.WriteString(fmt.Sprintf("%d:%d:%s", f.SegPos, f.SegLen, name))
                }
                buf.WriteString("\n")
        }