Skip to content

Commit

Permalink
Merge pull request #42 from jkawamoto/hotfix/v0.6.3
Browse files Browse the repository at this point in the history
Hotfix/v0.6.3
  • Loading branch information
jkawamoto authored Apr 6, 2023
2 parents 43ee5d3 + d90993b commit 6e9701e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.6.2
current_version = 0.6.3
commit = True

[bumpversion:file:README.md]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 9 additions & 13 deletions cmd/pd/command/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 6e9701e

Please sign in to comment.