about summary refs log tree commit diff
path: root/youtube_dl/extractor/googledrive.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-07-17 14:37:21 +0100
committerremitamine <remitamine@gmail.com>2015-07-23 11:59:12 +0100
commitd1cc05e17eccccb7ee6473574c6a4f887104baeb (patch)
tree100bd37a2b3aba8b796495bcdb4f09fba4f35647 /youtube_dl/extractor/googledrive.py
parent3b3d531965f0f36c20f5fa8557481c144170653f (diff)
downloadyoutube-dl-d1cc05e17eccccb7ee6473574c6a4f887104baeb.tar.gz
youtube-dl-d1cc05e17eccccb7ee6473574c6a4f887104baeb.tar.xz
youtube-dl-d1cc05e17eccccb7ee6473574c6a4f887104baeb.zip
remove unnecessary regex group names
Diffstat (limited to 'youtube_dl/extractor/googledrive.py')
-rw-r--r--youtube_dl/extractor/googledrive.py32
1 files changed, 13 insertions, 19 deletions
diff --git a/youtube_dl/extractor/googledrive.py b/youtube_dl/extractor/googledrive.py
index c82c9037f..6d9bcfefd 100644
--- a/youtube_dl/extractor/googledrive.py
+++ b/youtube_dl/extractor/googledrive.py
@@ -62,46 +62,40 @@ class GoogleDriveIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(
-            'http://docs.google.com/file/d/'+video_id, video_id, encoding='unicode_escape'
+            'http://docs.google.com/file/d/' + video_id, video_id, encoding='unicode_escape'
         )
         try:
             title = self._html_search_regex(
-                r'"title","(?P<title>.*?)"',
+                r'"title"\s+,\s+"[^"]+',
                 webpage,
-                'title',
-                group='title'
+                'title'
             )
             fmt_stream_map = self._html_search_regex(
-                r'"fmt_stream_map","(?P<fmt_stream_map>.*?)"',
+                r'"fmt_stream_map"\s+,\s+"[^"]+',
                 webpage,
-                'fmt_stream_map',
-                group='fmt_stream_map'
+                'fmt_stream_map'
             )
             fmt_list = self._html_search_regex(
-                r'"fmt_list","(?P<fmt_list>.*?)"',
+                r'"fmt_list"\s+,\s+"[^"]+',
                 webpage,
-                'fmt_list',
-                group='fmt_list'
+                'fmt_list'
             )
 #			timestamp = self._html_search_regex(
-#				r'"timestamp","(?P<timestamp>.*?)"',
+#				r'"timestamp"\s+,\s+"[^"]+',
 #				webpage,
-#				'timestamp',
-#				group='timestamp'
+#				'timestamp'
 #			)
             length_seconds = self._html_search_regex(
-                r'"length_seconds","(?P<length_seconds>.*?)"',
+                r'"length_seconds"\s+,\s+"[^"]+',
                 webpage,
-                'length_seconds',
-                group='length_seconds'
+                'length_seconds'
             )
         except RegexNotFoundError:
             try:
                 reason = self._html_search_regex(
-                    r'"reason","(?P<reason>.*?)"',
+                    r'"reason","[^"]+',
                     webpage,
-                    'reason',
-                    group='reason'
+                    'reason'
                 )
                 self.report_warning(reason)
                 return