diff options
Diffstat (limited to 'youtube_dlc')
| -rw-r--r-- | youtube_dlc/YoutubeDL.py | 12 | ||||
| -rw-r--r-- | youtube_dlc/extractor/anvato.py | 1 | ||||
| -rw-r--r-- | youtube_dlc/extractor/youtube.py | 4 | ||||
| -rw-r--r-- | youtube_dlc/postprocessor/embedthumbnail.py | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/youtube_dlc/YoutubeDL.py b/youtube_dlc/YoutubeDL.py index 20a4af751..e88299f19 100644 --- a/youtube_dlc/YoutubeDL.py +++ b/youtube_dlc/YoutubeDL.py @@ -1119,15 +1119,15 @@ class YoutubeDL(object): if not ensure_dir_exists(encodeFilename(infofn)): return if self.params.get('overwrites', True) and os.path.exists(encodeFilename(infofn)): - self.to_screen('[info] Playlist description metadata is already present') + self.to_screen('[info] Playlist metadata is already present') else: - self.to_screen('[info] Writing description playlist metadata as JSON to: ' + infofn) + self.to_screen('[info] Writing playlist metadata as JSON to: ' + infofn) playlist_info = dict(ie_result) playlist_info.pop('entries') try: write_json_file(self.filter_requested_info(playlist_info), infofn) except (OSError, IOError): - self.report_error('Cannot write playlist description metadata to JSON file ' + infofn) + self.report_error('Cannot write playlist metadata to JSON file ' + infofn) if self.params.get('writedescription', False): descfn = replace_extension( @@ -2144,13 +2144,13 @@ class YoutubeDL(object): if not ensure_dir_exists(encodeFilename(infofn)): return if not self.params.get('overwrites', True) and os.path.exists(encodeFilename(infofn)): - self.to_screen('[info] Video description metadata is already present') + self.to_screen('[info] Video metadata is already present') else: - self.to_screen('[info] Writing video description metadata as JSON to: ' + infofn) + self.to_screen('[info] Writing video metadata as JSON to: ' + infofn) try: write_json_file(self.filter_requested_info(info_dict), infofn) except (OSError, IOError): - self.report_error('Cannot write metadata to JSON file ' + infofn) + self.report_error('Cannot write video metadata to JSON file ' + infofn) return info_dict['__infojson_filepath'] = infofn diff --git a/youtube_dlc/extractor/anvato.py b/youtube_dlc/extractor/anvato.py index 9b3867605..ab69b69bd 100644 --- a/youtube_dlc/extractor/anvato.py +++ b/youtube_dlc/extractor/anvato.py @@ -31,6 +31,7 @@ try: except ImportError: NFLTokenGenerator = None + def md5_text(s): if not isinstance(s, compat_str): s = compat_str(s) diff --git a/youtube_dlc/extractor/youtube.py b/youtube_dlc/extractor/youtube.py index f9e60f03e..7c32d3200 100644 --- a/youtube_dlc/extractor/youtube.py +++ b/youtube_dlc/extractor/youtube.py @@ -2492,8 +2492,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor): def get_continuation(continuation, session_token, replies=False): query = { - 'pbj': 1, - 'ctoken': continuation, + 'pbj': 1, + 'ctoken': continuation, } if replies: query['action_get_comment_replies'] = 1 diff --git a/youtube_dlc/postprocessor/embedthumbnail.py b/youtube_dlc/postprocessor/embedthumbnail.py index 2bce72bea..b9205a5ca 100644 --- a/youtube_dlc/postprocessor/embedthumbnail.py +++ b/youtube_dlc/postprocessor/embedthumbnail.py @@ -153,7 +153,7 @@ class EmbedThumbnailPP(FFmpegPostProcessor): elif info['ext'] in ['ogg', 'opus']: if not _has_mutagen: - raise EmbedThumbnailPPError('module mutagen was not found. Please install.') + raise EmbedThumbnailPPError('module mutagen was not found. Please install') size_regex = r',\s*(?P<w>\d+)x(?P<h>\d+)\s*[,\[]' size_result = self.run_ffmpeg(thumbnail_filename, thumbnail_filename, ['-hide_banner']) mobj = re.search(size_regex, size_result) |