touch command added. Centralized cmd keys

Author: Emmanuel Odeke

cmd/drive/main.go

@@ -40,19 +40,20 @@ func main() {
 	}
 	runtime.GOMAXPROCS(int(maxProcs))
 
-	command.On("diff", drive.DescDiff, &diffCmd{}, []string{})
-	command.On("init", drive.DescInit, &initCmd{}, []string{})
-	command.On("list", drive.DescList, &listCmd{}, []string{})
-	command.On("pull", drive.DescPull, &pullCmd{}, []string{})
-	command.On("push", drive.DescPush, &pushCmd{}, []string{})
-	command.On("pub", drive.DescPublish, &publishCmd{}, []string{})
-	command.On("emptytrash", drive.DescEmptyTrash, &emptyTrashCmd{}, []string{})
-	command.On("help", drive.DescHelp, &helpCmd{}, []string{})
-	command.On("quota", drive.DescQuota, &quotaCmd{}, []string{})
-	command.On("trash", drive.DescTrash, &trashCmd{}, []string{})
-	command.On("untrash", drive.DescUntrash, &untrashCmd{}, []string{})
-	command.On("unpub", drive.DescUnpublish, &unpublishCmd{}, []string{})
-	command.On("version", drive.Version, &versionCmd{}, []string{})
+	command.On(drive.DiffKey, drive.DescDiff, &diffCmd{}, []string{})
+	command.On(drive.EmptyTrashKey, drive.DescEmptyTrash, &emptyTrashCmd{}, []string{})
+	command.On(drive.InitKey, drive.DescInit, &initCmd{}, []string{})
+	command.On(drive.HelpKey, drive.DescHelp, &helpCmd{}, []string{})
+	command.On(drive.ListKey, drive.DescList, &listCmd{}, []string{})
+	command.On(drive.PullKey, drive.DescPull, &pullCmd{}, []string{})
+	command.On(drive.PushKey, drive.DescPush, &pushCmd{}, []string{})
+	command.On(drive.PubKey, drive.DescPublish, &publishCmd{}, []string{})
+	command.On(drive.QuotaKey, drive.DescQuota, &quotaCmd{}, []string{})
+	command.On(drive.TouchKey, drive.DescTouch, &touchCmd{}, []string{})
+	command.On(drive.TrashKey, drive.DescTrash, &trashCmd{}, []string{})
+	command.On(drive.UntrashKey, drive.DescUntrash, &untrashCmd{}, []string{})
+	command.On(drive.UnpubKey, drive.DescUnpublish, &unpublishCmd{}, []string{})
+	command.On(drive.VersionKey, drive.Version, &versionCmd{}, []string{})
 	command.ParseAndRun()
 }
 
@@ -281,6 +282,30 @@ func (cmd *pushCmd) Run(args []string) {
 	}
 }
 
+type touchCmd struct {
+	hidden    *bool
+	noPrompt  *bool
+	recursive *bool
+}
+
+func (cmd *touchCmd) Flags(fs *flag.FlagSet) *flag.FlagSet {
+	cmd.hidden = fs.Bool("hidden", false, "allows pushing of hidden paths")
+	cmd.recursive = fs.Bool("r", true, "performs the push action recursively")
+	cmd.noPrompt = fs.Bool("no-prompt", false, "shows no prompt before applying the push action")
+	return fs
+}
+
+func (cmd *touchCmd) Run(args []string) {
+	sources, context, path := preprocessArgs(args)
+	exitWithError(drive.New(context, &drive.Options{
+		Hidden:    *cmd.hidden,
+		NoPrompt:  *cmd.noPrompt,
+		Path:      path,
+		Recursive: *cmd.recursive,
+		Sources:   sources,
+	}).Touch())
+}
+
 func pushMounted(cmd *pushCmd, args []string) {
 	argc := len(args)
 

help.go

@@ -20,6 +20,23 @@ import (
 
 var Version = "0.0.4c"
 
+const (
+	DiffKey       = "diff"
+	EmptyTrashKey = "emptytrash"
+	InitKey       = "init"
+	ListKey       = "list"
+	PullKey       = "pull"
+	PushKey       = "push"
+	PubKey        = "pub"
+	HelpKey       = "help"
+	QuotaKey      = "quota"
+	TouchKey      = "touch"
+	TrashKey      = "trash"
+	UntrashKey    = "untrash"
+	UnpubKey      = "unpub"
+	VersionKey    = "version"
+)
+
 const (
 	DescInit       = "initializes a directory and authenticates user"
 	DescPull       = "pulls remote changes from Google Drive"
@@ -33,44 +50,48 @@ const (
 	DescTrash      = "moves files to trash"
 	DescUntrash    = "restores files from trash to their original locations"
 	DescUnpublish  = "revokes public access to a file"
+	DescTouch      = "updates a remote file's modification time to that currently on the server"
 	DescVersion    = "prints the version"
 	DescAll        = "print out the entire help section"
 	All            = "all"
 )
 
 var docMap = map[string][]string{
-	"diff": []string{
+	DiffKey: []string{
 		DescDiff, "Accepts multiple remote paths for line by line comparison",
 	},
-	"emptytrash": []string{
+	EmptyTrashKey: []string{
 		DescEmptyTrash,
 	},
-	"init": []string{
+	InitKey: []string{
 		DescInit, "Requests for access to your Google Drive",
 		"Creating a folder that contains your credentials",
 		"Note: init in an already initialized drive will erase the old credentials",
 	},
-	"pull": []string{
+	PullKey: []string{
 		DescPull, "Downloads content from the remote drive or modifies",
 		" local content to match that on your Google Drive",
 	},
-	"push": []string{
+	PushKey: []string{
 		DescPush, "Uploads content to your Google Drive from your local path",
 		"Push comes in a couple of flavors",
 		"\t* Ordinary push: `drive push path1 path2 path3`",
 		"\t* Mounted push: `drive push -m path1 [path2 path3] drive_context_path`",
 	},
-	"list": []string{
+	ListKey: []string{
 		DescList,
 		"List the information related a remote path not necessarily present locally",
 		"Allows printing of long options and by default does minimal printing",
 	},
-	"quota":   []string{DescQuota},
-	"trash":   []string{DescTrash, "Accepts multiple paths"},
-	"untrash": []string{DescUntrash, "Accepts multiple paths"},
-	"pub":     []string{DescPublish, "Accepts multiple paths"},
-	"unpub":   []string{DescUnpublish, "Accepts multiple paths"},
-	"version": []string{DescVersion, fmt.Sprintf("current version is: %s", Version)},
+	QuotaKey:   []string{DescQuota},
+	TrashKey:   []string{DescTrash, "Accepts multiple paths"},
+	UntrashKey: []string{DescUntrash, "Accepts multiple paths"},
+	PubKey:     []string{DescPublish, "Accepts multiple paths"},
+	UnpubKey:   []string{DescUnpublish, "Accepts multiple paths"},
+	TouchKey:   []string{DescTouch},
+	VersionKey: []string{
+		DescVersion, fmt.Sprintf("current version is: %s", Version),
+	},
 }
 
 func ShowAllDescriptions() {

push.go

@@ -22,6 +22,7 @@ import (
 	gopath "path"
 	"sort"
 	"strings"
+	"sync"
 
 	"github.com/odeke-em/drive/config"
 )
@@ -87,6 +88,52 @@ func (g *Commands) Push() (err error) {
 	return
 }
 
+func (g *Commands) Touch() (err error) {
+	srcLen := len(g.opts.Sources)
+	chunkSize := 4
+	q, r := srcLen/chunkSize, srcLen%chunkSize
+	i, chunkCount := 0, q
+	if r != 0 {
+		chunkCount += 1
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(chunkCount)
+
+	for j := 0; j < chunkCount; j += 1 {
+		end := i + chunkSize
+		if end >= srcLen {
+			end = srcLen
+		}
+		chunk := g.opts.Sources[i:end]
+		go func(wg *sync.WaitGroup, chunk []string) {
+			for _, relToRootPath := range chunk {
+				if tErr := g.touch(relToRootPath); tErr != nil {
+					fmt.Printf("touch: %s %v\n", relToRootPath, tErr)
+				}
+			}
+			wg.Done()
+		}(&wg, chunk)
+
+		i += chunkSize
+	}
+
+	wg.Wait()
+	return
+}
+
+func (g *Commands) touch(relToRootPath string) (err error) {
+	var file *File
+	file, err = g.rem.FindByPath(relToRootPath)
+	if err != nil {
+		return err
+	}
+	if file == nil {
+		return ErrPathNotExists
+	}
+	return g.rem.Touch(file.Id)
+}
+
 func (g *Commands) playPushChangeList(cl []*Change) (err error) {
 	g.taskStart(len(cl))
 

remote.go

@@ -244,6 +244,11 @@ func (r *Remote) Download(id string, exportURL string) (io.ReadCloser, error) {
 	return resp.Body, nil
 }
 
+func (r *Remote) Touch(id string) error {
+	_, err := r.service.Files.Touch(id).Do()
+	return err
+}
+
 func (r *Remote) UpsertByComparison(parentId, fsAbsPath string, src, dest *File) (f *File, err error) {
 	var body io.Reader
 	body, err = os.Open(fsAbsPath)