diff options
| -rw-r--r-- | drive/info.go | 4 | ||||
| -rw-r--r-- | drive/url.go | 28 | ||||
| -rw-r--r-- | gdrive.go | 16 | ||||
| -rw-r--r-- | handlers_drive.go | 9 |
4 files changed, 3 insertions, 54 deletions
diff --git a/drive/info.go b/drive/info.go index 936b7da..d8383c3 100644 --- a/drive/info.go +++ b/drive/info.go @@ -13,7 +13,7 @@ type FileInfoArgs struct { } func (self *Drive) Info(args FileInfoArgs) (err error) { - f, err := self.service.Files.Get(args.Id).Fields("id", "name", "size", "createdTime", "modifiedTime", "md5Checksum", "mimeType", "parents", "shared", "description").Do() + f, err := self.service.Files.Get(args.Id).Fields("id", "name", "size", "createdTime", "modifiedTime", "md5Checksum", "mimeType", "parents", "shared", "description", "webContentLink", "webViewLink").Do() if err != nil { return fmt.Errorf("Failed to get file: %s", err) } @@ -47,6 +47,8 @@ func PrintFileInfo(args PrintFileInfoArgs) { kv{"Md5sum", f.Md5Checksum}, kv{"Shared", formatBool(f.Shared)}, kv{"Parents", formatList(f.Parents)}, + kv{"ViewUrl", f.WebViewLink}, + kv{"DownloadUrl", f.WebContentLink}, } for _, item := range items { diff --git a/drive/url.go b/drive/url.go deleted file mode 100644 index 9dee4ad..0000000 --- a/drive/url.go +++ /dev/null @@ -1,28 +0,0 @@ -package drive - -import ( - "io" - "fmt" -) - -type UrlArgs struct { - Out io.Writer - FileId string - DownloadUrl bool -} - -func (self *Drive) Url(args UrlArgs) { - if args.DownloadUrl { - fmt.Fprintln(args.Out, downloadUrl(args.FileId)) - return - } - fmt.Fprintln(args.Out, previewUrl(args.FileId)) -} - -func previewUrl(id string) string { - return fmt.Sprintf("https://drive.google.com/uc?id=%s", id) -} - -func downloadUrl(id string) string { - return fmt.Sprintf("https://drive.google.com/uc?id=%s&export=download", id) -} @@ -375,22 +375,6 @@ func main() { }, }, &cli.Handler{ - Pattern: "[global options] url [options] <id>", - Description: "Get url to file or directory", - Callback: urlHandler, - Flags: cli.Flags{ - "global options": globalFlags, - "options": []cli.Flag{ - cli.BoolFlag{ - Name: "download", - Patterns: []string{"--download"}, - Description: "Download url", - OmitValue: true, - }, - }, - }, - }, - &cli.Handler{ Pattern: "[global options] delete <id>", Description: "Delete file or directory", Callback: deleteHandler, diff --git a/handlers_drive.go b/handlers_drive.go index 5c3b549..eeb997f 100644 --- a/handlers_drive.go +++ b/handlers_drive.go @@ -155,15 +155,6 @@ func shareHandler(ctx cli.Context) { checkErr(err) } -func urlHandler(ctx cli.Context) { - args := ctx.Args() - newDrive(args).Url(drive.UrlArgs{ - Out: os.Stdout, - FileId: args.String("id"), - DownloadUrl: args.Bool("download"), - }) -} - func deleteHandler(ctx cli.Context) { args := ctx.Args() err := newDrive(args).Delete(drive.DeleteArgs{ |