Compare commits

..

No commits in common. "6c9912e83453098dd7a46a5eef6728dc0cafb9ac" and "aaaf18a53f480dd91b5430583ad0b157ffcc3ac0" have entirely different histories.

2 changed files with 9 additions and 18 deletions

View File

@ -1812,10 +1812,10 @@ class InfoExtractor(object):
} }
def _report_ignoring_subs(self, name): def _report_ignoring_subs(self, name):
self.report_warning(bug_reports_message( self.report_warning(
'Ignoring subtitle tracks found in the {0} manifest; ' 'Ignoring subtitle tracks found in the {0} manifest; '
'if any subtitle tracks are missing,'.format(name) 'if any subtitle tracks are missing, {1}'.format(name, bug_reports_message()),
), only_once=True) only_once=True)
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None, def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
entry_protocol='m3u8', preference=None, entry_protocol='m3u8', preference=None,

View File

@ -2371,24 +2371,15 @@ def make_HTTPS_handler(params, **kwargs):
return YoutubeDLHTTPSHandler(params, context=context, **kwargs) return YoutubeDLHTTPSHandler(params, context=context, **kwargs)
def bug_reports_message(before=';'): def bug_reports_message():
if ytdl_is_updateable(): if ytdl_is_updateable():
update_cmd = 'type youtube-dl -U to update' update_cmd = 'type youtube-dl -U to update'
else: else:
update_cmd = 'see https://github.com/ytdl-org/youtube-dl/#user-content-installation on how to update' update_cmd = 'see https://yt-dl.org/update on how to update'
msg = '; please report this issue on https://yt-dl.org/bug .'
msg = ( msg += ' Make sure you are using the latest version; %s.' % update_cmd
'please report this issue on https://github.com/ytdl-org/youtube-dl/issues ,' msg += ' Be sure to call youtube-dl with the --verbose flag and include its complete output.'
' using the appropriate issue template.' return msg
' Make sure you are using the latest version; %s.'
' Be sure to call youtube-dl with the --verbose option and include the complete output.'
) % update_cmd
before = (before or '').rstrip()
if not before or before.endswith(('.', '!', '?')):
msg = msg[0].title() + msg[1:]
return (before + ' ' if before else '') + msg
class YoutubeDLError(Exception): class YoutubeDLError(Exception):