|
|
@@ -177,6 +177,7 @@ class CrunchyrollIE(CrunchyrollBaseIE):
|
|
|
'uploader': 'Kadokawa Pictures Inc.',
|
|
|
'upload_date': '20170118',
|
|
|
'series': "KONOSUBA -God's blessing on this wonderful world!",
|
|
|
+ 'season': "KONOSUBA -God's blessing on this wonderful world! 2",
|
|
|
'season_number': 2,
|
|
|
'episode': 'Give Me Deliverance from this Judicial Injustice!',
|
|
|
'episode_number': 1,
|
|
|
@@ -222,6 +223,23 @@ class CrunchyrollIE(CrunchyrollBaseIE):
|
|
|
# just test metadata extraction
|
|
|
'skip_download': True,
|
|
|
},
|
|
|
+ }, {
|
|
|
+ # A video with a vastly different season name compared to the series name
|
|
|
+ 'url': 'http://www.crunchyroll.com/nyarko-san-another-crawling-chaos/episode-1-test-590532',
|
|
|
+ 'info_dict': {
|
|
|
+ 'id': '590532',
|
|
|
+ 'ext': 'mp4',
|
|
|
+ 'title': 'Haiyoru! Nyaruani (ONA) Episode 1 – Test',
|
|
|
+ 'description': 'Mahiro and Nyaruko talk about official certification.',
|
|
|
+ 'uploader': 'TV TOKYO',
|
|
|
+ 'upload_date': '20120305',
|
|
|
+ 'series': 'Nyarko-san: Another Crawling Chaos',
|
|
|
+ 'season': 'Haiyoru! Nyaruani (ONA)',
|
|
|
+ },
|
|
|
+ 'params': {
|
|
|
+ # Just test metadata extraction
|
|
|
+ 'skip_download': True,
|
|
|
+ },
|
|
|
}]
|
|
|
|
|
|
_FORMAT_IDS = {
|
|
|
@@ -491,7 +509,8 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
|
|
|
# webpage provide more accurate data than series_title from XML
|
|
|
series = self._html_search_regex(
|
|
|
r'id=["\']showmedia_about_episode_num[^>]+>\s*<a[^>]+>([^<]+)',
|
|
|
- webpage, 'series', default=xpath_text(metadata, 'series_title'))
|
|
|
+ webpage, 'series', fatal=False)
|
|
|
+ season = xpath_text(metadata, 'series_title')
|
|
|
|
|
|
episode = xpath_text(metadata, 'episode_title')
|
|
|
episode_number = int_or_none(xpath_text(metadata, 'episode_number'))
|
|
|
@@ -508,6 +527,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
|
|
|
'uploader': video_uploader,
|
|
|
'upload_date': video_upload_date,
|
|
|
'series': series,
|
|
|
+ 'season': season,
|
|
|
'season_number': season_number,
|
|
|
'episode': episode,
|
|
|
'episode_number': episode_number,
|
Starsam80