diff options
| author | remitamine <remitamine@gmail.com> | 2015-12-21 03:15:19 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2015-12-21 03:15:19 +0100 |
| commit | a8ae232fa9c24534bd9c838c793f182e6796fe4e (patch) | |
| tree | 1a30e1e7d049c9b669adc0eb3385bfb3fde5a662 /youtube_dl/extractor/generic.py | |
| parent | b9a324c0daafb9484a2575783b6b120a7de885ff (diff) | |
| parent | 5b251628e9f45c89c1becb3f62c4212874eb74ea (diff) | |
| download | youtube-dl-a8ae232fa9c24534bd9c838c793f182e6796fe4e.tar.xz | |
Merge branch 'googledrive' of github.com:remitamine/youtube-dl into remitamine-googledrive
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index c2e8f9b62..7cf13fddf 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -55,6 +55,7 @@ from .snagfilms import SnagFilmsEmbedIE from .screenwavemedia import ScreenwaveMediaIE from .mtv import MTVServicesEmbeddedIE from .pladform import PladformIE +from .googledrive import GoogleDriveIE class GenericIE(InfoExtractor): @@ -1769,6 +1770,11 @@ class GenericIE(InfoExtractor): if nbc_sports_url: return self.url_result(nbc_sports_url, 'NBCSportsVPlayer') + # Look for Google Drive embeds + google_drive_url = GoogleDriveIE._extract_url(webpage) + if google_drive_url: + return self.url_result(google_drive_url, 'GoogleDrive') + # Look for UDN embeds mobj = re.search( r'<iframe[^>]+src="(?P<url>%s)"' % UDNEmbedIE._PROTOCOL_RELATIVE_VALID_URL, webpage) |