"git.curoverse.com/arvados.git/sdk/go/keepclient"
"git.curoverse.com/arvados.git/sdk/go/manifest"
"io"
+ "log"
"os"
"path/filepath"
+ "sort"
+ "strings"
)
type Block struct {
PutHB(hash string, buf []byte) (string, int, error)
}
-func (m *ManifestStreamWriter) Write(p []byte) (n int, err error) {
- // Needed to conform to Writer interface, but not implemented
- // because io.Copy will actually use ReadFrom instead.
- return 0, nil
+func (m *ManifestStreamWriter) Write(p []byte) (int, error) {
+ n, err := m.ReadFrom(bytes.NewReader(p))
+ return int(n), err
}
func (m *ManifestStreamWriter) ReadFrom(r io.Reader) (n int64, err error) {
count, err = r.Read(m.Block.data[m.Block.offset:])
total += int64(count)
m.Block.offset += int64(count)
- if count > 0 {
- if m.Block.offset == keepclient.BLOCKSIZE {
- m.uploader <- m.Block
- m.Block = nil
- }
+ if m.Block.offset == keepclient.BLOCKSIZE {
+ m.uploader <- m.Block
+ m.Block = nil
}
}
- return total, err
+ if err == io.EOF {
+ return total, nil
+ } else {
+ return total, err
+ }
+
}
func (m *ManifestStreamWriter) goUpload() {
var errors []error
uploader := m.uploader
finish := m.finish
- for true {
- select {
- case block, valid := <-uploader:
- if !valid {
- finish <- errors
- return
- }
- hash := fmt.Sprintf("%x", md5.Sum(block.data[0:block.offset]))
- signedHash, _, err := m.ManifestWriter.IKeepClient.PutHB(hash, block.data[0:block.offset])
- if err != nil {
- errors = append(errors, err)
- } else {
- m.ManifestStream.Blocks = append(m.ManifestStream.Blocks, signedHash)
- }
+ for block := range uploader {
+ hash := fmt.Sprintf("%x", md5.Sum(block.data[0:block.offset]))
+ signedHash, _, err := m.ManifestWriter.IKeepClient.PutHB(hash, block.data[0:block.offset])
+ if err != nil {
+ errors = append(errors, err)
+ } else {
+ m.ManifestStream.Blocks = append(m.ManifestStream.Blocks, signedHash)
}
}
+ finish <- errors
}
type ManifestWriter struct {
if len(path) > (len(m.stripPrefix) + len(info.Name()) + 1) {
dir = path[len(m.stripPrefix)+1 : (len(path) - len(info.Name()) - 1)]
}
+ if dir == "" {
+ dir = "."
+ }
fn := path[(len(path) - len(info.Name())):]
return err
}
+ log.Printf("Uploading %v/%v (%v bytes)", dir, fn, info.Size())
+
var count int64
count, err = io.Copy(stream, file)
- if err != nil && err != io.EOF {
+ if err != nil {
return err
}
func (m *ManifestWriter) Finish() error {
var errstring string
- for _, v := range m.Streams {
- if v.uploader != nil {
- if v.Block != nil {
- v.uploader <- v.Block
- }
- close(v.uploader)
- v.uploader = nil
-
- errors := <-v.finish
- close(v.finish)
- v.finish = nil
-
- if errors != nil {
- for _, r := range errors {
- errstring = fmt.Sprintf("%v%v\n", errstring, r.Error())
- }
- }
+ for _, stream := range m.Streams {
+ if stream.uploader == nil {
+ continue
+ }
+ if stream.Block != nil {
+ stream.uploader <- stream.Block
+ }
+ close(stream.uploader)
+ stream.uploader = nil
+
+ errors := <-stream.finish
+ close(stream.finish)
+ stream.finish = nil
+
+ for _, r := range errors {
+ errstring = fmt.Sprintf("%v%v\n", errstring, r.Error())
}
}
if errstring != "" {
func (m *ManifestWriter) ManifestText() string {
m.Finish()
var buf bytes.Buffer
- for k, v := range m.Streams {
- if k == "" {
+
+ dirs := make([]string, len(m.Streams))
+ i := 0
+ for k := range m.Streams {
+ dirs[i] = k
+ i++
+ }
+ sort.Strings(dirs)
+
+ for _, k := range dirs {
+ v := m.Streams[k]
+
+ if k == "." {
buf.WriteString(".")
} else {
+ k = strings.Replace(k, " ", "\\040", -1)
+ k = strings.Replace(k, "\n", "", -1)
buf.WriteString("./" + k)
}
for _, b := range v.Blocks {
}
for _, f := range v.Files {
buf.WriteString(" ")
+ f = strings.Replace(f, " ", "\\040", -1)
+ f = strings.Replace(f, "\n", "", -1)
buf.WriteString(f)
}
buf.WriteString("\n")