diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-09-28 12:14:16 +0200 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-09-28 12:14:16 +0200 | 
| commit | d6e6a4225650ff220c7fe0687d883552e4b45bde (patch) | |
| tree | e5692e65674c2d424f48d1086c6fdab6704d5258 /youtube_dl/extractor/generic.py | |
| parent | 76e7d1e74b10b99ed9289b0c30c5f4933f9d841e (diff) | |
[vimeo:likes] Add new extractor (Fixes #3835)
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 10 | 
1 files changed, 4 insertions, 6 deletions
| diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 367f930dd..0dfa4853d 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -397,12 +397,6 @@ class GenericIE(InfoExtractor):          },      ] -    def report_download_webpage(self, video_id): -        """Report webpage download.""" -        if not self._downloader.params.get('test', False): -            self._downloader.report_warning('Falling back on generic information extractor.') -        super(GenericIE, self).report_download_webpage(video_id) -      def report_following_redirect(self, new_url):          """Report information extraction."""          self._downloader.to_screen('[redirect] Following redirect to %s' % new_url) @@ -502,6 +496,7 @@ class GenericIE(InfoExtractor):          url, smuggled_data = unsmuggle_url(url)          force_videoid = None +        is_intentional = smuggled_data and smuggled_data.get('to_generic')          if smuggled_data and 'force_videoid' in smuggled_data:              force_videoid = smuggled_data['force_videoid']              video_id = force_videoid @@ -544,6 +539,9 @@ class GenericIE(InfoExtractor):                      'upload_date': upload_date,                  } +        if not self._downloader.params.get('test', False) and not is_intentional: +            self._downloader.report_warning('Falling back on generic information extractor.') +          try:              webpage = self._download_webpage(url, video_id)          except ValueError: | 
