feat: cli

This commit is contained in:
liwei committed 2021-03-25 17:30:40 +08:00
1 parent caf9bf265b
commit 359f28bb1f
12 files changed
+209 -97

No files matched your search

+1
View File
@@ -17,6 +17,7 @@ type EventKey string
const (
EventKeyStart = "start"
EventKeyPause = "pause"
EventKeyContinue = "continue"
EventKeyProgress = "progress"
EventKeyError = "error"
EventKeyDone = "done"
+9 -2
View File
@@ -121,7 +121,14 @@ func (d *Downloader) Create(res *base.Resource, opts *base.Options) (err error)
d.emit(task, base.EventKeyError)
} else {
task.Progress.Used = task.timer.Used()
task.Progress.Speed = task.Res.TotalSize / (task.Progress.Used / int64(time.Second))
if task.Res.TotalSize == 0 {
task.Res.TotalSize = task.fetcher.Progress().TotalDownloaded()
}
used := task.Progress.Used / int64(time.Second)
if used == 0 {
used = 1
}
task.Progress.Speed = task.Res.TotalSize / used
task.Progress.Downloaded = task.Res.TotalSize
d.emit(d.tasks[id], base.EventKeyDone)
}
@@ -144,7 +151,7 @@ func (d *Downloader) Continue(id string) {
defer task.locker.Unlock()
task.timer.Continue()
task.fetcher.Continue()
d.emit(task, base.EventKeyStart)
d.emit(task, base.EventKeyContinue)
}
func (d *Downloader) Listener(fn func(taskInfo *TaskInfo, eventKey base.EventKey)) {
+3 -2
View File
@@ -16,6 +16,7 @@ import (
"path"
"path/filepath"
"strconv"
"strings"
"time"
)
@@ -117,8 +118,8 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
}
}
// Get file filename by URL
if file.Name == "" {
file.Name = path.Base(req.URL)
if file.Name == "" && strings.Count(req.URL, "/") > 2 {
file.Name = filepath.Base(req.URL)
}
// unknown file filename
if file.Name == "" {