From a22a5f2008daefc48fbe4c1752df9d6327865ee7 Mon Sep 17 00:00:00 2001 From: Diwaker Gupta Date: Mon, 14 Mar 2016 13:03:01 -0700 Subject: [PATCH] Adapt to new generators. --- cmd/add-member.go | 8 ++------ cmd/get.go | 3 +-- cmd/ls.go | 6 ++---- cmd/mkdir.go | 3 +-- cmd/put.go | 14 ++++---------- cmd/remove-member.go | 3 +-- cmd/restore.go | 4 +--- cmd/revs.go | 3 +-- cmd/rm.go | 3 +-- cmd/root.go | 4 +--- cmd/search.go | 3 +-- 11 files changed, 16 insertions(+), 38 deletions(-) diff --git a/cmd/add-member.go b/cmd/add-member.go index abe7460..b9c3240 100644 --- a/cmd/add-member.go +++ b/cmd/add-member.go @@ -25,12 +25,8 @@ func addMember(cmd *cobra.Command, args []string) (err error) { email := args[0] firstName := args[1] lastName := args[2] - arg := team.NewMembersAddArg() - member := team.NewMemberAddArg() - member.MemberEmail = email - member.MemberGivenName = firstName - member.MemberSurname = lastName - arg.NewMembers = append(arg.NewMembers, member) + member := team.NewMemberAddArg(email, firstName, lastName) + arg := team.NewMembersAddArg([]*team.MemberAddArg{member}) res, err := dbx.MembersAdd(arg) if err != nil { return err diff --git a/cmd/get.go b/cmd/get.go index 872102c..6a72bc8 100644 --- a/cmd/get.go +++ b/cmd/get.go @@ -33,8 +33,7 @@ func get(cmd *cobra.Command, args []string) (err error) { dst = path.Base(src) } - arg := files.NewDownloadArg() - arg.Path = src + arg := files.NewDownloadArg(src) res, contents, err := dbx.Download(arg) defer contents.Close() diff --git a/cmd/ls.go b/cmd/ls.go index 8a79955..12fe059 100644 --- a/cmd/ls.go +++ b/cmd/ls.go @@ -46,8 +46,7 @@ func ls(cmd *cobra.Command, args []string) (err error) { } } - arg := files.NewListFolderArg() - arg.Path = path + arg := files.NewListFolderArg(path) res, err := dbx.ListFolder(arg) if err != nil { @@ -57,8 +56,7 @@ func ls(cmd *cobra.Command, args []string) (err error) { entries := res.Entries for res.HasMore { - arg := files.NewListFolderContinueArg() - arg.Cursor = res.Cursor + arg := files.NewListFolderContinueArg(res.Cursor) res, err = dbx.ListFolderContinue(arg) if err != nil { diff --git a/cmd/mkdir.go b/cmd/mkdir.go index f59b38a..4c54fae 100644 --- a/cmd/mkdir.go +++ b/cmd/mkdir.go @@ -25,8 +25,7 @@ func mkdir(cmd *cobra.Command, args []string) (err error) { return } - arg := files.NewCreateFolderArg() - arg.Path = dst + arg := files.NewCreateFolderArg(dst) if _, err = dbx.CreateFolder(arg); err != nil { return diff --git a/cmd/put.go b/cmd/put.go index c242741..5cbcf30 100644 --- a/cmd/put.go +++ b/cmd/put.go @@ -35,9 +35,7 @@ func uploadChunked(r io.Reader, commitInfo *files.CommitInfo, sizeTotal int64) ( written := chunkSize for (sizeTotal - written) > chunkSize { - args := files.NewUploadSessionCursor() - args.SessionId = res.SessionId - args.Offset = uint64(written) + args := files.NewUploadSessionCursor(res.SessionId, uint64(written)) err = dbx.UploadSessionAppend(args, &io.LimitedReader{R: r, N: chunkSize}) if err != nil { @@ -46,11 +44,8 @@ func uploadChunked(r io.Reader, commitInfo *files.CommitInfo, sizeTotal int64) ( written += chunkSize } - args := files.NewUploadSessionFinishArg() - args.Cursor = files.NewUploadSessionCursor() - args.Cursor.SessionId = res.SessionId - args.Cursor.Offset = uint64(written) - args.Commit = commitInfo + cursor := files.NewUploadSessionCursor(res.SessionId, uint64(written)) + args := files.NewUploadSessionFinishArg(cursor, commitInfo) if _, err = dbx.UploadSessionFinish(args, r); err != nil { return @@ -87,8 +82,7 @@ func put(cmd *cobra.Command, args []string) (err error) { Size: contentsInfo.Size(), } - commitInfo := files.NewCommitInfo() - commitInfo.Path = dst + commitInfo := files.NewCommitInfo(dst) commitInfo.Mode.Tag = "overwrite" if contentsInfo.Size() > chunkSize { diff --git a/cmd/remove-member.go b/cmd/remove-member.go index b2fe720..970d89b 100644 --- a/cmd/remove-member.go +++ b/cmd/remove-member.go @@ -23,8 +23,7 @@ import ( func removeMember(cmd *cobra.Command, args []string) (err error) { email := args[0] - arg := team.NewMembersRemoveArg() - arg.User = &team.UserSelectorArg{Tag: "email", Email: email} + arg := team.NewMembersRemoveArg(&team.UserSelectorArg{Tag: "email", Email: email}) res, err := dbx.MembersRemove(arg) if err != nil { return err diff --git a/cmd/restore.go b/cmd/restore.go index bdfeb06..17b40ba 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -27,9 +27,7 @@ func restore(cmd *cobra.Command, args []string) (err error) { rev := args[1] - arg := files.NewRestoreArg() - arg.Path = path - arg.Rev = rev + arg := files.NewRestoreArg(path, rev) if _, err = dbx.Restore(arg); err != nil { return diff --git a/cmd/revs.go b/cmd/revs.go index c2eb7a6..08f9425 100644 --- a/cmd/revs.go +++ b/cmd/revs.go @@ -28,8 +28,7 @@ func revs(cmd *cobra.Command, args []string) (err error) { return } - arg := files.NewListRevisionsArg() - arg.Path = path + arg := files.NewListRevisionsArg(path) res, err := dbx.ListRevisions(arg) if err != nil { diff --git a/cmd/rm.go b/cmd/rm.go index eb21d2a..a1ecc8f 100644 --- a/cmd/rm.go +++ b/cmd/rm.go @@ -25,8 +25,7 @@ func rm(cmd *cobra.Command, args []string) (err error) { return } - arg := files.NewDeleteArg() - arg.Path = path + arg := files.NewDeleteArg(path) if _, err = dbx.Delete(arg); err != nil { return diff --git a/cmd/root.go b/cmd/root.go index 88ce27a..671c01a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -67,9 +67,7 @@ func makeRelocationArg(s string, d string) (arg *files.RelocationArg, err error) return } - arg = files.NewRelocationArg() - arg.FromPath = src - arg.ToPath = dst + arg = files.NewRelocationArg(src, dst) return } diff --git a/cmd/search.go b/cmd/search.go index eea2885..81e1287 100644 --- a/cmd/search.go +++ b/cmd/search.go @@ -23,8 +23,7 @@ import ( ) func search(cmd *cobra.Command, args []string) (err error) { - arg := files.NewSearchArg() - arg.Query = args[0] + arg := files.NewSearchArg("", args[0]) res, err := dbx.Search(arg) if err != nil {