diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7508de3..c62565e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.2 +current_version = 0.6.3 commit = True [bumpversion:file:README.md] diff --git a/README.md b/README.md index 05bff5f..9431bcd 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![CircleCI](https://circleci.com/gh/jkawamoto/go-pixeldrain.svg?style=svg)](https://circleci.com/gh/jkawamoto/go-pixeldrain) [![Go Reference](https://pkg.go.dev/badge/github.com/jkawamoto/go-pixeldrain.svg)](https://pkg.go.dev/github.com/jkawamoto/go-pixeldrain) [![codecov](https://codecov.io/gh/jkawamoto/go-pixeldrain/branch/master/graph/badge.svg?token=ppX3MVIqWA)](https://codecov.io/gh/jkawamoto/go-pixeldrain) -[![Release](https://img.shields.io/badge/release-0.6.2-brightgreen.svg)](https://github.com/jkawamoto/go-pixeldrain/releases/tag/v0.6.2) +[![Release](https://img.shields.io/badge/release-0.6.3-brightgreen.svg)](https://github.com/jkawamoto/go-pixeldrain/releases/tag/v0.6.3) ## Usage diff --git a/cmd/pd/command/download.go b/cmd/pd/command/download.go index 9d11685..ff674af 100644 --- a/cmd/pd/command/download.go +++ b/cmd/pd/command/download.go @@ -48,18 +48,14 @@ func downloadURL(ctx *cli.Context, url, dir string) error { } func download(ctx *cli.Context, info *models.FileInfo, dir string) error { - out := ctx.App.Writer - if dir != "" { - var fp io.WriteCloser - fp, err := os.OpenFile(filepath.Join(dir, info.Name), os.O_CREATE|os.O_WRONLY, 0644) - if err != nil { - return err - } - defer func() { - err = errors.Join(err, fp.Close()) - }() - out = fp + var f io.WriteCloser + f, err := os.OpenFile(filepath.Join(dir, info.Name), os.O_CREATE|os.O_WRONLY, 0644) + if err != nil { + return err } + defer func() { + err = errors.Join(err, f.Close()) + }() bar := pb.New64(info.Size) bar.Set(pb.SIBytesPrefix, true) @@ -68,10 +64,10 @@ func download(ctx *cli.Context, info *models.FileInfo, dir string) error { bar.Start() defer bar.Finish() - _, err := pixeldrain.Default.File.DownloadFile( + _, err = pixeldrain.Default.File.DownloadFile( file.NewDownloadFileParamsWithContext(ctx.Context).WithID(swag.StringValue(info.ID)), auth.Extract(ctx.Context), - bar.NewProxyWriter(out), + bar.NewProxyWriter(f), ) if err != nil { return pixeldrain.NewError(err) diff --git a/cmd/pd/main.go b/cmd/pd/main.go index 10863e9..65e26ae 100644 --- a/cmd/pd/main.go +++ b/cmd/pd/main.go @@ -25,7 +25,7 @@ const ( // Name defines the basename of this program. Name = "pd" // Version defines current version number. - Version = "0.6.2" + Version = "0.6.3" ) // commandNotFound shows error message and exit when a given command is not found.