un-export the option func types

This commit is contained in:
risk danger olson 2016-12-07 13:18:33 -07:00
parent 110605a288
commit 7538addd11
4 changed files with 11 additions and 11 deletions

@ -40,11 +40,11 @@ func NewDownloadable(p *WrappedPointer) *Downloadable {
} }
// NewDownloadCheckQueue builds a checking queue, checks that objects are there but doesn't download // 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...) return newTransferQueue(transfer.Download, options...)
} }
// NewDownloadQueue builds a DownloadQueue, allowing concurrent downloads. // NewDownloadQueue builds a DownloadQueue, allowing concurrent downloads.
func NewDownloadQueue(options ...TransferQueueOption) *TransferQueue { func NewDownloadQueue(options ...transferQueueOption) *TransferQueue {
return newTransferQueue(transfer.Download, options...) return newTransferQueue(transfer.Download, options...)
} }

@ -115,22 +115,22 @@ type TransferQueue struct {
rc *retryCounter rc *retryCounter
} }
type TransferQueueOption func(*TransferQueue) type transferQueueOption func(*TransferQueue)
func DryRun(dryRun bool) TransferQueueOption { func DryRun(dryRun bool) transferQueueOption {
return func(tq *TransferQueue) { return func(tq *TransferQueue) {
tq.dryRun = dryRun tq.dryRun = dryRun
} }
} }
func WithProgress(m progress.Meter) TransferQueueOption { func WithProgress(m progress.Meter) transferQueueOption {
return func(tq *TransferQueue) { return func(tq *TransferQueue) {
tq.meter = m tq.meter = m
} }
} }
// newTransferQueue builds a TransferQueue, direction and underlying mechanism determined by adapter // 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{ q := &TransferQueue{
direction: dir, direction: dir,
retriesc: make(chan Transferable, batchSize), retriesc: make(chan Transferable, batchSize),

@ -67,7 +67,7 @@ func NewUploadable(oid, filename string) (*Uploadable, error) {
} }
// NewUploadQueue builds an UploadQueue, allowing `workers` concurrent uploads. // NewUploadQueue builds an UploadQueue, allowing `workers` concurrent uploads.
func NewUploadQueue(options ...TransferQueueOption) *TransferQueue { func NewUploadQueue(options ...transferQueueOption) *TransferQueue {
return newTransferQueue(transfer.Upload, options...) return newTransferQueue(transfer.Upload, options...)
} }

@ -37,9 +37,9 @@ type env interface {
Get(key string) (val string, ok bool) 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) { printErr := func(err string) {
fmt.Fprintf(os.Stderr, "Error creating progress logger: %s\n", err) 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") name, _ := os.Get("GIT_LFS_PROGRESS")
return WithLogFile(name) return WithLogFile(name)
} }
// NewMeter creates a new ProgressMeter. // NewMeter creates a new ProgressMeter.
func NewMeter(options ...MeterOption) *ProgressMeter { func NewMeter(options ...meterOption) *ProgressMeter {
m := &ProgressMeter{ m := &ProgressMeter{
logger: &progressLogger{}, logger: &progressLogger{},
startTime: time.Now(), startTime: time.Now(),