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

Fix for #7

Browse source
This commit is contained in:
bytedream 2021-10-14 22:40:06 +02:00
parent 74e8810123
commit 458c0595e5
4 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,4 +1,4 @@
VERSION=1.2.0 VERSION=1.2.1
BINARY_NAME=crunchy BINARY_NAME=crunchy
VERSION_BINARY_NAME=$(BINARY_NAME)-v$(VERSION) VERSION_BINARY_NAME=$(BINARY_NAME)-v$(VERSION)

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

@ -296,7 +296,7 @@ func parseURLs(urls []string) (allEpisodes []episodeInformation, total, successe
var seriesName string var seriesName string
var ok bool var ok bool
if seriesName, _, ok = crunchyroll.MatchEpisode(url); !ok { if seriesName, _, _, _, ok = crunchyroll.ParseEpisodeURL(url); !ok {
seriesName, _ = crunchyroll.MatchVideo(url) seriesName, _ = crunchyroll.MatchVideo(url)
} }
@ -339,7 +339,7 @@ func parseURLs(urls []string) (allEpisodes []episodeInformation, total, successe
var parsed []episodeInformation var parsed []episodeInformation
parsed, localTotal, localSuccesses = parseVideo(dupe, url) parsed, localTotal, localSuccesses = parseVideo(dupe, url)
allEpisodes = append(allEpisodes, parsed...) allEpisodes = append(allEpisodes, parsed...)
} else if _, _, ok = crunchyroll.MatchEpisode(url); ok { } else if _, _, _, _, ok = crunchyroll.ParseEpisodeURL(url); ok {
out.Debugf("Parsed url %d as episode\n", i+1) out.Debugf("Parsed url %d as episode\n", i+1)
if episode := parseEpisodes(dupe.(*utils.EpisodeStructure), url); episode.Format != nil { if episode := parseEpisodes(dupe.(*utils.EpisodeStructure), url); episode.Format != nil {
allEpisodes = append(allEpisodes, episode) allEpisodes = append(allEpisodes, episode)

23
crunchyroll.go
View file

@ -9,7 +9,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"regexp" "regexp"
"strings" "strconv"
) )
// LOCALE represents a locale / language // LOCALE represents a locale / language
@ -307,8 +307,7 @@ func (c *Crunchyroll) FindVideo(seriesUrl string) (Video, error) {
// FindEpisode finds an episode by its crunchyroll link // FindEpisode finds an episode by its crunchyroll link
// e.g. https://www.crunchyroll.com/darling-in-the-franxx/episode-1-alone-and-lonesome-759575 // e.g. https://www.crunchyroll.com/darling-in-the-franxx/episode-1-alone-and-lonesome-759575
func (c *Crunchyroll) FindEpisode(url string) ([]*Episode, error) { func (c *Crunchyroll) FindEpisode(url string) ([]*Episode, error) {
if series, title, ok := MatchEpisode(url); ok { if series, title, _, _, ok := ParseEpisodeURL(url); ok {
title = strings.TrimSuffix(title, "-")
video, err := c.FindVideo(fmt.Sprintf("https://www.crunchyroll.com/%s", series)) video, err := c.FindVideo(fmt.Sprintf("https://www.crunchyroll.com/%s", series))
if err != nil { if err != nil {
return nil, err return nil, err
@ -351,14 +350,26 @@ func MatchVideo(url string) (seriesName string, ok bool) {
} }
// MatchEpisode tries to extract the crunchyroll series name and title out of the given url // 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) { func MatchEpisode(url string) (seriesName, title string, ok bool) {
pattern := regexp.MustCompile(`(?m)^https?://(www\.)?crunchyroll\.com(/\w{2}(-\w{2})?)?/(?P<series>[^/]+)/episode-\d+-(?P<title>\D+).*`) seriesName, title, _, _, ok = ParseEpisodeURL(url)
return
}
// ParseEpisodeURL tries to extract the crunchyroll series name, title, episode number and web id out of the given url
// Note that the episode number can be misleading. For example if an episode has the episode number 23.5 (slime isekai)
// the episode number will be 235
func ParseEpisodeURL(url string) (seriesName, title string, episodeNumber int, webId int, ok bool) {
pattern := regexp.MustCompile(`(?m)^https?://(www\.)?crunchyroll\.com(/\w{2}(-\w{2})?)?/(?P<series>[^/]+)/episode-(?P<number>\d+)-(?P<title>\w+)-(?P<webId>\d+).*`)
if urlMatch := pattern.FindAllStringSubmatch(url, -1); len(urlMatch) != 0 { if urlMatch := pattern.FindAllStringSubmatch(url, -1); len(urlMatch) != 0 {
groups := regexGroups(urlMatch, pattern.SubexpNames()...) groups := regexGroups(urlMatch, pattern.SubexpNames()...)
seriesName = groups["series"] seriesName = groups["series"]
title = strings.TrimSuffix(groups["title"], "-") episodeNumber, _ = strconv.Atoi(groups["number"])
title = groups["title"]
webId, _ = strconv.Atoi(groups["webId"])
if seriesName != "" && title != "" { if seriesName != "" && title != "" && webId != 0 {
ok = true ok = true
} }
} }

11
utils/structure.go
View file

@ -2,6 +2,7 @@ package utils
import ( import (
"errors" "errors"
"fmt"
"github.com/ByteDream/crunchyroll-go" "github.com/ByteDream/crunchyroll-go"
"sync" "sync"
) )
@ -499,11 +500,13 @@ func (es *EpisodeStructure) GetEpisodeByFormat(format *crunchyroll.Format) (*cru
// GetEpisodeByURL returns an episode by its url // GetEpisodeByURL returns an episode by its url
func (es *EpisodeStructure) GetEpisodeByURL(url string) (*crunchyroll.Episode, error) { func (es *EpisodeStructure) GetEpisodeByURL(url string) (*crunchyroll.Episode, error) {
_, title, ok := crunchyroll.MatchEpisode(url) _, title, episodeNumber, _, ok := crunchyroll.ParseEpisodeURL(url)
if !ok { if !ok {
return nil, errors.New("invalid url") return nil, errors.New("invalid url")
} }
fmt.Println(title)
episodes, err := es.Episodes() episodes, err := es.Episodes()
if err != nil { if err != nil {
return nil, err return nil, err
@ -514,6 +517,12 @@ func (es *EpisodeStructure) GetEpisodeByURL(url string) (*crunchyroll.Episode, e
return episode, nil return episode, nil
} }
} }
for _, episode := range episodes {
if episode.EpisodeNumber == episodeNumber {
return episode, nil
}
}
return nil, errors.New("no episode could be found") return nil, errors.New("no episode could be found")
} }