refactor: package

This commit is contained in:
liwei committed 2021-03-25 19:38:23 +08:00
1 parent 359f28bb1f
commit ede6a9834d
55 files changed
+279 -237

No files matched your search

+28 -13
View File
@@ -1,20 +1,35 @@
## gopeed ## gopeed
支持多协议(HTTP、BitTorrent)下载的客户端,提供命令行、RESTful API、WebSocket、Go类库方式来使用。
支持多协议(HTTP、BitTorrent)下载的客户端,提供命令行、RESTful API、WebSocket、Go 类库方式来使用。
## 安装
```sh
go install github.com/monkeyWie/gopeed-core
```
## 示例
```go
```
## TODO ## TODO
- [x] HTTP下载实现
- [ ] BitTorrent下载实现 - [x] HTTP 下载实现
- [x] .torrent文件解析 - [ ] BitTorrent 下载实现
- [x] tracker协议实现 - [x] .torrent 文件解析
- [x] peer wire protocol协议实现 - [x] tracker 协议实现
- [ ] DHT协议实现 - [x] peer wire protocol 协议实现
- [ ] 磁力链接支持 - [ ] DHT 协议实现
- [ ] uTP协议实现 - [ ] 磁力链接支持
- [ ] 下载接口抽象(不关心具体协议) - [ ] uTP 协议实现
- [x] 下载接口抽象(不关心具体协议)
- [ ] 支持自定义配置 - [ ] 支持自定义配置
- [ ] 限速功能实现 - [ ] 限速功能实现
- [ ] 命令行工具提供 - [x] 命令行工具提供
- [ ] RESTful服务提供 - [ ] RESTful 服务提供
## 参与 ## 参与
由于项目目前还未定型,代码可能随时有大的调整,所以暂不接受PR,当然如果有什么好的想法可以在issue区提出来。
由于项目目前还未定型,代码可能随时有大的调整,所以暂不接受 PR,当然如果有什么好的想法可以在 issue 区提出来。
+7 -7
View File
@@ -2,10 +2,10 @@ package main
import ( import (
"fmt" "fmt"
"github.com/monkeyWie/gopeed-core/download" "github.com/monkeyWie/gopeed-core/internal/protocol/http"
"github.com/monkeyWie/gopeed-core/download/base" "github.com/monkeyWie/gopeed-core/pkg/base"
"github.com/monkeyWie/gopeed-core/download/http" "github.com/monkeyWie/gopeed-core/pkg/download"
"github.com/monkeyWie/gopeed-core/util" "github.com/monkeyWie/gopeed-core/pkg/util"
"path/filepath" "path/filepath"
"sync" "sync"
) )
@@ -33,11 +33,11 @@ func main() {
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(1) wg.Add(1)
downloader.Listener(func(taskInfo *download.TaskInfo, eventKey base.EventKey) { downloader.Listener(func(taskInfo *download.TaskInfo, eventKey download.EventKey) {
if eventKey == base.EventKeyProgress { if eventKey == download.EventKeyProgress {
printProgress(taskInfo, "downloading...") printProgress(taskInfo, "downloading...")
} }
if eventKey == base.EventKeyDone { if eventKey == download.EventKeyDone {
printProgress(taskInfo, "complete") printProgress(taskInfo, "complete")
wg.Done() wg.Done()
} }
-5
View File
@@ -1,5 +0,0 @@
package base
type Event struct {
Status
}
-32
View File
@@ -1,32 +0,0 @@
package base
// 对应协议的下载支持
type Fetcher interface {
Setup(ctl Controller)
// 解析请求
Resolve(req *Request) (res *Resource, err error)
// 创建任务
Create(res *Resource, opts *Options) (err error)
Start() (err error)
Pause() (err error)
Continue() (err error)
// 获取任务下载进度
Progress() Progress
// 该方法会一直阻塞,直到任务下载结束
Wait() (err error)
}
type DefaultFetcher struct {
Ctl Controller
DoneCh chan error
}
func (f *DefaultFetcher) Setup(ctl Controller) {
f.Ctl = ctl
f.DoneCh = make(chan error, 1)
}
func (f *DefaultFetcher) Wait() (err error) {
return <-f.DoneCh
}
-7
View File
@@ -1,7 +0,0 @@
package model
type Extra struct {
Method string
Header map[string]string
Body string
}
@@ -1,4 +1,4 @@
package base package controller
import ( import (
"golang.org/x/net/proxy" "golang.org/x/net/proxy"
@@ -15,40 +15,6 @@ type Controller interface {
ContextDialer() (proxy.Dialer, error) ContextDialer() (proxy.Dialer, error)
} }
// 下载请求
type Request struct {
// 下载链接
URL string
// 附加信息
Extra interface{}
}
// 资源信息
type Resource struct {
Req *Request
// 资源总大小
TotalSize int64
// 是否支持断点下载
Range bool
// 资源所包含的文件列表
Files []*FileInfo
}
type Options struct {
// 保存文件名
Name string
// 保存目录
Path string
// 并发连接数
Connections int
}
type FileInfo struct {
Name string
Path string
Size int64
}
type DefaultController struct { type DefaultController struct {
Files map[string]*os.File Files map[string]*os.File
} }
@@ -142,15 +108,3 @@ func (d *DialerWarp) Dial(network, addr string) (c net.Conn, err error) {
} }
return &ConnWarp{conn: conn}, nil return &ConnWarp{conn: conn}, nil
} }
// 获取任务中各个文件的已下载字节数
type Progress []int64
// TotalDownloaded 获取任务总下载字节数
func (p Progress) TotalDownloaded() int64 {
total := int64(0)
for _, d := range p {
total += d
}
return total
}
+49
View File
@@ -0,0 +1,49 @@
package fetcher
import (
"github.com/monkeyWie/gopeed-core/internal/controller"
"github.com/monkeyWie/gopeed-core/pkg/base"
)
// 对应协议的下载支持
type Fetcher interface {
Setup(ctl controller.Controller)
// 解析请求
Resolve(req *base.Request) (res *base.Resource, err error)
// 创建任务
Create(res *base.Resource, opts *base.Options) (err error)
Start() (err error)
Pause() (err error)
Continue() (err error)
// 获取任务各个文件下载进度
Progress() Progress
// 该方法会一直阻塞,直到任务下载结束
Wait() (err error)
}
type DefaultFetcher struct {
Ctl controller.Controller
DoneCh chan error
}
func (f *DefaultFetcher) Setup(ctl controller.Controller) {
f.Ctl = ctl
f.DoneCh = make(chan error, 1)
}
func (f *DefaultFetcher) Wait() (err error) {
return <-f.DoneCh
}
// 获取任务中各个文件的已下载字节数
type Progress []int64
// TotalDownloaded 获取任务总下载字节数
func (p Progress) TotalDownloaded() int64 {
total := int64(0)
for _, d := range p {
total += d
}
return total
}
@@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"github.com/monkeyWie/gopeed-core/download/base" "github.com/monkeyWie/gopeed-core/internal/fetcher"
"github.com/monkeyWie/gopeed-core/download/http/model" "github.com/monkeyWie/gopeed-core/pkg/base"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"io" "io"
"io/ioutil" "io/ioutil"
@@ -34,13 +34,13 @@ func (re *RequestError) Error() string {
} }
type Fetcher struct { type Fetcher struct {
*base.DefaultFetcher *fetcher.DefaultFetcher
res *base.Resource res *base.Resource
opts *base.Options opts *base.Options
status base.Status status base.Status
clients []*http.Response clients []*http.Response
chunks []*model.Chunk chunks []*Chunk
ctx context.Context ctx context.Context
cancel context.CancelFunc cancel context.CancelFunc
@@ -49,15 +49,15 @@ type Fetcher struct {
func NewFetcher() *Fetcher { func NewFetcher() *Fetcher {
return &Fetcher{ return &Fetcher{
DefaultFetcher: new(base.DefaultFetcher), DefaultFetcher: new(fetcher.DefaultFetcher),
pauseCh: make(chan interface{}), pauseCh: make(chan interface{}),
} }
} }
var protocols = []string{"HTTP", "HTTPS"} var protocols = []string{"HTTP", "HTTPS"}
func FetcherBuilder() ([]string, func() base.Fetcher) { func FetcherBuilder() ([]string, func() fetcher.Fetcher) {
return protocols, func() base.Fetcher { return protocols, func() fetcher.Fetcher {
return NewFetcher() return NewFetcher()
} }
} }
@@ -150,7 +150,7 @@ func (f *Fetcher) Start() (err error) {
if f.res.Range { if f.res.Range {
// 每个连接平均需要下载的分块大小 // 每个连接平均需要下载的分块大小
chunkSize := f.res.TotalSize / int64(f.opts.Connections) chunkSize := f.res.TotalSize / int64(f.opts.Connections)
f.chunks = make([]*model.Chunk, f.opts.Connections) f.chunks = make([]*Chunk, f.opts.Connections)
f.clients = make([]*http.Response, f.opts.Connections) f.clients = make([]*http.Response, f.opts.Connections)
for i := 0; i < f.opts.Connections; i++ { for i := 0; i < f.opts.Connections; i++ {
var ( var (
@@ -163,14 +163,14 @@ func (f *Fetcher) Start() (err error) {
} else { } else {
end = begin + chunkSize - 1 end = begin + chunkSize - 1
} }
chunk := model.NewChunk(begin, end) chunk := NewChunk(begin, end)
f.chunks[i] = chunk f.chunks[i] = chunk
} }
} else { } else {
// 只支持单连接下载 // 只支持单连接下载
f.chunks = make([]*model.Chunk, 1) f.chunks = make([]*Chunk, 1)
f.clients = make([]*http.Response, 1) f.clients = make([]*http.Response, 1)
f.chunks[0] = model.NewChunk(0, 0) f.chunks[0] = NewChunk(0, 0)
} }
f.fetch() f.fetch()
return return
@@ -200,8 +200,8 @@ func (f *Fetcher) Continue() (err error) {
return return
} }
func (f *Fetcher) Progress() base.Progress { func (f *Fetcher) Progress() fetcher.Progress {
p := make(base.Progress, 0) p := make(fetcher.Progress, 0)
if len(f.chunks) > 0 { if len(f.chunks) > 0 {
total := int64(0) total := int64(0)
for _, chunk := range f.chunks { for _, chunk := range f.chunks {
@@ -361,7 +361,7 @@ func buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request
if req.Extra == nil { if req.Extra == nil {
method = http.MethodGet method = http.MethodGet
} else { } else {
extra := req.Extra.(model.Extra) extra := req.Extra.(Extra)
if extra.Method != "" { if extra.Method != "" {
method = extra.Method method = extra.Method
} else { } else {
@@ -1,8 +1,10 @@
package http package http
import ( import (
"github.com/monkeyWie/gopeed-core/download/base" "github.com/monkeyWie/gopeed-core/internal/controller"
"github.com/monkeyWie/gopeed-core/download/dltest" "github.com/monkeyWie/gopeed-core/internal/fetcher"
"github.com/monkeyWie/gopeed-core/pkg/base"
"github.com/monkeyWie/gopeed-core/pkg/test"
"net" "net"
"reflect" "reflect"
"testing" "testing"
@@ -10,22 +12,22 @@ import (
) )
func TestFetcher_Resolve(t *testing.T) { func TestFetcher_Resolve(t *testing.T) {
testResolve(dltest.StartTestFileServer, &base.Resource{ testResolve(test.StartTestFileServer, &base.Resource{
TotalSize: dltest.BuildSize, TotalSize: test.BuildSize,
Range: true, Range: true,
Files: []*base.FileInfo{ Files: []*base.FileInfo{
{ {
Name: dltest.BuildName, Name: test.BuildName,
Size: dltest.BuildSize, Size: test.BuildSize,
}, },
}, },
}, t) }, t)
testResolve(dltest.StartTestChunkedServer, &base.Resource{ testResolve(test.StartTestChunkedServer, &base.Resource{
TotalSize: 0, TotalSize: 0,
Range: false, Range: false,
Files: []*base.FileInfo{ Files: []*base.FileInfo{
{ {
Name: dltest.BuildName, Name: test.BuildName,
Size: 0, Size: 0,
}, },
}, },
@@ -37,7 +39,7 @@ func testResolve(startTestServer func() net.Listener, want *base.Resource, t *te
defer listener.Close() defer listener.Close()
fetcher := NewFetcher() fetcher := NewFetcher()
res, err := fetcher.Resolve(&base.Request{ res, err := fetcher.Resolve(&base.Request{
URL: "http://" + listener.Addr().String() + "/" + dltest.BuildName, URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
}) })
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@@ -49,7 +51,7 @@ func testResolve(startTestServer func() net.Listener, want *base.Resource, t *te
} }
func TestFetcher_DownloadNormal(t *testing.T) { func TestFetcher_DownloadNormal(t *testing.T) {
listener := dltest.StartTestFileServer() listener := test.StartTestFileServer()
defer listener.Close() defer listener.Close()
// 正常下载 // 正常下载
downloadNormal(listener, 1, t) downloadNormal(listener, 1, t)
@@ -59,7 +61,7 @@ func TestFetcher_DownloadNormal(t *testing.T) {
} }
func TestFetcher_DownloadContinue(t *testing.T) { func TestFetcher_DownloadContinue(t *testing.T) {
listener := dltest.StartTestFileServer() listener := test.StartTestFileServer()
defer listener.Close() defer listener.Close()
// 暂停继续 // 暂停继续
downloadContinue(listener, 1, t) downloadContinue(listener, 1, t)
@@ -69,7 +71,7 @@ func TestFetcher_DownloadContinue(t *testing.T) {
} }
func TestFetcher_DownloadChunked(t *testing.T) { func TestFetcher_DownloadChunked(t *testing.T) {
listener := dltest.StartTestChunkedServer() listener := test.StartTestChunkedServer()
defer listener.Close() defer listener.Close()
// chunked编码下载 // chunked编码下载
downloadNormal(listener, 1, t) downloadNormal(listener, 1, t)
@@ -77,31 +79,31 @@ func TestFetcher_DownloadChunked(t *testing.T) {
} }
func TestFetcher_DownloadRetry(t *testing.T) { func TestFetcher_DownloadRetry(t *testing.T) {
listener := dltest.StartTestRetryServer() listener := test.StartTestRetryServer()
defer listener.Close() defer listener.Close()
// chunked编码下载 // chunked编码下载
downloadNormal(listener, 1, t) downloadNormal(listener, 1, t)
} }
func TestFetcher_DownloadError(t *testing.T) { func TestFetcher_DownloadError(t *testing.T) {
listener := dltest.StartTestErrorServer() listener := test.StartTestErrorServer()
defer listener.Close() defer listener.Close()
// chunked编码下载 // chunked编码下载
downloadError(listener, 1, t) downloadError(listener, 1, t)
} }
func downloadReady(listener net.Listener, connections int, t *testing.T) base.Fetcher { func downloadReady(listener net.Listener, connections int, t *testing.T) fetcher.Fetcher {
fetcher := NewFetcher() fetcher := NewFetcher()
fetcher.Setup(base.NewController()) fetcher.Setup(controller.NewController())
res, err := fetcher.Resolve(&base.Request{ res, err := fetcher.Resolve(&base.Request{
URL: "http://" + listener.Addr().String() + "/" + dltest.BuildName, URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
}) })
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = fetcher.Create(res, &base.Options{ err = fetcher.Create(res, &base.Options{
Name: dltest.DownloadName, Name: test.DownloadName,
Path: dltest.TestDir, Path: test.Dir,
Connections: connections, Connections: connections,
}) })
if err != nil { if err != nil {
@@ -121,8 +123,8 @@ func downloadNormal(listener net.Listener, connections int, t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
want := dltest.FileMd5(dltest.BuildFile) want := test.FileMd5(test.BuildFile)
got := dltest.FileMd5(dltest.DownloadFile) got := test.FileMd5(test.DownloadFile)
if want != got { if want != got {
t.Errorf("Download error = %v, want %v", got, want) t.Errorf("Download error = %v, want %v", got, want)
} }
@@ -146,8 +148,8 @@ func downloadContinue(listener net.Listener, connections int, t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
want := dltest.FileMd5(dltest.BuildFile) want := test.FileMd5(test.BuildFile)
got := dltest.FileMd5(dltest.DownloadFile) got := test.FileMd5(test.DownloadFile)
if want != got { if want != got {
t.Errorf("Download error = %v, want %v", got, want) t.Errorf("Download error = %v, want %v", got, want)
} }
@@ -1,8 +1,6 @@
package model package http
import ( import "github.com/monkeyWie/gopeed-core/pkg/base"
"github.com/monkeyWie/gopeed-core/download/base"
)
type Chunk struct { type Chunk struct {
Status base.Status Status base.Status
@@ -18,3 +16,9 @@ func NewChunk(begin int64, end int64) *Chunk {
End: end, End: end,
} }
} }
type Extra struct {
Method string
Header map[string]string
Body string
}
+1 -1
View File
@@ -2,7 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/monkeyWie/gopeed-core/protocol/http" "github.com/monkeyWie/gopeed-core/pkg/protocol/http"
) )
func main() { func main() {
@@ -12,17 +12,6 @@ const (
DownloadStatusDone DownloadStatusDone
) )
type EventKey string
const (
EventKeyStart = "start"
EventKeyPause = "pause"
EventKeyContinue = "continue"
EventKeyProgress = "progress"
EventKeyError = "error"
EventKeyDone = "done"
)
const ( const (
HttpCodeOK = 200 HttpCodeOK = 200
HttpCodePartialContent = 206 HttpCodePartialContent = 206
+36
View File
@@ -0,0 +1,36 @@
package base
// 下载请求
type Request struct {
// 下载链接
URL string
// 附加信息
Extra interface{}
}
// 资源信息
type Resource struct {
Req *Request
// 资源总大小
TotalSize int64
// 是否支持断点下载
Range bool
// 资源所包含的文件列表
Files []*FileInfo
}
type FileInfo struct {
Name string
Path string
Size int64
}
// 下载选项
type Options struct {
// 保存文件名
Name string
// 保存目录
Path string
// 并发连接数
Connections int
}
@@ -3,13 +3,19 @@ package download
import ( import (
"errors" "errors"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/monkeyWie/gopeed-core/download/base" "github.com/monkeyWie/gopeed-core/internal/controller"
"github.com/monkeyWie/gopeed-core/internal/fetcher"
"github.com/monkeyWie/gopeed-core/internal/protocol/http"
"github.com/monkeyWie/gopeed-core/pkg/base"
"github.com/monkeyWie/gopeed-core/pkg/util"
"net/url" "net/url"
"strings" "strings"
"sync" "sync"
"time" "time"
) )
type FetcherBuilder func() (protocols []string, builder func() fetcher.Fetcher)
type TaskInfo struct { type TaskInfo struct {
ID string ID string
Res *base.Resource Res *base.Resource
@@ -18,23 +24,32 @@ type TaskInfo struct {
Files map[string]*base.FileInfo Files map[string]*base.FileInfo
Progress *Progress Progress *Progress
fetcher base.Fetcher fetcher fetcher.Fetcher
timer *base.Timer timer *util.Timer
locker *sync.Mutex locker *sync.Mutex
} }
type FetcherBuilder func() (protocols []string, builder func() base.Fetcher) type Progress struct {
// 下载耗时(纳秒)
type Downloader struct { Used int64
*base.DefaultController // 每秒下载字节数
fetchBuilders map[string]func() base.Fetcher Speed int64
tasks map[string]*TaskInfo // 已下载的字节数
listener func(taskInfo *TaskInfo, eventKey base.EventKey) Downloaded int64
} }
type Downloader struct {
*controller.DefaultController
fetchBuilders map[string]func() fetcher.Fetcher
tasks map[string]*TaskInfo
listener func(taskInfo *TaskInfo, eventKey EventKey)
}
var DefaultDownloader = NewDownloader(http.FetcherBuilder)
func NewDownloader(fbs ...FetcherBuilder) *Downloader { func NewDownloader(fbs ...FetcherBuilder) *Downloader {
d := &Downloader{DefaultController: base.NewController()} d := &Downloader{DefaultController: controller.NewController()}
d.fetchBuilders = make(map[string]func() base.Fetcher) d.fetchBuilders = make(map[string]func() fetcher.Fetcher)
for _, f := range fbs { for _, f := range fbs {
protocols, builder := f() protocols, builder := f()
for _, p := range protocols { for _, p := range protocols {
@@ -57,7 +72,7 @@ func NewDownloader(fbs ...FetcherBuilder) *Downloader {
task.Progress.Used = task.timer.Used() task.Progress.Used = task.timer.Used()
task.Progress.Speed = current - task.Progress.Downloaded task.Progress.Speed = current - task.Progress.Downloaded
task.Progress.Downloaded = current task.Progress.Downloaded = current
d.emit(task, base.EventKeyProgress) d.emit(task, EventKeyProgress)
} }
} }
time.Sleep(time.Second) time.Sleep(time.Second)
@@ -66,7 +81,7 @@ func NewDownloader(fbs ...FetcherBuilder) *Downloader {
return d return d
} }
func (d *Downloader) buildFetcher(URL string) (base.Fetcher, error) { func (d *Downloader) buildFetcher(URL string) (fetcher.Fetcher, error) {
url, err := url.Parse(URL) url, err := url.Parse(URL)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -104,21 +119,21 @@ func (d *Downloader) Create(res *base.Resource, opts *base.Options) (err error)
Status: base.DownloadStatusReady, Status: base.DownloadStatusReady,
Progress: &Progress{}, Progress: &Progress{},
fetcher: fetcher, fetcher: fetcher,
timer: &base.Timer{}, timer: &util.Timer{},
locker: new(sync.Mutex), locker: new(sync.Mutex),
} }
d.tasks[id] = task d.tasks[id] = task
task.timer.Start() task.timer.Start()
d.emit(task, base.EventKeyStart) d.emit(task, EventKeyStart)
err = fetcher.Start() err = fetcher.Start()
if err != nil { if err != nil {
d.emit(task, base.EventKeyError) d.emit(task, EventKeyError)
return return
} }
go func() { go func() {
err = fetcher.Wait() err = fetcher.Wait()
if err != nil { if err != nil {
d.emit(task, base.EventKeyError) d.emit(task, EventKeyError)
} else { } else {
task.Progress.Used = task.timer.Used() task.Progress.Used = task.timer.Used()
if task.Res.TotalSize == 0 { if task.Res.TotalSize == 0 {
@@ -130,7 +145,7 @@ func (d *Downloader) Create(res *base.Resource, opts *base.Options) (err error)
} }
task.Progress.Speed = task.Res.TotalSize / used task.Progress.Speed = task.Res.TotalSize / used
task.Progress.Downloaded = task.Res.TotalSize task.Progress.Downloaded = task.Res.TotalSize
d.emit(d.tasks[id], base.EventKeyDone) d.emit(d.tasks[id], EventKeyDone)
} }
}() }()
return return
@@ -142,7 +157,7 @@ func (d *Downloader) Pause(id string) {
defer task.locker.Unlock() defer task.locker.Unlock()
task.timer.Pause() task.timer.Pause()
task.fetcher.Pause() task.fetcher.Pause()
d.emit(task, base.EventKeyPause) d.emit(task, EventKeyPause)
} }
func (d *Downloader) Continue(id string) { func (d *Downloader) Continue(id string) {
@@ -151,24 +166,29 @@ func (d *Downloader) Continue(id string) {
defer task.locker.Unlock() defer task.locker.Unlock()
task.timer.Continue() task.timer.Continue()
task.fetcher.Continue() task.fetcher.Continue()
d.emit(task, base.EventKeyContinue) d.emit(task, EventKeyContinue)
} }
func (d *Downloader) Listener(fn func(taskInfo *TaskInfo, eventKey base.EventKey)) { func (d *Downloader) Listener(fn func(taskInfo *TaskInfo, eventKey EventKey)) {
d.listener = fn d.listener = fn
} }
func (d *Downloader) emit(taskInfo *TaskInfo, eventKey base.EventKey) { func (d *Downloader) emit(taskInfo *TaskInfo, eventKey EventKey) {
if d.listener != nil { if d.listener != nil {
d.listener(taskInfo, eventKey) d.listener(taskInfo, eventKey)
} }
} }
type Progress struct { // Resolve 解析资源
// 下载耗时(纳秒) func Resolve(url string, extra ...interface{}) (*base.Resource, error) {
Used int64 var e interface{}
// 每秒下载字节数 if len(extra) == 0 {
Speed int64 e = nil
// 已下载的字节数 } else {
Downloaded int64 e = extra[0]
}
return DefaultDownloader.Resolve(&base.Request{
URL: url,
Extra: e,
})
} }
@@ -1,21 +1,21 @@
package download package download
import ( import (
"github.com/monkeyWie/gopeed-core/download/base" "github.com/monkeyWie/gopeed-core/internal/protocol/http"
"github.com/monkeyWie/gopeed-core/download/dltest" "github.com/monkeyWie/gopeed-core/pkg/base"
"github.com/monkeyWie/gopeed-core/download/http" "github.com/monkeyWie/gopeed-core/pkg/test"
"reflect" "reflect"
"sync" "sync"
"testing" "testing"
) )
func TestDownloader_Resolve(t *testing.T) { func TestDownloader_Resolve(t *testing.T) {
listener := dltest.StartTestFileServer() listener := test.StartTestFileServer()
defer listener.Close() defer listener.Close()
downloader := NewDownloader(http.FetcherBuilder) downloader := NewDownloader(http.FetcherBuilder)
req := &base.Request{ req := &base.Request{
URL: "http://" + listener.Addr().String() + "/" + dltest.BuildName, URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
} }
res, err := downloader.Resolve(req) res, err := downloader.Resolve(req)
if err != nil { if err != nil {
@@ -23,28 +23,28 @@ func TestDownloader_Resolve(t *testing.T) {
} }
want := &base.Resource{ want := &base.Resource{
Req: req, Req: req,
TotalSize: dltest.BuildSize, TotalSize: test.BuildSize,
Range: true, Range: true,
Files: []*base.FileInfo{ Files: []*base.FileInfo{
{ {
Name: dltest.BuildName, Name: test.BuildName,
Path: "", Path: "",
Size: dltest.BuildSize, Size: test.BuildSize,
}, },
}, },
} }
if !reflect.DeepEqual(res, want) { if !reflect.DeepEqual(res, want) {
t.Errorf("Resolve error = %s, want %s", dltest.ToJson(res), dltest.ToJson(want)) t.Errorf("Resolve error = %s, want %s", test.ToJson(res), test.ToJson(want))
} }
} }
func TestDownloader_Create(t *testing.T) { func TestDownloader_Create(t *testing.T) {
listener := dltest.StartTestFileServer() listener := test.StartTestFileServer()
defer listener.Close() defer listener.Close()
downloader := NewDownloader(http.FetcherBuilder) downloader := NewDownloader(http.FetcherBuilder)
req := &base.Request{ req := &base.Request{
URL: "http://" + listener.Addr().String() + "/" + dltest.BuildName, URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
} }
res, err := downloader.Resolve(req) res, err := downloader.Resolve(req)
if err != nil { if err != nil {
@@ -53,22 +53,22 @@ func TestDownloader_Create(t *testing.T) {
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(1) wg.Add(1)
downloader.Listener(func(taskInfo *TaskInfo, eventKey base.EventKey) { downloader.Listener(func(taskInfo *TaskInfo, eventKey EventKey) {
if eventKey == base.EventKeyDone { if eventKey == EventKeyDone {
wg.Done() wg.Done()
} }
}) })
err = downloader.Create(res, &base.Options{ err = downloader.Create(res, &base.Options{
Path: dltest.TestDir, Path: test.Dir,
Name: dltest.DownloadName, Name: test.DownloadName,
Connections: 4, Connections: 4,
}) })
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
wg.Wait() wg.Wait()
want := dltest.FileMd5(dltest.BuildFile) want := test.FileMd5(test.BuildFile)
got := dltest.FileMd5(dltest.DownloadFile) got := test.FileMd5(test.DownloadFile)
if want != got { if want != got {
t.Errorf("Download error = %v, want %v", got, want) t.Errorf("Download error = %v, want %v", got, want)
} }
+17
View File
@@ -0,0 +1,17 @@
package download
type EventKey string
const (
EventKeyStart = "start"
EventKeyPause = "pause"
EventKeyContinue = "continue"
EventKeyProgress = "progress"
EventKeyError = "error"
EventKeyDone = "done"
)
type Event struct {
EventKey
TaskInfo
}
@@ -2,8 +2,8 @@ package bt
import ( import (
"crypto/rand" "crypto/rand"
"github.com/monkeyWie/gopeed-core/protocol/bt/metainfo" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
"github.com/monkeyWie/gopeed-core/protocol/bt/torrent" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/torrent"
"net/url" "net/url"
) )
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,9 +1,9 @@
package main package main
import ( import (
"github.com/monkeyWie/gopeed-core/protocol/bt/metainfo" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
"github.com/monkeyWie/gopeed-core/protocol/bt/peer" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/peer"
"github.com/monkeyWie/gopeed-core/protocol/bt/torrent" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/torrent"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@@ -15,9 +15,9 @@ import (
"time" "time"
"github.com/cenkalti/mse" "github.com/cenkalti/mse"
"github.com/monkeyWie/gopeed-core/protocol/bt/metainfo" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
"github.com/monkeyWie/gopeed-core/protocol/bt/peer" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/peer"
"github.com/monkeyWie/gopeed-core/protocol/bt/peer/message" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/peer/message"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@@ -2,8 +2,8 @@ package torrent
import ( import (
"fmt" "fmt"
"github.com/monkeyWie/gopeed-core/protocol/bt/peer" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/peer"
"github.com/monkeyWie/gopeed-core/protocol/bt/tracker" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/tracker"
"os" "os"
"sync" "sync"
"testing" "testing"
@@ -4,8 +4,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/monkeyWie/gopeed-core/protocol/bt/peer" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/peer"
"github.com/monkeyWie/gopeed-core/protocol/bt/tracker" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/tracker"
) )
type peerPool struct { type peerPool struct {
@@ -1,7 +1,7 @@
package torrent package torrent
import ( import (
"github.com/monkeyWie/gopeed-core/protocol/bt/metainfo" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
"math" "math"
"sync" "sync"
@@ -4,7 +4,7 @@ import (
"errors" "errors"
"time" "time"
"github.com/monkeyWie/gopeed-core/protocol/bt/metainfo" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@@ -1,8 +1,8 @@
package torrent package torrent
import ( import (
"github.com/monkeyWie/gopeed-core/protocol/bt/metainfo" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
"github.com/monkeyWie/gopeed-core/protocol/bt/peer" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/peer"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"testing" "testing"
) )
File renamed without changes.
@@ -15,8 +15,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/monkeyWie/gopeed-core/protocol/bt/metainfo" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
"github.com/monkeyWie/gopeed-core/protocol/bt/peer" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/peer"
) )
const ( const (
@@ -2,7 +2,7 @@ package tracker
import ( import (
"fmt" "fmt"
"github.com/monkeyWie/gopeed-core/protocol/bt/metainfo" "github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
"testing" "testing"
) )
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 50 of 55 files, more files were not shown because too many files have changed in this diff. Show more