From: remitamine <remitamine@gmail.com>
Date: Mon, 21 Dec 2015 02:15:19 +0000 (+0100)
Subject: Merge branch 'googledrive' of github.com:remitamine/youtube-dl into remitamine-google... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=a8ae232fa9c24534bd9c838c793f182e6796fe4e

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

a8ae232fa9c24534bd9c838c793f182e6796fe4e
diff --cc youtube_dl/extractor/__init__.py
index 908581bf7,6655d7eb5..e7b536df0
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -231,10 -209,11 +231,11 @@@ from .globo import 
  from .godtube import GodTubeIE
  from .goldenmoustache import GoldenMoustacheIE
  from .golem import GolemIE
+ from .googledrive import GoogleDriveIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 -from .gorillavid import GorillaVidIE
  from .goshgay import GoshgayIE
 +from .gputechconf import GPUTechConfIE
  from .groupon import GrouponIE
  from .hark import HarkIE
  from .hearthisat import HearThisAtIE
diff --cc youtube_dl/extractor/generic.py
index c2e8f9b62,abd98e500..7cf13fddf
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -52,9 -48,7 +52,10 @@@ from .vimeo import VimeoI
  from .dailymotion import DailymotionCloudIE
  from .onionstudios import OnionStudiosIE
  from .snagfilms import SnagFilmsEmbedIE
 +from .screenwavemedia import ScreenwaveMediaIE
 +from .mtv import MTVServicesEmbeddedIE
 +from .pladform import PladformIE
+ from .googledrive import GoogleDriveIE
  
  
  class GenericIE(InfoExtractor):
@@@ -1769,9 -1600,14 +1770,14 @@@
          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._VALID_URL, webpage)
 +            r'<iframe[^>]+src="(?P<url>%s)"' % UDNEmbedIE._PROTOCOL_RELATIVE_VALID_URL, webpage)
          if mobj is not None:
              return self.url_result(
                  compat_urlparse.urljoin(url, mobj.group('url')), 'UDNEmbed')