Skip to content

Commit

Permalink
crunchyroll_anime: harden add series url regex
Browse files Browse the repository at this point in the history
  • Loading branch information
TAAPArthur committed Aug 13, 2023
1 parent 2d6b603 commit 32123fe
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions amt/servers/crunchyroll.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class CrunchyrollAnime(GenericCrunchyrollServer):
need_cloud_scraper = True

stream_url_regex = re.compile(r"crunchyroll.\w+/watch/(\w*)/.+")
add_series_url_regex = re.compile(r"crunchyroll.\w+/series/(\w*)/([A-z-]*)")
add_series_url_regex = re.compile(r"crunchyroll.\w+/series/(\w*)")

version = 2

Expand Down Expand Up @@ -243,7 +243,7 @@ def get_params(self):
def get_media_list(self, **kwargs):
return self.search_for_media(None, **kwargs)

def get_media_data_for_series(self, media_id, media_title):
def get_media_data_for_series(self, media_id):
season_url = f"{self.get_api_domain()}/content/v2/cms/series/{media_id}/seasons"
season_data = self.session_get_cache_json(f"{season_url}", key=season_url, need_auth_headers=True)
media_list = []
Expand All @@ -260,15 +260,15 @@ def search_for_media(self, term, limit=None, **kwargs):
if media_info["type"] != "series":
continue
for media_item in media_info["items"]:
media_list.extend(self.get_media_data_for_series(media_item['id'], media_item["title"]))
media_list.extend(self.get_media_data_for_series(media_item['id']))
if limit and len(media_list) > limit:
break
return media_list

def get_all_media_data_from_url(self, url):
match = self.add_series_url_regex.search(url)
if match:
return self.get_media_data_for_series(match.group(1), match.group(2))
return self.get_media_data_for_series(match.group(1))
media_id = self.get_chapter_id_for_url(url)
bucket, params = self.get_params()
query = urlencode(params)
Expand Down

0 comments on commit 32123fe

Please sign in to comment.