NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 12:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename variables

Browse source
This commit is contained in:
bytedream 2022-03-28 19:57:19 +02:00
parent e4d075c855
commit e0069a10e0
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cmd/crunchyroll-go/cmd/archive.go
View file

@ -270,12 +270,12 @@ func archive(urls []string) error {
func archiveInfo(info formatInformation, writeCloser io.WriteCloser, filename string) error { func archiveInfo(info formatInformation, writeCloser io.WriteCloser, filename string) error {
out.Debug("Entering season %d, episode %d with %d additional formats", info.SeasonNumber, info.EpisodeNumber, len(info.additionalFormats)) out.Debug("Entering season %d, episode %d with %d additional formats", info.SeasonNumber, info.EpisodeNumber, len(info.additionalFormats))
downloadProgress, err := createArchiveProgress(info) dp, err := createArchiveProgress(info)
if err != nil { if err != nil {
return fmt.Errorf("error while setting up downloader: %v", err) return fmt.Errorf("error while setting up downloader: %v", err)
} }
defer func() { defer func() {
if downloadProgress.Total != downloadProgress.Current { if dp.Total != dp.Current {
fmt.Println() fmt.Println()
} }
}() }()
@ -297,13 +297,13 @@ func archiveInfo(info formatInformation, writeCloser io.WriteCloser, filename st
} }
if out.IsDev() { if out.IsDev() {
downloadProgress.UpdateMessage(fmt.Sprintf("Downloading %d/%d (%.2f%%) » %s", current, total, float32(current)/float32(total)*100, segment.URI), false) dp.UpdateMessage(fmt.Sprintf("Downloading %d/%d (%.2f%%) » %s", current, total, float32(current)/float32(total)*100, segment.URI), false)
} else { } else {
downloadProgress.Update() dp.Update()
} }
if current == total { if current == total {
downloadProgress.UpdateMessage("Merging segments", false) dp.UpdateMessage("Merging segments", false)
} }
return nil return nil
}) })
@ -415,7 +415,7 @@ func archiveInfo(info formatInformation, writeCloser io.WriteCloser, filename st
return fmt.Errorf("failed to merge files: %v", err) return fmt.Errorf("failed to merge files: %v", err)
} }
downloadProgress.UpdateMessage("Download finished", false) dp.UpdateMessage("Download finished", false)
signal.Stop(sig) signal.Stop(sig)
out.Debug("Stopped signal catcher") out.Debug("Stopped signal catcher")
@ -445,7 +445,7 @@ func createArchiveProgress(info formatInformation) (*downloadProgress, error) {
progressCount += int(f.Video.Chunklist.Count()) + 1 progressCount += int(f.Video.Chunklist.Count()) + 1
} }
downloadProgress := &downloadProgress{ dp := &downloadProgress{
Prefix: out.InfoLog.Prefix(), Prefix: out.InfoLog.Prefix(),
Message: "Downloading video", Message: "Downloading video",
// number of segments a video +1 is for the success message // number of segments a video +1 is for the success message
@ -454,10 +454,10 @@ func createArchiveProgress(info formatInformation) (*downloadProgress, error) {
Quiet: out.IsQuiet(), Quiet: out.IsQuiet(),
} }
if out.IsDev() { if out.IsDev() {
downloadProgress.Prefix = out.DebugLog.Prefix() dp.Prefix = out.DebugLog.Prefix()
} }
return downloadProgress, nil return dp, nil
} }
func archiveDownloadVideos(downloader crunchyroll.Downloader, filename string, video bool, formats ...*crunchyroll.Format) ([]string, error) { func archiveDownloadVideos(downloader crunchyroll.Downloader, filename string, video bool, formats ...*crunchyroll.Format) ([]string, error) {

14
cmd/crunchyroll-go/cmd/download.go
View file

@ -179,7 +179,7 @@ func downloadInfo(info formatInformation, file *os.File) error {
return fmt.Errorf("error while initializing the video: %v", err) return fmt.Errorf("error while initializing the video: %v", err)
} }
downloadProgress := &downloadProgress{ dp := &downloadProgress{
Prefix: out.InfoLog.Prefix(), Prefix: out.InfoLog.Prefix(),
Message: "Downloading video", Message: "Downloading video",
// number of segments a video has +2 is for merging and the success message // number of segments a video has +2 is for merging and the success message
@ -188,10 +188,10 @@ func downloadInfo(info formatInformation, file *os.File) error {
Quiet: out.IsQuiet(), Quiet: out.IsQuiet(),
} }
if out.IsDev() { if out.IsDev() {
downloadProgress.Prefix = out.DebugLog.Prefix() dp.Prefix = out.DebugLog.Prefix()
} }
defer func() { defer func() {
if downloadProgress.Total != downloadProgress.Current { if dp.Total != dp.Current {
fmt.Println() fmt.Println()
} }
}() }()
@ -206,13 +206,13 @@ func downloadInfo(info formatInformation, file *os.File) error {
} }
if out.IsDev() { if out.IsDev() {
downloadProgress.UpdateMessage(fmt.Sprintf("Downloading %d/%d (%.2f%%) » %s", current, total, float32(current)/float32(total)*100, segment.URI), false) dp.UpdateMessage(fmt.Sprintf("Downloading %d/%d (%.2f%%) » %s", current, total, float32(current)/float32(total)*100, segment.URI), false)
} else { } else {
downloadProgress.Update() dp.Update()
} }
if current == total { if current == total {
downloadProgress.UpdateMessage("Merging segments", false) dp.UpdateMessage("Merging segments", false)
} }
return nil return nil
}) })
@ -248,7 +248,7 @@ func downloadInfo(info formatInformation, file *os.File) error {
return fmt.Errorf("error while downloading: %v", err) return fmt.Errorf("error while downloading: %v", err)
} }
downloadProgress.UpdateMessage("Download finished", false) dp.UpdateMessage("Download finished", false)
signal.Stop(sig) signal.Stop(sig)
out.Debug("Stopped signal catcher") out.Debug("Stopped signal catcher")