From 21619fe33301d07d21262e29f24d5c2fc5c62450 Mon Sep 17 00:00:00 2001 From: bytedream Date: Tue, 18 Jan 2022 23:46:07 +0100 Subject: [PATCH] Removed deprecated functions --- cmd/crunchyroll-go/cmd/login.go | 6 +++--- crunchyroll.go | 8 -------- format.go | 10 ---------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/cmd/crunchyroll-go/cmd/login.go b/cmd/crunchyroll-go/cmd/login.go index fb4b85c..c2f07e0 100644 --- a/cmd/crunchyroll-go/cmd/login.go +++ b/cmd/crunchyroll-go/cmd/login.go @@ -30,7 +30,7 @@ func init() { } func loginCredentials(email, password string) error { - out.Debugln("Logging in via credentials") + out.Debug("Logging in via credentials") session, err := crunchyroll.LoginWithCredentials(email, password, locale, client) if err != nil { return err @@ -40,11 +40,11 @@ func loginCredentials(email, password string) error { func loginSessionID(sessionID string, alreadyChecked bool) error { if !alreadyChecked { - out.Debugln("Logging in via session id") + out.Debug("Logging in via session id") if _, err := crunchyroll.LoginWithSessionID(sessionID, locale, client); err != nil { return err } } - out.Infoln("Due to security reasons, you have to login again on the next reboot") + out.Info("Due to security reasons, you have to login again on the next reboot") return ioutil.WriteFile(sessionIDPath, []byte(sessionID), 0777) } diff --git a/crunchyroll.go b/crunchyroll.go index 457df0d..3d5adf4 100644 --- a/crunchyroll.go +++ b/crunchyroll.go @@ -325,14 +325,6 @@ func (c *Crunchyroll) FindEpisodeByName(seriesName, episodeTitle string) ([]*Epi return matchingEpisodes, nil } -// MatchEpisode tries to extract the crunchyroll series name and title out of the given url -// -// Deprecated: Use ParseEpisodeURL instead -func MatchEpisode(url string) (seriesName, title string, ok bool) { - seriesName, title, _, _, ok = ParseEpisodeURL(url) - return -} - // ParseVideoURL tries to extract the crunchyroll series / movie name out of the given url func ParseVideoURL(url string) (seriesName string, ok bool) { pattern := regexp.MustCompile(`(?m)^https?://(www\.)?crunchyroll\.com(/\w{2}(-\w{2})?)?/(?P[^/]+)/?$`) diff --git a/format.go b/format.go index 7fbdb58..fb388e1 100644 --- a/format.go +++ b/format.go @@ -37,16 +37,6 @@ type Format struct { Subtitles []*Subtitle } -// Download calls DownloadGoroutines with 4 goroutines. -// See DownloadGoroutines for more details -// -// Deprecated: Use DownloadGoroutines instead -func (f *Format) Download(output *os.File, onSegmentDownload func(segment *m3u8.MediaSegment, current, total int, file *os.File, err error) error) error { - return f.DownloadGoroutines(output, 4, func(segment *m3u8.MediaSegment, current, total int, file *os.File) error { - return onSegmentDownload(segment, current, total, file, nil) - }) -} - // DownloadGoroutines downloads the format to the given output file (as .ts file). // See Format.DownloadSegments for more information func (f *Format) DownloadGoroutines(output *os.File, goroutines int, onSegmentDownload func(segment *m3u8.MediaSegment, current, total int, file *os.File) error) error {