mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-07-09 06:48:30 +00:00
trying to correct formatting
This commit is contained in:
parent
ebed5745e8
commit
8297e51b34
@ -93,7 +93,8 @@ def run(self, info):
|
|||||||
# Using ffmpeg to embed the thumbnail in mp3 files is messing up lyrics
|
# Using ffmpeg to embed the thumbnail in mp3 files is messing up lyrics
|
||||||
# Using using mutagen instead
|
# Using using mutagen instead
|
||||||
audio = mutagen.id3.ID3(filename)
|
audio = mutagen.id3.ID3(filename)
|
||||||
if 'APIC' in audio:del audio['APIC']
|
if 'APIC' in audio:
|
||||||
|
del audio['APIC']
|
||||||
with open(thumbnail_filename, 'rb') as thumbfile:
|
with open(thumbnail_filename, 'rb') as thumbfile:
|
||||||
audio['APIC'] = mutagen.id3.APIC(
|
audio['APIC'] = mutagen.id3.APIC(
|
||||||
encoding=3, mime='image/%s' % thumbnail_ext, type=3,
|
encoding=3, mime='image/%s' % thumbnail_ext, type=3,
|
||||||
@ -218,7 +219,7 @@ def run(self, info):
|
|||||||
else:
|
else:
|
||||||
raise EmbedThumbnailPPError('Supported filetypes for thumbnail embedding are: mp3, mkv/mka, ogg/opus/flac, m4a/mp4/m4v/mov')
|
raise EmbedThumbnailPPError('Supported filetypes for thumbnail embedding are: mp3, mkv/mka, ogg/opus/flac, m4a/mp4/m4v/mov')
|
||||||
|
|
||||||
if info['ext']!='mp3' and success and temp_filename != filename:
|
if info['ext'] != 'mp3' and success and temp_filename != filename:
|
||||||
os.replace(temp_filename, filename)
|
os.replace(temp_filename, filename)
|
||||||
|
|
||||||
self.try_utime(filename, mtime, mtime)
|
self.try_utime(filename, mtime, mtime)
|
||||||
|
@ -59,6 +59,8 @@
|
|||||||
'alac': ('m4a', None, ('-acodec', 'alac')),
|
'alac': ('m4a', None, ('-acodec', 'alac')),
|
||||||
'wav': ('wav', None, ('-f', 'wav')),
|
'wav': ('wav', None, ('-f', 'wav')),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def create_mapping_re(supported):
|
def create_mapping_re(supported):
|
||||||
return re.compile(r'{0}(?:/{0})*$'.format(r'(?:\s*\w+\s*>)?\s*(?:%s)\s*' % '|'.join(supported)))
|
return re.compile(r'{0}(?:/{0})*$'.format(r'(?:\s*\w+\s*>)?\s*(?:%s)\s*' % '|'.join(supported)))
|
||||||
|
|
||||||
@ -585,7 +587,7 @@ def _options(target_ext):
|
|||||||
|
|
||||||
|
|
||||||
class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
|
class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
|
||||||
AUDIO_EXTS = ('mp3','m4a','flac','opus')
|
AUDIO_EXTS = ('mp3', 'm4a', 'flac', 'opus')
|
||||||
SUPPORTED_EXTS = ('mp4', 'mov', 'm4a', 'webm', 'mkv', 'mka')
|
SUPPORTED_EXTS = ('mp4', 'mov', 'm4a', 'webm', 'mkv', 'mka')
|
||||||
|
|
||||||
def __init__(self, downloader=None, already_have_subtitle=False):
|
def __init__(self, downloader=None, already_have_subtitle=False):
|
||||||
@ -674,7 +676,7 @@ def embed_lyrics(self, input_files):
|
|||||||
raise PostProcessingError('LRC subtitles required. Use "--convert-subs lrc" to convert')
|
raise PostProcessingError('LRC subtitles required. Use "--convert-subs lrc" to convert')
|
||||||
else:
|
else:
|
||||||
with open(subs, 'r', encoding='utf-8') as f:
|
with open(subs, 'r', encoding='utf-8') as f:
|
||||||
lyrics=f.read().strip()
|
lyrics = f.read().strip()
|
||||||
if audio_file.endswith('.mp3'):
|
if audio_file.endswith('.mp3'):
|
||||||
audio = mutagen.id3.ID3(audio_file)
|
audio = mutagen.id3.ID3(audio_file)
|
||||||
audio.add(mutagen.id3.USLT(encoding=3, lang='eng', desc='', text=lyrics))
|
audio.add(mutagen.id3.USLT(encoding=3, lang='eng', desc='', text=lyrics))
|
||||||
|
Loading…
Reference in New Issue
Block a user