Remove unnecessary parameters from NewUploadable function.

This commit is contained in:
Lars Schneider 2015-07-06 13:13:57 +02:00
parent 29f6944265
commit d52b1880ae
3 changed files with 5 additions and 5 deletions

@ -73,13 +73,13 @@ func prePushCommand(cmd *cobra.Command, args []string) {
uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(pointers)) uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(pointers))
for i, pointer := range pointers { for _, pointer := range pointers {
if prePushDryRun { if prePushDryRun {
Print("push %s", pointer.Name) Print("push %s", pointer.Name)
continue continue
} }
u, wErr := lfs.NewUploadable(pointer.Oid, pointer.Name, i+1, len(pointers)) u, wErr := lfs.NewUploadable(pointer.Oid, pointer.Name)
if wErr != nil { if wErr != nil {
if Debugging || wErr.Panic { if Debugging || wErr.Panic {
Panic(wErr.Err, wErr.Error()) Panic(wErr.Err, wErr.Error())

@ -41,7 +41,7 @@ func uploadsBetweenRefs(left string, right string) *lfs.TransferQueue {
} }
tracerx.Printf("checking_asset: %s %s %d/%d", pointer.Oid, pointer.Name, i+1, len(pointers)) tracerx.Printf("checking_asset: %s %s %d/%d", pointer.Oid, pointer.Name, i+1, len(pointers))
u, wErr := lfs.NewUploadable(pointer.Oid, pointer.Name, i+1, len(pointers)) u, wErr := lfs.NewUploadable(pointer.Oid, pointer.Name)
if wErr != nil { if wErr != nil {
if Debugging || wErr.Panic { if Debugging || wErr.Panic {
Panic(wErr.Err, wErr.Error()) Panic(wErr.Err, wErr.Error())
@ -59,7 +59,7 @@ func uploadsWithObjectIDs(oids []string) *lfs.TransferQueue {
uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(oids)) uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(oids))
for _, oid := range oids { for _, oid := range oids {
u, wErr := lfs.NewUploadable(oid, "", 0, 0) u, wErr := lfs.NewUploadable(oid, "")
if wErr != nil { if wErr != nil {
if Debugging || wErr.Panic { if Debugging || wErr.Panic {
Panic(wErr.Err, wErr.Error()) Panic(wErr.Err, wErr.Error())

@ -17,7 +17,7 @@ type Uploadable struct {
// NewUploadable builds the Uploadable from the given information. // 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)/ // "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) { func NewUploadable(oid, filename string) (*Uploadable, *WrappedError) {
localMediaPath, err := LocalMediaPath(oid) localMediaPath, err := LocalMediaPath(oid)
if err != nil { if err != nil {
return nil, Errorf(err, "Error uploading file %s (%s)", filename, oid) return nil, Errorf(err, "Error uploading file %s (%s)", filename, oid)