feat: support RESTful api (#33)

This commit is contained in:
monkeyWie authored and GitHub committed 2022-09-09 18:31:57 +08:00
1 parent e292926697
commit c6aa83194f
22 files changed
+603 -125

No files matched your search

+75 -36
View File
@@ -17,17 +17,17 @@ type Listener func(event *Event)
type Progress struct {
// 下载耗时(纳秒)
Used int64
Used int64 `json:"used"`
// 每秒下载字节数
Speed int64
Speed int64 `json:"speed"`
// 已下载的字节数
Downloaded int64
Downloaded int64 `json:"downloaded"`
}
type Downloader struct {
*controller.DefaultController
fetchBuilders map[string]fetcher.FetcherBuilder
tasks map[string]*Task
tasks []*Task
listener Listener
}
@@ -39,15 +39,14 @@ func NewDownloader(fbs ...fetcher.FetcherBuilder) *Downloader {
d.fetchBuilders[strings.ToUpper(p)] = f
}
}
d.tasks = make(map[string]*Task)
d.tasks = make([]*Task, 0)
// 每秒统计一次下载速度
go func() {
for {
if len(d.tasks) > 0 {
for _, task := range d.tasks {
if task.Status == base.DownloadStatusPrepare ||
task.Status == base.DownloadStatusDone ||
if task.Status == base.DownloadStatusDone ||
task.Status == base.DownloadStatusError ||
task.Status == base.DownloadStatusPause {
continue
@@ -79,42 +78,55 @@ func (d *Downloader) buildFetcher(url string) (fetcher.Fetcher, error) {
return nil, errors.New("unsupported protocol")
}
func (d *Downloader) Resolve(req *base.Request) (string, *base.Resource, error) {
func (d *Downloader) Resolve(req *base.Request) (*base.Resource, error) {
fetcher, err := d.buildFetcher(req.URL)
if err != nil {
return "", nil, err
return nil, err
}
res, err := fetcher.Resolve(req)
if err != nil {
return "", nil, err
return nil, err
}
task := NewTask()
task.fetcher = fetcher
task.Res = res
d.tasks[task.ID] = task
return task.ID, res, nil
return res, nil
}
func (d *Downloader) Create(taskID string, res *base.Resource, opts *base.Options) (err error) {
task := d.tasks[taskID]
fetcher := d.tasks[taskID].fetcher
func (d *Downloader) Create(res *base.Resource, opts *base.Options) (taskId string, err error) {
if opts == nil {
opts = &base.Options{}
}
if !res.Range || opts.Connections < 1 {
opts.Connections = 1
}
if len(opts.SelectFiles) == 0 {
opts.SelectFiles = make([]int, len(res.Files))
for i := range opts.SelectFiles {
opts.SelectFiles[i] = i
}
}
fetcher, err := d.buildFetcher(res.Req.URL)
if err != nil {
return
}
err = fetcher.Create(res, opts)
if err != nil {
return
}
task := NewTask()
task.fetcher = fetcher
task.Res = res
task.Opts = opts
task.Status = base.DownloadStatusReady
task.Progress = &Progress{}
task.timer = &util.Timer{}
task.locker = new(sync.Mutex)
task.timer.Start()
task.Status = base.DownloadStatusRunning
d.tasks = append(d.tasks, task)
d.emit(EventKeyStart, task)
taskId = task.ID
err = fetcher.Start()
if err != nil {
return
@@ -122,18 +134,20 @@ func (d *Downloader) Create(taskID string, res *base.Resource, opts *base.Option
go func() {
err = fetcher.Wait()
if err != nil {
task.Status = base.DownloadStatusError
d.emit(EventKeyError, task, err)
} else {
task.Progress.Used = task.timer.Used()
if task.Res.Length == 0 {
task.Res.Length = task.fetcher.Progress().TotalDownloaded()
if task.Res.Size == 0 {
task.Res.Size = task.fetcher.Progress().TotalDownloaded()
}
used := task.Progress.Used / int64(time.Second)
if used == 0 {
used = 1
}
task.Progress.Speed = task.Res.Length / used
task.Progress.Downloaded = task.Res.Length
task.Progress.Speed = task.Res.Size / used
task.Progress.Downloaded = task.Res.Size
task.Status = base.DownloadStatusDone
d.emit(EventKeyDone, task)
}
d.emit(EventKeyFinally, task, err)
@@ -142,21 +156,33 @@ func (d *Downloader) Create(taskID string, res *base.Resource, opts *base.Option
}
func (d *Downloader) Pause(id string) {
task := d.tasks[id]
task := d.GetTask(id)
if task == nil {
return
}
task.locker.Lock()
defer task.locker.Unlock()
task.timer.Pause()
task.fetcher.Pause()
d.emit(EventKeyPause, task)
if task.Status == base.DownloadStatusRunning {
task.Status = base.DownloadStatusPause
task.timer.Pause()
task.fetcher.Pause()
d.emit(EventKeyPause, task)
}
}
func (d *Downloader) Continue(id string) {
task := d.tasks[id]
task := d.GetTask(id)
if task == nil {
return
}
task.locker.Lock()
defer task.locker.Unlock()
task.timer.Continue()
task.fetcher.Continue()
d.emit(EventKeyContinue, task)
if task.Status == base.DownloadStatusPause || task.Status == base.DownloadStatusError {
task.Status = base.DownloadStatusRunning
task.timer.Continue()
task.fetcher.Continue()
d.emit(EventKeyContinue, task)
}
}
func (d *Downloader) Listener(fn Listener) {
@@ -177,6 +203,19 @@ func (d *Downloader) emit(eventKey EventKey, task *Task, errs ...error) {
}
}
func (d *Downloader) GetTask(id string) *Task {
for _, task := range d.tasks {
if task.ID == id {
return task
}
}
return nil
}
func (d *Downloader) GetTasks() []*Task {
return d.tasks
}
var defaultDownloader = NewDownloader(new(http.FetcherBuilder), new(bt.FetcherBuilder))
type boot struct {
@@ -195,7 +234,7 @@ func (b *boot) Extra(extra interface{}) *boot {
return b
}
func (b *boot) Resolve() (string, *base.Resource, error) {
func (b *boot) Resolve() (*base.Resource, error) {
return defaultDownloader.Resolve(&base.Request{
URL: b.url,
Extra: b.extra,
@@ -207,13 +246,13 @@ func (b *boot) Listener(listener Listener) *boot {
return b
}
func (b *boot) Create(opts *base.Options) error {
taskID, res, err := b.Resolve()
func (b *boot) Create(opts *base.Options) (string, error) {
res, err := b.Resolve()
if err != nil {
return err
return "", err
}
defaultDownloader.Listener(b.listener)
return defaultDownloader.Create(taskID, res, opts)
return defaultDownloader.Create(res, opts)
}
func Boot() *boot {
+9 -9
View File
@@ -17,14 +17,14 @@ func TestDownloader_Resolve(t *testing.T) {
req := &base.Request{
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
}
_, res, err := downloader.Resolve(req)
res, err := downloader.Resolve(req)
if err != nil {
t.Fatal(err)
}
want := &base.Resource{
Req: req,
Length: test.BuildSize,
Range: true,
Req: req,
Size: test.BuildSize,
Range: true,
Files: []*base.FileInfo{
{
Name: test.BuildName,
@@ -33,8 +33,8 @@ func TestDownloader_Resolve(t *testing.T) {
},
},
}
if !reflect.DeepEqual(res, want) {
t.Errorf("Resolve error = %s, want %s", test.ToJson(res), test.ToJson(want))
if !reflect.DeepEqual(want, res) {
t.Errorf("Resolve() got = %v, want %v", res, want)
}
}
@@ -46,7 +46,7 @@ func TestDownloader_Create(t *testing.T) {
req := &base.Request{
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
}
taskID, res, err := downloader.Resolve(req)
res, err := downloader.Resolve(req)
if err != nil {
t.Fatal(err)
}
@@ -58,7 +58,7 @@ func TestDownloader_Create(t *testing.T) {
wg.Done()
}
})
err = downloader.Create(taskID, res, &base.Options{
_, err = downloader.Create(res, &base.Options{
Path: test.Dir,
Name: test.DownloadName,
Connections: 4,
@@ -70,6 +70,6 @@ func TestDownloader_Create(t *testing.T) {
want := test.FileMd5(test.BuildFile)
got := test.FileMd5(test.DownloadFile)
if want != got {
t.Errorf("Download error = %v, want %v", got, want)
t.Errorf("Download() got = %v, want %v", got, want)
}
}
+11 -8
View File
@@ -6,15 +6,17 @@ import (
"github.com/monkeyWie/gopeed-core/pkg/base"
"github.com/monkeyWie/gopeed-core/pkg/util"
"sync"
"time"
)
type Task struct {
ID string
Res *base.Resource
Opts *base.Options
Status base.Status
Files map[string]*base.FileInfo
Progress *Progress
ID string `json:"id"`
Res *base.Resource `json:"res"`
Opts *base.Options `json:"opts"`
Status base.Status `json:"status"`
Files map[string]*base.FileInfo `json:"files"`
Progress *Progress `json:"progress"`
CreateTime time.Time `json:"create_time"`
fetcher fetcher.Fetcher
timer *util.Timer
@@ -23,7 +25,8 @@ type Task struct {
func NewTask() *Task {
return &Task{
ID: uuid.New().String(),
Status: base.DownloadStatusPrepare,
ID: uuid.New().String(),
Status: base.DownloadStatusReady,
CreateTime: time.Now(),
}
}