summary refs log tree commit diff
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-06-29 08:01:30 +0100
committerremitamine <remitamine@gmail.com>2015-07-23 11:59:12 +0100
commit653789afc72d1a225b971541fb633dd768d58942 (patch)
treea4c297f789f2056bbbc40c4f78b1d53bb61d2f48
parent2d651a2d02885cddf1752b45497e9113d3a3d403 (diff)
downloadyoutube-dl-653789afc72d1a225b971541fb633dd768d58942.tar.gz
youtube-dl-653789afc72d1a225b971541fb633dd768d58942.tar.xz
youtube-dl-653789afc72d1a225b971541fb633dd768d58942.zip
add google drive embeds
-rw-r--r--youtube_dl/extractor/generic.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 6d2efb22e..3f7b094db 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -48,6 +48,7 @@ from .vimeo import VimeoIE
 from .dailymotion import DailymotionCloudIE
 from .onionstudios import OnionStudiosIE
 from .snagfilms import SnagFilmsEmbedIE
+from .googledrive import GoogleDriveEmbedIE
 
 
 class GenericIE(InfoExtractor):
@@ -1599,6 +1600,11 @@ class GenericIE(InfoExtractor):
         if nbc_sports_url:
             return self.url_result(nbc_sports_url, 'NBCSportsVPlayer')
 
+        # Look for Google Drive embeds
+        google_drive_url = GoogleDriveEmbedIE._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._VALID_URL, webpage)