diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-04-17 14:55:24 +0200 | 
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-04-17 14:55:24 +0200 | 
| commit | 08f2a92c9c23cf460b00a290b5b3819c7972231b (patch) | |
| tree | 4dca727e9f8e0db3b05b3a6f360e108979274955 | |
| parent | 3220c50f9af3a1df239656025aebfe00fec00e45 (diff) | |
InfoExtractor._search_regex: Suggest updating when the regex is not found (suggested in #5442)
Reuse the same message from ExtractorError
| -rw-r--r-- | youtube_dl/extractor/common.py | 4 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 19 | 
2 files changed, 14 insertions, 9 deletions
| diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 28f672e42..7757bf950 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -23,6 +23,7 @@ from ..compat import (  )  from ..utils import (      age_restricted, +    bug_reports_message,      clean_html,      compiled_regex_type,      ExtractorError, @@ -556,8 +557,7 @@ class InfoExtractor(object):          elif fatal:              raise RegexNotFoundError('Unable to extract %s' % _name)          else: -            self._downloader.report_warning('unable to extract %s; ' -                                            'please report this issue on http://yt-dl.org/bug' % _name) +            self._downloader.report_warning('unable to extract %s' % _name + bug_reports_message())              return None      def _html_search_regex(self, pattern, string, name, default=_NO_DEFAULT, fatal=True, flags=0, group=None): diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index e628fac81..edeee1853 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -452,6 +452,17 @@ def make_HTTPS_handler(params, **kwargs):          return YoutubeDLHTTPSHandler(params, context=context, **kwargs) +def bug_reports_message(): +    if ytdl_is_updateable(): +        update_cmd = 'type  youtube-dl -U  to update' +    else: +        update_cmd = 'see  https://yt-dl.org/update  on how to update' +    msg = '; please report this issue on https://yt-dl.org/bug .' +    msg += ' Make sure you are using the latest version; %s.' % update_cmd +    msg += ' Be sure to call youtube-dl with the --verbose flag and include its complete output.' +    return msg + +  class ExtractorError(Exception):      """Error during info extraction.""" @@ -467,13 +478,7 @@ class ExtractorError(Exception):          if cause:              msg += ' (caused by %r)' % cause          if not expected: -            if ytdl_is_updateable(): -                update_cmd = 'type  youtube-dl -U  to update' -            else: -                update_cmd = 'see  https://yt-dl.org/update  on how to update' -            msg += '; please report this issue on https://yt-dl.org/bug .' -            msg += ' Make sure you are using the latest version; %s.' % update_cmd -            msg += ' Be sure to call youtube-dl with the --verbose flag and include its complete output.' +            msg += bug_reports_message()          super(ExtractorError, self).__init__(msg)          self.traceback = tb | 
