mirror of
https://github.com/crunchy-labs/crunchy-cli.git
synced 2026-01-21 12:12:00 -06:00
Moved url parsing methods from utils to standard library
This commit is contained in:
parent
5219f18417
commit
d6347a6b6b
1 changed files with 15 additions and 16 deletions
|
|
@ -1,19 +1,18 @@
|
||||||
package utils
|
package crunchyroll
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/ByteDream/crunchyroll-go"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// ExtractEpisodesFromUrl extracts all episodes from an url.
|
// ExtractEpisodesFromUrl extracts all episodes from an url.
|
||||||
// If audio is not empty, the episodes gets filtered after the given locale
|
// If audio is not empty, the episodes gets filtered after the given locale
|
||||||
func ExtractEpisodesFromUrl(crunchy *crunchyroll.Crunchyroll, url string, audio ...crunchyroll.LOCALE) ([]*crunchyroll.Episode, error) {
|
func (c *Crunchyroll) ExtractEpisodesFromUrl(url string, audio ...LOCALE) ([]*Episode, error) {
|
||||||
series, episodes, err := ParseUrl(crunchy, url)
|
series, episodes, err := c.ParseUrl(url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
var eps []*crunchyroll.Episode
|
var eps []*Episode
|
||||||
|
|
||||||
if series != nil {
|
if series != nil {
|
||||||
seasons, err := series.Seasons()
|
seasons, err := series.Seasons()
|
||||||
|
|
@ -80,27 +79,27 @@ func ExtractEpisodesFromUrl(crunchy *crunchyroll.Crunchyroll, url string, audio
|
||||||
|
|
||||||
// ParseUrl parses the given url into a series or episode.
|
// ParseUrl parses the given url into a series or episode.
|
||||||
// The returning episode is a slice because non-beta urls have the same episode with different languages
|
// The returning episode is a slice because non-beta urls have the same episode with different languages
|
||||||
func ParseUrl(crunchy *crunchyroll.Crunchyroll, url string) (*crunchyroll.Series, []*crunchyroll.Episode, error) {
|
func (c *Crunchyroll) ParseUrl(url string) (*Series, []*Episode, error) {
|
||||||
if seriesId, ok := crunchyroll.ParseBetaSeriesURL(url); ok {
|
if seriesId, ok := ParseBetaSeriesURL(url); ok {
|
||||||
series, err := crunchyroll.SeriesFromID(crunchy, seriesId)
|
series, err := SeriesFromID(c, seriesId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
return series, nil, nil
|
return series, nil, nil
|
||||||
} else if episodeId, ok := crunchyroll.ParseBetaEpisodeURL(url); ok {
|
} else if episodeId, ok := ParseBetaEpisodeURL(url); ok {
|
||||||
episode, err := crunchyroll.EpisodeFromID(crunchy, episodeId)
|
episode, err := EpisodeFromID(c, episodeId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
return nil, []*crunchyroll.Episode{episode}, nil
|
return nil, []*Episode{episode}, nil
|
||||||
} else if seriesName, ok := crunchyroll.ParseVideoURL(url); ok {
|
} else if seriesName, ok := ParseVideoURL(url); ok {
|
||||||
video, err := crunchy.FindVideoByName(seriesName)
|
video, err := c.FindVideoByName(seriesName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
return video.(*crunchyroll.Series), nil, nil
|
return video.(*Series), nil, nil
|
||||||
} else if seriesName, title, _, _, ok := crunchyroll.ParseEpisodeURL(url); ok {
|
} else if seriesName, title, _, _, ok := ParseEpisodeURL(url); ok {
|
||||||
episodes, err := crunchy.FindEpisodeByName(seriesName, title)
|
episodes, err := c.FindEpisodeByName(seriesName, title)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue