diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 333ebad7..615a13f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,4 +45,4 @@ jobs: go-version: '^1.15.2' - uses: actions/checkout@v2 - name: Build - run: go build -ldflags="-s -w" -o bin/gopeed cmd/gopeed/gopeed.go \ No newline at end of file + run: go build -ldflags="-s -w" -o gopeed cmd/gopeed/* \ No newline at end of file diff --git a/README.md b/README.md index 0e0c7d40..93437bc2 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,17 @@ go install github.com/monkeyWie/gopeed-core ## 示例 -```go +可以在本仓库的[\_examples](_examples)目录下查看 -``` +## 命令行工具 + +### 预览 + +![](_docs/img/cli-demo.gif) + +### 下载 + +前往[releases](https://github.com/monkeyWie/gopeed-core/releases)页面 ## TODO diff --git a/cmd/gopeed/gopeed.go b/cmd/gopeed/gopeed.go index 08abcdba..43d2e69b 100644 --- a/cmd/gopeed/gopeed.go +++ b/cmd/gopeed/gopeed.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "github.com/monkeyWie/gopeed-core/internal/protocol/http" "github.com/monkeyWie/gopeed-core/pkg/base" "github.com/monkeyWie/gopeed-core/pkg/download" "github.com/monkeyWie/gopeed-core/pkg/util" @@ -15,43 +14,46 @@ const progressWidth = 20 func main() { args := parse() - downloader := download.NewDownloader(http.FetcherBuilder) - res, err := downloader.Resolve(&base.Request{ - URL: args.url, - }) - if err != nil { - panic(err) - } - - err = downloader.Create(res, &base.Options{ - Path: *args.dir, - Connections: *args.connections, - }) - if err != nil { - panic(err) - } - var wg sync.WaitGroup + err := download.Boot(). + URL(args.url). + Listener(func(event *download.Event) { + if event.Key == download.EventKeyProgress { + printProgress(event.Task, "downloading...") + } + if event.Key == download.EventKeyFinally { + var title string + if event.Err != nil { + title = "fail" + } else { + title = "complete" + } + printProgress(event.Task, title) + fmt.Println() + if event.Err != nil { + gPrint("reason: " + event.Err.Error()) + } else { + gPrint("saving file " + filepath.Join(*args.dir, event.Task.Res.Files[0].Name)) + } + wg.Done() + } + }). + Create(&base.Options{ + Path: *args.dir, + Connections: *args.connections, + }) + if err != nil { + panic(err) + } wg.Add(1) - downloader.Listener(func(taskInfo *download.TaskInfo, eventKey download.EventKey) { - if eventKey == download.EventKeyProgress { - printProgress(taskInfo, "downloading...") - } - if eventKey == download.EventKeyDone { - printProgress(taskInfo, "complete") - wg.Done() - } - }) wg.Wait() - fmt.Println() - gPrint("saving file " + filepath.Join(*args.dir, res.Files[0].Name)) } -func printProgress(taskInfo *download.TaskInfo, title string) { - rate := float64(taskInfo.Progress.Downloaded) / float64(taskInfo.Res.TotalSize) +func printProgress(task *download.TaskInfo, title string) { + rate := float64(task.Progress.Downloaded) / float64(task.Res.TotalSize) completeWidth := int(progressWidth * rate) - speed := util.ByteFmt(taskInfo.Progress.Speed) - totalSize := util.ByteFmt(taskInfo.Res.TotalSize) + speed := util.ByteFmt(task.Progress.Speed) + totalSize := util.ByteFmt(task.Res.TotalSize) fmt.Printf("\r%s [", title) for i := 0; i < progressWidth; i++ { if i < completeWidth { diff --git a/go.mod b/go.mod index b9de5cff..4ec1499f 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,9 @@ module github.com/monkeyWie/gopeed-core -go 1.13 +go 1.15 require ( - github.com/RoaringBitmap/roaring v0.4.21 - github.com/cenkalti/mse v0.0.0-20140930130441-6ef65f170972 - github.com/gizak/termui/v3 v3.1.0 github.com/google/uuid v1.1.1 - github.com/marksamman/bencode v0.0.0-20150821143521-dc84f26e086e - github.com/mattn/go-tty v0.0.3 // indirect - github.com/sirupsen/logrus v1.4.2 - github.com/superhawk610/bar v0.0.2 - github.com/superhawk610/terminal v0.1.0 // indirect golang.org/x/net v0.0.0-20200707034311-ab3426394381 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c ) diff --git a/go.sum b/go.sum index 8555b33e..fb74fc84 100644 --- a/go.sum +++ b/go.sum @@ -1,83 +1,15 @@ -github.com/RoaringBitmap/roaring v0.4.21 h1:WJ/zIlNX4wQZ9x8Ey33O1UaD9TCTakYsdLFSBcTwH+8= -github.com/RoaringBitmap/roaring v0.4.21/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= -github.com/cenkalti/mse v0.0.0-20140930130441-6ef65f170972 h1:FvAasVrPm/VUO8M0odLDqA9Y7VbALYq3PRAwmWGPw78= -github.com/cenkalti/mse v0.0.0-20140930130441-6ef65f170972/go.mod h1:wGf99xKTJ8f/a8cC1inMqFz9cGEzISLLid5F6i5fI/g= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gizak/termui/v3 v3.1.0 h1:ZZmVDgwHl7gR7elfKf1xc4IudXZ5qqfDh4wExk4Iajc= -github.com/gizak/termui/v3 v3.1.0/go.mod h1:bXQEBkJpzxUAKf0+xq9MSWAvWZlE7c+aidmyFlkYTrY= -github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4= -github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= -github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8= -github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= -github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/marksamman/bencode v0.0.0-20150821143521-dc84f26e086e h1:KMs6SK8iDSR1+ZzOK10L5wGPpWDByyvOe5nrqk51g2U= -github.com/marksamman/bencode v0.0.0-20150821143521-dc84f26e086e/go.mod h1:+AHfJo5+69p+fjvMJTmYajNP9rFBHQcaTDFmuXRRATI= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.6 h1:V2iyH+aX9C5fsYCpK60U8BYIvmhqxuOL3JZcqc1NB7k= -github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-tty v0.0.3 h1:5OfyWorkyO7xP52Mq7tB36ajHDG5OHrmBGIS/DtakQI= -github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY= -github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= -github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d h1:x3S6kxmy49zXVVyhcnrFqxvNVCBPb2KZ9hV2RBdS840= -github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= -github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= -github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/superhawk610/bar v0.0.2 h1:Jf9+rXkpGgzJkpogpx+BGjC4EwkFZc8L7t8QBrmyfqY= -github.com/superhawk610/bar v0.0.2/go.mod h1:xc6t0MG+8Mbj9wnHBEdvX2TRtNIaqhM5fW3R+dF9vH8= -github.com/superhawk610/terminal v0.1.0 h1:OpWp0+861M3l5j4ZWprm8q0fgG9Y2xXZp5tkunvCm/M= -github.com/superhawk610/terminal v0.1.0/go.mod h1:NQ3EEKWSeofexUwENLX3lv4WR2qeGiLlbf/NveZ7ZAQ= -github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU= -github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc= -github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/internal/protocol/http/fetcher.go b/internal/protocol/http/fetcher.go index 7f1a1fbf..695a2f80 100644 --- a/internal/protocol/http/fetcher.go +++ b/internal/protocol/http/fetcher.go @@ -130,9 +130,6 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) { } func (f *Fetcher) Create(res *base.Resource, opts *base.Options) error { - if opts.Connections != 1 && !res.Range { - opts.Connections = 1 - } f.res = res f.opts = opts f.status = base.DownloadStatusReady diff --git a/pkg/download/downloader.go b/pkg/download/downloader.go index 665aa2b4..70e25763 100644 --- a/pkg/download/downloader.go +++ b/pkg/download/downloader.go @@ -15,6 +15,7 @@ import ( ) type FetcherBuilder func() (protocols []string, builder func() fetcher.Fetcher) +type Listener func(event *Event) type TaskInfo struct { ID string @@ -42,11 +43,9 @@ type Downloader struct { *controller.DefaultController fetchBuilders map[string]func() fetcher.Fetcher tasks map[string]*TaskInfo - listener func(taskInfo *TaskInfo, eventKey EventKey) + listener Listener } -var DefaultDownloader = NewDownloader(http.FetcherBuilder) - func NewDownloader(fbs ...FetcherBuilder) *Downloader { d := &Downloader{DefaultController: controller.NewController()} d.fetchBuilders = make(map[string]func() fetcher.Fetcher) @@ -72,7 +71,7 @@ func NewDownloader(fbs ...FetcherBuilder) *Downloader { task.Progress.Used = task.timer.Used() task.Progress.Speed = current - task.Progress.Downloaded task.Progress.Downloaded = current - d.emit(task, EventKeyProgress) + d.emit(EventKeyProgress, task) } } time.Sleep(time.Second) @@ -107,6 +106,9 @@ func (d *Downloader) Create(res *base.Resource, opts *base.Options) (err error) if err != nil { return } + if !res.Range || opts.Connections < 1 { + opts.Connections = 1 + } err = fetcher.Create(res, opts) if err != nil { return @@ -124,16 +126,15 @@ func (d *Downloader) Create(res *base.Resource, opts *base.Options) (err error) } d.tasks[id] = task task.timer.Start() - d.emit(task, EventKeyStart) + d.emit(EventKeyStart, task) err = fetcher.Start() if err != nil { - d.emit(task, EventKeyError) return } go func() { err = fetcher.Wait() if err != nil { - d.emit(task, EventKeyError) + d.emit(EventKeyError, task, err) } else { task.Progress.Used = task.timer.Used() if task.Res.TotalSize == 0 { @@ -145,8 +146,9 @@ func (d *Downloader) Create(res *base.Resource, opts *base.Options) (err error) } task.Progress.Speed = task.Res.TotalSize / used task.Progress.Downloaded = task.Res.TotalSize - d.emit(d.tasks[id], EventKeyDone) + d.emit(EventKeyDone, task) } + d.emit(EventKeyFinally, task, err) }() return } @@ -157,7 +159,7 @@ func (d *Downloader) Pause(id string) { defer task.locker.Unlock() task.timer.Pause() task.fetcher.Pause() - d.emit(task, EventKeyPause) + d.emit(EventKeyPause, task) } func (d *Downloader) Continue(id string) { @@ -166,29 +168,66 @@ func (d *Downloader) Continue(id string) { defer task.locker.Unlock() task.timer.Continue() task.fetcher.Continue() - d.emit(task, EventKeyContinue) + d.emit(EventKeyContinue, task) } -func (d *Downloader) Listener(fn func(taskInfo *TaskInfo, eventKey EventKey)) { +func (d *Downloader) Listener(fn Listener) { d.listener = fn } -func (d *Downloader) emit(taskInfo *TaskInfo, eventKey EventKey) { +func (d *Downloader) emit(eventKey EventKey, task *TaskInfo, errs ...error) { if d.listener != nil { - d.listener(taskInfo, eventKey) + var err error + if len(errs) > 0 { + err = errs[0] + } + d.listener(&Event{ + Key: eventKey, + Task: task, + Err: err, + }) } } -// Resolve 解析资源 -func Resolve(url string, extra ...interface{}) (*base.Resource, error) { - var e interface{} - if len(extra) == 0 { - e = nil - } else { - e = extra[0] - } - return DefaultDownloader.Resolve(&base.Request{ - URL: url, - Extra: e, +var defaultDownloader = NewDownloader(http.FetcherBuilder) + +type boot struct { + url string + extra interface{} + listener Listener +} + +func (b *boot) URL(url string) *boot { + b.url = url + return b +} + +func (b *boot) Extra(extra interface{}) *boot { + b.extra = extra + return b +} + +func (b *boot) Resolve() (*base.Resource, error) { + return defaultDownloader.Resolve(&base.Request{ + URL: b.url, + Extra: b.extra, }) } + +func (b *boot) Listener(listener Listener) *boot { + b.listener = listener + return b +} + +func (b *boot) Create(opts *base.Options) error { + res, err := b.Resolve() + if err != nil { + return err + } + defaultDownloader.Listener(b.listener) + return defaultDownloader.Create(res, opts) +} + +func Boot() *boot { + return &boot{} +} diff --git a/pkg/download/downloader_test.go b/pkg/download/downloader_test.go index a9526a15..c341c53a 100644 --- a/pkg/download/downloader_test.go +++ b/pkg/download/downloader_test.go @@ -53,8 +53,8 @@ func TestDownloader_Create(t *testing.T) { var wg sync.WaitGroup wg.Add(1) - downloader.Listener(func(taskInfo *TaskInfo, eventKey EventKey) { - if eventKey == EventKeyDone { + downloader.Listener(func(event *Event) { + if event.Key == EventKeyDone { wg.Done() } }) diff --git a/pkg/download/event.go b/pkg/download/event.go index 19d65923..92cec42d 100644 --- a/pkg/download/event.go +++ b/pkg/download/event.go @@ -9,9 +9,11 @@ const ( EventKeyProgress = "progress" EventKeyError = "error" EventKeyDone = "done" + EventKeyFinally = "finally" ) type Event struct { - EventKey - TaskInfo + Key EventKey + Task *TaskInfo + Err error } diff --git a/pkg/util/bytefmt_test.go b/pkg/util/bytefmt_test.go index 88f90a02..e040e157 100644 --- a/pkg/util/bytefmt_test.go +++ b/pkg/util/bytefmt_test.go @@ -11,6 +11,11 @@ func TestByteFmt(t *testing.T) { args args want string }{ + { + name: "unknown", + args: args{size: int64(0)}, + want: "unknown", + }, { name: "100B", args: args{size: int64(100)},