Skip to content

Commit

Permalink
Feat: display dl err info after downloading (#21)
Browse files Browse the repository at this point in the history
* feat(dl): show all dl err for henime1me

* feat(dl): show dl err for hanimetv

* feat(dl): fix linting issue
  • Loading branch information
dreamjz committed Dec 23, 2023
1 parent 76e6c9b commit 1e015cd
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 32 deletions.
5 changes: 5 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,15 @@ linters:
- gochecknoglobals # disbale no global variable
- depguard # disbale depguard
- noctx # disable noctx
- contextcheck

linters-settings:
cyclop:
max-complexity: 12
funlen:
lines: 80
statements: 40
ignore-comments: true

issues:
exclude-rules:
Expand Down
57 changes: 31 additions & 26 deletions cmd/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/charmbracelet/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"golang.org/x/sync/errgroup"
"golang.org/x/sync/semaphore"
)

Expand Down Expand Up @@ -64,44 +63,50 @@ func download(aniURL string, cfg *Config) error {
Retry: cfg.DLOpt.Retry,
})

if d.Option.Info {
log.Infof("Start fetching anime info")
} else {
log.Info("Start downloading ...")
}

ctx := context.Background()
sem := semaphore.NewWeighted(int64(runtime.GOMAXPROCS(0)))
group, ctx := errgroup.WithContext(context.Background())
dl := func(ani *resolvers.HAnime, m *progressbar.Model) func() error {
return func() error {
wg := sync.WaitGroup{}
errs := make([]error, len(anis))
for i, ani := range anis {
wg.Add(1)

go func(idx int, a *resolvers.HAnime) {
defer wg.Done()

if err := sem.Acquire(ctx, 1); err != nil {
return fmt.Errorf("goroutine download %q acquire semaphore: %w", ani.Title, err)
log.Errorf("Failed to acquire semaphore: %v", err)
return
}
defer sem.Release(1)

err := d.Download(ani, m) //nolint:contextcheck
if err != nil {
return fmt.Errorf("download %q error: %w", ani.Title, err)
if err := d.Download(a, m); err != nil {
errs[idx] = err
}
return nil
}
}(i, ani)
}

if d.Option.Info {
log.Infof("Start fetching anime info")
} else {
log.Info("Start downloading ...")
}
go func() {
wg.Wait()
p.Send(progressbar.ProgressCompleteMsg{})
}()

for _, ani := range anis {
group.Go(dl(ani, m))
if _, err := p.Run(); err != nil {
return err //nolint:wrapcheck
}

go func() {
if err := group.Wait(); err != nil {
p.Send(progressbar.ProgressErrMsg{Err: err})
return
for _, e := range errs {
if e != nil {
log.Errorf("dl: %v", e)
}
p.Send(progressbar.ProgressSuccessMsg{})
}()

_, err = p.Run()
}

return err //nolint:wrapcheck
return nil
}

func init() {
Expand Down
8 changes: 4 additions & 4 deletions internal/downloader/downloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,9 @@ func (d *Downloader) saveM3U8(v *resolvers.Video, outputDir, fPath, fName string
pb := countProgressBar(d.p, int64(len(segURIs)), fName)
m.AddPb(pb)

ctx := context.Background()
sem := semaphore.NewWeighted(defaultGoRoutineNum)
group, ctx := errgroup.WithContext(context.Background())
group := &errgroup.Group{} // no need to cancel other dl goroutines
dlTS := func(idx, u string) func() error {
return func() error {
if err := sem.Acquire(ctx, 1); err != nil {
Expand All @@ -203,8 +204,6 @@ func (d *Downloader) saveM3U8(v *resolvers.Video, outputDir, fPath, fName string
} else if i-1 == int(d.Option.Retry) {
return err
}
log.Debugf("err: %s", err)
log.Debugf("retry download %s", tsPath)
}
time.Sleep(time.Duration(util.RandomInt63n(900, 3000)) * time.Millisecond) //nolint:gomnd
pb.Pc.Increase()
Expand All @@ -216,7 +215,8 @@ func (d *Downloader) saveM3U8(v *resolvers.Video, outputDir, fPath, fName string
group.Go(dlTS(strconv.Itoa(i), u))
}
if err := group.Wait(); err != nil {
return err //nolint:wrapcheck
d.SendPbStatus(fName, progressbar.ErrStatus)
return fmt.Errorf("download %s: %w", fName, err)
}

return d.mergeFiles(fileListPath, fName, fPath)
Expand Down
4 changes: 2 additions & 2 deletions internal/tui/progressbar/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type ProgressMsg struct {
Ratio float64
}

type ProgressSuccessMsg struct{}
type ProgressCompleteMsg struct{}

type ProgressErrMsg struct{ Err error }

Expand All @@ -40,7 +40,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:cyclop
m.width = w
return m, nil

case ProgressSuccessMsg:
case ProgressCompleteMsg:
return m, tea.Quit

case ProgressErrMsg:
Expand Down

0 comments on commit 1e015cd

Please sign in to comment.