mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-16 05:13:41 +00:00
fix: tasks block when paused while not ready (#648)
This commit is contained in:
1 file changed
+11
-13
+11
-13
@@ -362,18 +362,10 @@ func (d *Downloader) Pause(id string) (err error) {
|
|||||||
return ErrTaskNotFound
|
return ErrTaskNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
func() {
|
if err = d.doPause(task); err != nil {
|
||||||
task.lock.Lock()
|
return
|
||||||
defer task.lock.Unlock()
|
}
|
||||||
|
d.notifyRunning()
|
||||||
if task.Status == base.DownloadStatusPause {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = d.doPause(task); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
d.notifyRunning()
|
|
||||||
}()
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -592,11 +584,11 @@ func (d *Downloader) Close() error {
|
|||||||
|
|
||||||
closeArr := []func() error{
|
closeArr := []func() error{
|
||||||
d.PauseAll,
|
d.PauseAll,
|
||||||
d.storage.Close,
|
|
||||||
}
|
}
|
||||||
for _, fm := range d.cfg.FetchManagers {
|
for _, fm := range d.cfg.FetchManagers {
|
||||||
closeArr = append(closeArr, fm.Close)
|
closeArr = append(closeArr, fm.Close)
|
||||||
}
|
}
|
||||||
|
closeArr = append(closeArr, d.storage.Close)
|
||||||
// Make sure all resources are released, if had error, return the last error
|
// Make sure all resources are released, if had error, return the last error
|
||||||
var lastErr error
|
var lastErr error
|
||||||
for i, close := range closeArr {
|
for i, close := range closeArr {
|
||||||
@@ -732,6 +724,12 @@ func (d *Downloader) watch(task *Task) {
|
|||||||
d.doOnError(task, err)
|
d.doOnError(task, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// When delete a not resolved task, need check if the task resource is nil
|
||||||
|
if task.Meta.Res == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
task.Progress.Used = task.timer.Used()
|
task.Progress.Used = task.timer.Used()
|
||||||
if task.Meta.Res.Size == 0 {
|
if task.Meta.Res.Size == 0 {
|
||||||
task.Meta.Res.Size = task.fetcher.Progress().TotalDownloaded()
|
task.Meta.Res.Size = task.fetcher.Progress().TotalDownloaded()
|
||||||
|
|||||||
Reference in new issue
Block a user