Annotate changelog with bug being closed.

[youtubedl] / youtube_dl / extractor / googlesearch.py

diff --git a/youtube_dl/extractor/googlesearch.py b/youtube_dl/extractor/googlesearch.py
index f9c88e9b5328a035cda2abe1014a015fceff2ed7..5279fa807f6903fa757c552b3e9ad3e013e5b494 100644 (file)
--- a/youtube_dl/extractor/googlesearch.py
+++ b/youtube_dl/extractor/googlesearch.py
@@ -1,39 +1,59 @@
+from __future__ import unicode_literals
+

 import itertools
 import re
 
 from .common import SearchInfoExtractor
 import itertools
 import re
 
 from .common import SearchInfoExtractor

-from ..utils import (
-    compat_urllib_parse,
-)

 
 
 class GoogleSearchIE(SearchInfoExtractor):
 
 
 class GoogleSearchIE(SearchInfoExtractor):

-    IE_DESC = u'Google Video search'
-    _MORE_PAGES_INDICATOR = r'id="pnnext" class="pn"'
+    IE_DESC = 'Google Video search'

     _MAX_RESULTS = 1000
     _MAX_RESULTS = 1000

-    IE_NAME = u'video.google:search'
+    IE_NAME = 'video.google:search'

     _SEARCH_KEY = 'gvsearch'
     _SEARCH_KEY = 'gvsearch'

+    _TEST = {
+        'url': 'gvsearch15:python language',
+        'info_dict': {
+            'id': 'python language',
+            'title': 'python language',
+        },
+        'playlist_count': 15,
+    }

 
     def _get_n_results(self, query, n):
         """Get a specified number of results for a query"""
 
 
     def _get_n_results(self, query, n):
         """Get a specified number of results for a query"""
 

+        entries = []

         res = {
             '_type': 'playlist',
             'id': query,
         res = {
             '_type': 'playlist',
             'id': query,

-            'entries': []
+            'title': query,

         }
 
         }
 

-        for pagenum in itertools.count(1):
-            result_url = u'http://www.google.com/search?tbm=vid&q=%s&start=%s&hl=en' % (compat_urllib_parse.quote_plus(query), pagenum*10)
-            webpage = self._download_webpage(result_url, u'gvsearch:' + query,
-                                             note='Downloading result page ' + str(pagenum))
-
-            for mobj in re.finditer(r'<h3 class="r"><a href="([^"]+)"', webpage):
-                e = {
+        for pagenum in itertools.count():
+            webpage = self._download_webpage(
+                'http://www.google.com/search',
+                'gvsearch:' + query,
+                note='Downloading result page %s' % (pagenum + 1),
+                query={
+                    'tbm': 'vid',
+                    'q': query,
+                    'start': pagenum * 10,
+                    'hl': 'en',
+                })
+
+            for hit_idx, mobj in enumerate(re.finditer(
+                    r'<h3 class="r"><a href="([^"]+)"', webpage)):
+
+                # Skip playlists
+                if not re.search(r'id="vidthumb%d"' % (hit_idx + 1), webpage):
+                    continue
+
+                entries.append({

                     '_type': 'url',
                     'url': mobj.group(1)
                     '_type': 'url',
                     'url': mobj.group(1)

-                }
-                res['entries'].append(e)
+                })

 
 

-            if (pagenum * 10 > n) or not re.search(self._MORE_PAGES_INDICATOR, webpage):
+            if (len(entries) >= n) or not re.search(r'id="pnnext"', webpage):
+                res['entries'] = entries[:n]

                 return res
                 return res