diff options
Diffstat (limited to 'yt_dlp')
| -rw-r--r-- | yt_dlp/extractor/common.py | 3 | ||||
| -rw-r--r-- | yt_dlp/options.py | 17 | ||||
| -rw-r--r-- | yt_dlp/postprocessor/__init__.py | 6 |
3 files changed, 12 insertions, 14 deletions
diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py index 79f9c4035..4d77dba49 100644 --- a/yt_dlp/extractor/common.py +++ b/yt_dlp/extractor/common.py @@ -1580,7 +1580,8 @@ class InfoExtractor(object): else None) def print_verbose_info(self, to_screen): - to_screen('[debug] Sort order given by user: %s' % ','.join(self._sort_user)) + if self._sort_user: + to_screen('[debug] Sort order given by user: %s' % ','.join(self._sort_user)) if self._sort_extractor: to_screen('[debug] Sort order given by extractor: %s' % ', '.join(self._sort_extractor)) to_screen('[debug] Formats sorted by: %s' % ', '.join(['%s%s%s' % ( diff --git a/yt_dlp/options.py b/yt_dlp/options.py index 574af0a54..cced9fb89 100644 --- a/yt_dlp/options.py +++ b/yt_dlp/options.py @@ -259,7 +259,7 @@ def parseOpts(overrideArguments=None): help='Make all connections via IPv6', ) - geo = optparse.OptionGroup(parser, 'Geo Restriction') + geo = optparse.OptionGroup(parser, 'Geo-restriction') geo.add_option( '--geo-verification-proxy', dest='geo_verification_proxy', default=None, metavar='URL', @@ -429,21 +429,19 @@ def parseOpts(overrideArguments=None): '--video-password', dest='videopassword', metavar='PASSWORD', help='Video password (vimeo, youku)') - - adobe_pass = optparse.OptionGroup(parser, 'Adobe Pass Options') - adobe_pass.add_option( + authentication.add_option( '--ap-mso', dest='ap_mso', metavar='MSO', help='Adobe Pass multiple-system operator (TV provider) identifier, use --ap-list-mso for a list of available MSOs') - adobe_pass.add_option( + authentication.add_option( '--ap-username', dest='ap_username', metavar='USERNAME', help='Multiple-system operator account login') - adobe_pass.add_option( + authentication.add_option( '--ap-password', dest='ap_password', metavar='PASSWORD', help='Multiple-system operator account password. If this option is left out, yt-dlp will ask interactively') - adobe_pass.add_option( + authentication.add_option( '--ap-list-mso', action='store_true', dest='ap_list_mso', default=False, help='List all supported multiple-system operators') @@ -569,7 +567,7 @@ def parseOpts(overrideArguments=None): downloader.add_option( '-N', '--concurrent-fragments', dest='concurrent_fragment_downloads', metavar='N', default=1, type=int, - help='Number of fragments to download concurrently (default is %default)') + help='Number of fragments of a dash/hlsnative video that should be download concurrently (default is %default)') downloader.add_option( '-r', '--limit-rate', '--rate-limit', dest='ratelimit', metavar='RATE', @@ -1037,7 +1035,7 @@ def parseOpts(overrideArguments=None): action='store_true', dest='rm_cachedir', help='Delete all filesystem cache files') - thumbnail = optparse.OptionGroup(parser, 'Thumbnail Images') + thumbnail = optparse.OptionGroup(parser, 'Thumbnail Options') thumbnail.add_option( '--write-thumbnail', action='store_true', dest='writethumbnail', default=False, @@ -1310,7 +1308,6 @@ def parseOpts(overrideArguments=None): parser.add_option_group(video_format) parser.add_option_group(subtitles) parser.add_option_group(authentication) - parser.add_option_group(adobe_pass) parser.add_option_group(postproc) parser.add_option_group(sponskrub) parser.add_option_group(extractor) diff --git a/yt_dlp/postprocessor/__init__.py b/yt_dlp/postprocessor/__init__.py index fe69c2c72..d9e369d4d 100644 --- a/yt_dlp/postprocessor/__init__.py +++ b/yt_dlp/postprocessor/__init__.py @@ -10,11 +10,11 @@ from .ffmpeg import ( FFmpegFixupM4aPP, FFmpegMergerPP, FFmpegMetadataPP, - FFmpegVideoConvertorPP, - FFmpegVideoRemuxerPP, FFmpegSubtitlesConvertorPP, FFmpegThumbnailsConvertorPP, FFmpegSplitChaptersPP, + FFmpegVideoConvertorPP, + FFmpegVideoRemuxerPP, ) from .xattrpp import XAttrMetadataPP from .execafterdownload import ExecAfterDownloadPP @@ -29,6 +29,7 @@ def get_postprocessor(key): __all__ = [ + 'FFmpegPostProcessor', 'EmbedThumbnailPP', 'ExecAfterDownloadPP', 'FFmpegEmbedSubtitlePP', @@ -39,7 +40,6 @@ __all__ = [ 'FFmpegFixupStretchedPP', 'FFmpegMergerPP', 'FFmpegMetadataPP', - 'FFmpegPostProcessor', 'FFmpegSubtitlesConvertorPP', 'FFmpegThumbnailsConvertorPP', 'FFmpegVideoConvertorPP', |