]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
fix recursive error
authorremitamine <remitamine@gmail.com>
Fri, 17 Jul 2015 13:52:01 +0000 (14:52 +0100)
committerremitamine <remitamine@gmail.com>
Thu, 23 Jul 2015 10:59:13 +0000 (11:59 +0100)
youtube_dl/extractor/googledrive.py

index 6d9bcfefdd1bfda424004f706d2a1d8eea711357..a3d9b44506015002c3dad145b614f763995cac86 100644 (file)
@@ -26,7 +26,7 @@ class GoogleDriveEmbedIE(InfoExtractor):
         video_id = self._match_id(url)
         return {
             '_type': 'url',
-            'ie-key': 'GoogleDrive',
+            'ie_key': 'GoogleDrive',
             'url': 'https://drive.google.com/file/d/%s' % video_id
         }
 
@@ -66,34 +66,34 @@ class GoogleDriveIE(InfoExtractor):
         )
         try:
             title = self._html_search_regex(
-                r'"title"\s+,\s+"[^"]+',
+                r'"title"\s*,\s*"([^"]+)',
                 webpage,
                 'title'
             )
             fmt_stream_map = self._html_search_regex(
-                r'"fmt_stream_map"\s+,\s+"[^"]+',
+                r'"fmt_stream_map"\s*,\s*"([^"]+)',
                 webpage,
                 'fmt_stream_map'
             )
             fmt_list = self._html_search_regex(
-                r'"fmt_list"\s+,\s+"[^"]+',
+                r'"fmt_list"\s*,\s*"([^"]+)',
                 webpage,
                 'fmt_list'
             )
 #                      timestamp = self._html_search_regex(
-#                              r'"timestamp"\s+,\s+"[^"]+',
+#                              r'"timestamp"\s*,\s*"([^"]+)',
 #                              webpage,
 #                              'timestamp'
 #                      )
             length_seconds = self._html_search_regex(
-                r'"length_seconds"\s+,\s+"[^"]+',
+                r'"length_seconds"\s*,\s*"([^"]+)',
                 webpage,
                 'length_seconds'
             )
         except RegexNotFoundError:
             try:
                 reason = self._html_search_regex(
-                    r'"reason","[^"]+',
+                    r'"reason","([^"]+)',
                     webpage,
                     'reason'
                 )