R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correcting for flake8 errors

Browse Source
This commit is contained in:
Katie Pratt 2019-11-03 20:09:04 -05:00
parent 809927da64
commit ff57b29971
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/__init__.py
View File

@ -12,7 +12,6 @@ import random
import sys import sys
import json import json
from .options import ( from .options import (
parseOpts, parseOpts,
) )
@ -286,8 +285,6 @@ def _real_main(argv=None):
postprocessors.append({ postprocessors.append({
'key': 'FFmpegMetadata' 'key': 'FFmpegMetadata'
}) })
if opts.convertsubtitles: if opts.convertsubtitles:
postprocessors.append({ postprocessors.append({
'key': 'FFmpegSubtitlesConvertor', 'key': 'FFmpegSubtitlesConvertor',

3
youtube_dl/options.py
View File

@ -830,8 +830,7 @@ def parseOpts(overrideArguments=None):
'inputted from the info_list, only one will be used. Fields ' 'inputted from the info_list, only one will be used. Fields '
'curently supported for metadata override are ' 'curently supported for metadata override are '
'((info_list) => (meta_list)):\n {}'.format(',\n'.join( '((info_list) => (meta_list)):\n {}'.format(',\n'.join(
['({}) => ({})'.format(*[', '.join(a) for a in reversed(x)]) for x in get_metadata_override_elements()] ['({}) => ({})'.format(*[', '.join(a) for a in reversed(x)]) for x in get_metadata_override_elements()])))
)))
postproc.add_option( postproc.add_option(
'--preferred-metadata-json' '--preferred-metadata-json'
) )

27
youtube_dl/postprocessor/ffmpeg.py
View File

@ -48,18 +48,19 @@ ACODECS = {
METADATA_TO_INFO_LIST_ELEMENTS = [ METADATA_TO_INFO_LIST_ELEMENTS = [
['title', ('track','title')] ['title', ('track', 'title')],
, ['date', 'upload_date'] ['date', 'upload_date'],
, [('description','comment'), 'description'] [('description', 'comment'), 'description'],
, ['purl','webpage_url'] ['purl', 'webpage_url'],
, ['track','track_number'] ['track', 'track_number'],
, ['artist', ('artist', 'creator', 'uploader', 'uploader_id')] ['artist', ('artist', 'creator', 'uploader', 'uploader_id')],
, ['genre'] ['genre'],
, ['album'] ['album'],
, ['album_artists'] ['album_artists'],
, ['disc', 'disc_number'] ['disc', 'disc_number']
] ]
def get_meta_and_info_lists(meta_to_info_list): def get_meta_and_info_lists(meta_to_info_list):
convert_to_tuple = lambda x: tuple(x) if isinstance(x, (list, tuple)) else tuple([x]) convert_to_tuple = lambda x: tuple(x) if isinstance(x, (list, tuple)) else tuple([x])
if any(isinstance(x, (list, tuple)) for x in meta_to_info_list): if any(isinstance(x, (list, tuple)) for x in meta_to_info_list):
@ -70,12 +71,14 @@ def get_meta_and_info_lists(meta_to_info_list):
info_list = meta_list info_list = meta_list
return (meta_list, info_list) return (meta_list, info_list)
def get_metadata_override_elements(): def get_metadata_override_elements():
elements = [] elements = []
for metadata_to_info_lists in METADATA_TO_INFO_LIST_ELEMENTS: for metadata_to_info_lists in METADATA_TO_INFO_LIST_ELEMENTS:
elements.append(get_meta_and_info_lists(metadata_to_info_lists)) elements.append(get_meta_and_info_lists(metadata_to_info_lists))
return elements return elements
class FFmpegPostProcessorError(PostProcessingError): class FFmpegPostProcessorError(PostProcessingError):
pass pass
@ -463,8 +466,8 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
def __init__(self, downloader=None, preferredmetadatatoembed=None): def __init__(self, downloader=None, preferredmetadatatoembed=None):
super(FFmpegMetadataPP, self).__init__(downloader) super(FFmpegMetadataPP, self).__init__(downloader)
assert ( assert (
(isinstance(preferredmetadatatoembed, dict) or (isinstance(preferredmetadatatoembed, dict)
preferredmetadatatoembed != None) or preferredmetadatatoembed is not None)
), 'preferredmetadatatoembed must be a dictionary, if provided' ), 'preferredmetadatatoembed must be a dictionary, if provided'
self._preferredmetadatatoembed = preferredmetadatatoembed self._preferredmetadatatoembed = preferredmetadatatoembed