R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't stop processing URLs

Browse Source 
Use `continue` instead of `return` to loop through all possible sources.

Added test case for episode where `<SourceFile>` element has `[NOT-USED]` in URL, but other `<*Files>` elements have working URLs.
This commit is contained in:
Toni Viemerö 2018-03-05 20:18:16 +02:00 committed by GitHub
parent 64f34528df
commit 913bfc8c87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/ruutu.py
View File

@ -15,6 +15,19 @@ from ..utils import (
class RuutuIE(InfoExtractor): class RuutuIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?(?:ruutu|supla)\.fi/(?:video|supla)/(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?(?:ruutu|supla)\.fi/(?:video|supla)/(?P<id>\d+)'
_TESTS = [ _TESTS = [
{
'url': 'http://www.ruutu.fi/video/3193728',
'md5': '285a06ce136bc4fdb4d48b02bf3ce5f6',
'info_dict': {
'id': '3193728',
'ext': 'mp4',
'title': 'Poliisit - Kausi 10 - Jakso 11',
'description': 'md5:5154e593a0a138baeeb1caaabcbe13cb',
'thumbnail': r're:^https?://.*\.jpg$',
'duration': 1283,
'age_limit': 0,
},
},
{ {
'url': 'http://www.ruutu.fi/video/2058907', 'url': 'http://www.ruutu.fi/video/2058907',
'md5': 'ab2093f39be1ca8581963451b3c0234f', 'md5': 'ab2093f39be1ca8581963451b3c0234f',
@ -72,7 +85,7 @@ class RuutuIE(InfoExtractor):
video_url = child.text video_url = child.text
if (not video_url or video_url in processed_urls or if (not video_url or video_url in processed_urls or
any(p in video_url for p in ('NOT_USED', 'NOT-USED'))): any(p in video_url for p in ('NOT_USED', 'NOT-USED'))):
return continue
processed_urls.append(video_url) processed_urls.append(video_url)
ext = determine_ext(video_url) ext = determine_ext(video_url)
if ext == 'm3u8': if ext == 'm3u8':