lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify the pushAsset code

Browse Source
This commit is contained in:
rubyist 2015-01-27 12:07:11 -05:00
parent 5cb0520e9c
commit ffa86bbdff
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
commands/command_push.go
View File

@ -133,31 +133,35 @@ func pushAsset(oid, filename string, index, totalFiles int) *gitmedia.WrappedErr
return gitmedia.Errorf(err, "Error uploading file %s (%s)", filename, oid)
}
linkMeta, status, err := gitmediaclient.Post(path, filename) // Payload?
linkMeta, status, err := gitmediaclient.Post(path, filename)
if err != nil {
return gitmedia.Errorf(err, "Error uploading file %s (%s)", filename, oid)
}
if status == 405 {
// Do the old style OPTIONS + PUT
status, err := gitmediaclient.Options(path)
if err != nil {
return gitmedia.Errorf(err, "Error uploading file %s (%s)", filename, oid)
}
if status == 200 {
return nil
return gitmedia.Errorf(err, "Error starting file upload %s (%s)", filename, oid)
}
cb, file, cbErr := gitmedia.CopyCallbackFile("push", filename, index, totalFiles)
if cbErr != nil {
Error(cbErr.Error())
}
if file != nil {
defer file.Close()
}
if status == 405 {
// Do the old style OPTIONS + PUT
status, err := gitmediaclient.Options(path)
if err != nil {
return gitmedia.Errorf(err, "Error getting options for file %s (%s)", filename, oid)
}
if status == 200 {
return nil
}
err = gitmediaclient.Put(path, filename, cb)
if file != nil {
file.Close()
if err != nil {
return gitmedia.Errorf(err, "Error uploading file %s (%s)", filename, oid)
}
return nil
} // End old style
@ -165,14 +169,9 @@ func pushAsset(oid, filename string, index, totalFiles int) *gitmedia.WrappedErr
return nil
}
cb, file, cbErr := gitmedia.CopyCallbackFile("push", filename, index, totalFiles)
if cbErr != nil {
Error(cbErr.Error())
}
err = gitmediaclient.ExternalPut(path, filename, linkMeta, cb)
if file != nil {
file.Close()
if err != nil {
return gitmedia.Errorf(err, "Error uploading file %s (%s)", filename, oid)
}
return nil