From d27fc672889f97b245a953597017e890dc1025dd Mon Sep 17 00:00:00 2001 From: bytedream Date: Mon, 28 Mar 2022 20:02:51 +0200 Subject: [PATCH] Remove empty output on last download --- cmd/crunchyroll-go/cmd/archive.go | 10 ++++++---- cmd/crunchyroll-go/cmd/download.go | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cmd/crunchyroll-go/cmd/archive.go b/cmd/crunchyroll-go/cmd/archive.go index aefc85c..95091d0 100644 --- a/cmd/crunchyroll-go/cmd/archive.go +++ b/cmd/crunchyroll-go/cmd/archive.go @@ -218,8 +218,8 @@ func archive(urls []string) error { } out.Empty() - for _, season := range episodes { - for _, info := range season { + for j, season := range episodes { + for k, info := range season { var filename string var writeCloser io.WriteCloser if c != nil { @@ -253,8 +253,11 @@ func archive(urls []string) error { } return err } - writeCloser.Close() + + if i != len(urls)-1 || j != len(episodes)-1 || k != len(season)-1 { + out.Empty() + } } } if c != nil { @@ -420,7 +423,6 @@ func archiveInfo(info formatInformation, writeCloser io.WriteCloser, filename st signal.Stop(sig) out.Debug("Stopped signal catcher") - out.Empty() out.Empty() return nil diff --git a/cmd/crunchyroll-go/cmd/download.go b/cmd/crunchyroll-go/cmd/download.go index 30d764a..4fbac96 100644 --- a/cmd/crunchyroll-go/cmd/download.go +++ b/cmd/crunchyroll-go/cmd/download.go @@ -147,8 +147,8 @@ func download(urls []string) error { } out.Empty() - for _, season := range episodes { - for _, info := range season { + for j, season := range episodes { + for k, info := range season { dir := info.Format(downloadDirectoryFlag) if _, err = os.Stat(dir); os.IsNotExist(err) { if err = os.MkdirAll(dir, 0777); err != nil { @@ -166,6 +166,10 @@ func download(urls []string) error { return err } file.Close() + + if i != len(urls)-1 || j != len(episodes)-1 || k != len(season)-1 { + out.Empty() + } } } } @@ -253,7 +257,6 @@ func downloadInfo(info formatInformation, file *os.File) error { signal.Stop(sig) out.Debug("Stopped signal catcher") - out.Empty() out.Empty() return nil