ageng/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp synced 2025-12-17 22:55:42 +07:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bliptv' of github.com:remitamine/youtube-dl into remitamine-bliptv

Browse Source
This commit is contained in:
remitamine
2015-12-21 04:31:17 +01:00
parent a8ae232fa9 7cb0952474
commit 7ba71e30fb
6 changed files with 118 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/generic.py
View File

@@ -44,7 +44,6 @@
from .condenast import CondeNastIE
from .udn import UDNEmbedIE
from .senateisvp import SenateISVPIE
from .bliptv import BlipTVIE
from .svt import SVTIE
from .pornhub import PornHubIE
from .xhamster import XHamsterEmbedIE
@@ -56,6 +55,7 @@
from .mtv import MTVServicesEmbeddedIE
from .pladform import PladformIE
from .googledrive import GoogleDriveIE
from .jwplatform import JWPlatformIE
class GenericIE(InfoExtractor):
@@ -1441,11 +1441,6 @@ def _playlist_from_matches(matches, getter=None, ie=None):
'id': match.group('id')
}
# Look for embedded blip.tv player
bliptv_url = BlipTVIE._extract_url(webpage)
if bliptv_url:
return self.url_result(bliptv_url, 'BlipTV')
# Look for SVT player
svt_url = SVTIE._extract_url(webpage)
if svt_url:
@@ -1802,6 +1797,11 @@ def _playlist_from_matches(matches, getter=None, ie=None):
if snagfilms_url:
return self.url_result(snagfilms_url)
# Look for JWPlatform embeds
jwplatform_url = JWPlatformIE._extract_url(webpage)
if jwplatform_url:
return self.url_result(jwplatform_url, 'JWPlatform')
# Look for ScreenwaveMedia embeds
mobj = re.search(ScreenwaveMediaIE.EMBED_PATTERN, webpage)
if mobj is not None: