diff --git a/lfs/download_queue.go b/lfs/download_queue.go index c211e47e..40c2b976 100644 --- a/lfs/download_queue.go +++ b/lfs/download_queue.go @@ -40,11 +40,11 @@ func NewDownloadable(p *WrappedPointer) *Downloadable { } // NewDownloadCheckQueue builds a checking queue, checks that objects are there but doesn't download -func NewDownloadCheckQueue(options ...TransferQueueOption) *TransferQueue { +func NewDownloadCheckQueue(options ...transferQueueOption) *TransferQueue { return newTransferQueue(transfer.Download, options...) } // NewDownloadQueue builds a DownloadQueue, allowing concurrent downloads. -func NewDownloadQueue(options ...TransferQueueOption) *TransferQueue { +func NewDownloadQueue(options ...transferQueueOption) *TransferQueue { return newTransferQueue(transfer.Download, options...) } diff --git a/lfs/transfer_queue.go b/lfs/transfer_queue.go index 0d213922..d684a5bd 100644 --- a/lfs/transfer_queue.go +++ b/lfs/transfer_queue.go @@ -115,22 +115,22 @@ type TransferQueue struct { rc *retryCounter } -type TransferQueueOption func(*TransferQueue) +type transferQueueOption func(*TransferQueue) -func DryRun(dryRun bool) TransferQueueOption { +func DryRun(dryRun bool) transferQueueOption { return func(tq *TransferQueue) { tq.dryRun = dryRun } } -func WithProgress(m progress.Meter) TransferQueueOption { +func WithProgress(m progress.Meter) transferQueueOption { return func(tq *TransferQueue) { tq.meter = m } } // newTransferQueue builds a TransferQueue, direction and underlying mechanism determined by adapter -func newTransferQueue(dir transfer.Direction, options ...TransferQueueOption) *TransferQueue { +func newTransferQueue(dir transfer.Direction, options ...transferQueueOption) *TransferQueue { q := &TransferQueue{ direction: dir, retriesc: make(chan Transferable, batchSize), diff --git a/lfs/upload_queue.go b/lfs/upload_queue.go index e0e5472e..e7683acc 100644 --- a/lfs/upload_queue.go +++ b/lfs/upload_queue.go @@ -67,7 +67,7 @@ func NewUploadable(oid, filename string) (*Uploadable, error) { } // NewUploadQueue builds an UploadQueue, allowing `workers` concurrent uploads. -func NewUploadQueue(options ...TransferQueueOption) *TransferQueue { +func NewUploadQueue(options ...transferQueueOption) *TransferQueue { return newTransferQueue(transfer.Upload, options...) } diff --git a/progress/meter.go b/progress/meter.go index 9c1f524f..e4e73a20 100644 --- a/progress/meter.go +++ b/progress/meter.go @@ -37,9 +37,9 @@ type env interface { Get(key string) (val string, ok bool) } -type MeterOption func(*ProgressMeter) +type meterOption func(*ProgressMeter) -func WithLogFile(name string) MeterOption { +func WithLogFile(name string) meterOption { printErr := func(err string) { fmt.Fprintf(os.Stderr, "Error creating progress logger: %s\n", err) } @@ -71,13 +71,13 @@ func WithLogFile(name string) MeterOption { } } -func WithOSEnv(os env) MeterOption { +func WithOSEnv(os env) meterOption { name, _ := os.Get("GIT_LFS_PROGRESS") return WithLogFile(name) } // NewMeter creates a new ProgressMeter. -func NewMeter(options ...MeterOption) *ProgressMeter { +func NewMeter(options ...meterOption) *ProgressMeter { m := &ProgressMeter{ logger: &progressLogger{}, startTime: time.Now(),