fix some typos and linter

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f3eb3f8f76a554dc52a734de4c15998e717b4599..aac387e6509c2d5e2e68b347911903a8a74f47aa 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -24,7 +24,7 @@ tsukumi
 bbepis
 animelover1984
 Pccode66
-Ashish
+Ashish0804
 RobinD42
 hseg
 DennyDai

diff --git a/Changelog.md b/Changelog.md
index 28f0f50f8034da00caa9eb37e78dbe560d163e01..6e502b459c4fd04095f8238216e658f4635568f8 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -24,7 +24,7 @@ ### 2021.03.15
 * **Parallel fragment downloads** by [shirt](https://github.com/shirt-dev)
     * Use option `--concurrent-fragments` (`-N`) to set the number of threads (default 1)
 * Merge youtube-dl: Upto [commit/3be0980](https://github.com/ytdl-org/youtube-dl/commit/3be098010f667b14075e3dfad1e74e5e2becc8ea)
-* [zee5] Add Show Extractor by [Ashish](https://github.com/Ashish) and [pukkandan](https://github.com/pukkandan)
+* [zee5] Add Show Extractor by [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
 * [rai] fix drm check [nixxo](https://github.com/nixxo)
 * [wimtv] Add extractor by [nixxo](https://github.com/nixxo)
 * [mtv] Add mtv.it and extract series metadata by [nixxo](https://github.com/nixxo)
@@ -39,7 +39,7 @@ ### 2021.03.07
 * [youtube] Fix private feeds/playlists on multi-channel accounts by [colethedj](https://github.com/colethedj)
 * [youtube] Extract alerts from continuation by [colethedj](https://github.com/colethedj)
 * [cbs] Add support for ParamountPlus by [shirt](https://github.com/shirt-dev)
-* [mxplayer] Rewrite extractor with show support by [pukkandan](https://github.com/pukkandan) and [Ashish](https://github.com/Ashish)
+* [mxplayer] Rewrite extractor with show support by [pukkandan](https://github.com/pukkandan) and [Ashish0804](https://github.com/Ashish0804)
 * [gedi] Improvements from youtube-dl by [nixxo](https://github.com/nixxo)
 * [vimeo] Fix videos with password by [teesid](https://github.com/teesid)
 * [lbry] Support `lbry://` url by [nixxo](https://github.com/nixxo)
@@ -49,7 +49,7 @@ ### 2021.03.07
 * [downloader] Fix bug for `ffmpeg`/`httpie`
 * [update] Fix updater removing the executable bit on some UNIX distros
 * [update] Fix current build hash for UNIX
-* [documentation] Include wget/curl/aria2c install instructions for Unix by [Ashish](https://github.com/Ashish)
+* [documentation] Include wget/curl/aria2c install instructions for Unix by [Ashish0804](https://github.com/Ashish0804)
 * Fix some videos downloading with `m3u8` extension
 * Remove "fixup is ignored" warning when fixup wasn't passed by user
 
@@ -99,7 +99,7 @@ ### 2021.02.24
 * Merge youtube-dl: Upto [commit/4460329](https://github.com/ytdl-org/youtube-dl/commit/44603290e5002153f3ebad6230cc73aef42cc2cd) (except tmz, gedi)
 * [Readthedocs](https://yt-dlp.readthedocs.io) support by [shirt](https://github.com/shirt-dev)
 * [youtube] Show if video was a live stream in info (`was_live`)
-* [Zee5] Add new extractor by [Ashish](https://github.com/Ashish) and [pukkandan](https://github.com/pukkandan)
+* [Zee5] Add new extractor by [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
 * [jwplatform] Add support for `hyland.com`
 * [tennistv] Fix extractor
 * [hls] Support media initialization by [shirt](https://github.com/shirt-dev)

diff --git a/README.md b/README.md
index 9ae2ef50004d78a16e415747533263e8c75790dd..687e9c303eed0d27373e537328e55178aa4b764f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ # YT-DLP
 
 A command-line program to download videos from youtube.com and many other [video platforms](supportedsites.md)
 
-This is a fork of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) which is inturn a fork of [youtube-dl](https://github.com/ytdl-org/youtube-dl)
+This is a [youtube-dl](https://github.com/ytdl-org/youtube-dl) fork based on the now inactive [youtube-dlc](https://github.com/blackjack4494/yt-dlc). The main focus of this project is adding new features and patches while also keeping up to date with the original project
 
 * [NEW FEATURES](#new-features)
 * [INSTALLATION](#installation)
@@ -77,7 +77,7 @@ # NEW FEATURES
 
 * **Fixed extractors**: archive.org, roosterteeth.com, skyit, instagram, itv, SouthparkDe, spreaker, Vlive, tiktok, akamai, ina, rumble, tennistv
 
-* **Plugin support**: Extractors can be loaded from an external file. See [plugins](#plugins) for details
+* **Plugin extractors**: Extractors can be loaded from an external file. See [plugins](#plugins) for details
 
 * **Multiple paths and output templates**: You can give different [output templates](#output-template) and download paths for different types of files. You can also set a temporary path where intermediary files are downloaded to using `--paths` (`-P`)
 

diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py
index e79039b5ca33f67dab7416b81e299a4b2f65e781..d5b1ba07c14beb1762457400b7b0a5e183146f7f 100644 (file)
--- a/yt_dlp/YoutubeDL.py
+++ b/yt_dlp/YoutubeDL.py
@@ -2536,9 +2536,9 @@ def filter_requested_info(info_dict, actually_filter=True):
         }
         keep_key = lambda k: k in exceptions['keep'] or not (k.startswith('_') or k in exceptions['remove'])
         filter_fn = lambda obj: (
-                list(map(filter_fn, obj)) if isinstance(obj, (list, tuple))
-                else obj if not isinstance(obj, dict)
-                else dict((k, filter_fn(v)) for k, v in obj.items() if keep_key(k)))
+            list(map(filter_fn, obj)) if isinstance(obj, (list, tuple))
+            else obj if not isinstance(obj, dict)
+            else dict((k, filter_fn(v)) for k, v in obj.items() if keep_key(k)))
         return filter_fn(info_dict)
 
     def run_pp(self, pp, infodict):

diff --git a/yt_dlp/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py
index dd07e7c18de690ef83e007902125cdbb49eb8c72..363f10e6d0fb468cb330373acef2aa2a0f7d779c 100644 (file)
--- a/yt_dlp/postprocessor/ffmpeg.py
+++ b/yt_dlp/postprocessor/ffmpeg.py
@@ -19,7 +19,6 @@
     PostProcessingError,
     prepend_extension,
     shell_quote,
-    subtitles_filename,
     dfxp2srt,
     ISO639Utils,
     process_communicate_or_kill,
@@ -712,7 +711,6 @@ def __init__(self, downloader=None, format=None):
 
     def run(self, info):
         subs = info.get('requested_subtitles')
-        filename = info['filepath']
         new_ext = self.format
         new_format = new_ext
         if new_format == 'vtt':