fixed merge conflicts from master

Author: odeke-em

src/changes.go

@@ -30,10 +30,19 @@ import (
 type destination int
 
 const (
-	SelectSrc = 1 << iota
+	SelectSrc destination = 1 << iota
 	SelectDest
 )
 
+type Agreement int
+
+const (
+	NotApplicable Agreement = 1 << iota
+	Rejected
+	Accepted
+	AcceptedImplicitly
+)
+
 type dirList struct {
 	remote *File
 	local  *File
@@ -658,22 +667,46 @@ func previewChanges(clArgs *changeListArg, reduce bool, opMap map[Operation]size
 	}
 }
 
-func printChangeList(clArg *changeListArg) (bool, *map[Operation]sizeCounter) {
+func rejected(status Agreement) bool {
+	return (status & Rejected) != 0
+}
+
+func accepted(status Agreement) bool {
+	return (status&Accepted) != 0 || (status&AcceptedImplicitly) != 0
+}
+
+func notApplicable(status Agreement) bool {
+	return (status & NotApplicable) != 0
+}
+
+func (ag *Agreement) Error() error {
+	switch *ag {
+	case Rejected:
+		return ErrRejectedTerms
+	}
+
+	return nil
+}
+
+func printChangeList(clArg *changeListArg) (Agreement, *map[Operation]sizeCounter) {
 	if len(clArg.changes) == 0 {
 		clArg.logy.Logln("Everything is up-to-date.")
-		return false, nil
+		return NotApplicable, nil
 	}
 	if !clArg.canPreview {
-		return true, nil
+		return AcceptedImplicitly, nil
 	}
 
 	opMap := opChangeCount(clArg.changes)
 	previewChanges(clArg, true, opMap)
 
-	accepted := clArg.noPrompt
-	if !accepted {
-		accepted = promptForChanges()
+	status := Rejected
+	if clArg.noPrompt {
+		status = AcceptedImplicitly
+	}
+	if !accepted(status) {
+		status = promptForChanges()
 	}
 
-	return accepted, &opMap
+	return status, &opMap
 }

src/commands.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/cheggaaa/pb"
 	"github.com/mattn/go-isatty"
-	expirable "github.com/odeke-em/cache"
+	expirableCache "github.com/odeke-em/cache"
 	"github.com/odeke-em/drive/config"
 	"github.com/odeke-em/log"
 )
@@ -99,7 +99,7 @@ type Commands struct {
 	log     *log.Logger
 
 	progress      *pb.ProgressBar
-	mkdirAllCache *expirable.OperationCache
+	mkdirAllCache *expirableCache.OperationCache
 }
 
 func (opts *Options) canPrompt() bool {
@@ -194,7 +194,7 @@ func New(context *config.Context, opts *Options) *Commands {
 		rem:           r,
 		opts:          opts,
 		log:           logger,
-		mkdirAllCache: expirable.New(),
+		mkdirAllCache: expirableCache.New(),
 	}
 }
 

src/edit.go

@@ -49,8 +49,8 @@ func (g *Commands) EditDescription(byId bool) (composedErr error) {
 
 	if description == "" && g.opts.canPrompt() {
 		g.log.Logln("Using an empty description will clear out the previous one")
-		if !promptForChanges() {
-			return
+		if status := promptForChanges(); !accepted(status) {
+			return status.Error()
 		}
 	}
 

src/fetch.go

@@ -93,9 +93,9 @@ func (g *Commands) fetch(fetchOp int) (err error) {
 		noClobber: g.opts.NoClobber,
 	}
 
-	ok, opMap := printFetchChangeList(&clArg)
-	if !ok {
-		return nil
+	status, opMap := printFetchChangeList(&clArg)
+	if !accepted(status) {
+		return status.Error()
 	}
 
 	return g.playFetchChanges(cl, opMap)
@@ -315,13 +315,13 @@ func (g *Commands) createIndex(f *File) (err error) {
 	return g.context.SerializeIndex(index)
 }
 
-func printFetchChangeList(clArg *changeListArg) (bool, *map[Operation]sizeCounter) {
+func printFetchChangeList(clArg *changeListArg) (Agreement, *map[Operation]sizeCounter) {
 	if len(clArg.changes) == 0 {
 		clArg.logy.Logln("Everything is up-to-date.")
-		return false, nil
+		return NotApplicable, nil
 	}
 	if clArg.noPrompt {
-		return true, nil
+		return AcceptedImplicitly, nil
 	}
 
 	logy := clArg.logy

src/init.go

@@ -44,7 +44,8 @@ func (g *Commands) DeInit() error {
 			return true
 		}
 
-		return promptForChanges(args...)
+		status := promptForChanges(args...)
+		return accepted(status)
 	}
 
 	return g.context.DeInitialize(prompt, true)

src/misc.go

@@ -33,10 +33,17 @@ import (
 
 	"google.golang.org/api/googleapi"
 
+	expirableCache "github.com/odeke-em/cache"
 	spinner "github.com/odeke-em/cli-spinner"
 	"github.com/odeke-em/drive/config"
 )
 
+var (
+	// ErrRejectedTerms is empty "" because messages might be too
+	// verbose to affirm a rejection that a user has already seen
+	ErrRejectedTerms = errors.New("")
+)
+
 const (
 	MimeTypeJoiner      = "-"
 	RemoteDriveRootPath = "My Drive"
@@ -246,7 +253,7 @@ func nextPage() bool {
 	return true
 }
 
-func promptForChanges(args ...interface{}) bool {
+func promptForChanges(args ...interface{}) Agreement {
 	argv := []interface{}{
 		"Proceed with the changes? [Y/n]:",
 	}
@@ -260,7 +267,11 @@ func promptForChanges(args ...interface{}) bool {
 		input = YesShortKey
 	}
 
-	return strings.ToUpper(input) == YesShortKey
+	if strings.ToUpper(input) == YesShortKey {
+		return Accepted
+	}
+
+	return Rejected
 }
 
 func (f *File) toDesktopEntry(urlMExt *urlMimeTypeExt) *desktopEntry {
@@ -624,36 +635,8 @@ func customQuote(s string) string {
 	return "\"" + strings.Replace(strings.Replace(s, "\\", "\\\\", -1), "\"", "\\\"", -1) + "\""
 }
 
-type expirableCacheValue struct {
-	value     interface{}
-	entryTime time.Time
-}
-
-func (e *expirableCacheValue) Expired(q time.Time) bool {
-	if e == nil {
-		return true
-	}
-
-	return e.entryTime.Before(q)
-}
-
-func (e *expirableCacheValue) Value() interface{} {
-	if e == nil {
-		return nil
-	}
-
-	return e.value
-}
-
-func newExpirableCacheValueWithOffset(v interface{}, offset time.Duration) *expirableCacheValue {
-	return &expirableCacheValue{
-		value:     v,
-		entryTime: time.Now().Add(offset),
-	}
-}
-
-var newExpirableCacheValue = func(v interface{}) *expirableCacheValue {
-	return newExpirableCacheValueWithOffset(v, time.Hour)
+func newExpirableCacheValue(v interface{}) *expirableCache.ExpirableValue {
+	return expirableCache.NewExpirableValueWithOffset(v, uint64(time.Hour))
 }
 
 func reComposeError(prevErr error, messages ...string) error {

src/pull.go

@@ -119,9 +119,9 @@ func pull(g *Commands, pt pullType) error {
 		canPreview: g.opts.canPreview(),
 	}
 
-	ok, opMap := printChangeList(&clArg)
-	if !ok {
-		return nil
+	status, opMap := printChangeList(&clArg)
+	if !accepted(status) {
+		return status.Error()
 	}
 
 	return g.playPullChanges(nonConflicts, g.opts.Exports, opMap)
@@ -173,7 +173,8 @@ func autoRenameClashes(g *Commands, clashes []*Change) error {
 		for _, r := range renames {
 			g.log.Logf("%v %v -> %v\n", r.originalPath, r.change.Src.Id, r.newName)
 		}
-		if !promptForChanges("Proceed with the changes [Y/N] ? ") {
+		status := promptForChanges("Proceed with the changes [Y/N] ? ")
+		if !accepted(status) {
 			return ErrClashesDetected
 		}
 	}

src/push.go

@@ -134,8 +134,8 @@ func (g *Commands) Push() (err error) {
 		}
 
 		g.log.LogErrf(" %s", unSafeQuotaMsg)
-		if !promptForChanges() {
-			return
+		if status := promptForChanges(); !accepted(status) {
+			return status.Error()
 		}
 	}
 
@@ -147,9 +147,9 @@ func (g *Commands) Push() (err error) {
 		canPreview: g.opts.canPreview(),
 	}
 
-	ok, opMap := printChangeList(&clArg)
-	if !ok {
-		return
+	status, opMap := printChangeList(&clArg)
+	if !accepted(status) {
+		return status.Error()
 	}
 
 	return g.playPushChanges(nonConflicts, opMap)

src/share.go

@@ -175,9 +175,9 @@ func (c *Commands) Share(byId bool) (err error) {
 	return c.share(false, byId)
 }
 
-func showPromptShareChanges(logy *log.Logger, change *shareChange) bool {
+func showPromptShareChanges(logy *log.Logger, change *shareChange) Agreement {
 	if len(change.files) < 1 {
-		return false
+		return NotApplicable
 	}
 	if change.revoke {
 		logy.Logf("Revoke access for accountType: \033[92m%s\033[00m for file(s):\n",
@@ -190,7 +190,7 @@ func showPromptShareChanges(logy *log.Logger, change *shareChange) bool {
 	}
 
 	if len(change.emails) < 1 {
-		return false
+		return NotApplicable
 	}
 
 	if change.notify {
@@ -213,8 +213,10 @@ func showPromptShareChanges(logy *log.Logger, change *shareChange) bool {
 }
 
 func (c *Commands) playShareChanges(change *shareChange) error {
-	if c.opts.canPrompt() && !showPromptShareChanges(c.log, change) {
-		return nil
+	if c.opts.canPrompt() {
+		if status := showPromptShareChanges(c.log, change); !accepted(status) {
+			return status.Error()
+		}
 	}
 
 	for _, file := range change.files {

src/trash.go

@@ -78,9 +78,9 @@ func (g *Commands) EmptyTrash() error {
 
 		g.log.Logln("This operation is irreversible. Empty trash! ")
 
-		if !promptForChanges() {
+		if status := promptForChanges(); !accepted(status) {
 			g.log.Logln("Aborted emptying trash")
-			return nil
+			return status.Error()
 		}
 	}
 
@@ -168,9 +168,9 @@ func (g *Commands) trashByMatch(inTrash, permanent bool) error {
 		noClobber: false,
 	}
 
-	ok, _ := printChangeList(&clArg)
-	if !ok {
-		return nil
+	status, _ := printChangeList(&clArg)
+	if !accepted(status) {
+		return status.Error()
 	}
 
 	toTrash := !inTrash
@@ -212,14 +212,15 @@ func (g *Commands) reduceForTrash(args []string, opt *trashOpt) error {
 		noClobber: false,
 	}
 
-	ok, _ := printChangeList(&clArg)
-	if !ok {
-		return nil
+	status, _ := printChangeList(&clArg)
+	if !accepted(status) {
+		return status.Error()
 	}
 
 	if opt.permanent && g.opts.canPrompt() {
-		if !promptForChanges("This operation is irreversible. Continue [Y/N] ") {
-			return nil
+		status := promptForChanges("This operation is irreversible. Continue [Y/N] ")
+		if !accepted(status) {
+			return status.Error()
 		}
 	}
 	return g.playTrashChangeList(cl, opt)