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

Remove superfluous NewUploadableWithoutFilename function.

Browse Source
This commit is contained in:
Lars Schneider 2015-07-06 13:05:34 +02:00
parent d55f813f48
commit 29f6944265
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/command_push.go
View File

@ -59,7 +59,7 @@ func uploadsWithObjectIDs(oids []string) *lfs.TransferQueue {
uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(oids))
for _, oid := range oids {
u, wErr := lfs.NewUploadableWithoutFilename(oid)
u, wErr := lfs.NewUploadable(oid, "", 0, 0)
if wErr != nil {
if Debugging || wErr.Panic {
Panic(wErr.Err, wErr.Error())

29
lfs/upload_queue.go
View File

@ -16,36 +16,27 @@ type Uploadable struct {
}
// NewUploadable builds the Uploadable from the given information.
// "filename" can be empty if a raw object is pushed (see "object-id" flag in push command)/
func NewUploadable(oid, filename string, index, totalFiles int) (*Uploadable, *WrappedError) {
path, err := LocalMediaPath(oid)
localMediaPath, err := LocalMediaPath(oid)
if err != nil {
return nil, Errorf(err, "Error uploading file %s (%s)", filename, oid)
}
if err := ensureFile(filename, path); err != nil {
return nil, Errorf(err, "Error uploading file %s (%s)", filename, oid)
var pathForStats string = localMediaPath
if len(filename) > 0 {
if err := ensureFile(filename, localMediaPath); err != nil {
return nil, Errorf(err, "Error uploading file %s (%s)", filename, oid)
}
pathForStats = filename
}
fi, err := os.Stat(filename)
fi, err := os.Stat(pathForStats)
if err != nil {
return nil, Errorf(err, "Error uploading file %s (%s)", filename, oid)
}
return &Uploadable{oid: oid, OidPath: path, Filename: filename, size: fi.Size()}, nil
}
func NewUploadableWithoutFilename(oid string) (*Uploadable, *WrappedError) {
path, err := LocalMediaPath(oid)
if err != nil {
return nil, Errorf(err, "Error uploading file %s", oid)
}
fi, err := os.Stat(path)
if err != nil {
return nil, Errorf(err, "Error uploading file %s", oid)
}
return &Uploadable{oid: oid, OidPath: path, Filename: "", size: fi.Size()}, nil
return &Uploadable{oid: oid, OidPath: localMediaPath, Filename: filename, size: fi.Size()}, nil
}
func (u *Uploadable) Check() (*objectResource, *WrappedError) {