Release 2021.03.03

[build] fix bug from da7f321e93
2026-08-09 13:48:35 +03:00 · 2021-03-03 16:25:04 +05:30 · 2021-03-03 16:25:04 +05:30
150 changed files with 2934 additions and 7497 deletions
@@ -21,7 +21,7 @@ assignees: ''
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.04.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
 - Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -29,7 +29,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 - [ ] I'm reporting a broken site support
- [ ] I've verified that I'm running yt-dlp version **2021.04.11**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar issues including closed ones
@@ -44,7 +44,7 @@ Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your com
 [debug] User config: []
 [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
 [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] yt-dlp version 2021.04.11
+ [debug] yt-dlp version 2021.03.01
 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
 [debug] Proxy map: {}
@@ -21,7 +21,7 @@ assignees: ''
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.04.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/yt-dlp/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
 - Search the bugtracker for similar site support requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -29,7 +29,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 - [ ] I'm reporting a new site support request
- [ ] I've verified that I'm running yt-dlp version **2021.04.11**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that none of provided URLs violate any copyrights
 - [ ] I've searched the bugtracker for similar site support requests including closed ones
@@ -21,13 +21,13 @@ assignees: ''
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.04.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar site feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 - [ ] I'm reporting a site feature request
- [ ] I've verified that I'm running yt-dlp version **2021.04.11**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've searched the bugtracker for similar site feature requests including closed ones
@@ -21,7 +21,7 @@ assignees: ''
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.04.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
 - Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -30,7 +30,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 - [ ] I'm reporting a broken site support issue
- [ ] I've verified that I'm running yt-dlp version **2021.04.11**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar bug reports including closed ones
@@ -46,7 +46,7 @@ Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your com
 [debug] User config: []
 [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
 [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] yt-dlp version 2021.04.11
+ [debug] yt-dlp version 2021.03.01
 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
 [debug] Proxy map: {}
@@ -21,13 +21,13 @@ assignees: ''
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.04.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 - [ ] I'm reporting a feature request
- [ ] I've verified that I'm running yt-dlp version **2021.04.11**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've searched the bugtracker for similar feature requests including closed ones
@@ -29,7 +29,7 @@ jobs:
    - name: Print version
      run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
    - name: Run Make
-      run: make
+      run: make yt-dlp
    - name: Create Release
      id: create_release
      uses: actions/create-release@v1
@@ -6,7 +6,7 @@ jobs:
    if: "!contains(github.event.head_commit.message, 'ci skip')"
    runs-on: ${{ matrix.os }}
    strategy:
-      fail-fast: false
+      fail-fast: true
      matrix:
        os: [ubuntu-18.04]
        # TODO: python 2.6
@@ -60,7 +60,6 @@ yt-dlp.zip
 *.mkv
 *.swf
 *.part
 *.part-*
 *.ytdl
 *.dump
 *.frag
@@ -1,6 +1,5 @@
 pukkandan (owner)
 shirt-dev (collaborator)
 colethedj (collaborator)
 h-h-h-h
 pauldubois98
 nixxo
@@ -22,21 +21,10 @@ nao20010128nao
 kurumigi
 tsukumi
 bbepis
 animelover1984
 Pccode66
-Ashish0804
+Ashish
 RobinD42
 hseg
 colethedj
 DennyDai
 codeasashu
 teesid
 kevinoconnor7
 damianoamatruda
 2ShedsJackson
 CXwudi
 xtkoba
 llacb47
 hheimbuerger
 B0pol
 lkho
 fstirlitz
@@ -6,10 +6,8 @@
 * Run `make doc`
 * Update Changelog.md and CONTRIBUTORS
 * Change "Merged with ytdl" version in Readme.md if needed
 * Add new/fixed extractors in "new features" section of Readme.md
 * Commit to master as `Release <version>`
-* Push to origin/release using `git push origin master:release`
+* Push to origin/release - build task will now run
    build task will now run
 * Update version.py using devscripts\update-version.py
 * Run `make issuetemplates`
 * Commit to master as `[version] update :ci skip all`
@@ -19,180 +17,16 @@
 -->
 ### 2021.04.22
 * **Improve output template:**
    * Objects can be traversed like `%(field.key1.key2)s`
    * An offset can be added to numeric fields as `%(field+N)s`
    * Deprecates `--autonumber-start`
 * **Improve `--sub-langs`:**
    * Treat `--sub-langs` entries as regex
    * `all` can be used to refer to all the subtitles
    * language codes can be prefixed with `-` to exclude it
    * Deprecates `--all-subs`
 * Add option `--ignore-no-formats-error` to ignore the "no video format" and similar errors
 * Add option `--skip-playlist-after-errors` to skip the rest of a playlist after a given number of errors are encountered
 * Merge youtube-dl: Upto [commit/7e8b3f9](https://github.com/ytdl-org/youtube-dl/commit/7e8b3f9439ebefb3a3a4e5da9c0bd2b595976438)
 * [downloader] Fix bug in downloader selection
 * [BilibiliChannel] Fix pagination by [nao20010128nao](https://github.com/nao20010128nao) and[pukkandan](https://github.com/pukkandan)
 * [rai] Add support for http formats by [nixxo](https://github.com/nixxo)
 * [TubiTv] Add TubiTvShowIE by [Ashish0804](https://github.com/Ashish0804)
 * [twitcasting] Fix extractor
 * [viu:ott] Fix extractor and support series by [lkho](https://github.com/lkho) and[pukkandan](https://github.com/pukkandan)
 * [youtube:tab] Show unavailable videos in playlists by [colethedj](https://github.com/colethedj)
 * [youtube:tab] Reload with unavailable videos for all playlists
 * [youtube] Ignore invalid stretch ratio
 * [youtube] Improve channel syncid extraction to support ytcfg by [colethedj](https://github.com/colethedj)
 * [youtube] Standardize API calls for tabs, mixes and search by [colethedj](https://github.com/colethedj)
 * [youtube] Bugfix in `_extract_ytcfg`
 * [mildom:user:vod] Download only necessary amount of pages
 * [mildom] Remove proxy completely by [fstirlitz](https://github.com/fstirlitz)
 * [go] Fix `_VALID_URL`
 * [MetadataFromField] Improve regex and add tests
 * [Exec] Ensure backward compatibility when the command contains `%`
 * [extractor] Fix inconsistent use of `report_warning`
 * Ensure `mergeall` selects best format when multistreams are disabled
 * Improve the yt-dlp.sh script by [fstirlitz](https://github.com/fstirlitz)
 * [lazy_extractor] Do not load plugins
 * [ci] Disable fail-fast
 * [documentation] Clarify which deprecated options still work
 * [documentation] Fix typos
 ### 2021.04.11
 * Add option `--convert-thumbnails` (only jpg currently supported)
 * Format selector `mergeall` to download and merge all formats
 * Pass any field to `--exec` using similar syntax to output template
 * Choose downloader for each protocol using `--downloader PROTO:NAME`
    * Alias `--downloader` for `--external-downloader`
    * Added `native` as an option for the downloader
 * Merge youtube-dl: Upto [commit/4fb25ff](https://github.com/ytdl-org/youtube-dl/commit/4fb25ff5a3be5206bb72e5c4046715b1529fb2c7) (except vimeo)
 * [DiscoveryPlusIndia] Add DiscoveryPlusIndiaShowIE by [Ashish0804](https://github.com/Ashish0804)
 * [NFHSNetwork] Add extractor by [llacb47](https://github.com/llacb47)
 * [nebula] Add extractor (watchnebula.com) by [hheimbuerger](https://github.com/hheimbuerger)
 * [nitter] Fix extraction of reply tweets and update instance list by [B0pol](https://github.com/B0pol)
 * [nitter] Fix thumbnails by [B0pol](https://github.com/B0pol)
 * [youtube] Fix thumbnail URL
 * [youtube] Parse API parameters from initial webpage by [colethedj](https://github.com/colethedj)
 * [youtube] Extract comments' approximate timestamp by [colethedj](https://github.com/colethedj)
 * [youtube] Fix alert extraction
 * [bilibili] Fix uploader
 * [utils] Add `datetime_from_str` and `datetime_add_months` by [colethedj](https://github.com/colethedj)
 * Run some `postprocessors` before actual download
 * Improve argument parsing for `-P`, `-o`, `-S`
 * Fix some `m3u8` not obeying `--allow-unplayable-formats`
 * Fix default of `dynamic_mpd`
 * Deprecate `--all-formats`, `--include-ads`, `--hls-prefer-native`, `--hls-prefer-ffmpeg`
 * [documentation] Improvements
 ### 2021.04.03
 * Merge youtube-dl: Upto [commit/654b4f4](https://github.com/ytdl-org/youtube-dl/commit/654b4f4ff2718f38b3182c1188c5d569c14cc70a)
 * Ability to set a specific field in the file's metadata using `--parse-metadata`
 * Ability to select n'th best format like `-f bv*.2`
 * [DiscoveryPlus] Add discoveryplus.in
 * [la7] Add podcasts and podcast playlists by [nixxo](https://github.com/nixxo)
 * [mildom] Update extractor with current proxy by [nao20010128nao](https://github.com/nao20010128nao)
 * [ard:mediathek] Fix video id extraction
 * [generic] Detect Invidious' link element
 * [youtube] Show premium state in `availability` by [colethedj](https://github.com/colethedj)
 * [viewsource] Add extractor to handle `view-source:`
 * [sponskrub] Run before embedding thumbnail
 * [documentation] Improve `--parse-metadata` documentation
 ### 2021.03.24.1
 * Revert [commit/8562218](https://github.com/ytdl-org/youtube-dl/commit/8562218350a79d4709da8593bb0c538aa0824acf)
 ### 2021.03.24
 * Merge youtube-dl: Upto 2021.03.25 ([commit/8562218](https://github.com/ytdl-org/youtube-dl/commit/8562218350a79d4709da8593bb0c538aa0824acf))
 * Parse metadata from multiple fields using `--parse-metadata`
 * Ability to load playlist infojson using `--load-info-json`
 * Write current epoch to infojson when using `--no-clean-infojson`
 * [youtube_live_chat] fix bug when trying to set cookies
 * [niconico] Fix for when logged in by [CXwudi](https://github.com/CXwudi) and [xtkoba](https://github.com/xtkoba)
 * [linuxacadamy] Fix login
 ### 2021.03.21
 * Merge youtube-dl: Upto [commit/7e79ba7](https://github.com/ytdl-org/youtube-dl/commit/7e79ba7dd6e6649dd2ce3a74004b2044f2182881)
 * Option `--no-clean-infojson` to keep private keys in the infojson
 * [aria2c] Support retry/abort unavailable fragments by [damianoamatruda](https://github.com/damianoamatruda)
 * [aria2c] Better default arguments
 * [movefiles] Fix bugs and make more robust
 * [formatSort] Fix `quality` being ignored
 * [splitchapters] Fix for older ffmpeg
 * [sponskrub] Pass proxy to sponskrub
 * Make sure `post_hook` gets the final filename
 * Recursively remove any private keys from infojson
 * Embed video URL metadata inside `mp4` by [damianoamatruda](https://github.com/damianoamatruda) and [pukkandan](https://github.com/pukkandan)
 * Merge `webm` formats into `mkv` if thumbnails are to be embedded by [damianoamatruda](https://github.com/damianoamatruda)
 * Use headers and cookies when downloading subtitles by [damianoamatruda](https://github.com/damianoamatruda)
 * Parse resolution in info dictionary by [damianoamatruda](https://github.com/damianoamatruda)
 * More consistent warning messages by [damianoamatruda](https://github.com/damianoamatruda) and [pukkandan](https://github.com/pukkandan)
 * [documentation] Add deprecated options and aliases in readme
 * [documentation] Fix some minor mistakes
 * [niconico] Partial fix adapted from [animelover1984/youtube-dl@b5eff52](https://github.com/animelover1984/youtube-dl/commit/b5eff52dd9ed5565672ea1694b38c9296db3fade) (login and smile formats still don't work)
 * [niconico] Add user extractor by [animelover1984](https://github.com/animelover1984)
 * [bilibili] Add anthology support by [animelover1984](https://github.com/animelover1984)
 * [amcnetworks] Fix extractor by [2ShedsJackson](https://github.com/2ShedsJackson)
 * [stitcher] Merge from youtube-dl by [nixxo](https://github.com/nixxo)
 * [rcs] Improved extraction by [nixxo](https://github.com/nixxo)
 * [linuxacadamy] Improve regex
 * [youtube] Show if video is `private`, `unlisted` etc in info (`availability`) by [colethedj](https://github.com/colethedj) and [pukkandan](https://github.com/pukkandan)
 * [youtube] bugfix for channel playlist extraction
 * [nbc] Improve metadata extraction by [2ShedsJackson](https://github.com/2ShedsJackson)
 ### 2021.03.15
 * **Split video by chapters**: using option `--split-chapters`
    * The output file of the split files can be set with `-o`/`-P` using the prefix `chapter:`
    * Additional keys `section_title`, `section_number`, `section_start`, `section_end` are available in the output template
 * **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 [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)
 * [pluto.tv] Add extractor by [kevinoconnor7](https://github.com/kevinoconnor7)
 * [youtube] Rewrite comment extraction by [colethedj](https://github.com/colethedj)
 * [embedthumbnail] Set mtime correctly
 * Refactor some postprocessor/downloader code by [pukkandan](https://github.com/pukkandan) and [shirt](https://github.com/shirt-dev)
 ### 2021.03.07
 * [youtube] Fix history, mixes, community pages and trending by [pukkandan](https://github.com/pukkandan) and [colethedj](https://github.com/colethedj)
 * [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 [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)
 * [bilibili] Change `Accept` header by [pukkandan](https://github.com/pukkandan) and [animelover1984](https://github.com/animelover1984)
 * [trovo] Pass origin header
 * [rai] Check for DRM by [nixxo](https://github.com/nixxo)
 * [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 [Ashish0804](https://github.com/Ashish0804)
 * Fix some videos downloading with `m3u8` extension
 * Remove "fixup is ignored" warning when fixup wasn't passed by user
 ### 2021.03.03.2
 * [build] Fix bug
 ### 2021.03.03
-* [youtube] Use new browse API for continuation page extraction by [colethedj](https://github.com/colethedj) and [pukkandan](https://github.com/pukkandan)
+* [youtube] Use new browse API for continuation page extraction by @colethedj and @pukkandan
-* Fix HLS playlist downloading by [shirt](https://github.com/shirt-dev)
+* Fix HLS playlist downloading by @shirt
-* Merge youtube-dl: Upto [2021.03.03](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.03)
+* **Merge youtube-dl:** Upto [2021.03.03](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.03)
 * [mtv] Fix extractor
-* [nick] Fix extractor by [DennyDai](https://github.com/DennyDai)
+* [nick] Fix extractor by @DennyDai
-* [mxplayer] Add new extractor by [codeasashu](https://github.com/codeasashu)
+* [mxplayer] Add new extractor by@codeasashu
 * [youtube] Throw error when `--extractor-retries` are exhausted
 * Reduce default of `--extractor-retries` to 3
-* Fix packaging bugs by [hseg](https://github.com/hseg)
+* Fix packaging bugs by @hseg
 ### 2021.03.01
@@ -221,10 +55,10 @@
 * Moved project to an organization [yt-dlp](https://github.com/yt-dlp)
 * **Completely changed project name to yt-dlp** by [Pccode66](https://github.com/Pccode66) and [pukkandan](https://github.com/pukkandan)
    * Also, `youtube-dlc` config files are no longer loaded
-* Merge youtube-dl: Upto [commit/4460329](https://github.com/ytdl-org/youtube-dl/commit/44603290e5002153f3ebad6230cc73aef42cc2cd) (except tmz, gedi)
+* **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 [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
+* [Zee5] Add new extractor by [Ashish](https://github.com/Ashish) 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)
@@ -239,7 +73,7 @@
 ### 2021.02.19
-* Merge youtube-dl: Upto [commit/cf2dbec](https://github.com/ytdl-org/youtube-dl/commit/cf2dbec6301177a1fddf72862de05fa912d9869d) (except kakao)
+* **Merge youtube-dl:** Upto [commit/cf2dbec](https://github.com/ytdl-org/youtube-dl/commit/cf2dbec6301177a1fddf72862de05fa912d9869d) (except kakao)
 * [viki] Fix extractor
 * [niconico] Extract `channel` and `channel_id` by [kurumigi](https://github.com/kurumigi)
 * [youtube] Multiple page support for hashtag URLs
@@ -264,7 +98,7 @@
 ### 2021.02.15
-* Merge youtube-dl: Upto [2021.02.10](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.10) (except archive.org)
+* **Merge youtube-dl:** Upto [2021.02.10](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.10) (except archive.org)
 * [niconico] Improved extraction and support encrypted/SMILE movies by [kurumigi](https://github.com/kurumigi), [tsukumi](https://github.com/tsukumi), [bbepis](https://github.com/bbepis), [pukkandan](https://github.com/pukkandan)
 * Fix HLS AES-128 with multiple keys in external downloaders by [shirt](https://github.com/shirt-dev)
 * [youtube_live_chat] Fix by using POST API by [siikamiika](https://github.com/siikamiika)
@@ -307,7 +141,7 @@
 ### 2021.02.04
-* Merge youtube-dl: Upto [2021.02.04.1](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.04.1)
+* **Merge youtube-dl:** Upto [2021.02.04.1](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.04.1)
 * **Date/time formatting in output template:**
    * You can use [`strftime`](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) to format date/time fields. Example: `%(upload_date>%Y-%m-%d)s`
 * **Multiple output templates:**
@@ -361,7 +195,7 @@
 ### 2021.01.24
-* Merge youtube-dl: Upto [2021.01.24](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
+* **Merge youtube-dl:** Upto [2021.01.24](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
 * Plugin support ([documentation](https://github.com/yt-dlp/yt-dlp#plugins))
 * **Multiple paths**: New option `-P`/`--paths` to give different paths for different types of files
    * The syntax is `-P "type:path" -P "type:path"` ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=-P,%20--paths%20TYPE:PATH))
@@ -390,7 +224,7 @@
 ### 2021.01.16
-* Merge youtube-dl: Upto [2021.01.16](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
+* **Merge youtube-dl:** Upto [2021.01.16](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
 * **Configuration files:**
    * Portable configuration file: `./yt-dlp.conf`
    * Allow the configuration files to be named `yt-dlp` instead of `youtube-dlc`. See [this](https://github.com/yt-dlp/yt-dlp#configuration) for details
@@ -420,7 +254,7 @@
 * [archive.org] Fix extractor and add support for audio and playlists by [wporr](https://github.com/wporr)
 * [Animelab] Added by [mariuszskon](https://github.com/mariuszskon)
 * [youtube:search] Fix view_count by [ohnonot](https://github.com/ohnonot)
-* [youtube] Show if video is embeddable in info (`playable_in_embed`)
+* [youtube] Show if video is embeddable in info
 * Update version badge automatically in README
 * Enable `test_youtube_search_matching`
 * Create `to_screen` and similar functions in postprocessor/common
@@ -436,8 +270,9 @@
 ### 2021.01.08
-* Merge youtube-dl: Upto [2021.01.08](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.08) except stitcher ([1](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc), [2](https://github.com/ytdl-org/youtube-dl/commit/a563c97c5cddf55f8989ed7ea8314ef78e30107f))
+* **Merge youtube-dl:** Upto [2021.01.08](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.08)
-* Moved changelog to separate file
+    * Extractor stitcher ([1](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc), [2](https://github.com/ytdl-org/youtube-dl/commit/a563c97c5cddf55f8989ed7ea8314ef78e30107f)) have not been merged
 * Moved changelog to seperate file
 ### 2021.01.07-1
@@ -475,7 +310,7 @@
    * Changed video format sorting to show video only files and video+audio files together.
    * Added `--video-multistreams`, `--no-video-multistreams`, `--audio-multistreams`, `--no-audio-multistreams`
    * Added `b`,`w`,`v`,`a` as alias for `best`, `worst`, `video` and `audio` respectively
-* Shortcut Options: Added `--write-link`, `--write-url-link`, `--write-webloc-link`, `--write-desktop-link` by [h-h-h-h](https://github.com/h-h-h-h) - See [Internet Shortcut Options](README.md#internet-shortcut-options) for details
+* **Shortcut Options:** Added `--write-link`, `--write-url-link`, `--write-webloc-link`, `--write-desktop-link` by [h-h-h-h](https://github.com/h-h-h-h) - See [Internet Shortcut Options](README.md#internet-shortcut-options) for details
 * **Sponskrub integration:** Added `--sponskrub`, `--sponskrub-cut`, `--sponskrub-force`, `--sponskrub-location`, `--sponskrub-args` - See [SponSkrub Options](README.md#sponskrub-sponsorblock-options) for details
 * Added `--force-download-archive` (`--force-write-archive`) by [h-h-h-h](https://github.com/h-h-h-h)
 * Added `--list-formats-as-table`,  `--list-formats-old`
@@ -485,38 +320,36 @@
 * Relaxed validation for format filters so that any arbitrary field can be used
 * Fix for embedding thumbnail in mp3 by [pauldubois98](https://github.com/pauldubois98) ([ytdl-org/youtube-dl#21569](https://github.com/ytdl-org/youtube-dl/pull/21569))
 * Make Twitch Video ID output from Playlist and VOD extractor same. This is only a temporary fix
-* Merge youtube-dl: Upto [2021.01.03](https://github.com/ytdl-org/youtube-dl/commit/8e953dcbb10a1a42f4e12e4e132657cb0100a1f8) - See [blackjack4494/yt-dlc#280](https://github.com/blackjack4494/yt-dlc/pull/280) for details
+* **Merge youtube-dl:** Upto [2021.01.03](https://github.com/ytdl-org/youtube-dl/commit/8e953dcbb10a1a42f4e12e4e132657cb0100a1f8) - See [blackjack4494/yt-dlc#280](https://github.com/blackjack4494/yt-dlc/pull/280) for details
    * Extractors [tiktok](https://github.com/ytdl-org/youtube-dl/commit/fb626c05867deab04425bad0c0b16b55473841a2) and [hotstar](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc) have not been merged
 * Cleaned up the fork for public use
 **PS**: All uncredited changes above this point are authored by [pukkandan](https://github.com/pukkandan)
 ### Unreleased changes in [blackjack4494/yt-dlc](https://github.com/blackjack4494/yt-dlc)
-* Updated to youtube-dl release 2020.11.26 by [pukkandan](https://github.com/pukkandan)
+* Updated to youtube-dl release 2020.11.26
-* Youtube improvements by [pukkandan](https://github.com/pukkandan)
+* [youtube]
    * Implemented all Youtube Feeds (ytfav, ytwatchlater, ytsubs, ythistory, ytrec) and SearchURL
    * Fix ytsearch not returning results sometimes due to promoted content
    * Temporary fix for automatic captions - disable json3
    * Fix some improper Youtube URLs
    * Redirect channel home to /video
    * Print youtube's warning message
-    * Handle Multiple pages for feeds better
+    * Multiple pages are handled better for feeds
 * [youtube] Fix ytsearch not returning results sometimes due to promoted content by [colethedj](https://github.com/colethedj)
 * [youtube] Temporary fix for automatic captions - disable json3 by [blackjack4494](https://github.com/blackjack4494)
 * Add --break-on-existing by [gergesh](https://github.com/gergesh)
-* Pre-check video IDs in the archive before downloading by [pukkandan](https://github.com/pukkandan)
+* Pre-check video IDs in the archive before downloading
-* [bitwave.tv] New extractor by [lorpus](https://github.com/lorpus)
+* [bitwave.tv] New extractor
-* [Gedi] Add extractor by [nixxo](https://github.com/nixxo)
+* [Gedi] Add extractor
-* [Rcs] Add new extractor by [nixxo](https://github.com/nixxo)
+* [Rcs] Add new extractor
-* [skyit] New skyitalia extractor by [nixxo](https://github.com/nixxo)
+* [skyit] Add support for multiple Sky Italia website and removed old skyitalia extractor
-* [france.tv] Fix thumbnail URL by [renalid](https://github.com/renalid)
+* [france.tv] Fix thumbnail URL
-* [ina] support mobile links by [B0pol](https://github.com/B0pol)
+* [ina] support mobile links
-* [instagram] Fix thumbnail extractor by [nao20010128nao](https://github.com/nao20010128nao)
+* [instagram] Fix extractor
-* [SouthparkDe] Support for English URLs by [xypwn](https://github.com/xypwn)
+* [itv] BTCC new pages' URL update (articles instead of races)
-* [spreaker] fix SpreakerShowIE test URL by [pukkandan](https://github.com/pukkandan)
+* [SouthparkDe] Support for English URLs
-* [Vlive] Fix playlist handling when downloading a channel by [kyuyeunk](https://github.com/kyuyeunk)
+* [spreaker] fix SpreakerShowIE test URL
-* [tmz] Fix extractor by [diegorodriguezv](https://github.com/diegorodriguezv)
+* [Vlive] Fix playlist handling when downloading a channel
-* [generic] Detect embedded bitchute videos by [pukkandan](https://github.com/pukkandan)
+* [generic] Detect embedded bitchute videos
-* [generic] Extract embedded youtube and twitter videos by [diegorodriguezv](https://github.com/diegorodriguezv)
+* [generic] Extract embedded youtube and twitter videos
-* [ffmpeg] Ensure all streams are copied by [pukkandan](https://github.com/pukkandan)
+* [ffmpeg] Ensure all streams are copied
-* [embedthumbnail] Fix for os.rename error by [pukkandan](https://github.com/pukkandan)
+* Fix for os.rename error when embedding thumbnail to video in a different drive
-* make_win.bat: don't use UPX to pack vcruntime140.dll by [jbruchon](https://github.com/jbruchon)
+* make_win.bat: don't use UPX to pack vcruntime140.dll
@@ -1,4 +1,4 @@
-all: yt-dlp doc pypi-files
+all: yt-dlp doc
 clean: clean-test clean-dist clean-cache
 completions: completion-bash completion-fish completion-zsh
 doc: README.md CONTRIBUTING.md issuetemplates supportedsites
@@ -1,43 +1,39 @@
 <div align="center">
 # YT-DLP
 A command-line program to download videos from YouTube and many other [video platforms](supportedsites.md)
-<!-- GHA doesn't have for-the-badge style
+[![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=brightgreen&label=Release)](https://github.com/yt-dlp/yt-dlp/releases/latest)
 [![License: Unlicense](https://img.shields.io/badge/License-Unlicense-blue.svg)](LICENSE)
 [![CI Status](https://github.com/yt-dlp/yt-dlp/workflows/Core%20Tests/badge.svg?branch=master)](https://github.com/yt-dlp/yt-dlp/actions)
-->
+[![Discord](https://img.shields.io/discord/807245652072857610?color=blue&label=discord&logo=discord)](https://discord.gg/S75JaBna)  
 [![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=brightgreen&label=Release&style=for-the-badge)](https://github.com/yt-dlp/yt-dlp/releases/latest)
 [![License: Unlicense](https://img.shields.io/badge/License-Unlicense-blue.svg?style=for-the-badge)](LICENSE)
 [![Doc Status](https://readthedocs.org/projects/yt-dlp/badge/?version=latest&style=for-the-badge)](https://yt-dlp.readthedocs.io)
 [![Discord](https://img.shields.io/discord/807245652072857610?color=blue&label=discord&logo=discord&style=for-the-badge)](https://discord.gg/H5MNcFW63r)
 [![Commits](https://img.shields.io/github/commit-activity/m/yt-dlp/yt-dlp?label=commits&style=for-the-badge)](https://github.com/yt-dlp/yt-dlp/commits)
 [![Last Commit](https://img.shields.io/github/last-commit/yt-dlp/yt-dlp/master?style=for-the-badge)](https://github.com/yt-dlp/yt-dlp/commits)
 [![Downloads](https://img.shields.io/github/downloads/yt-dlp/yt-dlp/total?style=for-the-badge&color=blue)](https://github.com/yt-dlp/yt-dlp/releases/latest)
 [![PyPi Downloads](https://img.shields.io/pypi/dm/yt-dlp?label=PyPi&style=for-the-badge)](https://pypi.org/project/yt-dlp)
-</div>
+[![Commits](https://img.shields.io/github/commit-activity/m/yt-dlp/yt-dlp?label=commits)](https://github.com/yt-dlp/yt-dlp/commits)
 [![Last Commit](https://img.shields.io/github/last-commit/yt-dlp/yt-dlp/master)](https://github.com/yt-dlp/yt-dlp/commits)
 [![Downloads](https://img.shields.io/github/downloads/yt-dlp/yt-dlp/total)](https://github.com/yt-dlp/yt-dlp/releases/latest)
 [![PyPi Downloads](https://img.shields.io/pypi/dm/yt-dlp?label=PyPi)](https://pypi.org/project/yt-dlp)
 [![Doc Status](https://readthedocs.org/projects/yt-dlp/badge/?version=latest)](https://yt-dlp.readthedocs.io)
-yt-dlp 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
+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)
 * [NEW FEATURES](#new-features)
 * [INSTALLATION](#installation)
    * [Dependencies](#dependencies)
    * [Update](#update)
    * [Compile](#compile)
-* [USAGE AND OPTIONS](#usage-and-options)
+* [DESCRIPTION](#description)
-    * [General Options](#general-options)
+* [OPTIONS](#options)
    * [Network Options](#network-options)
-    * [Geo-restriction](#geo-restriction)
+    * [Geo Restriction](#geo-restriction)
    * [Video Selection](#video-selection)
    * [Download Options](#download-options)
    * [Filesystem Options](#filesystem-options)
-    * [Thumbnail Options](#thumbnail-options)
+    * [Thumbnail images](#thumbnail-images)
    * [Internet Shortcut Options](#internet-shortcut-options)
    * [Verbosity and Simulation Options](#verbosity-and-simulation-options)
    * [Workarounds](#workarounds)
    * [Video Format Options](#video-format-options)
    * [Subtitle Options](#subtitle-options)
    * [Authentication Options](#authentication-options)
    * [Adobe Pass Options](#adobe-pass-options)
    * [Post-processing Options](#post-processing-options)
    * [SponSkrub (SponsorBlock) Options](#sponskrub-sponsorblock-options)
    * [Extractor Options](#extractor-options)
@@ -50,12 +46,8 @@ yt-dlp is a [youtube-dl](https://github.com/ytdl-org/youtube-dl) fork based on t
    * [Filtering Formats](#filtering-formats)
    * [Sorting Formats](#sorting-formats)
    * [Format Selection examples](#format-selection-examples)
 * [MODIFYING METADATA](#modifying-metadata)
    * [Modifying metadata examples](#modifying-metadata-examples)
 * [PLUGINS](#plugins)
 * [DEPRECATED OPTIONS](#deprecated-options)
 * [MORE](#more)
 </div>
 # NEW FEATURES
@@ -65,27 +57,26 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/
 * **[Format Sorting](#sorting-formats)**: The default format sorting options have been changed so that higher resolution and better codecs will be now preferred instead of simply using larger bitrate. Furthermore, you can now specify the sort order using `-S`. This allows for much easier format selection that what is possible by simply using `--format` ([examples](#format-selection-examples))
-* **Merged with youtube-dl v2021.04.17**: You get all the latest features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494/yt-dlc)
+* **Merged with youtube-dl v2021.03.03**: You get all the latest features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494/yt-dlc)
 * **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--get-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, Playlist infojson etc. Note that the NicoNico improvements are not available. See [#31](https://github.com/yt-dlp/yt-dlp/pull/31) for details.
 * **Youtube improvements**:
-    * All Youtube Feeds (`:ytfav`, `:ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`) works and supports downloading multiple pages of content
+    * All Youtube Feeds (`:ytfav`, `:ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`) works correctly and supports downloading multiple pages of content
-    * Youtube search (`ytsearch:`, `ytsearchdate:`) along with Search URLs work
+    * Youtube search (`ytsearch:`, `ytsearchdate:`) along with Search URLs works correctly
    * Youtube mixes supports downloading multiple pages of content
    * Redirect channel's home URL automatically to `/video` to preserve the old behaviour
-* **Split video by chapters**: Videos can be split into multiple files based on chapters using `--split-chapters`
+* **Aria2c with HLS/DASH**: You can use aria2c as the external downloader for DASH(mpd) and HLS(m3u8) formats. No more slow ffmpeg/native downloads
-* **Multi-threaded fragment downloads**: Download multiple fragments of m3u8/mpd videos in parallel. Use `--concurrent-fragments` (`-N`) option to set the number of threads used
+* **New extractors**: AnimeLab, Philo MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5
-* **Aria2c with HLS/DASH**: You can use `aria2c` as the external downloader for DASH(mpd) and HLS(m3u8) formats
+* **Fixed extractors**: archive.org, roosterteeth.com, skyit, instagram, itv, SouthparkDe, spreaker, Vlive, tiktok, akamai, ina, rumble, tennistv
-* **New extractors**: AnimeLab, Philo MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula
+* **Plugin support**: Extractors can be loaded from an external file. See [plugins](#plugins) for details
-* **Fixed extractors**: archive.org, roosterteeth.com, skyit, instagram, itv, SouthparkDe, spreaker, Vlive, akamai, ina, rumble, tennistv, amcnetworks, la7 podcasts, linuxacadamy, nitter, twitcasting, viu
+* **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. See [`--paths`](https://github.com/yt-dlp/yt-dlp/#:~:text=-P,%20--paths%20TYPE:PATH) 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`)
+<!-- Relative link doesn't work for "#:~:text=" -->
 * **Portable Configuration**: Configuration files are automatically loaded from the home and root directories. See [configuration](#configuration) for details
@@ -93,8 +84,6 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/
 * **Improvements**: Multiple `--postprocessor-args` and `--external-downloader-args`, Date/time formatting in `-o`, faster archive checking, more [format selection options](#format-selection) etc
 * **Plugin extractors**: Extractors can be loaded from an external file. See [plugins](#plugins) for details
 * **Self-updater**: The releases can be updated using `yt-dlp -U`
@@ -107,7 +96,6 @@ If you are coming from [youtube-dl](https://github.com/ytdl-org/youtube-dl), the
 # INSTALLATION
 yt-dlp is not platform specific. So it should work on your Unix box, on Windows or on macOS
 You can install yt-dlp using one of the following methods:
 * Download the binary from the [latest release](https://github.com/yt-dlp/yt-dlp/releases/latest) (recommended method)
@@ -115,30 +103,8 @@ You can install yt-dlp using one of the following methods:
 * Use pip+git: `python -m pip install --upgrade git+https://github.com/yt-dlp/yt-dlp.git@release`
 * Install master branch: `python -m pip install --upgrade git+https://github.com/yt-dlp/yt-dlp`
 UNIX users (Linux, macOS, BSD) can also install the [latest release](https://github.com/yt-dlp/yt-dlp/releases/latest) one of the following ways:
 ```
 sudo curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp
 sudo chmod a+rx /usr/local/bin/yt-dlp
 ```
 ```
 sudo wget https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -O /usr/local/bin/yt-dlp
 sudo chmod a+rx /usr/local/bin/yt-dlp
 ```
 ```
 sudo aria2c https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp
 sudo chmod a+rx /usr/local/bin/yt-dlp
 ```
 ### DEPENDENCIES
 Python versions 2.6, 2.7, or 3.2+ are currently supported. However, 3.2+ is strongly recommended and python2 support will be deprecated in the future.
 Although there are no required dependencies, `ffmpeg` and `ffprobe` are highly recommended. Other optional dependencies are `sponskrub`, `AtomicParsley`, `mutagen`, `pycryptodome` and any of the supported external downloaders. Note that the windows releases are already built with the python interpreter, mutagen and pycryptodome included.
 ### UPDATE
-You can use `yt-dlp -U` to update if you are using the provided release.
+Starting from version `2021.02.09`, you can use `yt-dlp -U` to update if you are using the provided release.
 If you are using `pip`, simply re-run the same command that was used to install the program.
 ### COMPILE
@@ -148,7 +114,7 @@ To build the Windows executable, you must have pyinstaller (and optionally mutag
    python -m pip install --upgrade pyinstaller mutagen pycryptodome
-Once you have all the necessary dependencies installed, just run `py pyinst.py`. The executable will be built for the same architecture (32/64 bit) as the python used to build it. It is strongly recommended to use python3 although python2.6+ is supported.
+Once you have all the necessary dependancies installed, just run `py pyinst.py`. The executable will be built for the same architecture (32/64 bit) as the python used to build it. It is strongly reccomended to use python3 although python2.6+ is supported.
 You can also build the executable without any version info or metadata by using:
@@ -160,12 +126,15 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
 **Note**: In either platform, `devscripts\update-version.py` can be used to automatically update the version number
-# USAGE AND OPTIONS
+# DESCRIPTION
 **yt-dlp** is a command-line program to download videos from youtube.com many other [video platforms](supportedsites.md). It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is not platform specific. It should work on your Unix box, on Windows or on macOS. It is released to the public domain, which means you can modify it, redistribute it or use it however you like.
    yt-dlp [OPTIONS] [--] URL [URL...]
 # OPTIONS
 `Ctrl+F` is your friend :D
-<!-- Auto generated -->
+<!-- Autogenerated -->
 ## General Options:
    -h, --help                       Print this help text and exit
@@ -208,7 +177,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     only list them
    --no-flat-playlist               Extract the videos of a playlist
    --mark-watched                   Mark videos watched (YouTube only)
-    --no-mark-watched                Do not mark videos watched (default)
+    --no-mark-watched                Do not mark videos watched
    --no-colors                      Do not emit color codes in output
 ## Network Options:
@@ -222,7 +191,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    -4, --force-ipv4                 Make all connections via IPv4
    -6, --force-ipv6                 Make all connections via IPv6
-## Geo-restriction:
+## Geo Restriction:
    --geo-verification-proxy URL     Use this proxy to verify the IP address for
                                     some geo-restricted sites. The default
                                     proxy specified by --proxy (or none, if the
@@ -305,14 +274,12 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     a file that is in the archive
    --break-on-reject                Stop the download process when encountering
                                     a file that has been filtered out
    --skip-playlist-after-errors N   Number of allowed failures until the rest
                                     of the playlist is skipped
    --no-download-archive            Do not use archive file (default)
    --include-ads                    Download advertisements as well
                                     (experimental)
    --no-include-ads                 Do not download advertisements (default)
 ## Download Options:
    -N, --concurrent-fragments N     Number of fragments of a dash/hlsnative
                                     video that should be download concurrently
                                     (default is 1)
    -r, --limit-rate RATE            Maximum download rate in bytes per second
                                     (e.g. 50K or 4.2M)
    -R, --retries RETRIES            Number of retries (default is 10), or
@@ -346,6 +313,10 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --playlist-random                Download playlist videos in random order
    --xattr-set-filesize             Set file xattribute ytdl.filesize with
                                     expected file size
    --hls-prefer-native              Use the native HLS downloader instead of
                                     ffmpeg
    --hls-prefer-ffmpeg              Use ffmpeg instead of the native HLS
                                     downloader
    --hls-use-mpegts                 Use the mpegts container for HLS videos;
                                     allowing some players to play the video
                                     while downloading, and reducing the chance
@@ -355,19 +326,10 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --no-hls-use-mpegts              Do not use the mpegts container for HLS
                                     videos. This is default when not
                                     downloading live streams
-    --downloader [PROTO:]NAME        Name or path of the external downloader to
+    --external-downloader NAME       Name or path of the external downloader to
-                                     use (optionally) prefixed by the protocols
+                                     use. Currently supports aria2c, avconv,
-                                     (http, ftp, m3u8, dash, rstp, rtmp, mms) to
+                                     axel, curl, ffmpeg, httpie, wget
-                                     use it for. Currently supports native,
+                                     (Recommended: aria2c)
                                     aria2c, avconv, axel, curl, ffmpeg, httpie,
                                     wget (Recommended: aria2c). You can use
                                     this option multiple times to set different
                                     downloaders for different protocols. For
                                     example, --downloader aria2c --downloader
                                     "dash,m3u8:native" will use aria2c for
                                     http/ftp downloads, and the native
                                     downloader for dash/m3u8 downloads
                                     (Alias: --external-downloader)
    --downloader-args NAME:ARGS      Give these arguments to the external
                                     downloader. Specify the downloader name and
                                     the arguments separated by a colon ":". You
@@ -379,7 +341,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     stdin), one URL per line. Lines starting
                                     with '#', ';' or ']' are considered as
                                     comments and ignored
-    -P, --paths TYPES:PATH           The paths where the files should be
+    -P, --paths TYPE:PATH            The paths where the files should be
                                     downloaded. Specify the type of file and
                                     the path separated by a colon ":". All the
                                     same types as --output are supported.
@@ -390,11 +352,13 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     home path after download is finished. This
                                     option is ignored if --output is an
                                     absolute path
-    -o, --output [TYPES:]TEMPLATE    Output filename template; see "OUTPUT
+    -o, --output [TYPE:]TEMPLATE     Output filename template, see "OUTPUT
                                     TEMPLATE" for details
    --output-na-placeholder TEXT     Placeholder value for unavailable meta
                                     fields in output filename template
                                     (default: "NA")
    --autonumber-start NUMBER        Specify the start value for %(autonumber)s
                                     (default is 1)
    --restrict-filenames             Restrict filenames to only ASCII
                                     characters, and avoid "&" and spaces in
                                     filenames
@@ -414,7 +378,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    -c, --continue                   Resume partially downloaded files/fragments
                                     (default)
    --no-continue                    Do not resume partially downloaded
-                                     fragments. If the file is not fragmented,
+                                     fragments. If the file is unfragmented,
                                     restart download of the entire file
    --part                           Use .part files instead of writing directly
                                     into output file (default)
@@ -438,11 +402,6 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     --write-description etc. (default)
    --no-write-playlist-metafiles    Do not write playlist metadata when using
                                     --write-info-json, --write-description etc.
    --clean-infojson                 Remove some private fields such as
                                     filenames from the infojson. Note that it
                                     could still contain some personal
                                     information (default)
    --no-clean-infojson              Write all fields to the infojson
    --get-comments                   Retrieve video comments to be placed in the
                                     .info.json file. The comments are fetched
                                     even without this option if the extraction
@@ -464,7 +423,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --no-cache-dir                   Disable filesystem caching
    --rm-cache-dir                   Delete all filesystem cache files
-## Thumbnail Options:
+## Thumbnail Images:
    --write-thumbnail                Write thumbnail image to disk
    --no-write-thumbnail             Do not write thumbnail image to disk
                                     (default)
@@ -486,14 +445,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --no-warnings                    Ignore warnings
    -s, --simulate                   Do not download the video and do not write
                                     anything to disk
-    --ignore-no-formats-error        Ignore "No video formats" error. Usefull
+    --skip-download                  Do not download the video
                                     for extracting metadata even if the video
                                     is not actually available for download
                                     (experimental)
    --no-ignore-no-formats-error     Throw error when no downloadable video
                                     formats are found (default)
    --skip-download                  Do not download the video but write all
                                     related files (Alias: --no-download)
    -g, --get-url                    Simulate, quiet but print URL
    -e, --get-title                  Simulate, quiet but print title
    --get-id                         Simulate, quiet but print id
@@ -512,8 +464,8 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --print-json                     Be quiet and print the video information as
                                     JSON (video is still being downloaded)
    --force-write-archive            Force download archive entries to be
-                                     written as far as no errors occur, even if
+                                     written as far as no errors occur,even if
-                                     -s or another simulation option is used
+                                     -s or another simulation switch is used
                                     (Alias: --force-download-archive)
    --newline                        Output progress bar as new lines
    --no-progress                    Do not print progress bar
@@ -530,7 +482,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --encoding ENCODING              Force the specified encoding (experimental)
    --no-check-certificate           Suppress HTTPS certificate validation
    --prefer-insecure                Use an unencrypted connection to retrieve
-                                     information about the video (Currently
+                                     information about the video. (Currently
                                     supported only for YouTube)
    --user-agent UA                  Specify a custom user agent
    --referer URL                    Specify a custom referer, use if the video
@@ -544,11 +496,15 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --sleep-requests SECONDS         Number of seconds to sleep between requests
                                     during data extraction
    --sleep-interval SECONDS         Number of seconds to sleep before each
-                                     download. This is the minimum time to sleep
+                                     download when used alone or a lower bound
-                                     when used along with --max-sleep-interval
+                                     of a range for randomized sleep before each
-                                     (Alias: --min-sleep-interval)
+                                     download (minimum possible number of
-    --max-sleep-interval SECONDS     Maximum number of seconds to sleep. Can
+                                     seconds to sleep) when used along with
-                                     only be used along with --min-sleep-interval
+                                     --max-sleep-interval
    --max-sleep-interval SECONDS     Upper bound of a range for randomized sleep
                                     before each download (maximum possible
                                     number of seconds to sleep). Must only be
                                     used along with --min-sleep-interval
    --sleep-subtitles SECONDS        Number of seconds to sleep before each
                                     subtitle download
@@ -571,6 +527,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     into a single file
    --no-audio-multistreams          Only one audio stream is downloaded for
                                     each output file (default)
    --all-formats                    Download all available video formats
    --prefer-free-formats            Prefer video formats with free containers
                                     over non-free ones of same quality. Use
                                     with "-S ext" to strictly prefer free
@@ -588,7 +545,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     container format. One of mkv, mp4, ogg,
                                     webm, flv. Ignored if no merge is required
    --allow-unplayable-formats       Allow unplayable formats to be listed and
-                                     downloaded. All video post-processing will
+                                     downloaded. All video postprocessing will
                                     also be turned off
    --no-allow-unplayable-formats    Do not allow unplayable formats to be
                                     listed or downloaded (default)
@@ -597,20 +554,18 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --write-subs                     Write subtitle file
    --no-write-subs                  Do not write subtitle file (default)
    --write-auto-subs                Write automatically generated subtitle file
-                                     (Alias: --write-automatic-subs)
+                                     (YouTube only)
-    --no-write-auto-subs             Do not write auto-generated subtitles
+    --no-write-auto-subs             Do not write automatically generated
-                                     (default) (Alias: --no-write-automatic-subs)
+                                     subtitle file (default)
    --all-subs                       Download all the available subtitles of the
                                     video
    --list-subs                      List all available subtitles for the video
    --sub-format FORMAT              Subtitle format, accepts formats
                                     preference, for example: "srt" or
                                     "ass/srt/best"
-    --sub-langs LANGS                Languages of the subtitles to download (can
+    --sub-lang LANGS                 Languages of the subtitles to download
-                                     be regex) or "all" separated by commas.
+                                     (optional) separated by commas, use --list-
-                                     (Eg: --sub-langs en.*,ja) You can prefix
+                                     subs for available language tags
                                     the language code with a "-" to exempt it
                                     from the requested languages. (Eg: --sub-
                                     langs all,-live_chat) Use --list-subs for a
                                     list of available language tags
 ## Authentication Options:
    -u, --username USERNAME          Login with this account ID
@@ -619,6 +574,8 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    -2, --twofactor TWOFACTOR        Two-factor authentication code
    -n, --netrc                      Use .netrc authentication data
    --video-password PASSWORD        Video password (vimeo, youku)
 ## Adobe Pass Options:
    --ap-mso MSO                     Adobe Pass multiple-system operator (TV
                                     provider) identifier, use --ap-list-mso for
                                     a list of available MSOs
@@ -655,24 +612,23 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     Specify the postprocessor/executable name
                                     and the arguments separated by a colon ":"
                                     to give the argument to the specified
-                                     postprocessor/executable. Supported PP are:
+                                     postprocessor/executable. Supported
-                                     Merger, ExtractAudio, SplitChapters,
+                                     postprocessors are: SponSkrub,
-                                     Metadata, EmbedSubtitle, EmbedThumbnail,
+                                     ExtractAudio, VideoRemuxer, VideoConvertor,
-                                     SubtitlesConvertor, ThumbnailsConvertor,
+                                     EmbedSubtitle, Metadata, Merger,
-                                     VideoRemuxer, VideoConvertor, SponSkrub,
+                                     FixupStretched, FixupM4a, FixupM3u8,
-                                     FixupStretched, FixupM4a and FixupM3u8. The
+                                     SubtitlesConvertor and EmbedThumbnail. The
-                                     supported executables are: AtomicParsley,
+                                     supported executables are: SponSkrub,
-                                     FFmpeg, FFprobe, and SponSkrub. You can
+                                     FFmpeg, FFprobe, and AtomicParsley. You can
                                     also specify "PP+EXE:ARGS" to give the
                                     arguments to the specified executable only
                                     when being used by the specified
                                     postprocessor. Additionally, for
-                                     ffmpeg/ffprobe, "_i"/"_o" can be appended
+                                     ffmpeg/ffprobe, a number can be appended to
-                                     to the prefix optionally followed by a
+                                     the exe name seperated by "_i" to pass the
-                                     number to pass the argument before the
+                                     argument before the specified input file.
-                                     specified input/output file. Eg: --ppa
+                                     Eg: --ppa "Merger+ffmpeg_i1:-v quiet". You
-                                     "Merger+ffmpeg_i1:-v quiet". You can use
+                                     can use this option multiple times to give
                                     this option multiple times to give
                                     different arguments to different
                                     postprocessors. (Alias: --ppa)
    -k, --keep-video                 Keep the intermediate video file on disk
@@ -688,9 +644,20 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --no-embed-thumbnail             Do not embed thumbnail (default)
    --add-metadata                   Write metadata to the video file
    --no-add-metadata                Do not write metadata (default)
-    --parse-metadata FROM:TO         Parse additional metadata like title/artist
+    --parse-metadata FIELD:FORMAT    Parse additional metadata like title/artist
-                                     from other fields; see "MODIFYING METADATA"
+                                     from other fields. Give field name to
-                                     for details
+                                     extract data from, and format of the field
                                     seperated by a ":". Either regular
                                     expression with named capture groups or a
                                     similar syntax to the output template can
                                     also be used. The parsed parameters replace
                                     any existing values and can be use in
                                     output template. This option can be used
                                     multiple times. Example: --parse-metadata
                                     "title:%(artist)s - %(title)s" matches a
                                     title like "Coldplay - Paradise". Example
                                     (regex): --parse-metadata
                                     "description:Artist - (?P<artist>.+?)"
    --xattrs                         Write metadata to the video file's xattrs
                                     (using dublin core and xdg standards)
    --fixup POLICY                   Automatically correct known faults of the
@@ -702,26 +669,11 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     path to the binary or its containing
                                     directory
    --exec CMD                       Execute a command on the file after
-                                     downloading and post-processing. Similar
+                                     downloading and post-processing, similar to
-                                     syntax to the output template can be used
+                                     find's -exec syntax. Example: --exec 'adb
-                                     to pass any field as arguments to the
+                                     push {} /sdcard/Music/ && rm {}'
-                                     command. An additional field "filepath"
+    --convert-subs FORMAT            Convert the subtitles to other format
                                     that contains the final path of the
                                     downloaded file is also available. If no
                                     fields are passed, "%(filepath)s" is
                                     appended to the end of the command
    --convert-subs FORMAT            Convert the subtitles to another format
                                     (currently supported: srt|ass|vtt|lrc)
                                     (Alias: --convert-subtitles)
    --convert-thumbnails FORMAT      Convert the thumbnails to another format
                                     (currently supported: jpg)
    --split-chapters                 Split video into multiple files based on
                                     internal chapters. The "chapter:" prefix
                                     can be used with "--paths" and "--output"
                                     to set the output filename for the split
                                     files. See "OUTPUT TEMPLATE" for details
    --no-split-chapters              Do not split video based on chapters
                                     (default)
 ## SponSkrub (SponsorBlock) Options:
 [SponSkrub](https://github.com/yt-dlp/SponSkrub) is a utility to
@@ -837,21 +789,9 @@ The `-o` option is used to indicate a template for the output file names while `
 **tl;dr:** [navigate me to examples](#output-template-examples).
-The simplest usage of `-o` is not to set any template arguments when downloading a single file, like in `yt-dlp -o funny_video.flv "https://some/video"` (hard-coding file extension like this is _not_ recommended and could break some post-processing).
+The basic usage of `-o` is not to set any template arguments when downloading a single file, like in `yt-dlp -o funny_video.flv "https://some/video"`. However, it may contain special sequences that will be replaced when downloading each video. The special sequences may be formatted according to [python string formatting operations](https://docs.python.org/2/library/stdtypes.html#string-formatting). For example, `%(NAME)s` or `%(NAME)05d`. To clarify, that is a percent symbol followed by a name in parentheses, followed by formatting operations. Date/time fields can also be formatted according to [strftime formatting](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) by specifying it inside the parantheses seperated from the field name using a `>`. For example, `%(duration>%H-%M-%S)s`.
-It may however also contain special sequences that will be replaced when downloading each video. The special sequences may be formatted according to [python string formatting operations](https://docs.python.org/2/library/stdtypes.html#string-formatting). For example, `%(NAME)s` or `%(NAME)05d`. To clarify, that is a percent symbol followed by a name in parentheses, followed by formatting operations.
+Additionally, you can set different output templates for the various metadata files seperately from the general output template by specifying the type of file followed by the template seperated by a colon ":". The different filetypes supported are `subtitle|thumbnail|description|annotation|infojson|pl_description|pl_infojson`. For example, `-o '%(title)s.%(ext)s' -o 'thumbnail:%(title)s\%(title)s.%(ext)s'`  will put the thumbnails in a folder with the same name as the video.
 The field names themselves (the part inside the parenthesis) can also have some special formatting:
 1. **Date/time Formatting**: Date/time fields can be formatted according to [strftime formatting](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) by specifying it separated from the field name using a `>`. Eg: `%(duration>%H-%M-%S)s` or `%(upload_date>%Y-%m-%d)s`
 2. **Offset numbers**: Numeric fields can have an initial offset specified by using a `+` separator. Eg: `%(playlist_index+10)03d`. This can also be used in conjunction with the date-time formatting. Eg: `%(epoch+-3600>%H-%M-%S)s`
 3. **Object traversal**: The dictionaries and lists available in metadata can be traversed by using a `.` (dot) separator. Eg: `%(tags.0)s` or `%(subtitles.en.-1.ext)`. Note that the fields that become available using this method are not listed below. Use `-j` to see such fields
 To summarize, the general syntax for a field is:
 ```
 %(name[.keys][+offset][>strf])[flags][width][.precision][length]type
 ```
 Additionally, you can set different output templates for the various metadata files separately from the general output template by specifying the type of file followed by the template separated by a colon `:`. The different file types supported are `subtitle`, `thumbnail`, `description`, `annotation`, `infojson`, `pl_description`, `pl_infojson`, `chapter`. For example, `-o '%(title)s.%(ext)s' -o 'thumbnail:%(title)s\%(title)s.%(ext)s'`  will put the thumbnails in a folder with the same name as the video.
 The available fields are:
@@ -860,7 +800,6 @@ The available fields are:
 - `url` (string): Video URL
 - `ext` (string): Video filename extension
 - `alt_title` (string): A secondary title of the video
 - `description` (string): The description of the video
 - `display_id` (string): An alternative identifier for the video
 - `uploader` (string): Full name of the video uploader
 - `license` (string): License name the video is licensed under
@@ -884,7 +823,6 @@ The available fields are:
 - `is_live` (boolean): Whether this video is a live stream or a fixed-length video
 - `was_live` (boolean): Whether this video was originally a live stream
 - `playable_in_embed` (string): Whether this video is allowed to play in embedded players on other sites
 - `availability` (string): Whether the video is 'private', 'premium_only', 'subscriber_only', 'needs_auth', 'unlisted' or 'public'
 - `start_time` (numeric): Time in seconds where the reproduction should start, as specified in the URL
 - `end_time` (numeric): Time in seconds where the reproduction should end, as specified in the URL
 - `format` (string): A human-readable description of the format
@@ -944,13 +882,6 @@ Available for the media that is a track or a part of a music album:
 - `disc_number` (numeric): Number of the disc or other physical medium the track belongs to
 - `release_year` (numeric): Year (YYYY) when the album was released
 Available for `chapter:` prefix when using `--split-chapters` for videos with internal chapters:
 - `section_title` (string): Title of the chapter
 - `section_number` (numeric): Number of the chapter within the file
 - `section_start` (numeric): Start time of the chapter in seconds
 - `section_end` (numeric): End time of the chapter in seconds
 Each aforementioned sequence when referenced in an output template will be replaced by the actual value corresponding to the sequence name. Note that some of the sequences are not guaranteed to be present since they depend on the metadata obtained by a particular extractor. Such sequences will be replaced with placeholder value provided with `--output-na-placeholder` (`NA` by default).
 For example for `-o %(title)s-%(id)s.%(ext)s` and an mp4 video with title `yt-dlp test video` and id `BaW_jenozKcj`, this will result in a `yt-dlp test video-BaW_jenozKcj.mp4` file created in the current directory.
@@ -983,7 +914,7 @@ youtube-dl_test_video_.mp4          # A simple file name
 # Download YouTube playlist videos in separate directory indexed by video order in a playlist
 $ yt-dlp -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re
-# Download YouTube playlist videos in separate directories according to their uploaded year
+# Download YouTube playlist videos in seperate directories according to their uploaded year
 $ yt-dlp -o '%(upload_date>%Y)s/%(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re
 # Download all playlists of YouTube channel/user keeping each playlist in separate directory:
@@ -1004,20 +935,19 @@ $ yt-dlp -o - BaW_jenozKc
 By default, yt-dlp tries to download the best available quality if you **don't** pass any options.
 This is generally equivalent to using `-f bestvideo*+bestaudio/best`. However, if multiple audiostreams is enabled (`--audio-multistreams`), the default format changes to `-f bestvideo+bestaudio/best`. Similarly, if ffmpeg is unavailable, or if you use yt-dlp to stream to `stdout` (`-o -`), the default becomes `-f best/bestvideo+bestaudio`.
-The general syntax for format selection is `-f FORMAT` (or `--format FORMAT`) where `FORMAT` is a *selector expression*, i.e. an expression that describes format or formats you would like to download.
+The general syntax for format selection is `--f FORMAT` (or `--format FORMAT`) where `FORMAT` is a *selector expression*, i.e. an expression that describes format or formats you would like to download.
 **tl;dr:** [navigate me to examples](#format-selection-examples).
-The simplest case is requesting a specific format, for example with `-f 22` you can download the format with format code equal to 22. You can get the list of available format codes for particular video using `--list-formats` or `-F`. Note that these format codes are extractor specific.
+The simplest case is requesting a specific format, for example with `-f 22` you can download the format with format code equal to 22. You can get the list of available format codes for particular video using `--list-formats` or `-F`. Note that these format codes are extractor specific. 
 You can also use a file extension (currently `3gp`, `aac`, `flv`, `m4a`, `mp3`, `mp4`, `ogg`, `wav`, `webm` are supported) to download the best quality format of a particular file extension served as a single file, e.g. `-f webm` will download the best quality format with the `webm` extension served as a single file.
 You can also use special names to select particular edge case formats:
 - `all`: Select all formats
- - `mergeall`: Select and merge all formats (Must be used with `--audio-multistreams`, `--video-multistreams` or both)
+ - `b*`, `best*`: Select the best quality format irrespective of whether it contains video or audio.
- - `b*`, `best*`: Select the best quality format irrespective of whether it contains video or audio
+ - `w*`, `worst*`: Select the worst quality format irrespective of whether it contains video or audio.
 - `w*`, `worst*`: Select the worst quality format irrespective of whether it contains video or audio
 - `b`, `best`: Select the best quality format that contains both video and audio. Equivalent to `best*[vcodec!=none][acodec!=none]`
 - `w`, `worst`: Select the worst quality format that contains both video and audio. Equivalent to `worst*[vcodec!=none][acodec!=none]`
 - `bv`, `bestvideo`: Select the best quality video-only format. Equivalent to `best*[acodec=none]`
@@ -1029,9 +959,7 @@ You can also use special names to select particular edge case formats:
 - `ba*`, `bestaudio*`: Select the best quality format that contains audio. It may also contain video. Equivalent to `best*[acodec!=none]`
 - `wa*`, `worstaudio*`: Select the worst quality format that contains audio. It may also contain video. Equivalent to `worst*[acodec!=none]`
-For example, to download the worst quality video-only format you can use `-f worstvideo`. It is however recommended not to use `worst` and related options. When your format selector is `worst`, the format which is worst in all respects is selected. Most of the time, what you actually want is the video with the smallest filesize instead. So it is generally better to use `-f best -S +size,+br,+res,+fps` instead of `-f worst`. See [sorting formats](#sorting-formats) for more details.
+For example, to download the worst quality video-only format you can use `-f worstvideo`. It is however recomended to never actually use `worst` and related options. When your format selector is `worst`, the format which is worst in all respects is selected. Most of the time, what you actually want is the video with the smallest filesize instead. So it is generally better to use `-f best -S +size,+br,+res,+fps` instead of `-f worst`. See [sorting formats](#sorting-formats) for more details.
 You can select the n'th best format of a type by using `best<type>.<n>`. For example, `best.2` will select the 2nd best combined format. Similarly, `bv*.3` will select the 3rd best format that contains a video stream.
 If you want to download multiple videos and they don't have the same formats available, you can specify the order of preference using slashes. Note that formats on the left hand side are preferred, for example `-f 22/17/18` will download format 22 if it's available, otherwise it will download format 17 if it's available, otherwise it will download format 18 if it's available, otherwise it will complain that no suitable formats are available for download.
@@ -1066,7 +994,7 @@ Also filtering work for comparisons `=` (equals), `^=` (starts with), `$=` (ends
 Any string comparison may be prefixed with negation `!` in order to produce an opposite comparison, e.g. `!*=` (does not contain).
-Note that none of the aforementioned meta fields are guaranteed to be present since this solely depends on the metadata obtained by particular extractor, i.e. the metadata offered by the website. Any other field made available by the extractor can also be used for filtering.
+Note that none of the aforementioned meta fields are guaranteed to be present since this solely depends on the metadata obtained by particular extractor, i.e. the metadata offered by the video hoster. Any other field made available by the extractor can also be used for filtering.
 Formats for which the value is not known are excluded unless you put a question mark (`?`) after the operator. You can combine format filters, so `-f "[height<=?720][tbr>500]"` selects up to 720p videos (or videos where the height is not known) with a bitrate of at least 500 KBit/s. You can also use the filters with `all` to download all formats that satisfy the filter. For example, `-f "all[vcodec=none]"` selects all audio-only formats.
@@ -1082,7 +1010,7 @@ You can change the criteria for being considered the `best` by using `-S` (`--fo
 - `lang`: Language preference as given by the extractor
 - `quality`: The quality of the format as given by the extractor
 - `source`: Preference of the source as given by the extractor
- - `proto`: Protocol used for download (`https`/`ftps` > `http`/`ftp` > `m3u8_native` > `m3u8` > `http_dash_segments` > other > `mms`/`rtsp` > unknown > `f4f`/`f4m`)
+ - `proto`: Protocol used for download (`https`/`ftps` > `http`/`ftp` > `m3u8-native` > `m3u8` > `http-dash-segments` > other > `mms`/`rtsp` > unknown > `f4f`/`f4m`)
 - `vcodec`: Video Codec (`av01` > `vp9.2` > `vp9` > `h265` > `h264` > `vp8` > `h263` > `theora` > other > unknown)
 - `acodec`: Audio Codec (`opus` > `vorbis` > `aac` > `mp4a` > `mp3` > `ac3` > `dts` > other > unknown)
 - `codec`: Equivalent to `vcodec,acodec`
@@ -1102,11 +1030,11 @@ You can change the criteria for being considered the `best` by using `-S` (`--fo
 - `br`: Equivalent to using `tbr,vbr,abr`
 - `asr`: Audio sample rate in Hz
-Note that any other **numerical** field made available by the extractor can also be used. All fields, unless specified otherwise, are sorted in descending order. To reverse this, prefix the field with a `+`. Eg: `+res` prefers format with the smallest resolution. Additionally, you can suffix a preferred value for the fields, separated by a `:`. Eg: `res:720` prefers larger videos, but no larger than 720p and the smallest video if there are no videos less than 720p. For `codec` and `ext`, you can provide two preferred values, the first for video and the second for audio. Eg: `+codec:avc:m4a` (equivalent to `+vcodec:avc,+acodec:m4a`) sets the video codec preference to `h264` > `h265` > `vp9` > `vp9.2` > `av01` > `vp8` > `h263` > `theora` and audio codec preference to `mp4a` > `aac` > `vorbis` > `opus` > `mp3` > `ac3` > `dts`. You can also make the sorting prefer the nearest values to the provided by using `~` as the delimiter. Eg: `filesize~1G` prefers the format with filesize closest to 1 GiB.
+Note that any other **numerical** field made available by the extractor can also be used. All fields, unless specified otherwise, are sorted in decending order. To reverse this, prefix the field with a `+`. Eg: `+res` prefers format with the smallest resolution. Additionally, you can suffix a prefered value for the fields, seperated by a `:`. Eg: `res:720` prefers larger videos, but no larger than 720p and the smallest video if there are no videos less than 720p. For `codec` and `ext`, you can provide two prefered values, the first for video and the second for audio. Eg: `+codec:avc:m4a` (equivalent to `+vcodec:avc,+acodec:m4a`) sets the video codec preference to `h264` > `h265` > `vp9` > `vp9.2` > `av01` > `vp8` > `h263` > `theora` and audio codec preference to `mp4a` > `aac` > `vorbis` > `opus` > `mp3` > `ac3` > `dts`. You can also make the sorting prefer the nearest values to the provided by using `~` as the delimiter. Eg: `filesize~1G` prefers the format with filesize closest to 1 GiB.
 The fields `hasvid`, `ie_pref`, `lang` are always given highest priority in sorting, irrespective of the user-defined order. This behaviour can be changed by using `--force-format-sort`. Apart from these, the default order used is: `quality,res,fps,codec:vp9.2,size,br,asr,proto,ext,hasaud,source,id`. Note that the extractors may override this default order, but they cannot override the user-provided order.
-If your format selector is `worst`, the last item is selected after sorting. This means it will select the format that is worst in all respects. Most of the time, what you actually want is the video with the smallest filesize instead. So it is generally better to use `-f best -S +size,+br,+res,+fps`.
+If your format selector is `worst`, the last item is selected after sorting. This means it will select the format that is worst in all repects. Most of the time, what you actually want is the video with the smallest filesize instead. So it is generally better to use `-f best -S +size,+br,+res,+fps`.
 **Tip**: You can use the `-v -F` to see how the formats have been sorted (worst to best).
@@ -1115,7 +1043,7 @@ If your format selector is `worst`, the last item is selected after sorting. Thi
 Note that on Windows you may need to use double quotes instead of single.
 ```bash
-# Download and merge the best video-only format and the best audio-only format,
+# Download and merge the best best video-only format and the best audio-only format,
 # or download the best combined format if video-only format is not available
 $ yt-dlp -f 'bv+ba/b'
@@ -1131,17 +1059,10 @@ $ yt-dlp
 # by default, bestvideo and bestaudio will have the same file name.
 $ yt-dlp -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s'
 # Download and merge the best format that has a video stream,
 # and all audio-only formats into one file
 $ yt-dlp -f 'bv*+mergeall[vcodec=none]' --audio-multistreams
 # Download and merge the best format that has a video stream,
 # and the best 2 audio-only formats into one file
 $ yt-dlp -f 'bv*+ba+ba.2' --audio-multistreams
 # The following examples show the old method (without -S) of format selection
-# and how to use -S to achieve a similar but (generally) better result
+# and how to use -S to achieve a similar but better result
 # Download the worst video available (old method)
 $ yt-dlp -f 'wv*+wa/w'
@@ -1217,112 +1138,28 @@ $ yt-dlp -S '+codec:h264'
 # More complex examples
-# Download the best video no better than 720p preferring framerate greater than 30,
+# Download the best video no better than 720p prefering framerate greater than 30,
-# or the worst video (still preferring framerate greater than 30) if there is no such video
+# or the worst video (still prefering framerate greater than 30) if there is no such video
 $ yt-dlp -f '((bv*[fps>30]/bv*)[height<=720]/(wv*[fps>30]/wv*)) + ba / (b[fps>30]/b)[height<=720]/(w[fps>30]/w)'
 # Download the video with the largest resolution no better than 720p,
-# or the video with the smallest resolution available if there is no such video,
+# or the video with the smallest resolution available  if there is no such video,
-# preferring larger framerate for formats with the same resolution
+# prefering larger framerate for formats with the same resolution
 $ yt-dlp -S 'res:720,fps'
 # Download the video with smallest resolution no worse than 480p,
 # or the video with the largest resolution available if there is no such video,
-# preferring better codec and then larger total bitrate for the same resolution
+# prefering better codec and then larger total bitrate for the same resolution
 $ yt-dlp -S '+res:480,codec,br'
 ```
 # MODIFYING METADATA
 The metadata obtained the the extractors can be modified by using `--parse-metadata FROM:TO`. The general syntax is to give the name of a field or a template (with similar syntax to [output template](#output-template)) to extract data from, and the format to interpret it as, separated by a colon `:`. Either a [python regular expression](https://docs.python.org/3/library/re.html#regular-expression-syntax) with named capture groups or a similar syntax to the [output template](#output-template) (only `%(field)s` formatting is supported) can be used for `TO`. The option can be used multiple times to parse and modify various fields.
 Note that any field created by this can be used in the [output template](#output-template) and will also affect the media file's metadata added when using `--add-metadata`.
 You can also use this to change only the metadata that is embedded in the media file. To do this, set the value of the corresponding field with a `meta_` prefix. For example, any value you set to `meta_description` field will be added to the `description` field in the file. You can use this to set a different "description" and "synopsis", for example.
 ## Modifying metadata examples
 Note that on Windows you may need to use double quotes instead of single.
 ```bash
 # Interpret the title as "Artist - Title"
 $ yt-dlp --parse-metadata 'title:%(artist)s - %(title)s'
 # Regex example
 $ yt-dlp --parse-metadata 'description:Artist - (?P<artist>.+)'
 # Set title as "Series name S01E05"
 $ yt-dlp --parse-metadata '%(series)s S%(season_number)02dE%(episode_number)02d:%(title)s'
 # Set "comment" field in video metadata using description instead of webpage_url
 $ yt-dlp --parse-metadata 'description:(?s)(?P<meta_comment>.+)' --add-metadata
 ```
 # PLUGINS
 Plugins are loaded from `<root-dir>/ytdlp_plugins/<type>/__init__.py`. Currently only `extractor` plugins are supported. Support for `downloader` and `postprocessor` plugins may be added in the future. See [ytdlp_plugins](ytdlp_plugins) for example.
 **Note**: `<root-dir>` is the directory of the binary (`<root-dir>/yt-dlp`), or the root directory of the module if you are running directly from source-code (`<root dir>/yt_dlp/__main__.py`)
 # DEPRECATED OPTIONS
 These are all the deprecated options and the current alternative to achieve the same effect
 #### Not recommended
 While these options still work, their use is not recommended since there are other alternatives to achieve the same
    --all-formats                    -f all
    --all-subs                       --sub-langs all --write-subs
    --autonumber-size NUMBER         Use string formatting. Eg: %(autonumber)03d
    --autonumber-start NUMBER        Use internal field formatting like %(autonumber+NUMBER)s
    --metadata-from-title FORMAT     --parse-metadata "%(title)s:FORMAT"
    --hls-prefer-native              --downloader "m3u8:native"
    --hls-prefer-ffmpeg              --downloader "m3u8:ffmpeg"
    --sponskrub-args ARGS            --ppa "sponskrub:ARGS"
    --test                           Used by developers for testing extractors. Not intended for the end user
 #### Old aliases
 These are aliases that are no longer documented for various reasons
    --avconv-location                --ffmpeg-location
    --cn-verification-proxy URL      --geo-verification-proxy URL
    --dump-headers                   --print-traffic
    --dump-intermediate-pages        --dump-pages
    --force-write-download-archive   --force-write-archive
    --load-info                      --load-info-json
    --no-split-tracks                --no-split-chapters
    --no-write-srt                   --no-write-subs
    --prefer-unsecure                --prefer-insecure
    --rate-limit RATE                --limit-rate RATE
    --split-tracks                   --split-chapters
    --srt-lang LANGS                 --sub-langs LANGS
    --trim-file-names LENGTH         --trim-filenames LENGTH
    --write-srt                      --write-subs
    --yes-overwrites                 --force-overwrites
 #### No longer supported
 These options may no longer work as intended
    --prefer-avconv                  avconv is not officially supported by yt-dlp (Alias: --no-prefer-ffmpeg)
    --prefer-ffmpeg                  Default (Alias: --no-prefer-avconv)
    -C, --call-home                  Not implemented
    --no-call-home                   Default
    --include-ads                    No longer supported
    --no-include-ads                 Default
    --youtube-print-sig-code         No longer supported
    --id                             -o "%(id)s.%(ext)s"
    -A, --auto-number                -o "%(autonumber)s-%(id)s.%(ext)s"
    -t, --title                      -o "%(title)s-%(id)s.%(ext)s"
    -l, --literal                    -o accepts literal names
 #### Removed
 Currently, there are no options that have been completely removed. But there are plans to remove the old output options `-A`,`-t`, `-l`, `--id` (which have been deprecated since 2014) in the near future. If you are still using these, please move to using `--output` instead
 # MORE
 For FAQ, Developer Instructions etc., see the [original README](https://github.com/ytdl-org/youtube-dl#faq)
@@ -14,14 +14,9 @@ lazy_extractors_filename = sys.argv[1]
 if os.path.exists(lazy_extractors_filename):
    os.remove(lazy_extractors_filename)
 # Block plugins from loading
 os.rename('ytdlp_plugins', 'ytdlp_plugins_blocked')
 from yt_dlp.extractor import _ALL_CLASSES
 from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
 os.rename('ytdlp_plugins_blocked', 'ytdlp_plugins')
 with open('devscripts/lazy_load_template.py', 'rt') as f:
    module_template = f.read()
@@ -69,7 +69,6 @@ PyInstaller.__main__.run([
    '--onefile',
    '--icon=devscripts/cloud.ico',
    '--exclude-module=youtube_dl',
    '--exclude-module=youtube_dlc',
    '--exclude-module=test',
    '--exclude-module=ytdlp_plugins',
    '--hidden-import=mutagen',
@@ -3,7 +3,6 @@
 - **20min**
 - **220.ro**
 - **23video**
 - **247sports**
 - **24video**
 - **3qsdn**: 3Q SDN
 - **3sat**
@@ -98,8 +97,7 @@
 - **bbc**: BBC
 - **bbc.co.uk**: BBC iPlayer
 - **bbc.co.uk:article**: BBC articles
- - **bbc.co.uk:iplayer:episodes**
+ - **bbc.co.uk:iplayer:playlist**
 - **bbc.co.uk:iplayer:group**
 - **bbc.co.uk:playlist**
 - **BBVTV**
 - **Beatport**
@@ -172,8 +170,7 @@
 - **cbsnews**: CBS News
 - **cbsnews:embed**
 - **cbsnews:livevideo**: CBS News Live Videos
- - **cbssports**
+ - **CBSSports**
 - **cbssports:embed**
 - **CCMA**
 - **CCTV**: 央视网
 - **CDA**
@@ -251,8 +248,6 @@
 - **DiscoveryGoPlaylist**
 - **DiscoveryNetworksDe**
 - **DiscoveryPlus**
 - **DiscoveryPlusIndia**
 - **DiscoveryPlusIndiaShow**
 - **DiscoveryVR**
 - **Disney**
 - **dlive:stream**
@@ -352,7 +347,8 @@
 - **Gaskrank**
 - **Gazeta**
 - **GDCVault**
- - **GediDigital**
+ - **Gedi**
 - **GediEmbeds**
 - **generic**: Generic downloader that works on some sites
 - **Gfycat**
 - **GiantBomb**
@@ -461,8 +457,6 @@
 - **kuwo:singer**: 酷我音乐 - 歌手
 - **kuwo:song**: 酷我音乐
 - **la7.it**
 - **la7.it:pod:episode**
 - **la7.it:podcast**
 - **laola1tv**
 - **laola1tv:embed**
 - **lbry**
@@ -486,8 +480,6 @@
 - **limelight**
 - **limelight:channel**
 - **limelight:channel_list**
 - **LineLive**
 - **LineLiveChannel**
 - **LineTV**
 - **linkedin:learning**
 - **linkedin:learning:course**
@@ -514,7 +506,6 @@
 - **mangomolo:live**
 - **mangomolo:video**
 - **ManyVids**
 - **MaoriTV**
 - **Markiza**
 - **MarkizaPage**
 - **massengeschmack.tv**
@@ -553,7 +544,6 @@
 - **mixcloud:playlist**
 - **mixcloud:user**
 - **MLB**
 - **MLBVideo**
 - **Mnet**
 - **MNetTV**
 - **MoeVideo**: LetitBit video services: moevideo.net, playreplay.net and videochart.net
@@ -572,8 +562,6 @@
 - **mtg**: MTG services
 - **mtv**
 - **mtv.de**
 - **mtv.it**
 - **mtv.it:programma**
 - **mtv:video**
 - **mtvjapan**
 - **mtvservices:embedded**
@@ -615,7 +603,6 @@
 - **ndr:embed**
 - **ndr:embed:base**
 - **NDTV**
 - **Nebula**
 - **NerdCubedFeed**
 - **netease:album**: 网易云音乐 - 专辑
 - **netease:djradio**: 网易云音乐 - 电台
@@ -634,7 +621,6 @@
 - **NextTV**: 壹電視
 - **Nexx**
 - **NexxEmbed**
 - **NFHSNetwork**
 - **nfl.com** (Currently broken)
 - **nfl.com:article** (Currently broken)
 - **NhkVod**
@@ -647,7 +633,6 @@
 - **nicknight**
 - **niconico**: ニコニコ動画
 - **NiconicoPlaylist**
 - **NiconicoUser**
 - **Nintendo**
 - **Nitter**
 - **njoy**: N-JOY
@@ -718,9 +703,6 @@
 - **OutsideTV**
 - **PacktPub**
 - **PacktPubCourse**
 - **PalcoMP3:artist**
 - **PalcoMP3:song**
 - **PalcoMP3:video**
 - **pandora.tv**: 판도라TV
 - **ParamountNetwork**
 - **parliamentlive.tv**: UK parliament videos
@@ -753,7 +735,6 @@
 - **Playwire**
 - **pluralsight**
 - **pluralsight:course**
 - **PlutoTV**
 - **podomatic**
 - **Pokemon**
 - **PokemonWatch**
@@ -934,7 +915,6 @@
 - **stanfordoc**: Stanford Open ClassRoom
 - **Steam**
 - **Stitcher**
 - **StitcherShow**
 - **StoryFire**
 - **StoryFireSeries**
 - **StoryFireUser**
@@ -1016,7 +996,6 @@
 - **TruTV**
 - **Tube8**
 - **TubiTv**
 - **TubiTvShow**
 - **Tumblr**
 - **tunein:clip**
 - **tunein:program**
@@ -1108,7 +1087,6 @@
 - **Vidbit**
 - **Viddler**
 - **Videa**
 - **video.arnes.si**: Arnes Video
 - **video.google:search**: Google Video search
 - **video.sky.it**
 - **video.sky.it:live**
@@ -1194,7 +1172,6 @@
 - **Weibo**
 - **WeiboMobile**
 - **WeiqiTV**: WQTV
 - **WimTV**
 - **Wistia**
 - **WistiaPlaylist**
 - **wnl**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
@@ -1265,9 +1242,7 @@
 - **ZDF**
 - **ZDFChannel**
 - **Zee5**
 - **zee5:series**
 - **Zhihu**
 - **zingmp3**: mp3.zing.vn
 - **zingmp3:album**
 - **zoom**
 - **Zype**
@@ -311,8 +311,8 @@ class TestFormatSelection(unittest.TestCase):
        self.assertRaises(ExtractorError, ydl.process_ie_result, info_dict.copy())
    def test_youtube_format_selection(self):
        # FIXME: Rewrite in accordance with the new format sorting options
        return
        # disabled for now - this needs some changes
        order = [
            '38', '37', '46', '22', '45', '35', '44', '18', '34', '43', '6', '5', '17', '36', '13',
@@ -601,26 +601,6 @@ class TestYoutubeDL(unittest.TestCase):
        self.assertTrue(subs)
        self.assertEqual(set(subs.keys()), set(['es', 'fr']))
        result = get_info({'writesubtitles': True, 'subtitleslangs': ['all', '-en']})
        subs = result['requested_subtitles']
        self.assertTrue(subs)
        self.assertEqual(set(subs.keys()), set(['es', 'fr']))
        result = get_info({'writesubtitles': True, 'subtitleslangs': ['en', 'fr', '-en']})
        subs = result['requested_subtitles']
        self.assertTrue(subs)
        self.assertEqual(set(subs.keys()), set(['fr']))
        result = get_info({'writesubtitles': True, 'subtitleslangs': ['-en', 'en']})
        subs = result['requested_subtitles']
        self.assertTrue(subs)
        self.assertEqual(set(subs.keys()), set(['en']))
        result = get_info({'writesubtitles': True, 'subtitleslangs': ['e.+']})
        subs = result['requested_subtitles']
        self.assertTrue(subs)
        self.assertEqual(set(subs.keys()), set(['es', 'en']))
        result = get_info({'writesubtitles': True, 'writeautomaticsub': True, 'subtitleslangs': ['es', 'pt']})
        subs = result['requested_subtitles']
        self.assertTrue(subs)
@@ -655,8 +635,6 @@ class TestYoutubeDL(unittest.TestCase):
            'height': 1080,
            'title1': '$PATH',
            'title2': '%PATH%',
            'timestamp': 1618488000,
            'formats': [{'id': 'id1'}, {'id': 'id2'}]
        }
        def fname(templ, na_placeholder='NA'):
@@ -673,7 +651,6 @@ class TestYoutubeDL(unittest.TestCase):
        # Or by provided placeholder
        self.assertEqual(fname(NA_TEST_OUTTMPL, na_placeholder='none'), 'none-none-1234.mp4')
        self.assertEqual(fname(NA_TEST_OUTTMPL, na_placeholder=''), '--1234.mp4')
        self.assertEqual(fname('%(height)s.%(ext)s'), '1080.mp4')
        self.assertEqual(fname('%(height)d.%(ext)s'), '1080.mp4')
        self.assertEqual(fname('%(height)6d.%(ext)s'), '  1080.mp4')
        self.assertEqual(fname('%(height)-6d.%(ext)s'), '1080  .mp4')
@@ -691,12 +668,6 @@ class TestYoutubeDL(unittest.TestCase):
        self.assertEqual(fname('%%(width)06d.%(ext)s'), '%(width)06d.mp4')
        self.assertEqual(fname('Hello %(title1)s'), 'Hello $PATH')
        self.assertEqual(fname('Hello %(title2)s'), 'Hello %PATH%')
        self.assertEqual(fname('%(timestamp+-1000>%H-%M-%S)s'), '11-43-20')
        self.assertEqual(fname('%(id+1)05d'), '01235')
        self.assertEqual(fname('%(width+100)05d'), 'NA')
        self.assertEqual(fname('%(formats.0)s').replace("u", ""), "{'id' - 'id1'}")
        self.assertEqual(fname('%(formats.-1.id)s'), 'id2')
        self.assertEqual(fname('%(formats.2)s'), 'NA')
    def test_format_note(self):
        ydl = YoutubeDL()
@@ -37,6 +37,7 @@ class TestAllURLsMatching(unittest.TestCase):
        assertPlaylist('PL63F0C78739B09958')
        assertTab('https://www.youtube.com/AsapSCIENCE')
        assertTab('https://www.youtube.com/embedded')
        assertTab('https://www.youtube.com/feed')  # Own channel's home page
        assertTab('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')
        assertTab('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
        assertTab('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
@@ -72,6 +73,15 @@ class TestAllURLsMatching(unittest.TestCase):
        self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
    def test_youtube_extract(self):
        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
        assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
        assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
        assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
    def test_facebook_matching(self):
        self.assertTrue(FacebookIE.suitable('https://www.facebook.com/Shiniknoh#!/photo.php?v=10153317450565268'))
        self.assertTrue(FacebookIE.suitable('https://www.facebook.com/cindyweather?fref=ts#!/photo.php?v=10152183998945793'))
@@ -39,16 +39,6 @@ class TestExecution(unittest.TestCase):
        _, stderr = p.communicate()
        self.assertFalse(stderr)
    def test_lazy_extractors(self):
        try:
            subprocess.check_call([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'], cwd=rootDir, stdout=_DEV_NULL)
            subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=_DEV_NULL)
        finally:
            try:
                os.remove('yt_dlp/extractor/lazy_extractors.py')
            except (IOError, OSError):
                pass
 if __name__ == '__main__':
    unittest.main()
@@ -14,19 +14,10 @@ from yt_dlp.postprocessor import MetadataFromFieldPP, MetadataFromTitlePP
 class TestMetadataFromField(unittest.TestCase):
    def test_format_to_regex(self):
        pp = MetadataFromFieldPP(None, ['title:%(title)s - %(artist)s'])
-        self.assertEqual(pp._data[0]['regex'], r'(?P<title>.+)\ \-\ (?P<artist>.+)')
+        self.assertEqual(pp._data[0]['regex'], r'(?P<title>[^\r\n]+)\ \-\ (?P<artist>[^\r\n]+)')
    def test_field_to_outtmpl(self):
        pp = MetadataFromFieldPP(None, ['title:%(title)s : %(artist)s'])
        self.assertEqual(pp._data[0]['tmpl'], '%(title)s')
    def test_in_out_seperation(self):
        pp = MetadataFromFieldPP(None, ['%(title)s \\: %(artist)s:%(title)s : %(artist)s'])
        self.assertEqual(pp._data[0]['in'], '%(title)s : %(artist)s')
        self.assertEqual(pp._data[0]['out'], '%(title)s : %(artist)s')
 class TestMetadataFromTitle(unittest.TestCase):
    def test_format_to_regex(self):
        pp = MetadataFromTitlePP(None, '%(title)s - %(artist)s')
-        self.assertEqual(pp._titleregex, r'(?P<title>.+)\ \-\ (?P<artist>.+)')
+        self.assertEqual(pp._titleregex, r'(?P<title>[^\r\n]+)\ \-\ (?P<artist>[^\r\n]+)')
@@ -23,7 +23,6 @@ from yt_dlp.utils import (
    clean_html,
    clean_podcast_url,
    date_from_str,
    datetime_from_str,
    DateRange,
    detect_exe_version,
    determine_ext,
@@ -312,18 +311,8 @@ class TestUtil(unittest.TestCase):
        self.assertEqual(date_from_str('yesterday'), date_from_str('now-1day'))
        self.assertEqual(date_from_str('now+7day'), date_from_str('now+1week'))
        self.assertEqual(date_from_str('now+14day'), date_from_str('now+2week'))
-        self.assertEqual(date_from_str('20200229+365day'), date_from_str('20200229+1year'))
+        self.assertEqual(date_from_str('now+365day'), date_from_str('now+1year'))
-        self.assertEqual(date_from_str('20210131+28day'), date_from_str('20210131+1month'))
+        self.assertEqual(date_from_str('now+30day'), date_from_str('now+1month'))
    def test_datetime_from_str(self):
        self.assertEqual(datetime_from_str('yesterday', precision='day'), datetime_from_str('now-1day', precision='auto'))
        self.assertEqual(datetime_from_str('now+7day', precision='day'), datetime_from_str('now+1week', precision='auto'))
        self.assertEqual(datetime_from_str('now+14day', precision='day'), datetime_from_str('now+2week', precision='auto'))
        self.assertEqual(datetime_from_str('20200229+365day', precision='day'), datetime_from_str('20200229+1year', precision='auto'))
        self.assertEqual(datetime_from_str('20210131+28day', precision='day'), datetime_from_str('20210131+1month', precision='auto'))
        self.assertEqual(datetime_from_str('20210131+59day', precision='day'), datetime_from_str('20210131+2month', precision='auto'))
        self.assertEqual(datetime_from_str('now+1day', precision='hour'), datetime_from_str('now+24hours', precision='auto'))
        self.assertEqual(datetime_from_str('now+23hours', precision='hour'), datetime_from_str('now+23hours', precision='auto'))
    def test_daterange(self):
        _20century = DateRange("19000101", "20000101")
@@ -1,26 +0,0 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 # Allow direct execution
 import os
 import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from yt_dlp.extractor import YoutubeIE
 class TestYoutubeMisc(unittest.TestCase):
    def test_youtube_extract(self):
        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
        assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
        assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
        assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
 if __name__ == '__main__':
    unittest.main()
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/bin/bash
-exec python3 "$(dirname "$(realpath "$0")")/yt_dlp/__main__.py" "$@"
+python3 "$(dirname $(realpath $0))/yt_dlp/__main__.py" "$@"
@@ -180,8 +180,6 @@ def _real_main(argv=None):
    if opts.overwrites:
        # --yes-overwrites implies --no-continue
        opts.continue_dl = False
    if opts.concurrent_fragment_downloads <= 0:
        raise ValueError('Concurrent fragments must be positive')
    def parse_retries(retries, name=''):
        if retries in ('inf', 'infinite'):
@@ -228,11 +226,8 @@ def _real_main(argv=None):
        if not re.match(remux_regex, opts.remuxvideo):
            parser.error('invalid video remux format specified')
    if opts.convertsubtitles is not None:
-        if opts.convertsubtitles not in ('srt', 'vtt', 'ass', 'lrc'):
+        if opts.convertsubtitles not in ['srt', 'vtt', 'ass', 'lrc']:
            parser.error('invalid subtitle format specified')
    if opts.convertthumbnails is not None:
        if opts.convertthumbnails not in ('jpg', ):
            parser.error('invalid thumbnail format specified')
    if opts.date is not None:
        date = DateRange.day(opts.date)
@@ -282,14 +277,9 @@ def _real_main(argv=None):
    def report_conflict(arg1, arg2):
        write_string('WARNING: %s is ignored since %s was given\n' % (arg2, arg1), out=sys.stderr)
    if opts.remuxvideo and opts.recodevideo:
        report_conflict('--recode-video', '--remux-video')
        opts.remuxvideo = False
    if opts.sponskrub_cut and opts.split_chapters and opts.sponskrub is not False:
        report_conflict('--split-chapter', '--sponskrub-cut')
        opts.sponskrub_cut = False
    if opts.allow_unplayable_formats:
        if opts.extractaudio:
            report_conflict('--allow-unplayable-formats', '--extract-audio')
@@ -325,22 +315,7 @@ def _real_main(argv=None):
        postprocessors.append({
            'key': 'MetadataFromField',
            'formats': opts.metafromfield,
-            # Run this immediately after extraction is complete
+            'when': 'beforedl'
            'when': 'pre_process'
        })
    if opts.convertsubtitles:
        postprocessors.append({
            'key': 'FFmpegSubtitlesConvertor',
            'format': opts.convertsubtitles,
            # Run this before the actual video download
            'when': 'before_dl'
        })
    if opts.convertthumbnails:
        postprocessors.append({
            'key': 'FFmpegThumbnailsConvertor',
            'format': opts.convertthumbnails,
            # Run this before the actual video download
            'when': 'before_dl'
        })
    if opts.extractaudio:
        postprocessors.append({
@@ -369,11 +344,15 @@ def _real_main(argv=None):
    # so metadata can be added here.
    if opts.addmetadata:
        postprocessors.append({'key': 'FFmpegMetadata'})
    if opts.convertsubtitles:
        postprocessors.append({
            'key': 'FFmpegSubtitlesConvertor',
            'format': opts.convertsubtitles,
        })
    if opts.embedsubtitles:
        already_have_subtitle = opts.writesubtitles
        postprocessors.append({
            'key': 'FFmpegEmbedSubtitle',
            # already_have_subtitle = True prevents the file from being deleted after embedding
            'already_have_subtitle': already_have_subtitle
        })
        if not already_have_subtitle:
@@ -382,9 +361,19 @@ def _real_main(argv=None):
    # this was the old behaviour if only --all-sub was given.
    if opts.allsubtitles and not opts.writeautomaticsub:
        opts.writesubtitles = True
-    # This should be above EmbedThumbnail since sponskrub removes the thumbnail attachment
+    if opts.embedthumbnail:
-    # but must be below EmbedSubtitle and FFmpegMetadata
+        already_have_thumbnail = opts.writethumbnail or opts.write_all_thumbnails
-    # See https://github.com/yt-dlp/yt-dlp/issues/204 , https://github.com/faissaloo/SponSkrub/issues/29
+        postprocessors.append({
            'key': 'EmbedThumbnail',
            'already_have_thumbnail': already_have_thumbnail
        })
        if not already_have_thumbnail:
            opts.writethumbnail = True
    # XAttrMetadataPP should be run after post-processors that may change file
    # contents
    if opts.xattrs:
        postprocessors.append({'key': 'XAttrMetadata'})
    # This should be below all ffmpeg PP because it may cut parts out from the video
    # If opts.sponskrub is None, sponskrub is used, but it silently fails if the executable can't be found
    if opts.sponskrub is not False:
        postprocessors.append({
@@ -395,27 +384,12 @@ def _real_main(argv=None):
            'force': opts.sponskrub_force,
            'ignoreerror': opts.sponskrub is None,
        })
    if opts.embedthumbnail:
        already_have_thumbnail = opts.writethumbnail or opts.write_all_thumbnails
        postprocessors.append({
            'key': 'EmbedThumbnail',
            # already_have_thumbnail = True prevents the file from being deleted after embedding
            'already_have_thumbnail': already_have_thumbnail
        })
        if not already_have_thumbnail:
            opts.writethumbnail = True
    if opts.split_chapters:
        postprocessors.append({'key': 'FFmpegSplitChapters'})
    # XAttrMetadataPP should be run after post-processors that may change file contents
    if opts.xattrs:
        postprocessors.append({'key': 'XAttrMetadata'})
    # ExecAfterDownload must be the last PP
    if opts.exec_cmd:
        postprocessors.append({
            'key': 'ExecAfterDownload',
            'exec_cmd': opts.exec_cmd,
-            # Run this only after the files have been moved to their final locations
+            'when': 'aftermove'
            'when': 'after_move'
        })
    def report_args_compat(arg, name):
@@ -441,6 +415,7 @@ def _real_main(argv=None):
        else match_filter_func(opts.match_filter))
    ydl_opts = {
        'convertsubtitles': opts.convertsubtitles,
        'usenetrc': opts.usenetrc,
        'username': opts.username,
        'password': opts.password,
@@ -466,7 +441,6 @@ def _real_main(argv=None):
        'skip_download': opts.skip_download,
        'format': opts.format,
        'allow_unplayable_formats': opts.allow_unplayable_formats,
        'ignore_no_formats_error': opts.ignore_no_formats_error,
        'format_sort': opts.format_sort,
        'format_sort_force': opts.format_sort_force,
        'allow_multiple_video_streams': opts.allow_multiple_video_streams,
@@ -489,7 +463,6 @@ def _real_main(argv=None):
        'extractor_retries': opts.extractor_retries,
        'skip_unavailable_fragments': opts.skip_unavailable_fragments,
        'keep_fragments': opts.keep_fragments,
        'concurrent_fragment_downloads': opts.concurrent_fragment_downloads,
        'buffersize': opts.buffersize,
        'noresizebuffer': opts.noresizebuffer,
        'http_chunk_size': opts.http_chunk_size,
@@ -509,7 +482,6 @@ def _real_main(argv=None):
        'writeannotations': opts.writeannotations,
        'writeinfojson': opts.writeinfojson,
        'allow_playlist_files': opts.allow_playlist_files,
        'clean_infojson': opts.clean_infojson,
        'getcomments': opts.getcomments,
        'writethumbnail': opts.writethumbnail,
        'write_all_thumbnails': opts.write_all_thumbnails,
@@ -544,7 +516,6 @@ def _real_main(argv=None):
        'download_archive': download_archive_fn,
        'break_on_existing': opts.break_on_existing,
        'break_on_reject': opts.break_on_reject,
        'skip_playlist_after_errors': opts.skip_playlist_after_errors,
        'cookiefile': opts.cookiefile,
        'nocheckcertificate': opts.no_check_certificate,
        'prefer_insecure': opts.prefer_insecure,
@@ -78,15 +78,6 @@ try:
 except ImportError:  # Python 2
    import Cookie as compat_cookies
 if sys.version_info[0] == 2:
    class compat_cookies_SimpleCookie(compat_cookies.SimpleCookie):
        def load(self, rawdata):
            if isinstance(rawdata, compat_str):
                rawdata = str(rawdata)
            return super(compat_cookies_SimpleCookie, self).load(rawdata)
 else:
    compat_cookies_SimpleCookie = compat_cookies.SimpleCookie
 try:
    import html.entities as compat_html_entities
 except ImportError:  # Python 2
@@ -3029,7 +3020,6 @@ __all__ = [
    'compat_cookiejar',
    'compat_cookiejar_Cookie',
    'compat_cookies',
    'compat_cookies_SimpleCookie',
    'compat_ctypes_WINFUNCTYPE',
    'compat_etree_Element',
    'compat_etree_fromstring',
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 from ..compat import compat_str
 from ..utils import (
    determine_protocol,
 )
@@ -43,23 +42,6 @@ PROTOCOL_MAP = {
 }
 def shorten_protocol_name(proto, simplify=False):
    short_protocol_names = {
        'm3u8_native': 'm3u8_n',
        'http_dash_segments': 'dash',
        'niconico_dmc': 'dmc',
    }
    if simplify:
        short_protocol_names.update({
            'https': 'http',
            'ftps': 'ftp',
            'm3u8_native': 'm3u8',
            'm3u8_frag_urls': 'm3u8',
            'dash_frag_urls': 'dash',
        })
    return short_protocol_names.get(proto, proto)
 def get_suitable_downloader(info_dict, params={}, default=HttpFD):
    """Get the downloader class that can handle the info dict."""
    protocol = determine_protocol(info_dict)
@@ -68,24 +50,16 @@ def get_suitable_downloader(info_dict, params={}, default=HttpFD):
    # if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict):
    #     return FFmpegFD
-    downloaders = params.get('external_downloader')
+    external_downloader = params.get('external_downloader')
-    external_downloader = (
+    if external_downloader is not None:
        downloaders if isinstance(downloaders, compat_str) or downloaders is None
        else downloaders.get(shorten_protocol_name(protocol, True), downloaders.get('default')))
    if external_downloader and external_downloader.lower() == 'native':
        external_downloader = 'native'
    if external_downloader not in (None, 'native'):
        ed = get_external_downloader(external_downloader)
        if ed.can_download(info_dict, external_downloader):
            return ed
-    if protocol in ('m3u8', 'm3u8_native'):
+    if protocol.startswith('m3u8'):
        if info_dict.get('is_live'):
            return FFmpegFD
-        elif external_downloader == 'native':
+        elif _get_real_downloader(info_dict, 'frag_urls', params, None):
            return HlsFD
        elif _get_real_downloader(info_dict, 'm3u8_frag_urls', params, None):
            return HlsFD
        elif params.get('hls_prefer_native') is True:
            return HlsFD
@@ -96,7 +70,6 @@ def get_suitable_downloader(info_dict, params={}, default=HttpFD):
 __all__ = [
    'FileDownloader',
    'get_suitable_downloader',
-    'shorten_protocol_name',
+    'FileDownloader',
 ]
@@ -326,12 +326,6 @@ class FileDownloader(object):
        """Report it was impossible to resume download."""
        self.to_screen('[download] Unable to resume')
    @staticmethod
    def supports_manifest(manifest):
        """ Whether the downloader can download the fragments from the manifest.
        Redefine in subclasses if needed. """
        pass
    def download(self, filename, info_dict, subtitle=False):
        """Download to a filename using the info from info_dict
        Return True on success and False otherwise
@@ -1,26 +1,18 @@
 from __future__ import unicode_literals
 try:
    import concurrent.futures
    can_threaded_download = True
 except ImportError:
    can_threaded_download = False
 from ..downloader import _get_real_downloader
 from .fragment import FragmentFD
 from ..compat import compat_urllib_error
 from ..utils import (
    DownloadError,
    sanitize_open,
    urljoin,
 )
 class DashSegmentsFD(FragmentFD):
    """
-    Download segments in a DASH manifest. External downloaders can take over
+    Download segments in a DASH manifest
    the fragment downloads by supporting the 'dash_frag_urls' protocol
    """
    FD_NAME = 'dashsegments'
@@ -30,7 +22,7 @@ class DashSegmentsFD(FragmentFD):
        fragments = info_dict['fragments'][:1] if self.params.get(
            'test', False) else info_dict['fragments']
-        real_downloader = _get_real_downloader(info_dict, 'dash_frag_urls', self.params, None)
+        real_downloader = _get_real_downloader(info_dict, 'frag_urls', self.params, None)
        ctx = {
            'filename': filename,
@@ -45,7 +37,7 @@ class DashSegmentsFD(FragmentFD):
        fragment_retries = self.params.get('fragment_retries', 0)
        skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
-        fragments_to_download = []
+        fragment_urls = []
        frag_index = 0
        for i, fragment in enumerate(fragments):
            frag_index += 1
@@ -56,17 +48,49 @@ class DashSegmentsFD(FragmentFD):
                assert fragment_base_url
                fragment_url = urljoin(fragment_base_url, fragment['path'])
-            fragments_to_download.append({
+            if real_downloader:
-                'frag_index': frag_index,
+                fragment_urls.append(fragment_url)
-                'index': i,
+                continue
-                'url': fragment_url,
+
-            })
+            # In DASH, the first segment contains necessary headers to
            # generate a valid MP4 file, so always abort for the first segment
            fatal = i == 0 or not skip_unavailable_fragments
            count = 0
            while count <= fragment_retries:
                try:
                    success, frag_content = self._download_fragment(ctx, fragment_url, info_dict)
                    if not success:
                        return False
                    self._append_fragment(ctx, frag_content)
                    break
                except compat_urllib_error.HTTPError as err:
                    # YouTube may often return 404 HTTP error for a fragment causing the
                    # whole download to fail. However if the same fragment is immediately
                    # retried with the same request data this usually succeeds (1-2 attempts
                    # is usually enough) thus allowing to download the whole file successfully.
                    # To be future-proof we will retry all fragments that fail with any
                    # HTTP error.
                    count += 1
                    if count <= fragment_retries:
                        self.report_retry_fragment(err, frag_index, count, fragment_retries)
                except DownloadError:
                    # Don't retry fragment if error occurred during HTTP downloading
                    # itself since it has own retry settings
                    if not fatal:
                        self.report_skip_fragment(frag_index)
                        break
                    raise
            if count > fragment_retries:
                if not fatal:
                    self.report_skip_fragment(frag_index)
                    continue
                self.report_error('giving up after %s fragment retries' % fragment_retries)
                return False
        if real_downloader:
            self.to_screen(
                '[%s] Fragment downloads will be delegated to %s' % (self.FD_NAME, real_downloader.get_basename()))
            info_copy = info_dict.copy()
-            info_copy['fragments'] = fragments_to_download
+            info_copy['url_list'] = fragment_urls
            fd = real_downloader(self.ydl, self.params)
            # TODO: Make progress updates work without hooking twice
            # for ph in self._progress_hooks:
@@ -75,104 +99,5 @@ class DashSegmentsFD(FragmentFD):
            if not success:
                return False
        else:
            def download_fragment(fragment):
                i = fragment['index']
                frag_index = fragment['frag_index']
                fragment_url = fragment['url']
                ctx['fragment_index'] = frag_index
                # In DASH, the first segment contains necessary headers to
                # generate a valid MP4 file, so always abort for the first segment
                fatal = i == 0 or not skip_unavailable_fragments
                count = 0
                while count <= fragment_retries:
                    try:
                        success, frag_content = self._download_fragment(ctx, fragment_url, info_dict)
                        if not success:
                            return False, frag_index
                        break
                    except compat_urllib_error.HTTPError as err:
                        # YouTube may often return 404 HTTP error for a fragment causing the
                        # whole download to fail. However if the same fragment is immediately
                        # retried with the same request data this usually succeeds (1-2 attempts
                        # is usually enough) thus allowing to download the whole file successfully.
                        # To be future-proof we will retry all fragments that fail with any
                        # HTTP error.
                        count += 1
                        if count <= fragment_retries:
                            self.report_retry_fragment(err, frag_index, count, fragment_retries)
                    except DownloadError:
                        # Don't retry fragment if error occurred during HTTP downloading
                        # itself since it has own retry settings
                        if not fatal:
                            break
                        raise
                if count > fragment_retries:
                    if not fatal:
                        return False, frag_index
                    self.report_error('Giving up after %s fragment retries' % fragment_retries)
                    return False, frag_index
                return frag_content, frag_index
            def append_fragment(frag_content, frag_index):
                if frag_content:
                    fragment_filename = '%s-Frag%d' % (ctx['tmpfilename'], frag_index)
                    try:
                        file, frag_sanitized = sanitize_open(fragment_filename, 'rb')
                        ctx['fragment_filename_sanitized'] = frag_sanitized
                        file.close()
                        self._append_fragment(ctx, frag_content)
                        return True
                    except FileNotFoundError:
                        if skip_unavailable_fragments:
                            self.report_skip_fragment(frag_index)
                            return True
                        else:
                            self.report_error(
                                'fragment %s not found, unable to continue' % frag_index)
                            return False
                else:
                    if skip_unavailable_fragments:
                        self.report_skip_fragment(frag_index)
                        return True
                    else:
                        self.report_error(
                            'fragment %s not found, unable to continue' % frag_index)
                        return False
            max_workers = self.params.get('concurrent_fragment_downloads', 1)
            if can_threaded_download and max_workers > 1:
                self.report_warning('The download speed shown is only of one thread. This is a known issue')
                with concurrent.futures.ThreadPoolExecutor(max_workers) as pool:
                    futures = [pool.submit(download_fragment, fragment) for fragment in fragments_to_download]
                    # timeout must be 0 to return instantly
                    done, not_done = concurrent.futures.wait(futures, timeout=0)
                    try:
                        while not_done:
                            # Check every 1 second for KeyboardInterrupt
                            freshly_done, not_done = concurrent.futures.wait(not_done, timeout=1)
                            done |= freshly_done
                    except KeyboardInterrupt:
                        for future in not_done:
                            future.cancel()
                        # timeout must be none to cancel
                        concurrent.futures.wait(not_done, timeout=None)
                        raise KeyboardInterrupt
                results = [future.result() for future in futures]
                for frag_content, frag_index in results:
                    result = append_fragment(frag_content, frag_index)
                    if not result:
                        return False
            else:
                for fragment in fragments_to_download:
                    frag_content, frag_index = download_fragment(fragment)
                    result = append_fragment(frag_content, frag_index)
                    if not result:
                        return False
            self._finish_frag_download(ctx)
        return True
@@ -24,6 +24,7 @@ from ..utils import (
    cli_bool_option,
    cli_configuration_args,
    encodeFilename,
    error_to_compat_str,
    encodeArgument,
    handle_youtubedl_headers,
    check_executable,
@@ -81,15 +82,11 @@ class ExternalFD(FileDownloader):
    @property
    def exe(self):
-        return self.get_basename()
+        return self.params.get('external_downloader')
    @classmethod
    def available(cls, path=None):
-        path = check_executable(path or cls.get_basename(), [cls.AVAILABLE_OPT])
+        return check_executable(path or cls.get_basename(), [cls.AVAILABLE_OPT])
        if path:
            cls.exe = path
            return path
        return False
    @classmethod
    def supports(cls, info_dict):
@@ -111,8 +108,7 @@ class ExternalFD(FileDownloader):
    def _configuration_args(self, *args, **kwargs):
        return cli_configuration_args(
            self.params.get('external_downloader_args'),
-            [self.get_basename(), 'default'],
+            self.get_basename(), *args, **kwargs)
            *args, **kwargs)
    def _call_downloader(self, tmpfilename, info_dict):
        """ Either overwrite this or implement _make_cmd """
@@ -120,43 +116,24 @@ class ExternalFD(FileDownloader):
        self._debug_cmd(cmd)
-        if 'fragments' in info_dict:
+        p = subprocess.Popen(
-            fragment_retries = self.params.get('fragment_retries', 0)
+            cmd, stderr=subprocess.PIPE)
-            skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
+        _, stderr = process_communicate_or_kill(p)
-
+        if p.returncode != 0:
-            count = 0
+            self.to_stderr(stderr.decode('utf-8', 'replace'))
            while count <= fragment_retries:
                p = subprocess.Popen(
                    cmd, stderr=subprocess.PIPE)
                _, stderr = process_communicate_or_kill(p)
                if p.returncode == 0:
                    break
                # TODO: Decide whether to retry based on error code
                # https://aria2.github.io/manual/en/html/aria2c.html#exit-status
                self.to_stderr(stderr.decode('utf-8', 'replace'))
                count += 1
                if count <= fragment_retries:
                    self.to_screen(
                        '[%s] Got error. Retrying fragments (attempt %d of %s)...'
                        % (self.get_basename(), count, self.format_retries(fragment_retries)))
            if count > fragment_retries:
                if not skip_unavailable_fragments:
                    self.report_error('Giving up after %s fragment retries' % fragment_retries)
                    return -1
        if 'url_list' in info_dict:
            file_list = []
            for [i, url] in enumerate(info_dict['url_list']):
                tmpsegmentname = '%s_%s.frag' % (tmpfilename, i)
                file_list.append(tmpsegmentname)
            key_list = info_dict.get('key_list')
            decrypt_info = None
            dest, _ = sanitize_open(tmpfilename, 'wb')
-            for frag_index, fragment in enumerate(info_dict['fragments']):
+            for i, file in enumerate(file_list):
-                fragment_filename = '%s-Frag%d' % (tmpfilename, frag_index)
+                src, _ = sanitize_open(file, 'rb')
-                try:
+                if key_list:
-                    src, _ = sanitize_open(fragment_filename, 'rb')
+                    decrypt_info = next((x for x in key_list if x['INDEX'] == i), decrypt_info)
                except IOError:
                    if skip_unavailable_fragments and frag_index > 1:
                        self.to_screen('[%s] Skipping fragment %d ...' % (self.get_basename(), frag_index))
                        continue
                    self.report_error('Unable to open fragment %d' % frag_index)
                    return -1
                decrypt_info = fragment.get('decrypt_info')
                if decrypt_info:
                    if decrypt_info['METHOD'] == 'AES-128':
                        iv = decrypt_info.get('IV')
                        decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(
@@ -172,16 +149,19 @@ class ExternalFD(FileDownloader):
                    fragment_data = src.read()
                    dest.write(fragment_data)
                src.close()
                if not self.params.get('keep_fragments', False):
                    os.remove(encodeFilename(fragment_filename))
            dest.close()
-            os.remove(encodeFilename('%s.frag.urls' % tmpfilename))
+            if not self.params.get('keep_fragments', False):
-        else:
+                for file_path in file_list:
-            p = subprocess.Popen(
+                    try:
-                cmd, stderr=subprocess.PIPE)
+                        os.remove(file_path)
-            _, stderr = process_communicate_or_kill(p)
+                    except OSError as ose:
-            if p.returncode != 0:
+                        self.report_error("Unable to delete file %s; %s" % (file_path, error_to_compat_str(ose)))
-                self.to_stderr(stderr.decode('utf-8', 'replace'))
+                try:
                    file_path = '%s.frag.urls' % tmpfilename
                    os.remove(file_path)
                except OSError as ose:
                    self.report_error("Unable to delete file %s; %s" % (file_path, error_to_compat_str(ose)))
        return p.returncode
    def _prepare_url(self, info_dict, url):
@@ -263,24 +243,17 @@ class WgetFD(ExternalFD):
 class Aria2cFD(ExternalFD):
    AVAILABLE_OPT = '-v'
-    SUPPORTED_PROTOCOLS = ('http', 'https', 'ftp', 'ftps', 'dash_frag_urls', 'm3u8_frag_urls')
+    SUPPORTED_PROTOCOLS = ('http', 'https', 'ftp', 'ftps', 'frag_urls')
    @staticmethod
    def supports_manifest(manifest):
        UNSUPPORTED_FEATURES = [
            r'#EXT-X-BYTERANGE',  # playlists composed of byte ranges of media files [1]
            # 1. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.2
        ]
        check_results = (not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES)
        return all(check_results)
    def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '-c',
+        cmd = [self.exe, '-c']
-               '--console-log-level=warn', '--summary-interval=0', '--download-result=hide',
+        dn = os.path.dirname(tmpfilename)
-               '--file-allocation=none', '-x16', '-j16', '-s16']
+        if 'url_list' not in info_dict:
-        if 'fragments' in info_dict:
+            cmd += ['--out', os.path.basename(tmpfilename)]
-            cmd += ['--allow-overwrite=true', '--allow-piece-length-change=true']
+        verbose_level_args = ['--console-log-level=warn', '--summary-interval=0']
-
+        cmd += self._configuration_args(['--file-allocation=none', '-x16', '-j16', '-s16'] + verbose_level_args)
        if dn:
            cmd += ['--dir', dn]
        if info_dict.get('http_headers') is not None:
            for key, val in info_dict['http_headers'].items():
                cmd += ['--header', '%s: %s' % (key, val)]
@@ -288,25 +261,19 @@ class Aria2cFD(ExternalFD):
        cmd += self._option('--all-proxy', 'proxy')
        cmd += self._bool_option('--check-certificate', 'nocheckcertificate', 'false', 'true', '=')
        cmd += self._bool_option('--remote-time', 'updatetime', 'true', 'false', '=')
        cmd += self._configuration_args()
        dn = os.path.dirname(tmpfilename)
        if dn:
            cmd += ['--dir', dn]
        if 'fragments' not in info_dict:
            cmd += ['--out', os.path.basename(tmpfilename)]
        cmd += ['--auto-file-renaming=false']
-
+        if 'url_list' in info_dict:
-        if 'fragments' in info_dict:
+            cmd += verbose_level_args
-            cmd += ['--file-allocation=none', '--uri-selector=inorder']
+            cmd += ['--uri-selector', 'inorder', '--download-result=hide']
            url_list_file = '%s.frag.urls' % tmpfilename
            url_list = []
-            for frag_index, fragment in enumerate(info_dict['fragments']):
+            for [i, url] in enumerate(info_dict['url_list']):
-                fragment_filename = '%s-Frag%d' % (os.path.basename(tmpfilename), frag_index)
+                tmpsegmentname = '%s_%s.frag' % (os.path.basename(tmpfilename), i)
-                url_list.append('%s\n\tout=%s' % (fragment['url'], fragment_filename))
+                url_list.append('%s\n\tout=%s' % (url, tmpsegmentname))
            stream, _ = sanitize_open(url_list_file, 'wb')
            stream.write('\n'.join(url_list).encode('utf-8'))
            stream.close()
            cmd += ['-i', url_list_file]
        else:
            cmd += ['--', info_dict['url']]
@@ -314,11 +281,9 @@ class Aria2cFD(ExternalFD):
 class HttpieFD(ExternalFD):
    AVAILABLE_OPT = '--version'
    @classmethod
-    def available(cls, path=None):
+    def available(cls):
-        return ExternalFD.available(cls, path or 'http')
+        return check_executable('http', ['--version'])
    def _make_cmd(self, tmpfilename, info_dict):
        cmd = ['http', '--download', '--output', tmpfilename, info_dict['url']]
@@ -330,11 +295,10 @@ class HttpieFD(ExternalFD):
 class FFmpegFD(ExternalFD):
-    SUPPORTED_PROTOCOLS = ('http', 'https', 'ftp', 'ftps', 'm3u8', 'm3u8_native', 'rtsp', 'rtmp', 'mms')
+    SUPPORTED_PROTOCOLS = ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms')
    @classmethod
-    def available(cls, path=None):
+    def available(cls):
        # TODO: Fix path for ffmpeg
        return FFmpegPostProcessor().available
    def _call_downloader(self, tmpfilename, info_dict):
@@ -491,4 +455,4 @@ def get_external_downloader(external_downloader):
        downloader . """
    # Drop .exe extension on Windows
    bn = os.path.splitext(os.path.basename(external_downloader))[0]
-    return _BY_NAME.get(bn)
+    return _BY_NAME[bn]
@@ -7,11 +7,6 @@ try:
    can_decrypt_frag = True
 except ImportError:
    can_decrypt_frag = False
 try:
    import concurrent.futures
    can_threaded_download = True
 except ImportError:
    can_threaded_download = False
 from ..downloader import _get_real_downloader
 from .fragment import FragmentFD
@@ -24,17 +19,12 @@ from ..compat import (
 )
 from ..utils import (
    parse_m3u8_attributes,
    sanitize_open,
    update_url_query,
 )
 class HlsFD(FragmentFD):
-    """
+    """ A limited implementation that does not require ffmpeg """
    Download segments in a m3u8 manifest. External downloaders can take over
    the fragment downloads by supporting the 'm3u8_frag_urls' protocol and
    re-defining 'supports_manifest' function
    """
    FD_NAME = 'hlsnative'
@@ -63,15 +53,12 @@ class HlsFD(FragmentFD):
            UNSUPPORTED_FEATURES += [
                r'#EXT-X-KEY:METHOD=(?!NONE|AES-128)',  # encrypted streams [1]
            ]
-
+        check_results = [not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES]
-        def check_results():
+        is_aes128_enc = '#EXT-X-KEY:METHOD=AES-128' in manifest
-            yield not info_dict.get('is_live')
+        check_results.append(with_crypto or not is_aes128_enc)
-            is_aes128_enc = '#EXT-X-KEY:METHOD=AES-128' in manifest
+        check_results.append(not (is_aes128_enc and r'#EXT-X-BYTERANGE' in manifest))
-            yield with_crypto or not is_aes128_enc
+        check_results.append(not info_dict.get('is_live'))
-            yield not (is_aes128_enc and r'#EXT-X-BYTERANGE' in manifest)
+        return all(check_results)
            for feature in UNSUPPORTED_FEATURES:
                yield not re.search(feature, manifest)
        return all(check_results())
    def real_download(self, filename, info_dict):
        man_url = info_dict['url']
@@ -83,24 +70,20 @@ class HlsFD(FragmentFD):
        if not self.can_download(s, info_dict, self.params.get('allow_unplayable_formats')):
            if info_dict.get('extra_param_to_segment_url') or info_dict.get('_decryption_key_url'):
-                self.report_error('pycryptodome not found. Please install')
+                self.report_error('pycryptodome not found. Please install it.')
                return False
            if self.can_download(s, info_dict, with_crypto=True):
-                self.report_warning('pycryptodome is needed to download this file natively')
+                self.report_warning('pycryptodome is needed to download this file with hlsnative')
            fd = FFmpegFD(self.ydl, self.params)
            self.report_warning(
-                '%s detected unsupported features; extraction will be delegated to %s' % (self.FD_NAME, fd.get_basename()))
+                'hlsnative has detected features it does not support, '
                'extraction will be delegated to ffmpeg')
            fd = FFmpegFD(self.ydl, self.params)
            # TODO: Make progress updates work without hooking twice
            # for ph in self._progress_hooks:
            #     fd.add_progress_hook(ph)
            return fd.real_download(filename, info_dict)
-        real_downloader = _get_real_downloader(info_dict, 'm3u8_frag_urls', self.params, None)
+        real_downloader = _get_real_downloader(info_dict, 'frag_urls', self.params, None)
        if real_downloader and not real_downloader.supports_manifest(s):
            real_downloader = None
        if real_downloader:
            self.to_screen(
                '[%s] Fragment downloads will be delegated to %s' % (self.FD_NAME, real_downloader.get_basename()))
        def is_ad_fragment_start(s):
            return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s
@@ -110,7 +93,7 @@ class HlsFD(FragmentFD):
            return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=master' in s
                    or s.startswith('#UPLYNK-SEGMENT') and s.endswith(',segment'))
-        fragments = []
+        fragment_urls = []
        media_frags = 0
        ad_frags = 0
@@ -153,12 +136,14 @@ class HlsFD(FragmentFD):
        i = 0
        media_sequence = 0
        decrypt_info = {'METHOD': 'NONE'}
        key_list = []
        byte_range = {}
        discontinuity_count = 0
        frag_index = 0
        ad_frag_next = False
        for line in s.splitlines():
            line = line.strip()
            download_frag = False
            if line:
                if not line.startswith('#'):
                    if format_index and discontinuity_count != format_index:
@@ -175,20 +160,17 @@ class HlsFD(FragmentFD):
                    if extra_query:
                        frag_url = update_url_query(frag_url, extra_query)
-                    fragments.append({
+                    if real_downloader:
-                        'frag_index': frag_index,
+                        fragment_urls.append(frag_url)
-                        'url': frag_url,
+                        continue
-                        'decrypt_info': decrypt_info,
+                    download_frag = True
                        'byte_range': byte_range,
                        'media_sequence': media_sequence,
                    })
                elif line.startswith('#EXT-X-MAP'):
                    if format_index and discontinuity_count != format_index:
                        continue
                    if frag_index > 0:
                        self.report_error(
-                            'Initialization fragment found after media fragments, unable to download')
+                            'initialization fragment found after media fragments, unable to download')
                        return False
                    frag_index += 1
                    map_info = parse_m3u8_attributes(line[11:])
@@ -198,14 +180,9 @@ class HlsFD(FragmentFD):
                        else compat_urlparse.urljoin(man_url, map_info.get('URI')))
                    if extra_query:
                        frag_url = update_url_query(frag_url, extra_query)
-
+                    if real_downloader:
-                    fragments.append({
+                        fragment_urls.append(frag_url)
-                        'frag_index': frag_index,
+                        continue
                        'url': frag_url,
                        'decrypt_info': decrypt_info,
                        'byte_range': byte_range,
                        'media_sequence': media_sequence
                    })
                    if map_info.get('BYTERANGE'):
                        splitted_byte_range = map_info.get('BYTERANGE').split('@')
@@ -214,6 +191,7 @@ class HlsFD(FragmentFD):
                            'start': sub_range_start,
                            'end': sub_range_start + int(splitted_byte_range[0]),
                        }
                    download_frag = True
                elif line.startswith('#EXT-X-KEY'):
                    decrypt_url = decrypt_info.get('URI')
@@ -228,6 +206,9 @@ class HlsFD(FragmentFD):
                            decrypt_info['URI'] = update_url_query(decrypt_info['URI'], extra_query)
                        if decrypt_url != decrypt_info['URI']:
                            decrypt_info['KEY'] = None
                    key_data = decrypt_info.copy()
                    key_data['INDEX'] = frag_index
                    key_list.append(key_data)
                elif line.startswith('#EXT-X-MEDIA-SEQUENCE'):
                    media_sequence = int(line[22:])
@@ -244,16 +225,58 @@ class HlsFD(FragmentFD):
                    ad_frag_next = False
                elif line.startswith('#EXT-X-DISCONTINUITY'):
                    discontinuity_count += 1
                i += 1
                media_sequence += 1
-        # We only download the first fragment during the test
+                if download_frag:
-        if test:
+                    count = 0
-            fragments = [fragments[0] if fragments else None]
+                    headers = info_dict.get('http_headers', {})
                    if byte_range:
                        headers['Range'] = 'bytes=%d-%d' % (byte_range['start'], byte_range['end'] - 1)
                    while count <= fragment_retries:
                        try:
                            success, frag_content = self._download_fragment(
                                ctx, frag_url, info_dict, headers)
                            if not success:
                                return False
                            break
                        except compat_urllib_error.HTTPError as err:
                            # Unavailable (possibly temporary) fragments may be served.
                            # First we try to retry then either skip or abort.
                            # See https://github.com/ytdl-org/youtube-dl/issues/10165,
                            # https://github.com/ytdl-org/youtube-dl/issues/10448).
                            count += 1
                            if count <= fragment_retries:
                                self.report_retry_fragment(err, frag_index, count, fragment_retries)
                    if count > fragment_retries:
                        if skip_unavailable_fragments:
                            i += 1
                            media_sequence += 1
                            self.report_skip_fragment(frag_index)
                            continue
                        self.report_error(
                            'giving up after %s fragment retries' % fragment_retries)
                        return False
                    if decrypt_info['METHOD'] == 'AES-128':
                        iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', media_sequence)
                        decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(
                            self._prepare_url(info_dict, info_dict.get('_decryption_key_url') or decrypt_info['URI'])).read()
                        # Don't decrypt the content in tests since the data is explicitly truncated and it's not to a valid block
                        # size (see https://github.com/ytdl-org/youtube-dl/pull/27660). Tests only care that the correct data downloaded,
                        # not what it decrypts to.
                        if not test:
                            frag_content = AES.new(
                                decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
                    self._append_fragment(ctx, frag_content)
                    # We only download the first fragment during the test
                    if test:
                        break
                    i += 1
                    media_sequence += 1
        if real_downloader:
            info_copy = info_dict.copy()
-            info_copy['fragments'] = fragments
+            info_copy['url_list'] = fragment_urls
            info_copy['key_list'] = key_list
            fd = real_downloader(self.ydl, self.params)
            # TODO: Make progress updates work without hooking twice
            # for ph in self._progress_hooks:
@@ -262,107 +285,5 @@ class HlsFD(FragmentFD):
            if not success:
                return False
        else:
            def download_fragment(fragment):
                frag_index = fragment['frag_index']
                frag_url = fragment['url']
                decrypt_info = fragment['decrypt_info']
                byte_range = fragment['byte_range']
                media_sequence = fragment['media_sequence']
                ctx['fragment_index'] = frag_index
                count = 0
                headers = info_dict.get('http_headers', {})
                if byte_range:
                    headers['Range'] = 'bytes=%d-%d' % (byte_range['start'], byte_range['end'] - 1)
                while count <= fragment_retries:
                    try:
                        success, frag_content = self._download_fragment(
                            ctx, frag_url, info_dict, headers)
                        if not success:
                            return False, frag_index
                        break
                    except compat_urllib_error.HTTPError as err:
                        # Unavailable (possibly temporary) fragments may be served.
                        # First we try to retry then either skip or abort.
                        # See https://github.com/ytdl-org/youtube-dl/issues/10165,
                        # https://github.com/ytdl-org/youtube-dl/issues/10448).
                        count += 1
                        if count <= fragment_retries:
                            self.report_retry_fragment(err, frag_index, count, fragment_retries)
                if count > fragment_retries:
                    self.report_error('Giving up after %s fragment retries' % fragment_retries)
                    return False, frag_index
                if decrypt_info['METHOD'] == 'AES-128':
                    iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', media_sequence)
                    decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(
                        self._prepare_url(info_dict, info_dict.get('_decryption_key_url') or decrypt_info['URI'])).read()
                    # Don't decrypt the content in tests since the data is explicitly truncated and it's not to a valid block
                    # size (see https://github.com/ytdl-org/youtube-dl/pull/27660). Tests only care that the correct data downloaded,
                    # not what it decrypts to.
                    if not test:
                        frag_content = AES.new(
                            decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
                return frag_content, frag_index
            def append_fragment(frag_content, frag_index):
                if frag_content:
                    fragment_filename = '%s-Frag%d' % (ctx['tmpfilename'], frag_index)
                    try:
                        file, frag_sanitized = sanitize_open(fragment_filename, 'rb')
                        ctx['fragment_filename_sanitized'] = frag_sanitized
                        file.close()
                        self._append_fragment(ctx, frag_content)
                        return True
                    except FileNotFoundError:
                        if skip_unavailable_fragments:
                            self.report_skip_fragment(frag_index)
                            return True
                        else:
                            self.report_error(
                                'fragment %s not found, unable to continue' % frag_index)
                            return False
                else:
                    if skip_unavailable_fragments:
                        self.report_skip_fragment(frag_index)
                        return True
                    else:
                        self.report_error(
                            'fragment %s not found, unable to continue' % frag_index)
                        return False
            max_workers = self.params.get('concurrent_fragment_downloads', 1)
            if can_threaded_download and max_workers > 1:
                self.report_warning('The download speed shown is only of one thread. This is a known issue')
                with concurrent.futures.ThreadPoolExecutor(max_workers) as pool:
                    futures = [pool.submit(download_fragment, fragment) for fragment in fragments]
                    # timeout must be 0 to return instantly
                    done, not_done = concurrent.futures.wait(futures, timeout=0)
                    try:
                        while not_done:
                            # Check every 1 second for KeyboardInterrupt
                            freshly_done, not_done = concurrent.futures.wait(not_done, timeout=1)
                            done |= freshly_done
                    except KeyboardInterrupt:
                        for future in not_done:
                            future.cancel()
                        # timeout must be none to cancel
                        concurrent.futures.wait(not_done, timeout=None)
                        raise KeyboardInterrupt
                results = [future.result() for future in futures]
                for frag_content, frag_index in results:
                    result = append_fragment(frag_content, frag_index)
                    if not result:
                        return False
            else:
                for fragment in fragments:
                    frag_content, frag_index = download_fragment(fragment)
                    result = append_fragment(frag_content, frag_index)
                    if not result:
                        return False
            self._finish_frag_download(ctx)
        return True
@@ -117,7 +117,7 @@ class RtmpFD(FileDownloader):
        # Check for rtmpdump first
        if not check_executable('rtmpdump', ['-h']):
-            self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install')
+            self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install it.')
            return False
        # Download using rtmpdump. rtmpdump returns exit code 2 when
@@ -24,7 +24,7 @@ class RtspFD(FileDownloader):
            args = [
                'mpv', '-really-quiet', '--vo=null', '--stream-dump=' + tmpfilename, url]
        else:
-            self.report_error('MMS or RTSP download detected but neither "mplayer" nor "mpv" could be run. Please install one')
+            self.report_error('MMS or RTSP download detected but neither "mplayer" nor "mpv" could be run. Please install any.')
            return False
        self._debug_cmd(args)
@@ -79,7 +79,8 @@ class YoutubeLiveChatReplayFD(FragmentFD):
        self._prepare_and_start_frag_download(ctx)
-        success, raw_fragment = dl_fragment(info_dict['url'])
+        success, raw_fragment = dl_fragment(
            'https://www.youtube.com/watch?v={}'.format(video_id))
        if not success:
            return False
        try:
@@ -257,7 +257,7 @@ class AfreecaTVIE(InfoExtractor):
            if flag and flag == 'SUCCEED':
                break
            if flag == 'PARTIAL_ADULT':
-                self.report_warning(
+                self._downloader.report_warning(
                    'In accordance with local laws and regulations, underage users are restricted from watching adult content. '
                    'Only content suitable for all ages will be downloaded. '
                    'Provide account credentials if you wish to download restricted content.')
@@ -323,7 +323,7 @@ class AfreecaTVIE(InfoExtractor):
                        'url': file_url,
                        'format_id': 'http',
                    }]
-                if not formats and not self._downloader.params.get('ignore_no_formats'):
+                if not formats:
                    continue
                self._sort_formats(formats)
                file_info = common_entry.copy()
@@ -65,35 +65,15 @@ class AMCNetworksIE(ThePlatformIE):
    def _real_extract(self, url):
        site, display_id = re.match(self._VALID_URL, url).groups()
        requestor_id = self._REQUESTOR_ID_MAP[site]
-        page_data = self._download_json(
+        properties = self._download_json(
-            'https://content-delivery-gw.svc.ds.amcn.com/api/v2/content/amcn/%s/url/%s'
+            'https://content-delivery-gw.svc.ds.amcn.com/api/v2/content/amcn/%s/url/%s' % (requestor_id.lower(), display_id),
-            % (requestor_id.lower(), display_id), display_id)['data']
+            display_id)['data']['properties']
        properties = page_data.get('properties') or {}
        query = {
            'mbr': 'true',
            'manifest': 'm3u',
        }
-
+        tp_path = 'M_UwQC/media/' + properties['videoPid']
-        video_player_count = 0
+        media_url = 'https://link.theplatform.com/s/' + tp_path
        try:
            for v in page_data['children']:
                if v.get('type') == 'video-player':
                    releasePid = v['properties']['currentVideo']['meta']['releasePid']
                    tp_path = 'M_UwQC/' + releasePid
                    media_url = 'https://link.theplatform.com/s/' + tp_path
                    video_player_count += 1
        except KeyError:
            pass
        if video_player_count > 1:
            self.report_warning(
                'The JSON data has %d video players. Only one will be extracted' % video_player_count)
        # Fall back to videoPid if releasePid not found.
        # TODO: Fall back to videoPid if releasePid manifest uses DRM.
        if not video_player_count:
            tp_path = 'M_UwQC/media/' + properties['videoPid']
            media_url = 'https://link.theplatform.com/s/' + tp_path
        theplatform_metadata = self._download_theplatform_metadata(tp_path, display_id)
        info = self._parse_theplatform_metadata(theplatform_metadata)
        video_id = theplatform_metadata['pid']
@@ -110,41 +90,30 @@ class AMCNetworksIE(ThePlatformIE):
        formats, subtitles = self._extract_theplatform_smil(
            media_url, video_id)
        self._sort_formats(formats)
        thumbnails = []
        thumbnail_urls = [properties.get('imageDesktop')]
        if 'thumbnail' in info:
            thumbnail_urls.append(info.pop('thumbnail'))
        for thumbnail_url in thumbnail_urls:
            if not thumbnail_url:
                continue
            mobj = re.search(r'(\d+)x(\d+)', thumbnail_url)
            thumbnails.append({
                'url': thumbnail_url,
                'width': int(mobj.group(1)) if mobj else None,
                'height': int(mobj.group(2)) if mobj else None,
            })
        info.update({
            'age_limit': parse_age_limit(rating),
            'formats': formats,
            'id': video_id,
            'subtitles': subtitles,
-            'thumbnails': thumbnails,
+            'formats': formats,
            'age_limit': parse_age_limit(parse_age_limit(rating)),
        })
        ns_keys = theplatform_metadata.get('$xmlns', {}).keys()
        if ns_keys:
            ns = list(ns_keys)[0]
-            episode = theplatform_metadata.get(ns + '$episodeTitle') or None
+            series = theplatform_metadata.get(ns + '$show')
            episode_number = int_or_none(
                theplatform_metadata.get(ns + '$episode'))
            season_number = int_or_none(
                theplatform_metadata.get(ns + '$season'))
-            series = theplatform_metadata.get(ns + '$show') or None
+            episode = theplatform_metadata.get(ns + '$episodeTitle')
            episode_number = int_or_none(
                theplatform_metadata.get(ns + '$episode'))
            if season_number:
                title = 'Season %d - %s' % (season_number, title)
            if series:
                title = '%s - %s' % (series, title)
            info.update({
                'title': title,
                'series': series,
                'season_number': season_number,
                'episode': episode,
                'episode_number': episode_number,
                'season_number': season_number,
                'series': series,
            })
        return info
@@ -42,7 +42,6 @@ class ApplePodcastsIE(InfoExtractor):
        ember_data = self._parse_json(self._search_regex(
            r'id="shoebox-ember-data-store"[^>]*>\s*({.+?})\s*<',
            webpage, 'ember data'), episode_id)
        ember_data = ember_data.get(episode_id) or ember_data
        episode = ember_data['data']['attributes']
        description = episode.get('description') or {}
@@ -36,12 +36,12 @@ class ARDMediathekBaseIE(InfoExtractor):
        if not formats:
            if fsk:
-                self.raise_no_formats(
+                raise ExtractorError(
                    'This video is only available after 20:00', expected=True)
            elif media_info.get('_geoblocked'):
                self.raise_geo_restricted(
                    'This video is not available due to geoblocking',
-                    countries=self._GEO_COUNTRIES, metadata_available=True)
+                    countries=self._GEO_COUNTRIES)
        self._sort_formats(formats)
@@ -272,8 +272,7 @@ class ARDMediathekIE(ARDMediathekBaseIE):
        else:  # request JSON file
            if not document_id:
                video_id = self._search_regex(
-                    (r'/play/(?:config|media|sola)/(\d+)', r'contentId["\']\s*:\s*(\d+)'),
+                    r'/play/(?:config|media)/(\d+)', webpage, 'media id')
                    webpage, 'media id', default=None)
            info = self._extract_media_info(
                'http://www.ardmediathek.de/play/media/%s' % video_id,
                webpage, video_id)
@@ -1,101 +0,0 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from .common import InfoExtractor
 from ..compat import (
    compat_parse_qs,
    compat_urllib_parse_urlparse,
 )
 from ..utils import (
    float_or_none,
    int_or_none,
    parse_iso8601,
    remove_start,
 )
 class ArnesIE(InfoExtractor):
    IE_NAME = 'video.arnes.si'
    IE_DESC = 'Arnes Video'
    _VALID_URL = r'https?://video\.arnes\.si/(?:[a-z]{2}/)?(?:watch|embed|api/(?:asset|public/video))/(?P<id>[0-9a-zA-Z]{12})'
    _TESTS = [{
        'url': 'https://video.arnes.si/watch/a1qrWTOQfVoU?t=10',
        'md5': '4d0f4d0a03571b33e1efac25fd4a065d',
        'info_dict': {
            'id': 'a1qrWTOQfVoU',
            'ext': 'mp4',
            'title': 'Linearna neodvisnost, definicija',
            'description': 'Linearna neodvisnost, definicija',
            'license': 'PRIVATE',
            'creator': 'Polona Oblak',
            'timestamp': 1585063725,
            'upload_date': '20200324',
            'channel': 'Polona Oblak',
            'channel_id': 'q6pc04hw24cj',
            'channel_url': 'https://video.arnes.si/?channel=q6pc04hw24cj',
            'duration': 596.75,
            'view_count': int,
            'tags': ['linearna_algebra'],
            'start_time': 10,
        }
    }, {
        'url': 'https://video.arnes.si/api/asset/s1YjnV7hadlC/play.mp4',
        'only_matching': True,
    }, {
        'url': 'https://video.arnes.si/embed/s1YjnV7hadlC',
        'only_matching': True,
    }, {
        'url': 'https://video.arnes.si/en/watch/s1YjnV7hadlC',
        'only_matching': True,
    }, {
        'url': 'https://video.arnes.si/embed/s1YjnV7hadlC?t=123&hideRelated=1',
        'only_matching': True,
    }, {
        'url': 'https://video.arnes.si/api/public/video/s1YjnV7hadlC',
        'only_matching': True,
    }]
    _BASE_URL = 'https://video.arnes.si'
    def _real_extract(self, url):
        video_id = self._match_id(url)
        video = self._download_json(
            self._BASE_URL + '/api/public/video/' + video_id, video_id)['data']
        title = video['title']
        formats = []
        for media in (video.get('media') or []):
            media_url = media.get('url')
            if not media_url:
                continue
            formats.append({
                'url': self._BASE_URL + media_url,
                'format_id': remove_start(media.get('format'), 'FORMAT_'),
                'format_note': media.get('formatTranslation'),
                'width': int_or_none(media.get('width')),
                'height': int_or_none(media.get('height')),
            })
        self._sort_formats(formats)
        channel = video.get('channel') or {}
        channel_id = channel.get('url')
        thumbnail = video.get('thumbnailUrl')
        return {
            'id': video_id,
            'title': title,
            'formats': formats,
            'thumbnail': self._BASE_URL + thumbnail,
            'description': video.get('description'),
            'license': video.get('license'),
            'creator': video.get('author'),
            'timestamp': parse_iso8601(video.get('creationTime')),
            'channel': channel.get('name'),
            'channel_id': channel_id,
            'channel_url': self._BASE_URL + '/?channel=' + channel_id if channel_id else None,
            'duration': float_or_none(video.get('duration'), 1000),
            'view_count': int_or_none(video.get('views')),
            'tags': video.get('hashtags'),
            'start_time': int_or_none(compat_parse_qs(
                compat_urllib_parse_urlparse(url).query).get('t', [None])[0]),
        }
@@ -49,7 +49,6 @@ class BandcampIE(InfoExtractor):
            'uploader': 'Ben Prunty',
            'timestamp': 1396508491,
            'upload_date': '20140403',
            'release_timestamp': 1396483200,
            'release_date': '20140403',
            'duration': 260.877,
            'track': 'Lanius (Battle)',
@@ -70,7 +69,6 @@ class BandcampIE(InfoExtractor):
            'uploader': 'Mastodon',
            'timestamp': 1322005399,
            'upload_date': '20111122',
            'release_timestamp': 1076112000,
            'release_date': '20040207',
            'duration': 120.79,
            'track': 'Hail to Fire',
@@ -199,7 +197,7 @@ class BandcampIE(InfoExtractor):
            'thumbnail': thumbnail,
            'uploader': artist,
            'timestamp': timestamp,
-            'release_timestamp': unified_timestamp(tralbum.get('album_release_date')),
+            'release_date': unified_strdate(tralbum.get('album_release_date')),
            'duration': duration,
            'track': track,
            'track_number': track_number,
@@ -1,23 +1,17 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import functools
 import itertools
 import json
 import re
 from .common import InfoExtractor
 from ..compat import (
    compat_etree_Element,
    compat_HTTPError,
    compat_parse_qs,
    compat_str,
    compat_urllib_parse_urlparse,
    compat_urlparse,
 )
 from ..utils import (
    ExtractorError,
    OnDemandPagedList,
    clean_html,
    dict_get,
    float_or_none,
@@ -26,10 +20,8 @@ from ..utils import (
    js_to_json,
    parse_duration,
    parse_iso8601,
    strip_or_none,
    try_get,
    unescapeHTML,
    unified_timestamp,
    url_or_none,
    urlencode_postdata,
    urljoin,
@@ -764,17 +756,8 @@ class BBCIE(BBCCoUkIE):
        'only_matching': True,
    }, {
        # custom redirection to www.bbc.com
        # also, video with window.__INITIAL_DATA__
        'url': 'http://www.bbc.co.uk/news/science-environment-33661876',
-        'info_dict': {
+        'only_matching': True,
            'id': 'p02xzws1',
            'ext': 'mp4',
            'title': "Pluto may have 'nitrogen glaciers'",
            'description': 'md5:6a95b593f528d7a5f2605221bc56912f',
            'thumbnail': r're:https?://.+/.+\.jpg',
            'timestamp': 1437785037,
            'upload_date': '20150725',
        },
    }, {
        # single video article embedded with data-media-vpid
        'url': 'http://www.bbc.co.uk/sport/rowing/35908187',
@@ -828,7 +811,7 @@ class BBCIE(BBCCoUkIE):
    @classmethod
    def suitable(cls, url):
-        EXCLUDE_IE = (BBCCoUkIE, BBCCoUkArticleIE, BBCCoUkIPlayerEpisodesIE, BBCCoUkIPlayerGroupIE, BBCCoUkPlaylistIE)
+        EXCLUDE_IE = (BBCCoUkIE, BBCCoUkArticleIE, BBCCoUkIPlayerPlaylistIE, BBCCoUkPlaylistIE)
        return (False if any(ie.suitable(url) for ie in EXCLUDE_IE)
                else super(BBCIE, cls).suitable(url))
@@ -1176,29 +1159,12 @@ class BBCIE(BBCCoUkIE):
                        continue
                    formats, subtitles = self._download_media_selector(item_id)
                    self._sort_formats(formats)
                    item_desc = None
                    blocks = try_get(media, lambda x: x['summary']['blocks'], list)
                    if blocks:
                        summary = []
                        for block in blocks:
                            text = try_get(block, lambda x: x['model']['text'], compat_str)
                            if text:
                                summary.append(text)
                        if summary:
                            item_desc = '\n\n'.join(summary)
                    item_time = None
                    for meta in try_get(media, lambda x: x['metadata']['items'], list) or []:
                        if try_get(meta, lambda x: x['label']) == 'Published':
                            item_time = unified_timestamp(meta.get('timestamp'))
                            break
                    entries.append({
                        'id': item_id,
                        'title': item_title,
                        'thumbnail': item.get('holdingImageUrl'),
                        'formats': formats,
                        'subtitles': subtitles,
                        'timestamp': item_time,
                        'description': strip_or_none(item_desc),
                    })
            for resp in (initial_data.get('data') or {}).values():
                name = resp.get('name')
@@ -1271,7 +1237,7 @@ class BBCIE(BBCCoUkIE):
        entries = []
        for num, media_meta in enumerate(medias, start=1):
            formats, subtitles = self._extract_from_media_meta(media_meta, playlist_id)
-            if not formats and not self._downloader.params.get('ignore_no_formats'):
+            if not formats:
                continue
            self._sort_formats(formats)
@@ -1372,149 +1338,21 @@ class BBCCoUkPlaylistBaseIE(InfoExtractor):
            playlist_id, title, description)
-class BBCCoUkIPlayerPlaylistBaseIE(InfoExtractor):
+class BBCCoUkIPlayerPlaylistIE(BBCCoUkPlaylistBaseIE):
-    _VALID_URL_TMPL = r'https?://(?:www\.)?bbc\.co\.uk/iplayer/%%s/(?P<id>%s)' % BBCCoUkIE._ID_REGEX
+    IE_NAME = 'bbc.co.uk:iplayer:playlist'
-
+    _VALID_URL = r'https?://(?:www\.)?bbc\.co\.uk/iplayer/(?:episodes|group)/(?P<id>%s)' % BBCCoUkIE._ID_REGEX
-    @staticmethod
+    _URL_TEMPLATE = 'http://www.bbc.co.uk/iplayer/episode/%s'
-    def _get_default(episode, key, default_key='default'):
+    _VIDEO_ID_TEMPLATE = r'data-ip-id=["\'](%s)'
        return try_get(episode, lambda x: x[key][default_key])
    def _get_description(self, data):
        synopsis = data.get(self._DESCRIPTION_KEY) or {}
        return dict_get(synopsis, ('large', 'medium', 'small'))
    def _fetch_page(self, programme_id, per_page, series_id, page):
        elements = self._get_elements(self._call_api(
            programme_id, per_page, page + 1, series_id))
        for element in elements:
            episode = self._get_episode(element)
            episode_id = episode.get('id')
            if not episode_id:
                continue
            thumbnail = None
            image = self._get_episode_image(episode)
            if image:
                thumbnail = image.replace('{recipe}', 'raw')
            category = self._get_default(episode, 'labels', 'category')
            yield {
                '_type': 'url',
                'id': episode_id,
                'title': self._get_episode_field(episode, 'subtitle'),
                'url': 'https://www.bbc.co.uk/iplayer/episode/' + episode_id,
                'thumbnail': thumbnail,
                'description': self._get_description(episode),
                'categories': [category] if category else None,
                'series': self._get_episode_field(episode, 'title'),
                'ie_key': BBCCoUkIE.ie_key(),
            }
    def _real_extract(self, url):
        pid = self._match_id(url)
        qs = compat_parse_qs(compat_urllib_parse_urlparse(url).query)
        series_id = qs.get('seriesId', [None])[0]
        page = qs.get('page', [None])[0]
        per_page = 36 if page else self._PAGE_SIZE
        fetch_page = functools.partial(self._fetch_page, pid, per_page, series_id)
        entries = fetch_page(int(page) - 1) if page else OnDemandPagedList(fetch_page, self._PAGE_SIZE)
        playlist_data = self._get_playlist_data(self._call_api(pid, 1))
        return self.playlist_result(
            entries, pid, self._get_playlist_title(playlist_data),
            self._get_description(playlist_data))
 class BBCCoUkIPlayerEpisodesIE(BBCCoUkIPlayerPlaylistBaseIE):
    IE_NAME = 'bbc.co.uk:iplayer:episodes'
    _VALID_URL = BBCCoUkIPlayerPlaylistBaseIE._VALID_URL_TMPL % 'episodes'
    _TESTS = [{
        'url': 'http://www.bbc.co.uk/iplayer/episodes/b05rcz9v',
        'info_dict': {
            'id': 'b05rcz9v',
            'title': 'The Disappearance',
-            'description': 'md5:58eb101aee3116bad4da05f91179c0cb',
+            'description': 'French thriller serial about a missing teenager.',
        },
-        'playlist_mincount': 8,
+        'playlist_mincount': 6,
        'skip': 'This programme is not currently available on BBC iPlayer',
    }, {
        # all seasons
        'url': 'https://www.bbc.co.uk/iplayer/episodes/b094m5t9/doctor-foster',
        'info_dict': {
            'id': 'b094m5t9',
            'title': 'Doctor Foster',
            'description': 'md5:5aa9195fad900e8e14b52acd765a9fd6',
        },
        'playlist_mincount': 10,
    }, {
        # explicit season
        'url': 'https://www.bbc.co.uk/iplayer/episodes/b094m5t9/doctor-foster?seriesId=b094m6nv',
        'info_dict': {
            'id': 'b094m5t9',
            'title': 'Doctor Foster',
            'description': 'md5:5aa9195fad900e8e14b52acd765a9fd6',
        },
        'playlist_mincount': 5,
    }, {
        # all pages
        'url': 'https://www.bbc.co.uk/iplayer/episodes/m0004c4v/beechgrove',
        'info_dict': {
            'id': 'm0004c4v',
            'title': 'Beechgrove',
            'description': 'Gardening show that celebrates Scottish horticulture and growing conditions.',
        },
        'playlist_mincount': 37,
    }, {
        # explicit page
        'url': 'https://www.bbc.co.uk/iplayer/episodes/m0004c4v/beechgrove?page=2',
        'info_dict': {
            'id': 'm0004c4v',
            'title': 'Beechgrove',
            'description': 'Gardening show that celebrates Scottish horticulture and growing conditions.',
        },
        'playlist_mincount': 1,
    }]
    _PAGE_SIZE = 100
    _DESCRIPTION_KEY = 'synopsis'
    def _get_episode_image(self, episode):
        return self._get_default(episode, 'image')
    def _get_episode_field(self, episode, field):
        return self._get_default(episode, field)
    @staticmethod
    def _get_elements(data):
        return data['entities']['results']
    @staticmethod
    def _get_episode(element):
        return element.get('episode') or {}
    def _call_api(self, pid, per_page, page=1, series_id=None):
        variables = {
            'id': pid,
            'page': page,
            'perPage': per_page,
        }
        if series_id:
            variables['sliceId'] = series_id
        return self._download_json(
            'https://graph.ibl.api.bbc.co.uk/', pid, headers={
                'Content-Type': 'application/json'
            }, data=json.dumps({
                'id': '5692d93d5aac8d796a0305e895e61551',
                'variables': variables,
            }).encode('utf-8'))['data']['programme']
    @staticmethod
    def _get_playlist_data(data):
        return data
    def _get_playlist_title(self, data):
        return self._get_default(data, 'title')
 class BBCCoUkIPlayerGroupIE(BBCCoUkIPlayerPlaylistBaseIE):
    IE_NAME = 'bbc.co.uk:iplayer:group'
    _VALID_URL = BBCCoUkIPlayerPlaylistBaseIE._VALID_URL_TMPL % 'group'
    _TESTS = [{
        # Available for over a year unlike 30 days for most other programmes
        'url': 'http://www.bbc.co.uk/iplayer/group/p02tcc32',
        'info_dict': {
@@ -1523,56 +1361,14 @@ class BBCCoUkIPlayerGroupIE(BBCCoUkIPlayerPlaylistBaseIE):
            'description': 'md5:683e901041b2fe9ba596f2ab04c4dbe7',
        },
        'playlist_mincount': 10,
    }, {
        # all pages
        'url': 'https://www.bbc.co.uk/iplayer/group/p081d7j7',
        'info_dict': {
            'id': 'p081d7j7',
            'title': 'Music in Scotland',
            'description': 'Perfomances in Scotland and programmes featuring Scottish acts.',
        },
        'playlist_mincount': 47,
    }, {
        # explicit page
        'url': 'https://www.bbc.co.uk/iplayer/group/p081d7j7?page=2',
        'info_dict': {
            'id': 'p081d7j7',
            'title': 'Music in Scotland',
            'description': 'Perfomances in Scotland and programmes featuring Scottish acts.',
        },
        'playlist_mincount': 11,
    }]
    _PAGE_SIZE = 200
    _DESCRIPTION_KEY = 'synopses'
-    def _get_episode_image(self, episode):
+    def _extract_title_and_description(self, webpage):
-        return self._get_default(episode, 'images', 'standard')
+        title = self._search_regex(r'<h1>([^<]+)</h1>', webpage, 'title', fatal=False)
-
+        description = self._search_regex(
-    def _get_episode_field(self, episode, field):
+            r'<p[^>]+class=(["\'])subtitle\1[^>]*>(?P<value>[^<]+)</p>',
-        return episode.get(field)
+            webpage, 'description', fatal=False, group='value')
-
+        return title, description
    @staticmethod
    def _get_elements(data):
        return data['elements']
    @staticmethod
    def _get_episode(element):
        return element
    def _call_api(self, pid, per_page, page=1, series_id=None):
        return self._download_json(
            'http://ibl.api.bbc.co.uk/ibl/v1/groups/%s/episodes' % pid,
            pid, query={
                'page': page,
                'per_page': per_page,
            })['group_episodes']
    @staticmethod
    def _get_playlist_data(data):
        return data['group']
    def _get_playlist_title(self, data):
        return data.get('title')
 class BBCCoUkPlaylistIE(BBCCoUkPlaylistBaseIE):
@@ -2,13 +2,11 @@
 from __future__ import unicode_literals
 import hashlib
 import itertools
 import json
 import re
 from .common import InfoExtractor, SearchInfoExtractor
 from ..compat import (
    compat_str,
    compat_parse_qs,
    compat_urlparse,
 )
@@ -17,7 +15,6 @@ from ..utils import (
    int_or_none,
    float_or_none,
    parse_iso8601,
    try_get,
    smuggle_url,
    str_or_none,
    strip_jsonp,
@@ -116,14 +113,6 @@ class BiliBiliIE(InfoExtractor):
        # new BV video id format
        'url': 'https://www.bilibili.com/video/BV1JE411F741',
        'only_matching': True,
    }, {
        # Anthology
        'url': 'https://www.bilibili.com/video/BV1bK411W797',
        'info_dict': {
            'id': 'BV1bK411W797',
            'title': '物语中的人物是如何吐槽自己的OP的'
        },
        'playlist_count': 17,
    }]
    _APP_KEY = 'iVGUTjsxvpLeuDCf'
@@ -150,20 +139,9 @@ class BiliBiliIE(InfoExtractor):
        page_id = mobj.group('page')
        webpage = self._download_webpage(url, video_id)
        # Bilibili anthologies are similar to playlists but all videos share the same video ID as the anthology itself.
        # If the video has no page argument, check to see if it's an anthology
        if page_id is None:
            if not self._downloader.params.get('noplaylist'):
                r = self._extract_anthology_entries(bv_id, video_id, webpage)
                if r is not None:
                    self.to_screen('Downloading anthology %s - add --no-playlist to just download video' % video_id)
                    return r
            else:
                self.to_screen('Downloading just video %s because of --no-playlist' % video_id)
        if 'anime/' not in url:
            cid = self._search_regex(
-                r'\bcid(?:["\']:|=)(\d+),["\']page(?:["\']:|=)' + compat_str(page_id), webpage, 'cid',
+                r'\bcid(?:["\']:|=)(\d+),["\']page(?:["\']:|=)' + str(page_id), webpage, 'cid',
                default=None
            ) or self._search_regex(
                r'\bcid(?:["\']:|=)(\d+)', webpage, 'cid',
@@ -192,7 +170,6 @@ class BiliBiliIE(InfoExtractor):
            cid = js['result']['cid']
        headers = {
            'Accept': 'application/json',
            'Referer': url
        }
        headers.update(self.geo_verification_headers())
@@ -246,18 +223,7 @@ class BiliBiliIE(InfoExtractor):
        title = self._html_search_regex(
            (r'<h1[^>]+\btitle=(["\'])(?P<title>(?:(?!\1).)+)\1',
             r'(?s)<h1[^>]*>(?P<title>.+?)</h1>'), webpage, 'title',
-            group='title')
+            group='title') + ('_p' + str(page_id) if page_id is not None else '')
        # Get part title for anthologies
        if page_id is not None:
            # TODO: The json is already downloaded by _extract_anthology_entries. Don't redownload for each video
            part_title = try_get(
                self._download_json(
                    "https://api.bilibili.com/x/player/pagelist?bvid=%s&jsonp=jsonp" % bv_id,
                    video_id, note='Extracting videos in anthology'),
                lambda x: x['data'][int(page_id) - 1]['part'])
            title = part_title or title
        description = self._html_search_meta('description', webpage)
        timestamp = unified_timestamp(self._html_search_regex(
            r'<time[^>]+datetime="([^"]+)"', webpage, 'upload time',
@@ -267,7 +233,7 @@ class BiliBiliIE(InfoExtractor):
        # TODO 'view_count' requires deobfuscating Javascript
        info = {
-            'id': compat_str(video_id) if page_id is None else '%s_p%s' % (video_id, page_id),
+            'id': str(video_id) if page_id is None else '%s_p%s' % (video_id, page_id),
            'cid': cid,
            'title': title,
            'description': description,
@@ -277,7 +243,7 @@ class BiliBiliIE(InfoExtractor):
        }
        uploader_mobj = re.search(
-            r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/(?P<id>\d+)"[^>]*>\s*(?P<name>[^<]+?)\s*<',
+            r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/(?P<id>\d+)"[^>]*>(?P<name>[^<]+)',
            webpage)
        if uploader_mobj:
            info.update({
@@ -333,7 +299,7 @@ class BiliBiliIE(InfoExtractor):
            global_info = {
                '_type': 'multi_video',
-                'id': compat_str(video_id),
+                'id': video_id,
                'bv_id': bv_id,
                'title': title,
                'description': description,
@@ -345,20 +311,6 @@ class BiliBiliIE(InfoExtractor):
            return global_info
    def _extract_anthology_entries(self, bv_id, video_id, webpage):
        title = self._html_search_regex(
            (r'<h1[^>]+\btitle=(["\'])(?P<title>(?:(?!\1).)+)\1',
             r'(?s)<h1[^>]*>(?P<title>.+?)</h1>'), webpage, 'title',
            group='title')
        json_data = self._download_json(
            "https://api.bilibili.com/x/player/pagelist?bvid=%s&jsonp=jsonp" % bv_id,
            video_id, note='Extracting videos in anthology')
        if len(json_data['data']) > 1:
            return self.playlist_from_matches(
                json_data['data'], bv_id, title, ie=BiliBiliIE.ie_key(),
                getter=lambda entry: 'https://www.bilibili.com/video/%s?p=%d' % (bv_id, entry['page']))
    def _get_video_id_set(self, id, is_bv):
        query = {'bvid': id} if is_bv else {'aid': id}
        response = self._download_json(
@@ -499,40 +451,28 @@ class BiliBiliBangumiIE(InfoExtractor):
 class BilibiliChannelIE(InfoExtractor):
    _VALID_URL = r'https?://space.bilibili\.com/(?P<id>\d+)'
-    _API_URL = "https://api.bilibili.com/x/space/arc/search?mid=%s&pn=%d&jsonp=jsonp"
+    # May need to add support for pagination? Need to find a user with many video uploads to test
-    _TESTS = [{
+    _API_URL = "https://api.bilibili.com/x/space/arc/search?mid=%s&pn=1&ps=25&jsonp=jsonp"
-        'url': 'https://space.bilibili.com/3985676/video',
+    _TEST = {}  # TODO: Add tests
        'info_dict': {},
        'playlist_mincount': 112,
    }]
    def _entries(self, list_id):
        count, max_count = 0, None
        for page_num in itertools.count(1):
            data = self._parse_json(
                self._download_webpage(
                    self._API_URL % (list_id, page_num), list_id,
                    note='Downloading page %d' % page_num),
                list_id)['data']
            max_count = max_count or try_get(data, lambda x: x['page']['count'])
            entries = try_get(data, lambda x: x['list']['vlist'])
            if not entries:
                return
            for entry in entries:
                yield self.url_result(
                    'https://www.bilibili.com/video/%s' % entry['bvid'],
                    BiliBiliIE.ie_key(), entry['bvid'])
            count += len(entries)
            if max_count and count >= max_count:
                return
    def _real_extract(self, url):
        list_id = self._match_id(url)
-        return self.playlist_result(self._entries(list_id), list_id)
+        json_str = self._download_webpage(self._API_URL % list_id, "None")
        json_parsed = json.loads(json_str)
        entries = [{
            '_type': 'url',
            'ie_key': BiliBiliIE.ie_key(),
            'url': ('https://www.bilibili.com/video/%s' %
                    entry['bvid']),
            'id': entry['bvid'],
        } for entry in json_parsed['data']['list']['vlist']]
        return {
            '_type': 'playlist',
            'id': list_id,
            'entries': entries
        }
 class BiliBiliSearchIE(SearchInfoExtractor):
@@ -565,7 +505,7 @@ class BiliBiliSearchIE(SearchInfoExtractor):
            videos = data['result']
            for video in videos:
-                e = self.url_result(video['arcurl'], 'BiliBili', compat_str(video['aid']))
+                e = self.url_result(video['arcurl'], 'BiliBili', str(video['aid']))
                entries.append(e)
            if(len(entries) >= n or len(videos) >= BiliBiliSearchIE.MAX_NUMBER_OF_RESULTS):
@@ -114,7 +114,7 @@ class BRIE(InfoExtractor):
            medias.append(media)
        if len(medias) > 1:
-            self.report_warning(
+            self._downloader.report_warning(
                'found multiple medias; please '
                'report this with the video URL to http://yt-dl.org/bug')
        if not medias:
@@ -545,9 +545,9 @@ class BrightcoveNewIE(AdobePassIE):
            errors = json_data.get('errors')
            if errors:
                error = errors[0]
-                self.raise_no_formats(
+                raise ExtractorError(
                    error.get('message') or error.get('error_subcode') or error['error_code'], expected=True)
-            elif (not self._downloader.params.get('allow_unplayable_formats')
+            if (not self._downloader.params.get('allow_unplayable_formats')
                    and sources and num_drm_sources == len(sources)):
                raise ExtractorError('This video is DRM protected.', expected=True)
@@ -27,10 +27,10 @@ class CBSBaseIE(ThePlatformFeedIE):
 class CBSIE(CBSBaseIE):
-    _VALID_URL = r'(?:cbs:|https?://(?:www\.)?(?:(?:cbs|paramountplus)\.com/shows/[^/]+/video|colbertlateshow\.com/(?:video|podcasts))/)(?P<id>[\w-]+)'
+    _VALID_URL = r'(?:cbs:|https?://(?:www\.)?(?:cbs\.com/shows/[^/]+/video|colbertlateshow\.com/(?:video|podcasts))/)(?P<id>[\w-]+)'
    _TESTS = [{
-        'url': 'https://www.cbs.com/shows/garth-brooks/video/_u7W953k6la293J7EPTd9oHkSPs6Xn6_/connect-chat-feat-garth-brooks/',
+        'url': 'http://www.cbs.com/shows/garth-brooks/video/_u7W953k6la293J7EPTd9oHkSPs6Xn6_/connect-chat-feat-garth-brooks/',
        'info_dict': {
            'id': '_u7W953k6la293J7EPTd9oHkSPs6Xn6_',
            'ext': 'mp4',
@@ -52,19 +52,16 @@ class CBSIE(CBSBaseIE):
    }, {
        'url': 'http://www.colbertlateshow.com/podcasts/dYSwjqPs_X1tvbV_P2FcPWRa_qT6akTC/in-the-bad-room-with-stephen/',
        'only_matching': True,
    }, {
        'url': 'https://www.paramountplus.com/shows/all-rise/video/QmR1WhNkh1a_IrdHZrbcRklm176X_rVc/all-rise-space/',
        'only_matching': True,
    }]
    def _extract_video_info(self, content_id, site='cbs', mpx_acc=2198311517):
        items_data = self._download_xml(
-            'https://can.cbs.com/thunder/player/videoPlayerService.php',
+            'http://can.cbs.com/thunder/player/videoPlayerService.php',
            content_id, query={'partner': site, 'contentId': content_id})
        video_data = xpath_element(items_data, './/item')
        title = xpath_text(video_data, 'videoTitle', 'title') or xpath_text(video_data, 'videotitle', 'title')
        tp_path = 'dJ5BDC/media/guid/%d/%s' % (mpx_acc, content_id)
-        tp_release_url = 'https://link.theplatform.com/s/' + tp_path
+        tp_release_url = 'http://link.theplatform.com/s/' + tp_path
        asset_types = []
        subtitles = {}
@@ -26,7 +26,7 @@ class CBSNewsEmbedIE(CBSIE):
    def _real_extract(self, url):
        item = self._parse_json(zlib.decompress(compat_b64decode(
            compat_urllib_parse_unquote(self._match_id(url))),
-            -zlib.MAX_WBITS).decode('utf-8'), None)['video']['items'][0]
+            -zlib.MAX_WBITS), None)['video']['items'][0]
        return self._extract_video_info(item['mpxRefId'], 'cbsnews')
@@ -1,113 +1,38 @@
 from __future__ import unicode_literals
-import re
+from .cbs import CBSBaseIE
 # from .cbs import CBSBaseIE
 from .common import InfoExtractor
 from ..utils import (
    int_or_none,
    try_get,
 )
-# class CBSSportsEmbedIE(CBSBaseIE):
+class CBSSportsIE(CBSBaseIE):
-class CBSSportsEmbedIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?cbssports\.com/[^/]+/(?:video|news)/(?P<id>[^/?#&]+)'
-    IE_NAME = 'cbssports:embed'
+
    _VALID_URL = r'''(?ix)https?://(?:(?:www\.)?cbs|embed\.247)sports\.com/player/embed.+?
        (?:
            ids%3D(?P<id>[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12})|
            pcid%3D(?P<pcid>\d+)
        )'''
    _TESTS = [{
-        'url': 'https://www.cbssports.com/player/embed/?args=player_id%3Db56c03a6-231a-4bbe-9c55-af3c8a8e9636%26ids%3Db56c03a6-231a-4bbe-9c55-af3c8a8e9636%26resizable%3D1%26autoplay%3Dtrue%26domain%3Dcbssports.com%26comp_ads_enabled%3Dfalse%26watchAndRead%3D0%26startTime%3D0%26env%3Dprod',
+        'url': 'https://www.cbssports.com/nba/video/donovan-mitchell-flashes-star-potential-in-game-2-victory-over-thunder/',
-        'only_matching': True,
+        'info_dict': {
            'id': '1214315075735',
            'ext': 'mp4',
            'title': 'Donovan Mitchell flashes star potential in Game 2 victory over Thunder',
            'description': 'md5:df6f48622612c2d6bd2e295ddef58def',
            'timestamp': 1524111457,
            'upload_date': '20180419',
            'uploader': 'CBSI-NEW',
        },
        'params': {
            # m3u8 download
            'skip_download': True,
        }
    }, {
-        'url': 'https://embed.247sports.com/player/embed/?args=%3fplayer_id%3d1827823171591%26channel%3dcollege-football-recruiting%26pcid%3d1827823171591%26width%3d640%26height%3d360%26autoplay%3dTrue%26comp_ads_enabled%3dFalse%26uvpc%3dhttps%253a%252f%252fwww.cbssports.com%252fapi%252fcontent%252fvideo%252fconfig%252f%253fcfg%253duvp_247sports_v4%2526partner%253d247%26uvpc_m%3dhttps%253a%252f%252fwww.cbssports.com%252fapi%252fcontent%252fvideo%252fconfig%252f%253fcfg%253duvp_247sports_m_v4%2526partner_m%253d247_mobile%26utag%3d247sportssite%26resizable%3dTrue',
+        'url': 'https://www.cbssports.com/nba/news/nba-playoffs-2018-watch-76ers-vs-heat-game-3-series-schedule-tv-channel-online-stream/',
        'only_matching': True,
    }]
-    # def _extract_video_info(self, filter_query, video_id):
+    def _extract_video_info(self, filter_query, video_id):
-    #     return self._extract_feed_info('dJ5BDC', 'VxxJg8Ymh8sE', filter_query, video_id)
+        return self._extract_feed_info('dJ5BDC', 'VxxJg8Ymh8sE', filter_query, video_id)
    def _real_extract(self, url):
        uuid, pcid = re.match(self._VALID_URL, url).groups()
        query = {'id': uuid} if uuid else {'pcid': pcid}
        video = self._download_json(
            'https://www.cbssports.com/api/content/video/',
            uuid or pcid, query=query)[0]
        video_id = video['id']
        title = video['title']
        metadata = video.get('metaData') or {}
        # return self._extract_video_info('byId=%d' % metadata['mpxOutletId'], video_id)
        # return self._extract_video_info('byGuid=' + metadata['mpxRefId'], video_id)
        formats = self._extract_m3u8_formats(
            metadata['files'][0]['url'], video_id, 'mp4',
            'm3u8_native', m3u8_id='hls', fatal=False)
        self._sort_formats(formats)
        image = video.get('image')
        thumbnails = None
        if image:
            image_path = image.get('path')
            if image_path:
                thumbnails = [{
                    'url': image_path,
                    'width': int_or_none(image.get('width')),
                    'height': int_or_none(image.get('height')),
                    'filesize': int_or_none(image.get('size')),
                }]
        return {
            'id': video_id,
            'title': title,
            'formats': formats,
            'thumbnails': thumbnails,
            'description': video.get('description'),
            'timestamp': int_or_none(try_get(video, lambda x: x['dateCreated']['epoch'])),
            'duration': int_or_none(metadata.get('duration')),
        }
 class CBSSportsBaseIE(InfoExtractor):
    def _real_extract(self, url):
        display_id = self._match_id(url)
        webpage = self._download_webpage(url, display_id)
-        iframe_url = self._search_regex(
+        video_id = self._search_regex(
-            r'<iframe[^>]+(?:data-)?src="(https?://[^/]+/player/embed[^"]+)"',
+            [r'(?:=|%26)pcid%3D(\d+)', r'embedVideo(?:Container)?_(\d+)'],
-            webpage, 'embed url')
+            webpage, 'video id')
-        return self.url_result(iframe_url, CBSSportsEmbedIE.ie_key())
+        return self._extract_video_info('byId=%s' % video_id, video_id)
 class CBSSportsIE(CBSSportsBaseIE):
    IE_NAME = 'cbssports'
    _VALID_URL = r'https?://(?:www\.)?cbssports\.com/[^/]+/video/(?P<id>[^/?#&]+)'
    _TESTS = [{
        'url': 'https://www.cbssports.com/college-football/video/cover-3-stanford-spring-gleaning/',
        'info_dict': {
            'id': 'b56c03a6-231a-4bbe-9c55-af3c8a8e9636',
            'ext': 'mp4',
            'title': 'Cover 3: Stanford Spring Gleaning',
            'description': 'The Cover 3 crew break down everything you need to know about the Stanford Cardinal this spring.',
            'timestamp': 1617218398,
            'upload_date': '20210331',
            'duration': 502,
        },
    }]
 class TwentyFourSevenSportsIE(CBSSportsBaseIE):
    IE_NAME = '247sports'
    _VALID_URL = r'https?://(?:www\.)?247sports\.com/Video/(?:[^/?#&]+-)?(?P<id>\d+)'
    _TESTS = [{
        'url': 'https://247sports.com/Video/2021-QB-Jake-Garcia-senior-highlights-through-five-games-10084854/',
        'info_dict': {
            'id': '4f1265cb-c3b5-44a8-bb1d-1914119a0ccc',
            'ext': 'mp4',
            'title': '2021 QB Jake Garcia senior highlights through five games',
            'description': 'md5:8cb67ebed48e2e6adac1701e0ff6e45b',
            'timestamp': 1607114223,
            'upload_date': '20201204',
            'duration': 208,
        },
    }]
@@ -5,6 +5,7 @@ import re
 from .common import InfoExtractor
 from ..utils import (
    clean_html,
    ExtractorError,
    int_or_none,
    parse_iso8601,
    qualities,
@@ -186,13 +187,14 @@ class Channel9IE(InfoExtractor):
                    'quality': quality(q, q_url),
                })
            self._sort_formats(formats)
            slides = content_data.get('Slides')
            zip_file = content_data.get('ZipFile')
            if not formats and not slides and not zip_file:
-                self.raise_no_formats(
+                raise ExtractorError(
                    'None of recording, slides or zip are available for %s' % content_path)
            self._sort_formats(formats)
            subtitles = {}
            for caption in content_data.get('Captions', []):
@@ -17,7 +17,7 @@ import math
 from ..compat import (
    compat_cookiejar_Cookie,
-    compat_cookies_SimpleCookie,
+    compat_cookies,
    compat_etree_Element,
    compat_etree_fromstring,
    compat_getpass,
@@ -231,9 +231,8 @@ class InfoExtractor(object):
    uploader:       Full name of the video uploader.
    license:        License name the video is licensed under.
    creator:        The creator of the video.
    release_timestamp: UNIX timestamp of the moment the video was released.
    release_date:   The date (YYYYMMDD) when the video was released.
-    timestamp:      UNIX timestamp of the moment the video was uploaded
+    timestamp:      UNIX timestamp of the moment the video became available.
    upload_date:    Video upload date (YYYYMMDD).
                    If not explicitly set, calculated from timestamp.
    uploader_id:    Nickname or id of the video uploader.
@@ -252,8 +251,8 @@ class InfoExtractor(object):
                        * "data": The subtitles file contents
                        * "url": A URL pointing to the subtitles file
                    "ext" will be calculated from URL if missing
-    automatic_captions: Like 'subtitles'; contains automatically generated
+    automatic_captions: Like 'subtitles', used by the YoutubeIE for
-                    captions instead of normal subtitles
+                    automatically generated captions
    duration:       Length of the video in seconds, as an integer or float.
    view_count:     How many users have watched the video on the platform.
    like_count:     Number of positive ratings of the video
@@ -265,7 +264,6 @@ class InfoExtractor(object):
                    properties (all but one of text or html optional):
                        * "author" - human-readable name of the comment author
                        * "author_id" - user ID of the comment author
                        * "author_thumbnail" - The thumbnail of the comment author
                        * "id" - Comment ID
                        * "html" - Comment as HTML
                        * "text" - Plain text of the comment
@@ -273,12 +271,6 @@ class InfoExtractor(object):
                        * "parent" - ID of the comment this one is replying to.
                                     Set to "root" to indicate that this is a
                                     comment to the original video.
                        * "like_count" - Number of positive ratings of the comment
                        * "dislike_count" - Number of negative ratings of the comment
                        * "is_favorited" - Whether the comment is marked as
                                           favorite by the video uploader
                        * "author_is_uploader" - Whether the comment is made by
                                                 the video uploader
    age_limit:      Age restriction for the video, as an integer (years)
    webpage_url:    The URL to the video webpage, if given to yt-dlp it
                    should allow to get the same result again. (It will be set
@@ -301,11 +293,7 @@ class InfoExtractor(object):
    playable_in_embed: Whether this video is allowed to play in embedded
                    players on other sites. Can be True (=always allowed),
                    False (=never allowed), None (=unknown), or a string
-                    specifying the criteria for embedability (Eg: 'whitelist')
+                    specifying the criteria for embedability (Eg: 'whitelist').
    availability:   Under what condition the video is available. One of
                    'private', 'premium_only', 'subscriber_only', 'needs_auth',
                    'unlisted' or 'public'. Use 'InfoExtractor._availability'
                    to set it
    __post_extractor: A function to be called just before the metadata is
                    written to either disk, logger or console. The function
                    must return a dict which will be added to the info_dict.
@@ -683,7 +671,7 @@ class InfoExtractor(object):
            if fatal:
                raise ExtractorError(errmsg, sys.exc_info()[2], cause=err)
            else:
-                self.report_warning(errmsg)
+                self._downloader.report_warning(errmsg)
                return False
    def _download_webpage_handle(self, url_or_request, video_id, note=None, errnote=None, fatal=True, encoding=None, data=None, headers={}, query={}, expected_status=None):
@@ -968,27 +956,15 @@ class InfoExtractor(object):
        """Report attempt to log in."""
        self.to_screen('Logging in')
-    def raise_login_required(
+    @staticmethod
-            self, msg='This video is only available for registered users', metadata_available=False):
+    def raise_login_required(msg='This video is only available for registered users'):
        if metadata_available and self._downloader.params.get('ignore_no_formats_error'):
            self.report_warning(msg)
        raise ExtractorError(
-            '%s. Use --cookies, --username and --password or --netrc to provide account credentials' % msg,
+            '%s. Use --username and --password or --netrc to provide account credentials.' % msg,
            expected=True)
-    def raise_geo_restricted(
+    @staticmethod
-            self, msg='This video is not available from your location due to geo restriction',
+    def raise_geo_restricted(msg='This video is not available from your location due to geo restriction', countries=None):
-            countries=None, metadata_available=False):
+        raise GeoRestrictedError(msg, countries=countries)
        if metadata_available and self._downloader.params.get('ignore_no_formats_error'):
            self.report_warning(msg)
        else:
            raise GeoRestrictedError(msg, countries=countries)
    def raise_no_formats(self, msg, expected=False, video_id=None):
        if expected and self._downloader.params.get('ignore_no_formats_error'):
            self.report_warning(msg, video_id)
        else:
            raise ExtractorError(msg, expected=expected, video_id=video_id)
    # Methods for following #608
    @staticmethod
@@ -1056,7 +1032,7 @@ class InfoExtractor(object):
        elif fatal:
            raise RegexNotFoundError('Unable to extract %s' % _name)
        else:
-            self.report_warning('unable to extract %s' % _name + bug_reports_message())
+            self._downloader.report_warning('unable to extract %s' % _name + bug_reports_message())
            return None
    def _html_search_regex(self, pattern, string, name, default=NO_DEFAULT, fatal=True, flags=0, group=None):
@@ -1084,7 +1060,7 @@ class InfoExtractor(object):
                    raise netrc.NetrcParseError(
                        'No authenticators for %s' % netrc_machine)
            except (IOError, netrc.NetrcParseError) as err:
-                self.report_warning(
+                self._downloader.report_warning(
                    'parsing .netrc: %s' % error_to_compat_str(err))
        return username, password
@@ -1259,7 +1235,7 @@ class InfoExtractor(object):
        elif fatal:
            raise RegexNotFoundError('Unable to extract JSON-LD')
        else:
-            self.report_warning('unable to extract JSON-LD %s' % bug_reports_message())
+            self._downloader.report_warning('unable to extract JSON-LD %s' % bug_reports_message())
            return {}
    def _json_ld(self, json_ld, video_id, fatal=True, expected_type=None):
@@ -1320,7 +1296,6 @@ class InfoExtractor(object):
        def extract_video_object(e):
            assert e['@type'] == 'VideoObject'
            author = e.get('author')
            info.update({
                'url': url_or_none(e.get('contentUrl')),
                'title': unescapeHTML(e.get('name')),
@@ -1328,11 +1303,7 @@ class InfoExtractor(object):
                'thumbnail': url_or_none(e.get('thumbnailUrl') or e.get('thumbnailURL')),
                'duration': parse_duration(e.get('duration')),
                'timestamp': unified_timestamp(e.get('uploadDate')),
-                # author can be an instance of 'Organization' or 'Person' types.
+                'uploader': str_or_none(e.get('author')),
                # both types can have 'name' property(inherited from 'Thing' type). [1]
                # however some websites are using 'Text' type instead.
                # 1. https://schema.org/VideoObject
                'uploader': author.get('name') if isinstance(author, dict) else author if isinstance(author, compat_str) else None,
                'filesize': float_or_none(e.get('contentSize')),
                'tbr': int_or_none(e.get('bitrate')),
                'width': int_or_none(e.get('width')),
@@ -1415,7 +1386,7 @@ class InfoExtractor(object):
        return self._hidden_inputs(form)
    class FormatSort:
-        regex = r' *((?P<reverse>\+)?(?P<field>[a-zA-Z0-9_]+)((?P<separator>[~:])(?P<limit>.*?))?)? *$'
+        regex = r' *((?P<reverse>\+)?(?P<field>[a-zA-Z0-9_]+)((?P<seperator>[~:])(?P<limit>.*?))?)? *$'
        default = ('hidden', 'hasvid', 'ie_pref', 'lang', 'quality',
                   'res', 'fps', 'codec:vp9.2', 'size', 'br', 'asr',
@@ -1438,8 +1409,8 @@ class InfoExtractor(object):
            'ie_pref': {'priority': True, 'type': 'extractor'},
            'hasvid': {'priority': True, 'field': 'vcodec', 'type': 'boolean', 'not_in_list': ('none',)},
            'hasaud': {'field': 'acodec', 'type': 'boolean', 'not_in_list': ('none',)},
-            'lang': {'priority': True, 'convert': 'ignore', 'field': 'language_preference'},
+            'lang': {'priority': True, 'convert': 'ignore', 'type': 'extractor', 'field': 'language_preference'},
-            'quality': {'convert': 'float_none'},
+            'quality': {'convert': 'float_none', 'type': 'extractor'},
            'filesize': {'convert': 'bytes'},
            'fs_approx': {'convert': 'bytes', 'field': 'filesize_approx'},
            'id': {'convert': 'string', 'field': 'format_id'},
@@ -1450,7 +1421,7 @@ class InfoExtractor(object):
            'vbr': {'convert': 'float_none'},
            'abr': {'convert': 'float_none'},
            'asr': {'convert': 'float_none'},
-            'source': {'convert': 'ignore', 'field': 'source_preference'},
+            'source': {'convert': 'ignore', 'type': 'extractor', 'field': 'source_preference'},
            'codec': {'type': 'combined', 'field': ('vcodec', 'acodec')},
            'br': {'type': 'combined', 'field': ('tbr', 'vbr', 'abr'), 'same_limit': True},
@@ -1575,7 +1546,7 @@ class InfoExtractor(object):
                if self._get_field_setting(field, 'type') == 'alias':
                    field = self._get_field_setting(field, 'field')
                reverse = match.group('reverse') is not None
-                closest = match.group('separator') == '~'
+                closest = match.group('seperator') == '~'
                limit_text = match.group('limit')
                has_limit = limit_text is not None
@@ -1592,8 +1563,7 @@ class InfoExtractor(object):
                             else None)
        def print_verbose_info(self, to_screen):
-            if self._sort_user:
+            to_screen('[debug] Sort order given by user: %s' % ','.join(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' % (
@@ -1682,8 +1652,6 @@ class InfoExtractor(object):
    def _sort_formats(self, formats, field_preference=[]):
        if not formats:
            if self._downloader.params.get('ignore_no_formats_error'):
                return
            raise ExtractorError('No video formats found')
        format_sort = self.FormatSort()  # params and to_screen are taken from the downloader
        format_sort.evaluate_params(self._downloader.params, field_preference)
@@ -1881,9 +1849,8 @@ class InfoExtractor(object):
    def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
                              entry_protocol='m3u8', preference=None, quality=None,
-                              m3u8_id=None, note=None, errnote=None,
+                              m3u8_id=None, live=False, note=None, errnote=None,
-                              fatal=True, live=False, data=None, headers={},
+                              fatal=True, data=None, headers={}, query={}):
                              query={}):
        res = self._download_webpage_handle(
            m3u8_url, video_id,
            note=note or 'Downloading m3u8 information',
@@ -1909,8 +1876,7 @@ class InfoExtractor(object):
        if '#EXT-X-FAXS-CM:' in m3u8_doc:  # Adobe Flash Access
            return []
-        if (not self._downloader.params.get('allow_unplayable_formats')
+        if re.search(r'#EXT-X-SESSION-KEY:.*?URI="skd://', m3u8_doc):  # Apple FairPlay
                and re.search(r'#EXT-X-SESSION-KEY:.*?URI="skd://', m3u8_doc)):  # Apple FairPlay
            return []
        formats = []
@@ -2084,11 +2050,11 @@ class InfoExtractor(object):
                playlist_formats = _extract_m3u8_playlist_formats(manifest_url, video_id=video_id,
                                                                  fatal=fatal, data=data, headers=headers)
-                for frmt in playlist_formats:
+                for format in playlist_formats:
                    format_id = []
                    if m3u8_id:
                        format_id.append(m3u8_id)
-                    format_index = frmt.get('index')
+                    format_index = format.get('index')
                    stream_name = build_stream_name()
                    # Bandwidth of live streams may differ over time thus making
                    # format_id unpredictable. So it's better to keep provided
@@ -2143,8 +2109,6 @@ class InfoExtractor(object):
                            # TODO: update acodec for audio only formats with
                            # the same GROUP-ID
                            f['acodec'] = 'none'
                    if not f.get('ext'):
                        f['ext'] = 'm4a' if f.get('vcodec') == 'none' else 'mp4'
                    formats.append(f)
                    # for DailyMotion
@@ -2427,7 +2391,7 @@ class InfoExtractor(object):
            http://standards.iso.org/ittf/PubliclyAvailableStandards/c065274_ISO_IEC_23009-1_2014.zip
         2. https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP
        """
-        if not self._downloader.params.get('dynamic_mpd', True):
+        if not self._downloader.params.get('dynamic_mpd'):
            if mpd_doc.get('type') == 'dynamic':
                return []
@@ -3217,7 +3181,7 @@ class InfoExtractor(object):
            if fatal:
                raise ExtractorError(msg)
            else:
-                self.report_warning(msg)
+                self._downloader.report_warning(msg)
        return res
    def _float(self, v, name, fatal=False, **kwargs):
@@ -3227,7 +3191,7 @@ class InfoExtractor(object):
            if fatal:
                raise ExtractorError(msg)
            else:
-                self.report_warning(msg)
+                self._downloader.report_warning(msg)
        return res
    def _set_cookie(self, domain, name, value, expire_time=None, port=None,
@@ -3239,10 +3203,10 @@ class InfoExtractor(object):
        self._downloader.cookiejar.set_cookie(cookie)
    def _get_cookies(self, url):
-        """ Return a compat_cookies_SimpleCookie with the cookies for the url """
+        """ Return a compat_cookies.SimpleCookie with the cookies for the url """
        req = sanitized_Request(url)
        self._downloader.cookiejar.add_cookie_header(req)
-        return compat_cookies_SimpleCookie(req.get_header('Cookie'))
+        return compat_cookies.SimpleCookie(req.get_header('Cookie'))
    def _apply_first_set_cookie_header(self, url_handle, cookie):
        """
@@ -3357,20 +3321,6 @@ class InfoExtractor(object):
    def _generic_title(self, url):
        return compat_urllib_parse_unquote(os.path.splitext(url_basename(url))[0])
    @staticmethod
    def _availability(is_private, needs_premium, needs_subscription, needs_auth, is_unlisted):
        all_known = all(map(
            lambda x: x is not None,
            (is_private, needs_premium, needs_subscription, needs_auth, is_unlisted)))
        return (
            'private' if is_private
            else 'premium_only' if needs_premium
            else 'subscriber_only' if needs_subscription
            else 'needs_auth' if needs_auth
            else 'unlisted' if is_unlisted
            else 'public' if all_known
            else None)
 class SearchInfoExtractor(InfoExtractor):
    """
@@ -3403,7 +3353,7 @@ class SearchInfoExtractor(InfoExtractor):
            if n <= 0:
                raise ExtractorError('invalid download number %s for query "%s"' % (n, query))
            elif n > self._MAX_RESULTS:
-                self.report_warning('%s returns max %i results (you requested %i)' % (self._SEARCH_KEY, self._MAX_RESULTS, n))
+                self._downloader.report_warning('%s returns max %i results (you requested %i)' % (self._SEARCH_KEY, self._MAX_RESULTS, n))
                n = self._MAX_RESULTS
            return self._get_n_results(query, n)
@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 import re
 from .common import InfoExtractor
 from ..compat import (
    compat_urlparse,
@@ -60,16 +58,3 @@ class MmsIE(InfoExtractor):
            'title': title,
            'url': url,
        }
 class ViewSourceIE(InfoExtractor):
    IE_DESC = False
    _VALID_URL = r'view-source:(?P<url>.+)'
    _TEST = {
        'url': 'view-source:https://www.youtube.com/watch?v=BaW_jenozKc',
        'only_matching': True
    }
    def _real_extract(self, url):
        return self.url_result(re.match(self._VALID_URL, url).group('url'))
@@ -131,7 +131,7 @@ class CorusIE(ThePlatformFeedIE):
            formats.extend(self._parse_smil_formats(
                smil, smil_url, video_id, namespace))
        if not formats and video.get('drm'):
-            self.raise_no_formats('This video is DRM protected.', expected=True)
+            raise ExtractorError('This video is DRM protected.', expected=True)
        self._sort_formats(formats)
        subtitles = {}
@@ -428,7 +428,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
            r'<div class="showmedia-trailer-notice">(.+?)</div>',
            webpage, 'trailer-notice', default='')
        if note_m:
-            raise ExtractorError(note_m, expected=True)
+            raise ExtractorError(note_m)
        mobj = re.search(r'Page\.messaging_box_controller\.addItems\(\[(?P<msg>{.+?})\]\)', webpage)
        if mobj:
@@ -25,12 +25,12 @@ class CuriosityStreamBaseIE(InfoExtractor):
            raise ExtractorError(
                '%s said: %s' % (self.IE_NAME, error), expected=True)
-    def _call_api(self, path, video_id, query=None):
+    def _call_api(self, path, video_id):
        headers = {}
        if self._auth_token:
            headers['X-Auth-Token'] = self._auth_token
        result = self._download_json(
-            self._API_BASE_URL + path, video_id, headers=headers, query=query)
+            self._API_BASE_URL + path, video_id, headers=headers)
        self._handle_errors(result)
        return result['data']
@@ -52,75 +52,62 @@ class CuriosityStreamIE(CuriosityStreamBaseIE):
    _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/video/(?P<id>\d+)'
    _TEST = {
        'url': 'https://app.curiositystream.com/video/2',
        'md5': '262bb2f257ff301115f1973540de8983',
        'info_dict': {
            'id': '2',
            'ext': 'mp4',
            'title': 'How Did You Develop The Internet?',
            'description': 'Vint Cerf, Google\'s Chief Internet Evangelist, describes how he and Bob Kahn created the internet.',
-        },
+        }
        'params': {
            'format': 'bestvideo',
            # m3u8 download
            'skip_download': True,
        },
    }
    def _real_extract(self, url):
        video_id = self._match_id(url)
        media = self._call_api('media/' + video_id, video_id)
        title = media['title']
        formats = []
-        for encoding_format in ('m3u8', 'mpd'):
+        for encoding in media.get('encodings', []):
-            media = self._call_api('media/' + video_id, video_id, query={
+            m3u8_url = encoding.get('master_playlist_url')
-                'encodingsNew': 'true',
+            if m3u8_url:
-                'encodingsFormat': encoding_format,
+                formats.extend(self._extract_m3u8_formats(
-            })
+                    m3u8_url, video_id, 'mp4', 'm3u8_native',
-            for encoding in media.get('encodings', []):
+                    m3u8_id='hls', fatal=False))
-                playlist_url = encoding.get('master_playlist_url')
+            encoding_url = encoding.get('url')
-                if encoding_format == 'm3u8':
+            file_url = encoding.get('file_url')
-                    # use `m3u8` entry_protocol until EXT-X-MAP is properly supported by `m3u8_native` entry_protocol
+            if not encoding_url and not file_url:
-                    formats.extend(self._extract_m3u8_formats(
+                continue
-                        playlist_url, video_id, 'mp4',
+            f = {
-                        m3u8_id='hls', fatal=False))
+                'width': int_or_none(encoding.get('width')),
-                elif encoding_format == 'mpd':
+                'height': int_or_none(encoding.get('height')),
-                    formats.extend(self._extract_mpd_formats(
+                'vbr': int_or_none(encoding.get('video_bitrate')),
-                        playlist_url, video_id, mpd_id='dash', fatal=False))
+                'abr': int_or_none(encoding.get('audio_bitrate')),
-                encoding_url = encoding.get('url')
+                'filesize': int_or_none(encoding.get('size_in_bytes')),
-                file_url = encoding.get('file_url')
+                'vcodec': encoding.get('video_codec'),
-                if not encoding_url and not file_url:
+                'acodec': encoding.get('audio_codec'),
                'container': encoding.get('container_type'),
            }
            for f_url in (encoding_url, file_url):
                if not f_url:
                    continue
-                f = {
+                fmt = f.copy()
-                    'width': int_or_none(encoding.get('width')),
+                rtmp = re.search(r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+))/(?P<playpath>mp[34]:.+)$', f_url)
-                    'height': int_or_none(encoding.get('height')),
+                if rtmp:
-                    'vbr': int_or_none(encoding.get('video_bitrate')),
+                    fmt.update({
-                    'abr': int_or_none(encoding.get('audio_bitrate')),
+                        'url': rtmp.group('url'),
-                    'filesize': int_or_none(encoding.get('size_in_bytes')),
+                        'play_path': rtmp.group('playpath'),
-                    'vcodec': encoding.get('video_codec'),
+                        'app': rtmp.group('app'),
-                    'acodec': encoding.get('audio_codec'),
+                        'ext': 'flv',
-                    'container': encoding.get('container_type'),
+                        'format_id': 'rtmp',
-                }
+                    })
-                for f_url in (encoding_url, file_url):
+                else:
-                    if not f_url:
+                    fmt.update({
-                        continue
+                        'url': f_url,
-                    fmt = f.copy()
+                        'format_id': 'http',
-                    rtmp = re.search(r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+))/(?P<playpath>mp[34]:.+)$', f_url)
+                    })
-                    if rtmp:
+                formats.append(fmt)
                        fmt.update({
                            'url': rtmp.group('url'),
                            'play_path': rtmp.group('playpath'),
                            'app': rtmp.group('app'),
                            'ext': 'flv',
                            'format_id': 'rtmp',
                        })
                    else:
                        fmt.update({
                            'url': f_url,
                            'format_id': 'http',
                        })
                    formats.append(fmt)
        self._sort_formats(formats)
        title = media['title']
        subtitles = {}
        for closed_caption in media.get('closed_captions', []):
            sub_url = closed_caption.get('file')
@@ -153,7 +140,7 @@ class CuriosityStreamCollectionIE(CuriosityStreamBaseIE):
            'title': 'Curious Minds: The Internet',
            'description': 'How is the internet shaping our lives in the 21st Century?',
        },
-        'playlist_mincount': 16,
+        'playlist_mincount': 17,
    }, {
        'url': 'https://curiositystream.com/series/2',
        'only_matching': True,
@@ -14,7 +14,7 @@ from ..utils import (
 class DeezerBaseInfoExtractor(InfoExtractor):
    def get_data(self, url):
        if not self._downloader.params.get('test'):
-            self.report_warning('For now, this extractor only supports the 30 second previews. Patches welcome!')
+            self._downloader.report_warning('For now, this extractor only supports the 30 second previews. Patches welcome!')
        mobj = re.match(self._VALID_URL, url)
        data_id = mobj.group('id')
@@ -1,100 +0,0 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import json
 import re
 from ..compat import compat_str
 from ..utils import try_get
 from .common import InfoExtractor
 from .dplay import DPlayIE
 class DiscoveryPlusIndiaIE(DPlayIE):
    _VALID_URL = r'https?://(?:www\.)?discoveryplus\.in/videos?' + DPlayIE._PATH_REGEX
    _TESTS = [{
        'url': 'https://www.discoveryplus.in/videos/how-do-they-do-it/fugu-and-more?seasonId=8&type=EPISODE',
        'info_dict': {
            'id': '27104',
            'ext': 'mp4',
            'display_id': 'how-do-they-do-it/fugu-and-more',
            'title': 'Fugu and More',
            'description': 'The Japanese catch, prepare and eat the deadliest fish on the planet.',
            'duration': 1319,
            'timestamp': 1582309800,
            'upload_date': '20200221',
            'series': 'How Do They Do It?',
            'season_number': 8,
            'episode_number': 2,
            'creator': 'Discovery Channel',
        },
        'params': {
            'format': 'bestvideo',
            'skip_download': True,
        },
        'skip': 'Cookies (not necessarily logged in) are needed'
    }]
    def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
        headers['x-disco-params'] = 'realm=%s' % realm
        headers['x-disco-client'] = 'WEB:UNKNOWN:dplus-india:17.0.0'
    def _download_video_playback_info(self, disco_base, video_id, headers):
        return self._download_json(
            disco_base + 'playback/v3/videoPlaybackInfo',
            video_id, headers=headers, data=json.dumps({
                'deviceInfo': {
                    'adBlocker': False,
                },
                'videoId': video_id,
            }).encode('utf-8'))['data']['attributes']['streaming']
    def _real_extract(self, url):
        display_id = self._match_id(url)
        return self._get_disco_api_info(
            url, display_id, 'ap2-prod-direct.discoveryplus.in', 'dplusindia', 'in')
 class DiscoveryPlusIndiaShowIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?discoveryplus\.in/show/(?P<show_name>[^/]+)/?(?:[?#]|$)'
    _TESTS = [{
        'url': 'https://www.discoveryplus.in/show/how-do-they-do-it',
        'playlist_mincount': 140,
        'info_dict': {
            'id': 'how-do-they-do-it',
        },
    }
    ]
    def _entries(self, show_name):
        headers = {
            'x-disco-client': 'WEB:UNKNOWN:dplus-india:prod',
            'x-disco-params': 'realm=dplusindia',
            'referer': 'https://www.discoveryplus.in/',
        }
        show_url = 'https://ap2-prod-direct.discoveryplus.in/cms/routes/show/{}?include=default'.format(show_name)
        show_json = self._download_json(show_url,
                                        video_id=show_name,
                                        headers=headers)['included'][4]['attributes']['component']
        show_id = show_json['mandatoryParams'].split('=')[-1]
        season_url = 'https://ap2-prod-direct.discoveryplus.in/content/videos?sort=episodeNumber&filter[seasonNumber]={}&filter[show.id]={}&page[size]=100&page[number]={}'
        for season in show_json['filters'][0]['options']:
            season_id = season['id']
            total_pages, page_num = 1, 0
            while page_num < total_pages:
                season_json = self._download_json(season_url.format(season_id, show_id, compat_str(page_num + 1)),
                                                  video_id=show_id, headers=headers,
                                                  note='Downloading JSON metadata%s' % (' page %d' % page_num if page_num else ''))
                if page_num == 0:
                    total_pages = try_get(season_json, lambda x: x['meta']['totalPages'], int) or 1
                episodes_json = season_json['data']
                for episode in episodes_json:
                    video_id = episode['attributes']['path']
                    yield self.url_result(
                        'https://discoveryplus.in/videos/%s' % video_id,
                        ie=DiscoveryPlusIndiaIE.ie_key(), video_id=video_id)
                page_num += 1
    def _real_extract(self, url):
        show_name = re.match(self._VALID_URL, url).group('show_name')
        return self.playlist_result(self._entries(show_name), playlist_id=show_name)
@@ -9,6 +9,7 @@ from ..utils import (
    unified_strdate,
    compat_str,
    determine_ext,
    ExtractorError,
    update_url_query,
 )
@@ -139,7 +140,7 @@ class DisneyIE(InfoExtractor):
                'vcodec': 'none' if (width == 0 and height == 0) else None,
            })
        if not formats and video_data.get('expired'):
-            self.raise_no_formats(
+            raise ExtractorError(
                '%s said: %s' % (self.IE_NAME, page_data['translations']['video_expired']),
                expected=True)
        self._sort_formats(formats)
@@ -79,7 +79,7 @@ class ElonetIE(InfoExtractor):
        elif fmt == 'mpd':
            subs = self._parse_mpd_subtitles(doc)
        else:
-            self.report_warning(
+            self._downloader.report_warning(
                "Cannot download subtitles from '%s' streams." % (fmt))
            subs = {}
        return subs
@@ -80,7 +80,6 @@ from .arte import (
    ArteTVEmbedIE,
    ArteTVPlaylistIE,
 )
 from .arnes import ArnesIE
 from .asiancrush import (
    AsianCrushIE,
    AsianCrushPlaylistIE,
@@ -109,8 +108,7 @@ from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE
 from .bbc import (
    BBCCoUkIE,
    BBCCoUkArticleIE,
-    BBCCoUkIPlayerEpisodesIE,
+    BBCCoUkIPlayerPlaylistIE,
    BBCCoUkIPlayerGroupIE,
    BBCCoUkPlaylistIE,
    BBCIE,
 )
@@ -210,11 +208,7 @@ from .cbsnews import (
    CBSNewsIE,
    CBSNewsLiveVideoIE,
 )
-from .cbssports import (
+from .cbssports import CBSSportsIE
    CBSSportsEmbedIE,
    CBSSportsIE,
    TwentyFourSevenSportsIE,
 )
 from .ccc import (
    CCCIE,
    CCCPlaylistIE,
@@ -269,7 +263,6 @@ from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .commonprotocols import (
    MmsIE,
    RtmpIE,
    ViewSourceIE,
 )
 from .condenast import CondeNastIE
 from .contv import CONtvIE
@@ -313,10 +306,6 @@ from .democracynow import DemocracynowIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .digg import DiggIE
 from .discoveryplusindia import (
    DiscoveryPlusIndiaIE,
    DiscoveryPlusIndiaShowIE,
 )
 from .dotsub import DotsubIE
 from .douyutv import (
    DouyuShowIE,
@@ -461,7 +450,10 @@ from .gamestar import GameStarIE
 from .gaskrank import GaskrankIE
 from .gazeta import GazetaIE
 from .gdcvault import GDCVaultIE
-from .gedidigital import GediDigitalIE
+from .gedi import (
    GediIE,
    GediEmbedsIE,
 )
 from .generic import GenericIE
 from .gfycat import GfycatIE
 from .giantbomb import GiantBombIE
@@ -592,11 +584,7 @@ from .kuwo import (
    KuwoCategoryIE,
    KuwoMvIE,
 )
-from .la7 import (
+from .la7 import LA7IE
    LA7IE,
    LA7PodcastEpisodeIE,
    LA7PodcastIE,
 )
 from .laola1tv import (
    Laola1TvEmbedIE,
    Laola1TvIE,
@@ -637,11 +625,7 @@ from .limelight import (
    LimelightChannelIE,
    LimelightChannelListIE,
 )
-from .line import (
+from .line import LineTVIE
    LineTVIE,
    LineLiveIE,
    LineLiveChannelIE,
 )
 from .linkedin import (
    LinkedInLearningIE,
    LinkedInLearningCourseIE,
@@ -679,7 +663,6 @@ from .mangomolo import (
    MangomoloLiveIE,
 )
 from .manyvids import ManyVidsIE
 from .maoritv import MaoriTVIE
 from .markiza import (
    MarkizaIE,
    MarkizaPageIE,
@@ -728,10 +711,7 @@ from .mixcloud import (
    MixcloudUserIE,
    MixcloudPlaylistIE,
 )
-from .mlb import (
+from .mlb import MLBIE
    MLBIE,
    MLBVideoIE,
 )
 from .mnet import MnetIE
 from .moevideo import MoeVideoIE
 from .mofosex import (
@@ -755,8 +735,6 @@ from .mtv import (
    MTVServicesEmbeddedIE,
    MTVDEIE,
    MTVJapanIE,
    MTVItaliaIE,
    MTVItaliaProgrammaIE,
 )
 from .muenchentv import MuenchenTVIE
 from .mwave import MwaveIE, MwaveMeetGreetIE
@@ -803,9 +781,8 @@ from .ndr import (
    NJoyEmbedIE,
 )
 from .ndtv import NDTVIE
 from .nebula import NebulaIE
 from .nerdcubed import NerdCubedFeedIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .neteasemusic import (
    NetEaseMusicIE,
    NetEaseMusicAlbumIE,
@@ -830,7 +807,6 @@ from .nexx import (
    NexxIE,
    NexxEmbedIE,
 )
 from .nfhsnetwork import NFHSNetworkIE
 from .nfl import (
    NFLIE,
    NFLArticleIE,
@@ -847,7 +823,7 @@ from .nick import (
    NickNightIE,
    NickRuIE,
 )
-from .niconico import NiconicoIE, NiconicoPlaylistIE, NiconicoUserIE
+from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninecninemedia import NineCNineMediaIE
 from .ninegag import NineGagIE
 from .ninenow import NineNowIE
@@ -942,11 +918,6 @@ from .packtpub import (
    PacktPubIE,
    PacktPubCourseIE,
 )
 from .palcomp3 import (
    PalcoMP3IE,
    PalcoMP3ArtistIE,
    PalcoMP3VideoIE,
 )
 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
@@ -983,7 +954,6 @@ from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE
 from .playvid import PlayvidIE
 from .playwire import PlaywireIE
 from .plutotv import PlutoTVIE
 from .pluralsight import (
    PluralsightIE,
    PluralsightCourseIE,
@@ -1209,10 +1179,7 @@ from .spike import (
    BellatorIE,
    ParamountNetworkIE,
 )
-from .stitcher import (
+from .stitcher import StitcherIE
    StitcherIE,
    StitcherShowIE,
 )
 from .sport5 import Sport5IE
 from .sportbox import SportBoxIE
 from .sportdeutschland import SportDeutschlandIE
@@ -1340,10 +1307,7 @@ from .trovo import (
 from .trunews import TruNewsIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
-from .tubitv import (
+from .tubitv import TubiTvIE
    TubiTvIE,
    TubiTvShowIE,
 )
 from .tumblr import TumblrIE
 from .tunein import (
    TuneInClipIE,
@@ -1596,7 +1560,6 @@ from .weibo import (
    WeiboMobileIE
 )
 from .weiqitv import WeiqiTVIE
 from .wimtv import WimTVIE
 from .wistia import (
    WistiaIE,
    WistiaPlaylistIE,
@@ -1703,14 +1666,8 @@ from .zattoo import (
    ZattooLiveIE,
 )
 from .zdf import ZDFIE, ZDFChannelIE
 from .zee5 import (
    Zee5IE,
    Zee5SeriesIE,
 )
 from .zhihu import ZhihuIE
-from .zingmp3 import (
+from .zingmp3 import ZingMp3IE
-    ZingMp3IE,
+from .zee5 import Zee5IE
    ZingMp3AlbumIE,
 )
 from .zoom import ZoomIE
 from .zype import ZypeIE
@@ -348,7 +348,7 @@ class FacebookIE(InfoExtractor):
                    login_results, 'login error', default=None, group='error')
                if error:
                    raise ExtractorError('Unable to login: %s' % error, expected=True)
-                self.report_warning('unable to log in: bad username/password, or exceeded login rate limit (~3/min). Check credentials or wait.')
+                self._downloader.report_warning('unable to log in: bad username/password, or exceeded login rate limit (~3/min). Check credentials or wait.')
                return
            fb_dtsg = self._search_regex(
@@ -369,9 +369,9 @@ class FacebookIE(InfoExtractor):
            check_response = self._download_webpage(check_req, None,
                                                    note='Confirming login')
            if re.search(r'id="checkpointSubmitButton"', check_response) is not None:
-                self.report_warning('Unable to confirm login, you have to login in your browser and authorize the login.')
+                self._downloader.report_warning('Unable to confirm login, you have to login in your browser and authorize the login.')
        except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
-            self.report_warning('unable to log in: %s' % error_to_compat_str(err))
+            self._downloader.report_warning('unable to log in: %s' % error_to_compat_str(err))
            return
    def _real_initialize(self):
@@ -625,6 +625,8 @@ class FacebookIE(InfoExtractor):
            subtitles_src = f[0].get('subtitles_src')
            if subtitles_src:
                subtitles.setdefault('en', []).append({'url': subtitles_src})
        if not formats:
            raise ExtractorError('Cannot find video formats')
        process_formats(formats)
@@ -401,7 +401,7 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
            (r'player\.load[^;]+src:\s*["\']([^"\']+)',
             r'id-video=([^@]+@[^"]+)',
             r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"',
-             r'data-id=["\']([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'),
+             r'data-id="([^"]+)"'),
            webpage, 'video id')
        return self._make_url_result(video_id)
@@ -17,7 +17,7 @@ class FujiTVFODPlus7IE(InfoExtractor):
    def _real_extract(self, url):
        video_id = self._match_id(url)
        formats = self._extract_m3u8_formats(
-            self._BASE_URL + 'abr/pc_html5/%s.m3u8' % video_id, video_id, 'mp4')
+            self._BASE_URL + 'abr/pc_html5/%s.m3u8' % video_id, video_id)
        for f in formats:
            wh = self._BITRATE_MAP.get(f.get('tbr'))
            if wh:
@@ -0,0 +1,266 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import re
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
    base_url,
    url_basename,
    urljoin,
 )
 class GediBaseIE(InfoExtractor):
    @staticmethod
    def _clean_audio_fmts(formats):
        unique_formats = []
        for f in formats:
            if 'acodec' in f:
                unique_formats.append(f)
        formats[:] = unique_formats
    def _real_extract(self, url):
        video_id = self._match_id(url)
        webpage = self._download_webpage(url, video_id)
        player_data = re.findall(
            r'PlayerFactory\.setParam\(\'(?P<type>.+?)\',\s*\'(?P<name>.+?)\',\s*\'(?P<val>.+?)\'\);',
            webpage)
        formats = []
        audio_fmts = []
        hls_fmts = []
        http_fmts = []
        title = ''
        thumb = ''
        fmt_reg = r'(?P<t>video|audio)-(?P<p>rrtv|hls)-(?P<h>[\w\d]+)(?:-(?P<br>[\w\d]+))?$'
        br_reg = r'video-rrtv-(?P<br>\d+)-'
        for t, n, v in player_data:
            if t == 'format':
                m = re.match(fmt_reg, n)
                if m:
                    # audio formats
                    if m.group('t') == 'audio':
                        if m.group('p') == 'hls':
                            audio_fmts.extend(self._extract_m3u8_formats(
                                v, video_id, 'm4a', m3u8_id='hls', fatal=False))
                        elif m.group('p') == 'rrtv':
                            audio_fmts.append({
                                'format_id': 'mp3',
                                'url': v,
                                'tbr': 128,
                                'ext': 'mp3',
                                'vcodec': 'none',
                                'acodec': 'mp3',
                            })
                    # video formats
                    elif m.group('t') == 'video':
                        # hls manifest video
                        if m.group('p') == 'hls':
                            hls_fmts.extend(self._extract_m3u8_formats(
                                v, video_id, 'mp4', m3u8_id='hls', fatal=False))
                        # direct mp4 video
                        elif m.group('p') == 'rrtv':
                            if not m.group('br'):
                                mm = re.search(br_reg, v)
                            http_fmts.append({
                                'format_id': 'https-' + m.group('h'),
                                'protocol': 'https',
                                'url': v,
                                'tbr': int(m.group('br')) if m.group('br') else
                                (int(mm.group('br')) if mm.group('br') else 0),
                                'height': int(m.group('h'))
                            })
            elif t == 'param':
                if n == 'videotitle':
                    title = v
                if n == 'image_full_play':
                    thumb = v
        title = self._og_search_title(webpage) if title == '' else title
        # clean weird char
        title = compat_str(title).encode('utf8', 'replace').replace(b'\xc3\x82', b'').decode('utf8', 'replace')
        if audio_fmts:
            self._clean_audio_fmts(audio_fmts)
            self._sort_formats(audio_fmts)
        if hls_fmts:
            self._sort_formats(hls_fmts)
        if http_fmts:
            self._sort_formats(http_fmts)
        formats.extend(audio_fmts)
        formats.extend(hls_fmts)
        formats.extend(http_fmts)
        return {
            'id': video_id,
            'title': title,
            'description': self._html_search_meta('twitter:description', webpage),
            'thumbnail': thumb,
            'formats': formats,
        }
 class GediIE(GediBaseIE):
    _VALID_URL = r'''(?x)https?://video\.
                    (?:
                        (?:espresso\.)?repubblica
                        |lastampa
                        |huffingtonpost
                        |ilsecoloxix
                        |iltirreno
                        |messaggeroveneto
                        |ilpiccolo
                        |gazzettadimantova
                        |mattinopadova
                        |laprovinciapavese
                        |tribunatreviso
                        |nuovavenezia
                        |gazzettadimodena
                        |lanuovaferrara
                        |corrierealpi
                        |lasentinella
                    )
                    (?:\.gelocal)?\.it/(?!embed/).+?/(?P<id>[\d/]+)(?:\?|\&|$)'''
    _TESTS = [{
        'url': 'https://video.lastampa.it/politica/il-paradosso-delle-regionali-la-lega-vince-ma-sembra-aver-perso/121559/121683',
        'md5': '84658d7fb9e55a6e57ecc77b73137494',
        'info_dict': {
            'id': '121559/121683',
            'ext': 'mp4',
            'title': 'Il paradosso delle Regionali: ecco perché la Lega vince ma sembra aver perso',
            'description': 'md5:de7f4d6eaaaf36c153b599b10f8ce7ca',
            'thumbnail': r're:^https://www\.repstatic\.it/video/photo/.+?-thumb-social-play\.jpg$',
        },
    }, {
        'url': 'https://video.repubblica.it/motori/record-della-pista-a-spa-francorchamps-la-pagani-huayra-roadster-bc-stupisce/367415/367963',
        'md5': 'e763b94b7920799a0e0e23ffefa2d157',
        'info_dict': {
            'id': '367415/367963',
            'ext': 'mp4',
            'title': 'Record della pista a Spa Francorchamps, la Pagani Huayra Roadster BC stupisce',
            'description': 'md5:5deb503cefe734a3eb3f07ed74303920',
            'thumbnail': r're:^https://www\.repstatic\.it/video/photo/.+?-thumb-social-play\.jpg$',
        },
    }, {
        'url': 'https://video.ilsecoloxix.it/sport/cassani-e-i-brividi-azzurri-ai-mondiali-di-imola-qui-mi-sono-innamorato-del-ciclismo-da-ragazzino-incredibile-tornarci-da-ct/66184/66267',
        'md5': 'e48108e97b1af137d22a8469f2019057',
        'info_dict': {
            'id': '66184/66267',
            'ext': 'mp4',
            'title': 'Cassani e i brividi azzurri ai Mondiali di Imola: \\"Qui mi sono innamorato del ciclismo da ragazzino, incredibile tornarci da ct\\"',
            'description': 'md5:fc9c50894f70a2469bb9b54d3d0a3d3b',
            'thumbnail': r're:^https://www\.repstatic\.it/video/photo/.+?-thumb-social-play\.jpg$',
        },
    }, {
        'url': 'https://video.iltirreno.gelocal.it/sport/dentro-la-notizia-ferrari-cosa-succede-a-maranello/141059/142723',
        'md5': 'a6e39f3bdc1842bbd92abbbbef230817',
        'info_dict': {
            'id': '141059/142723',
            'ext': 'mp4',
            'title': 'Dentro la notizia - Ferrari, cosa succede a Maranello',
            'description': 'md5:9907d65b53765681fa3a0b3122617c1f',
            'thumbnail': r're:^https://www\.repstatic\.it/video/photo/.+?-thumb-social-play\.jpg$',
        },
    }]
 class GediEmbedsIE(GediBaseIE):
    _VALID_URL = r'''(?x)https?://video\.
                    (?:
                        (?:espresso\.)?repubblica
                        |lastampa
                        |huffingtonpost
                        |ilsecoloxix
                        |iltirreno
                        |messaggeroveneto
                        |ilpiccolo
                        |gazzettadimantova
                        |mattinopadova
                        |laprovinciapavese
                        |tribunatreviso
                        |nuovavenezia
                        |gazzettadimodena
                        |lanuovaferrara
                        |corrierealpi
                        |lasentinella
                    )
                    (?:\.gelocal)?\.it/embed/.+?/(?P<id>[\d/]+)(?:\?|\&|$)'''
    _TESTS = [{
        'url': 'https://video.huffingtonpost.it/embed/politica/cotticelli-non-so-cosa-mi-sia-successo-sto-cercando-di-capire-se-ho-avuto-un-malore/29312/29276?responsive=true&el=video971040871621586700',
        'md5': 'f4ac23cadfea7fef89bea536583fa7ed',
        'info_dict': {
            'id': '29312/29276',
            'ext': 'mp4',
            'title': 'Cotticelli: \\"Non so cosa mi sia successo. Sto cercando di capire se ho avuto un malore\\"',
            'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
            'thumbnail': r're:^https://www\.repstatic\.it/video/photo/.+?-thumb-social-play\.jpg$',
        },
    }, {
        'url': 'https://video.espresso.repubblica.it/embed/tutti-i-video/01-ted-villa/14772/14870&width=640&height=360',
        'md5': '0391c2c83c6506581003aaf0255889c0',
        'info_dict': {
            'id': '14772/14870',
            'ext': 'mp4',
            'title': 'Festival EMERGENCY, Villa: «La buona informazione aiuta la salute» (14772-14870)',
            'description': 'md5:2bce954d278248f3c950be355b7c2226',
            'thumbnail': r're:^https://www\.repstatic\.it/video/photo/.+?-thumb-social-play\.jpg$',
        },
    }]
    @staticmethod
    def _sanitize_urls(urls):
        # add protocol if missing
        for i, e in enumerate(urls):
            if e.startswith('//'):
                urls[i] = 'https:%s' % e
        # clean iframes urls
        for i, e in enumerate(urls):
            urls[i] = urljoin(base_url(e), url_basename(e))
        return urls
    @staticmethod
    def _extract_urls(webpage):
        entries = [
            mobj.group('url')
            for mobj in re.finditer(r'''(?x)
            (?:
                data-frame-src=|
                <iframe[^\n]+src=
            )
            (["'])
                (?P<url>https?://video\.
                    (?:
                        (?:espresso\.)?repubblica
                        |lastampa
                        |huffingtonpost
                        |ilsecoloxix
                        |iltirreno
                        |messaggeroveneto
                        |ilpiccolo
                        |gazzettadimantova
                        |mattinopadova
                        |laprovinciapavese
                        |tribunatreviso
                        |nuovavenezia
                        |gazzettadimodena
                        |lanuovaferrara
                        |corrierealpi
                        |lasentinella
                    )
                    (?:\.gelocal)?\.it/embed/.+?)
            \1''', webpage)]
        return GediEmbedsIE._sanitize_urls(entries)
    @staticmethod
    def _extract_url(webpage):
        urls = GediEmbedsIE._extract_urls(webpage)
        return urls[0] if urls else None
@@ -1,210 +0,0 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import re
 from .common import InfoExtractor
 from ..utils import (
    base_url,
    determine_ext,
    int_or_none,
    url_basename,
    urljoin,
 )
 class GediDigitalIE(InfoExtractor):
    _VALID_URL = r'''(?x)(?P<url>(?:https?:)//video\.
        (?:
            (?:
                (?:espresso\.)?repubblica
                |lastampa
                |ilsecoloxix
                |huffingtonpost
            )|
            (?:
                iltirreno
                |messaggeroveneto
                |ilpiccolo
                |gazzettadimantova
                |mattinopadova
                |laprovinciapavese
                |tribunatreviso
                |nuovavenezia
                |gazzettadimodena
                |lanuovaferrara
                |corrierealpi
                |lasentinella
            )\.gelocal
        )\.it(?:/[^/]+){2,4}/(?P<id>\d+))(?:$|[?&].*)'''
    _TESTS = [{
        'url': 'https://video.lastampa.it/politica/il-paradosso-delle-regionali-la-lega-vince-ma-sembra-aver-perso/121559/121683',
        'md5': '84658d7fb9e55a6e57ecc77b73137494',
        'info_dict': {
            'id': '121683',
            'ext': 'mp4',
            'title': 'Il paradosso delle Regionali: ecco perché la Lega vince ma sembra aver perso',
            'description': 'md5:de7f4d6eaaaf36c153b599b10f8ce7ca',
            'thumbnail': r're:^https://www\.repstatic\.it/video/photo/.+?-thumb-full-.+?\.jpg$',
            'duration': 125,
        },
    }, {
        'url': 'https://video.huffingtonpost.it/embed/politica/cotticelli-non-so-cosa-mi-sia-successo-sto-cercando-di-capire-se-ho-avuto-un-malore/29312/29276?responsive=true&el=video971040871621586700',
        'only_matching': True,
    }, {
        'url': 'https://video.espresso.repubblica.it/embed/tutti-i-video/01-ted-villa/14772/14870&width=640&height=360',
        'only_matching': True,
    }, {
        'url': 'https://video.repubblica.it/motori/record-della-pista-a-spa-francorchamps-la-pagani-huayra-roadster-bc-stupisce/367415/367963',
        'only_matching': True,
    }, {
        'url': 'https://video.ilsecoloxix.it/sport/cassani-e-i-brividi-azzurri-ai-mondiali-di-imola-qui-mi-sono-innamorato-del-ciclismo-da-ragazzino-incredibile-tornarci-da-ct/66184/66267',
        'only_matching': True,
    }, {
        'url': 'https://video.iltirreno.gelocal.it/sport/dentro-la-notizia-ferrari-cosa-succede-a-maranello/141059/142723',
        'only_matching': True,
    }, {
        'url': 'https://video.messaggeroveneto.gelocal.it/locale/maria-giovanna-elmi-covid-vaccino/138155/139268',
        'only_matching': True,
    }, {
        'url': 'https://video.ilpiccolo.gelocal.it/dossier/big-john/dinosauro-big-john-al-via-le-visite-guidate-a-trieste/135226/135751',
        'only_matching': True,
    }, {
        'url': 'https://video.gazzettadimantova.gelocal.it/locale/dal-ponte-visconteo-di-valeggio-l-and-8217sos-dei-ristoratori-aprire-anche-a-cena/137310/137818',
        'only_matching': True,
    }, {
        'url': 'https://video.mattinopadova.gelocal.it/dossier/coronavirus-in-veneto/covid-a-vo-un-anno-dopo-un-cuore-tricolore-per-non-dimenticare/138402/138964',
        'only_matching': True,
    }, {
        'url': 'https://video.laprovinciapavese.gelocal.it/locale/mede-zona-rossa-via-alle-vaccinazioni-per-gli-over-80/137545/138120',
        'only_matching': True,
    }, {
        'url': 'https://video.tribunatreviso.gelocal.it/dossier/coronavirus-in-veneto/ecco-le-prima-vaccinazioni-di-massa-nella-marca/134485/135024',
        'only_matching': True,
    }, {
        'url': 'https://video.nuovavenezia.gelocal.it/locale/camion-troppo-alto-per-il-ponte-ferroviario-perde-il-carico/135734/136266',
        'only_matching': True,
    }, {
        'url': 'https://video.gazzettadimodena.gelocal.it/locale/modena-scoperta-la-proteina-che-predice-il-livello-di-gravita-del-covid/139109/139796',
        'only_matching': True,
    }, {
        'url': 'https://video.lanuovaferrara.gelocal.it/locale/due-bombole-di-gpl-aperte-e-abbandonate-i-vigili-bruciano-il-gas/134391/134957',
        'only_matching': True,
    }, {
        'url': 'https://video.corrierealpi.gelocal.it/dossier/cortina-2021-i-mondiali-di-sci-alpino/mondiali-di-sci-il-timelapse-sulla-splendida-olympia/133760/134331',
        'only_matching': True,
    }, {
        'url': 'https://video.lasentinella.gelocal.it/locale/vestigne-centra-un-auto-e-si-ribalta/138931/139466',
        'only_matching': True,
    }, {
        'url': 'https://video.espresso.repubblica.it/tutti-i-video/01-ted-villa/14772',
        'only_matching': True,
    }]
    @staticmethod
    def _sanitize_urls(urls):
        # add protocol if missing
        for i, e in enumerate(urls):
            if e.startswith('//'):
                urls[i] = 'https:%s' % e
        # clean iframes urls
        for i, e in enumerate(urls):
            urls[i] = urljoin(base_url(e), url_basename(e))
        return urls
    @staticmethod
    def _extract_urls(webpage):
        entries = [
            mobj.group('eurl')
            for mobj in re.finditer(r'''(?x)
            (?:
                data-frame-src=|
                <iframe[^\n]+src=
            )
            (["'])(?P<eurl>%s)\1''' % GediDigitalIE._VALID_URL, webpage)]
        return GediDigitalIE._sanitize_urls(entries)
    @staticmethod
    def _extract_url(webpage):
        urls = GediDigitalIE._extract_urls(webpage)
        return urls[0] if urls else None
    @staticmethod
    def _clean_formats(formats):
        format_urls = set()
        clean_formats = []
        for f in formats:
            if f['url'] not in format_urls:
                if f.get('audio_ext') != 'none' and not f.get('acodec'):
                    continue
                format_urls.add(f['url'])
                clean_formats.append(f)
        formats[:] = clean_formats
    def _real_extract(self, url):
        video_id = self._match_id(url)
        url = re.match(self._VALID_URL, url).group('url')
        webpage = self._download_webpage(url, video_id)
        title = self._html_search_meta(
            ['twitter:title', 'og:title'], webpage, fatal=True)
        player_data = re.findall(
            r"PlayerFactory\.setParam\('(?P<type>format|param)',\s*'(?P<name>[^']+)',\s*'(?P<val>[^']+)'\);",
            webpage)
        formats = []
        duration = thumb = None
        for t, n, v in player_data:
            if t == 'format':
                if n in ('video-hds-vod-ec', 'video-hls-vod-ec', 'video-viralize', 'video-youtube-pfp'):
                    continue
                elif n.endswith('-vod-ak'):
                    formats.extend(self._extract_akamai_formats(
                        v, video_id, {'http': 'media.gedidigital.it'}))
                else:
                    ext = determine_ext(v)
                    if ext == 'm3u8':
                        formats.extend(self._extract_m3u8_formats(
                            v, video_id, 'mp4', 'm3u8_native', m3u8_id=n, fatal=False))
                        continue
                    f = {
                        'format_id': n,
                        'url': v,
                    }
                    if ext == 'mp3':
                        abr = int_or_none(self._search_regex(
                            r'-mp3-audio-(\d+)', v, 'abr', default=None))
                        f.update({
                            'abr': abr,
                            'tbr': abr,
                            'acodec': ext,
                            'vcodec': 'none'
                        })
                    else:
                        mobj = re.match(r'^video-rrtv-(\d+)(?:-(\d+))?$', n)
                        if mobj:
                            f.update({
                                'height': int(mobj.group(1)),
                                'vbr': int_or_none(mobj.group(2)),
                            })
                        if not f.get('vbr'):
                            f['vbr'] = int_or_none(self._search_regex(
                                r'-video-rrtv-(\d+)', v, 'abr', default=None))
                    formats.append(f)
            elif t == 'param':
                if n in ['image_full', 'image']:
                    thumb = v
                elif n == 'videoDuration':
                    duration = int_or_none(v)
        self._clean_formats(formats)
        self._sort_formats(formats)
        return {
            'id': video_id,
            'title': title,
            'description': self._html_search_meta(
                ['twitter:description', 'og:description', 'description'], webpage),
            'thumbnail': thumb or self._og_search_thumbnail(webpage),
            'formats': formats,
            'duration': duration,
        }
@@ -127,14 +127,13 @@ from .expressen import ExpressenIE
 from .zype import ZypeIE
 from .odnoklassniki import OdnoklassnikiIE
 from .kinja import KinjaEmbedIE
-from .gedidigital import GediDigitalIE
+from .gedi import GediEmbedsIE
 from .rcs import RCSEmbedsIE
 from .bitchute import BitChuteIE
 from .rumble import RumbleEmbedIE
 from .arcpublishing import ArcPublishingIE
 from .medialaan import MedialaanIE
 from .simplecast import SimplecastIE
 from .wimtv import WimTVIE
 class GenericIE(InfoExtractor):
@@ -2251,15 +2250,6 @@ class GenericIE(InfoExtractor):
            },
            'playlist_mincount': 52,
        },
        {
            # WimTv embed player
            'url': 'http://www.msmotor.tv/wearefmi-pt-2-2021/',
            'info_dict': {
                'id': 'wearefmi-pt-2-2021',
                'title': '#WEAREFMI – PT.2 – 2021 – MsMotorTV',
            },
            'playlist_count': 1,
        },
    ]
    def report_following_redirect(self, new_url):
@@ -2376,7 +2366,7 @@ class GenericIE(InfoExtractor):
            if default_search in ('auto', 'auto_warning', 'fixup_error'):
                if re.match(r'^[^\s/]+\.[^\s/]+/', url):
-                    self.report_warning('The url doesn\'t specify the protocol, trying with http')
+                    self._downloader.report_warning('The url doesn\'t specify the protocol, trying with http')
                    return self.url_result('http://' + url)
                elif default_search != 'fixup_error':
                    if default_search == 'auto_warning':
@@ -2385,7 +2375,7 @@ class GenericIE(InfoExtractor):
                                'Invalid URL:  %r . Call yt-dlp like this:  yt-dlp -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
                                expected=True)
                        else:
-                            self.report_warning(
+                            self._downloader.report_warning(
                                'Falling back to youtube search for  %s . Set --default-search "auto" to suppress this warning.' % url)
                    return self.url_result('ytsearch:' + url)
@@ -2461,7 +2451,7 @@ class GenericIE(InfoExtractor):
        if not self._downloader.params.get('test', False) and not is_intentional:
            force = self._downloader.params.get('force_generic_extractor', False)
-            self.report_warning(
+            self._downloader.report_warning(
                '%s on generic information extractor.' % ('Forcing' if force else 'Falling back'))
        if not full_response:
@@ -2488,7 +2478,7 @@ class GenericIE(InfoExtractor):
        # Maybe it's a direct link to a video?
        # Be careful not to download the whole thing!
        if not is_html(first_bytes):
-            self.report_warning(
+            self._downloader.report_warning(
                'URL could be a direct video link, returning it as such.')
            info_dict.update({
                'direct': True,
@@ -2659,15 +2649,6 @@ class GenericIE(InfoExtractor):
        if vid_me_embed_url is not None:
            return self.url_result(vid_me_embed_url, 'Vidme')
        # Invidious Instances
        # https://github.com/yt-dlp/yt-dlp/issues/195
        # https://github.com/iv-org/invidious/pull/1730
        youtube_url = self._search_regex(
            r'<link rel="alternate" href="(https://www\.youtube\.com/watch\?v=[0-9A-Za-z_-]{11})"',
            webpage, 'youtube link', default=None)
        if youtube_url:
            return self.url_result(youtube_url, YoutubeIE.ie_key())
        # Look for YouTube embeds
        youtube_urls = YoutubeIE._extract_urls(webpage)
        if youtube_urls:
@@ -2974,7 +2955,7 @@ class GenericIE(InfoExtractor):
            webpage)
        if not mobj:
            mobj = re.search(
-                r'data-video-link=["\'](?P<url>http://m\.mlb\.com/video/[^"\']+)',
+                r'data-video-link=["\'](?P<url>http://m.mlb.com/video/[^"\']+)',
                webpage)
        if mobj is not None:
            return self.url_result(mobj.group('url'), 'MLB')
@@ -3358,22 +3339,17 @@ class GenericIE(InfoExtractor):
            return self.playlist_from_matches(
                zype_urls, video_id, video_title, ie=ZypeIE.ie_key())
-        gedi_urls = GediDigitalIE._extract_urls(webpage)
+        # Look for RCS media group embeds
        gedi_urls = GediEmbedsIE._extract_urls(webpage)
        if gedi_urls:
            return self.playlist_from_matches(
-                gedi_urls, video_id, video_title, ie=GediDigitalIE.ie_key())
+                gedi_urls, video_id, video_title, ie=GediEmbedsIE.ie_key())
        # Look for RCS media group embeds
        rcs_urls = RCSEmbedsIE._extract_urls(webpage)
        if rcs_urls:
            return self.playlist_from_matches(
                rcs_urls, video_id, video_title, ie=RCSEmbedsIE.ie_key())
        wimtv_urls = WimTVIE._extract_urls(webpage)
        if wimtv_urls:
            return self.playlist_from_matches(
                wimtv_urls, video_id, video_title, ie=WimTVIE.ie_key())
        bitchute_urls = BitChuteIE._extract_urls(webpage)
        if bitchute_urls:
            return self.playlist_from_matches(
@@ -4,14 +4,10 @@ from __future__ import unicode_literals
 import re
 from .adobepass import AdobePassIE
 from ..compat import compat_str
 from ..utils import (
    int_or_none,
    determine_ext,
    parse_age_limit,
    remove_start,
    remove_end,
    try_get,
    urlencode_postdata,
    ExtractorError,
 )
@@ -50,15 +46,15 @@ class GoIE(AdobePassIE):
    }
    _VALID_URL = r'''(?x)
                    https?://
-                        (?P<sub_domain>
+                        (?:
-                            (?:%s\.)?go|fxnow\.fxnetworks|
+                            (?:(?P<sub_domain>%s)\.)?go|
-                            (?:www\.)?(?:abc|freeform|disneynow)
+                            (?P<sub_domain_2>abc|freeform|disneynow|fxnow\.fxnetworks)
                        )\.com/
                        (?:
                            (?:[^/]+/)*(?P<id>[Vv][Dd][Kk][Aa]\w+)|
                            (?:[^/]+/)*(?P<display_id>[^/?\#]+)
                        )
-                    ''' % r'\.|'.join(list(_SITE_INFO.keys()))
+                    ''' % '|'.join(list(_SITE_INFO.keys()))
    _TESTS = [{
        'url': 'http://abc.go.com/shows/designated-survivor/video/most-recent/VDKA3807643',
        'info_dict': {
@@ -120,18 +116,6 @@ class GoIE(AdobePassIE):
            # m3u8 download
            'skip_download': True,
        },
    }, {
        'url': 'https://abc.com/shows/modern-family/episode-guide/season-01/101-pilot',
        'info_dict': {
            'id': 'VDKA22600213',
            'ext': 'mp4',
            'title': 'Pilot',
            'description': 'md5:74306df917cfc199d76d061d66bebdb4',
        },
        'params': {
            # m3u8 download
            'skip_download': True,
        },
    }, {
        'url': 'http://abc.go.com/shows/the-catch/episode-guide/season-01/10-the-wedding',
        'only_matching': True,
@@ -149,9 +133,6 @@ class GoIE(AdobePassIE):
    }, {
        'url': 'https://disneynow.com/shows/minnies-bow-toons/video/happy-campers/vdka4872013',
        'only_matching': True,
    }, {
        'url': 'https://www.freeform.com/shows/cruel-summer/episode-guide/season-01/01-happy-birthday-jeanette-turner',
        'only_matching': True,
    }]
    def _extract_videos(self, brand, video_id='-1', show_id='-1'):
@@ -162,36 +143,24 @@ class GoIE(AdobePassIE):
    def _real_extract(self, url):
        mobj = re.match(self._VALID_URL, url)
-        sub_domain = remove_start(remove_end(mobj.group('sub_domain') or '', '.go'), 'www.')
+        sub_domain = mobj.group('sub_domain') or mobj.group('sub_domain_2')
        video_id, display_id = mobj.group('id', 'display_id')
        site_info = self._SITE_INFO.get(sub_domain, {})
        brand = site_info.get('brand')
        if not video_id or not site_info:
            webpage = self._download_webpage(url, display_id or video_id)
-            data = self._parse_json(
+            video_id = self._search_regex(
-                self._search_regex(
+                (
-                    r'["\']__abc_com__["\']\s*\]\s*=\s*({.+?})\s*;', webpage,
+                    # There may be inner quotes, e.g. data-video-id="'VDKA3609139'"
-                    'data', default='{}'),
+                    # from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood
-                display_id or video_id, fatal=False)
+                    r'data-video-id=["\']*(VDKA\w+)',
-            # https://abc.com/shows/modern-family/episode-guide/season-01/101-pilot
+                    # https://github.com/ytdl-org/youtube-dl/pull/25216/files
-            layout = try_get(data, lambda x: x['page']['content']['video']['layout'], dict)
+                    #  The following is based on the pull request on the line above. Changed the ABC.com URL to a show available now.
-            video_id = None
+                    # https://abc.com/shows/the-rookie/episode-guide/season-02/19-the-q-word
-            if layout:
+                    r'\bvideoIdCode["\']\s*:\s*["\'](vdka\w+)',
-                video_id = try_get(
+                    # Deprecated  fallback pattern
-                    layout,
+                    r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)'
-                    (lambda x: x['videoid'], lambda x: x['video']['id']),
+                ), webpage, 'video id', default=video_id)
                    compat_str)
            if not video_id:
                video_id = self._search_regex(
                    (
                        # There may be inner quotes, e.g. data-video-id="'VDKA3609139'"
                        # from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood
                        r'data-video-id=["\']*(VDKA\w+)',
                        # page.analytics.videoIdCode
                        r'\bvideoIdCode["\']\s*:\s*["\']((?:vdka|VDKA)\w+)',
                        # https://abc.com/shows/the-rookie/episode-guide/season-02/03-the-bet
                        r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)'
                    ), webpage, 'video id', default=video_id)
            if not site_info:
                brand = self._search_regex(
                    (r'data-brand=\s*["\']\s*(\d+)',
@@ -253,7 +253,7 @@ class GoogleDriveIE(InfoExtractor):
                            or 'unable to extract confirmation code')
        if not formats and reason:
-            self.raise_no_formats(reason, expected=True)
+            raise ExtractorError(reason, expected=True)
        self._sort_formats(formats)
@@ -184,7 +184,7 @@ class HotStarIE(HotStarBaseIE):
                    geo_restricted = True
                continue
        if not formats and geo_restricted:
-            self.raise_geo_restricted(countries=['IN'], metadata_available=True)
+            self.raise_geo_restricted(countries=['IN'])
        self._sort_formats(formats)
        for f in formats:
@@ -12,7 +12,6 @@ from ..compat import (
 )
 from ..utils import (
    ExtractorError,
    float_or_none,
    get_element_by_attribute,
    int_or_none,
    lowercase_escape,
@@ -33,7 +32,6 @@ class InstagramIE(InfoExtractor):
            'title': 'Video by naomipq',
            'description': 'md5:1f17f0ab29bd6fe2bfad705f58de3cb8',
            'thumbnail': r're:^https?://.*\.jpg',
            'duration': 0,
            'timestamp': 1371748545,
            'upload_date': '20130620',
            'uploader_id': 'naomipq',
@@ -50,7 +48,6 @@ class InstagramIE(InfoExtractor):
            'ext': 'mp4',
            'title': 'Video by britneyspears',
            'thumbnail': r're:^https?://.*\.jpg',
            'duration': 0,
            'timestamp': 1453760977,
            'upload_date': '20160125',
            'uploader_id': 'britneyspears',
@@ -89,24 +86,6 @@ class InstagramIE(InfoExtractor):
            'title': 'Post by instagram',
            'description': 'md5:0f9203fc6a2ce4d228da5754bcf54957',
        },
    }, {
        # IGTV
        'url': 'https://www.instagram.com/tv/BkfuX9UB-eK/',
        'info_dict': {
            'id': 'BkfuX9UB-eK',
            'ext': 'mp4',
            'title': 'Fingerboarding Tricks with @cass.fb',
            'thumbnail': r're:^https?://.*\.jpg',
            'duration': 53.83,
            'timestamp': 1530032919,
            'upload_date': '20180626',
            'uploader_id': 'instagram',
            'uploader': 'Instagram',
            'like_count': int,
            'comment_count': int,
            'comments': list,
            'description': 'Meet Cass Hirst (@cass.fb), a fingerboarding pro who can perform tiny ollies and kickflips while blindfolded.',
        }
    }, {
        'url': 'https://instagram.com/p/-Cmh1cukG2/',
        'only_matching': True,
@@ -180,9 +159,7 @@ class InstagramIE(InfoExtractor):
            description = try_get(
                media, lambda x: x['edge_media_to_caption']['edges'][0]['node']['text'],
                compat_str) or media.get('caption')
            title = media.get('title')
            thumbnail = media.get('display_src') or media.get('display_url')
            duration = float_or_none(media.get('video_duration'))
            timestamp = int_or_none(media.get('taken_at_timestamp') or media.get('date'))
            uploader = media.get('owner', {}).get('full_name')
            uploader_id = media.get('owner', {}).get('username')
@@ -223,10 +200,9 @@ class InstagramIE(InfoExtractor):
                            continue
                        entries.append({
                            'id': node.get('shortcode') or node['id'],
-                            'title': node.get('title') or 'Video %d' % edge_num,
+                            'title': 'Video %d' % edge_num,
                            'url': node_video_url,
                            'thumbnail': node.get('display_url'),
                            'duration': float_or_none(node.get('video_duration')),
                            'width': int_or_none(try_get(node, lambda x: x['dimensions']['width'])),
                            'height': int_or_none(try_get(node, lambda x: x['dimensions']['height'])),
                            'view_count': int_or_none(node.get('video_view_count')),
@@ -263,9 +239,8 @@ class InstagramIE(InfoExtractor):
            'id': video_id,
            'formats': formats,
            'ext': 'mp4',
-            'title': title or 'Video by %s' % uploader_id,
+            'title': 'Video by %s' % uploader_id,
            'description': description,
            'duration': duration,
            'thumbnail': thumbnail,
            'timestamp': timestamp,
            'uploader_id': uploader_id,
@@ -136,7 +136,7 @@ class IPrimaIE(InfoExtractor):
                extract_formats(src)
        if not formats and '>GEO_IP_NOT_ALLOWED<' in playerpage:
-            self.raise_geo_restricted(countries=['CZ'], metadata_available=True)
+            self.raise_geo_restricted(countries=['CZ'])
        self._sort_formats(formats)
@@ -280,7 +280,7 @@ class IqiyiIE(InfoExtractor):
                msg = 'error %s' % code
                if validation_result.get('msg'):
                    msg += ': ' + validation_result['msg']
-            self.report_warning('unable to log in: ' + msg)
+            self._downloader.report_warning('unable to log in: ' + msg)
            return False
        return True
@@ -146,7 +146,7 @@ class IviIE(InfoExtractor):
                        expected=True)
                elif not pycryptodomex_found:
                    raise ExtractorError(
-                        'pycryptodomex not found. Please install',
+                        'pycryptodomex not found. Please install it.',
                        expected=True)
                elif message:
                    extractor_msg += ': ' + message
@@ -29,51 +29,34 @@ class JamendoIE(InfoExtractor):
            'id': '196219',
            'display_id': 'stories-from-emona-i',
            'ext': 'flac',
-            # 'title': 'Maya Filipič - Stories from Emona I',
+            'title': 'Maya Filipič - Stories from Emona I',
-            'title': 'Stories from Emona I',
+            'artist': 'Maya Filipič',
            # 'artist': 'Maya Filipič',
            'track': 'Stories from Emona I',
            'duration': 210,
            'thumbnail': r're:^https?://.*\.jpg',
            'timestamp': 1217438117,
            'upload_date': '20080730',
            'license': 'by-nc-nd',
            'view_count': int,
            'like_count': int,
            'average_rating': int,
            'tags': ['piano', 'peaceful', 'newage', 'strings', 'upbeat'],
        }
    }, {
        'url': 'https://licensing.jamendo.com/en/track/1496667/energetic-rock',
        'only_matching': True,
    }]
    def _call_api(self, resource, resource_id):
        path = '/api/%ss' % resource
        rand = compat_str(random.random())
        return self._download_json(
            'https://www.jamendo.com' + path, resource_id, query={
                'id[]': resource_id,
            }, headers={
                'X-Jam-Call': '$%s*%s~' % (hashlib.sha1((path + rand).encode()).hexdigest(), rand)
            })[0]
    def _real_extract(self, url):
        track_id, display_id = self._VALID_URL_RE.match(url).groups()
-        # webpage = self._download_webpage(
+        webpage = self._download_webpage(
-        #     'https://www.jamendo.com/track/' + track_id, track_id)
+            'https://www.jamendo.com/track/' + track_id, track_id)
-        # models = self._parse_json(self._html_search_regex(
+        models = self._parse_json(self._html_search_regex(
-        #     r"data-bundled-models='([^']+)",
+            r"data-bundled-models='([^']+)",
-        #     webpage, 'bundled models'), track_id)
+            webpage, 'bundled models'), track_id)
-        # track = models['track']['models'][0]
+        track = models['track']['models'][0]
        track = self._call_api('track', track_id)
        title = track_name = track['name']
-        # get_model = lambda x: try_get(models, lambda y: y[x]['models'][0], dict) or {}
+        get_model = lambda x: try_get(models, lambda y: y[x]['models'][0], dict) or {}
-        # artist = get_model('artist')
+        artist = get_model('artist')
-        # artist_name = artist.get('name')
+        artist_name = artist.get('name')
-        # if artist_name:
+        if artist_name:
-        #     title = '%s - %s' % (artist_name, title)
+            title = '%s - %s' % (artist_name, title)
-        # album = get_model('album')
+        album = get_model('album')
        formats = [{
            'url': 'https://%s.jamendo.com/?trackid=%s&format=%s&from=app-97dab294'
@@ -91,7 +74,7 @@ class JamendoIE(InfoExtractor):
        urls = []
        thumbnails = []
-        for covers in (track.get('cover') or {}).values():
+        for _, covers in track.get('cover', {}).items():
            for cover_id, cover_url in covers.items():
                if not cover_url or cover_url in urls:
                    continue
@@ -105,14 +88,13 @@ class JamendoIE(InfoExtractor):
                })
        tags = []
-        for tag in (track.get('tags') or []):
+        for tag in track.get('tags', []):
            tag_name = tag.get('name')
            if not tag_name:
                continue
            tags.append(tag_name)
        stats = track.get('stats') or {}
        license = track.get('licenseCC') or []
        return {
            'id': track_id,
@@ -121,11 +103,11 @@ class JamendoIE(InfoExtractor):
            'title': title,
            'description': track.get('description'),
            'duration': int_or_none(track.get('duration')),
-            # 'artist': artist_name,
+            'artist': artist_name,
            'track': track_name,
-            # 'album': album.get('name'),
+            'album': album.get('name'),
            'formats': formats,
-            'license': '-'.join(license) if license else None,
+            'license': '-'.join(track.get('licenseCC', [])) or None,
            'timestamp': int_or_none(track.get('dateCreated')),
            'view_count': int_or_none(stats.get('listenedAll')),
            'like_count': int_or_none(stats.get('favorited')),
@@ -134,9 +116,9 @@ class JamendoIE(InfoExtractor):
        }
-class JamendoAlbumIE(JamendoIE):
+class JamendoAlbumIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?jamendo\.com/album/(?P<id>[0-9]+)'
-    _TESTS = [{
+    _TEST = {
        'url': 'https://www.jamendo.com/album/121486/duck-on-cover',
        'info_dict': {
            'id': '121486',
@@ -169,7 +151,17 @@ class JamendoAlbumIE(JamendoIE):
        'params': {
            'playlistend': 2
        }
-    }]
+    }
    def _call_api(self, resource, resource_id):
        path = '/api/%ss' % resource
        rand = compat_str(random.random())
        return self._download_json(
            'https://www.jamendo.com' + path, resource_id, query={
                'id[]': resource_id,
            }, headers={
                'X-Jam-Call': '$%s*%s~' % (hashlib.sha1((path + rand).encode()).hexdigest(), rand)
            })[0]
    def _real_extract(self, url):
        album_id = self._match_id(url)
@@ -177,7 +169,7 @@ class JamendoAlbumIE(JamendoIE):
        album_name = album.get('name')
        entries = []
-        for track in (album.get('tracks') or []):
+        for track in album.get('tracks', []):
            track_id = track.get('id')
            if not track_id:
                continue
@@ -101,7 +101,7 @@ class KeezMoviesIE(InfoExtractor):
        if not formats:
            if 'title="This video is no longer available"' in webpage:
-                self.raise_no_formats(
+                raise ExtractorError(
                    'Video %s is no longer available' % video_id, expected=True)
        try:
@@ -1,15 +1,9 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import re
 from .common import InfoExtractor
 from ..utils import (
    determine_ext,
    float_or_none,
    parse_duration,
    smuggle_url,
    unified_strdate,
 )
@@ -63,141 +57,3 @@ class LA7IE(InfoExtractor):
            'thumbnail': self._og_search_thumbnail(webpage, default=None),
            'ie_key': 'Kaltura',
        }
 class LA7PodcastEpisodeIE(InfoExtractor):
    IE_NAME = 'la7.it:pod:episode'
    _VALID_URL = r'''(?x)(https?://)?
        (?:www\.)?la7\.it/[^/]+/podcast/([^/]+-)?(?P<id>\d+)'''
    _TESTS = [{
        'url': 'https://www.la7.it/voicetown/podcast/la-carezza-delle-memoria-di-carlo-verdone-23-03-2021-371497',
        'md5': '7737d4d79b3c1a34b3de3e16297119ed',
        'info_dict': {
            'id': '371497',
            'ext': 'mp3',
            'title': '"La carezza delle memoria" di Carlo Verdone',
            'description': 'md5:5abf07c3c551a687db80af3f9ceb7d52',
            'thumbnail': 'https://www.la7.it/sites/default/files/podcast/371497.jpg',
            'upload_date': '20210323',
        },
    }, {
        # embed url
        'url': 'https://www.la7.it/embed/podcast/371497',
        'only_matching': True,
    }, {
        # date already in the title
        'url': 'https://www.la7.it/propagandalive/podcast/lintervista-di-diego-bianchi-ad-annalisa-cuzzocrea-puntata-del-1932021-20-03-2021-371130',
        'only_matching': True,
    }, {
        # title same as show_title
        'url': 'https://www.la7.it/otto-e-mezzo/podcast/otto-e-mezzo-26-03-2021-372340',
        'only_matching': True,
    }]
    def _extract_info(self, webpage, video_id=None, ppn=None):
        if not video_id:
            video_id = self._search_regex(
                r'data-nid=([\'"])(?P<vid>\d+)\1',
                webpage, 'video_id', group='vid')
        media_url = self._search_regex(
            (r'src:\s*([\'"])(?P<url>.+?mp3.+?)\1',
             r'data-podcast=([\'"])(?P<url>.+?mp3.+?)\1'),
            webpage, 'media_url', group='url')
        ext = determine_ext(media_url)
        formats = [{
            'url': media_url,
            'format_id': ext,
            'ext': ext,
        }]
        self._sort_formats(formats)
        title = self._html_search_regex(
            (r'<div class="title">(?P<title>.+?)</',
             r'<title>(?P<title>[^<]+)</title>',
             r'title:\s*([\'"])(?P<title>.+?)\1'),
            webpage, 'title', group='title')
        description = (
            self._html_search_regex(
                (r'<div class="description">(.+?)</div>',
                 r'<div class="description-mobile">(.+?)</div>',
                 r'<div class="box-txt">([^<]+?)</div>',
                 r'<div class="field-content"><p>(.+?)</p></div>'),
                webpage, 'description', default=None)
            or self._html_search_meta('description', webpage))
        thumb = self._html_search_regex(
            (r'<div class="podcast-image"><img src="(.+?)"></div>',
             r'<div class="container-embed"[^<]+url\((.+?)\);">',
             r'<div class="field-content"><img src="(.+?)"'),
            webpage, 'thumbnail', fatal=False, default=None)
        duration = parse_duration(self._html_search_regex(
            r'<span class="(?:durata|duration)">([\d:]+)</span>',
            webpage, 'duration', fatal=False, default=None))
        date = self._html_search_regex(
            r'class="data">\s*(?:<span>)?([\d\.]+)\s*</',
            webpage, 'date', default=None)
        date_alt = self._search_regex(
            r'(\d+[\./]\d+[\./]\d+)', title, 'date_alt', default=None)
        ppn = ppn or self._search_regex(
            r'ppN:\s*([\'"])(?P<ppn>.+?)\1',
            webpage, 'ppn', group='ppn', default=None)
        # if the date is not in the title
        # and title is the same as the show_title
        # add the date to the title
        if date and not date_alt and ppn and ppn.lower() == title.lower():
            title += ' del %s' % date
        return {
            'id': video_id,
            'title': title,
            'description': description,
            'duration': float_or_none(duration),
            'formats': formats,
            'thumbnail': thumb,
            'upload_date': unified_strdate(date),
        }
    def _real_extract(self, url):
        video_id = self._match_id(url)
        webpage = self._download_webpage(url, video_id)
        return self._extract_info(webpage, video_id)
 class LA7PodcastIE(LA7PodcastEpisodeIE):
    IE_NAME = 'la7.it:podcast'
    _VALID_URL = r'(https?://)?(www\.)?la7\.it/(?P<id>[^/]+)/podcast/?(?:$|[#?])'
    _TESTS = [{
        'url': 'https://www.la7.it/propagandalive/podcast',
        'info_dict': {
            'id': 'propagandalive',
            'title': "Propaganda Live",
        },
        'playlist_count': 10,
    }]
    def _real_extract(self, url):
        playlist_id = self._match_id(url)
        webpage = self._download_webpage(url, playlist_id)
        title = (
            self._html_search_regex(
                r'<h1.*?>(.+?)</h1>', webpage, 'title', fatal=False, default=None)
            or self._og_search_title(webpage))
        ppn = self._search_regex(
            r'window\.ppN\s*=\s*([\'"])(?P<ppn>.+?)\1',
            webpage, 'ppn', group='ppn', default=None)
        entries = []
        for episode in re.finditer(
                r'<div class="container-podcast-property">([\s\S]+?)(?:</div>\s*){3}',
                webpage):
            entries.append(self._extract_info(episode.group(1), ppn=ppn))
        return self.playlist_result(entries, playlist_id, title)
@@ -6,10 +6,8 @@ import json
 from .common import InfoExtractor
 from ..compat import (
    compat_parse_qs,
    compat_str,
    compat_urllib_parse_unquote,
    compat_urllib_parse_urlparse,
 )
 from ..utils import (
    determine_ext,
@@ -23,9 +21,9 @@ from ..utils import (
 class LBRYBaseIE(InfoExtractor):
-    _BASE_URL_REGEX = r'(?:https?://(?:www\.)?(?:lbry\.tv|odysee\.com)/|lbry://)'
+    _BASE_URL_REGEX = r'https?://(?:www\.)?(?:lbry\.tv|odysee\.com)/'
    _CLAIM_ID_REGEX = r'[0-9a-f]{1,40}'
-    _OPT_CLAIM_ID = '[^:/?#&]+(?:[:#]%s)?' % _CLAIM_ID_REGEX
+    _OPT_CLAIM_ID = '[^:/?#&]+(?::%s)?' % _CLAIM_ID_REGEX
    _SUPPORTED_STREAM_TYPES = ['video', 'audio']
    def _call_api_proxy(self, method, display_id, params, resource):
@@ -43,9 +41,7 @@ class LBRYBaseIE(InfoExtractor):
            'resolve', display_id, {'urls': url}, resource)[url]
    def _permanent_url(self, url, claim_name, claim_id):
-        return urljoin(
+        return urljoin(url, '/%s:%s' % (claim_name, claim_id))
            url.replace('lbry://', 'https://lbry.tv/'),
            '/%s:%s' % (claim_name, claim_id))
    def _parse_stream(self, stream, url):
        stream_value = stream.get('value') or {}
@@ -64,7 +60,6 @@ class LBRYBaseIE(InfoExtractor):
            'description': stream_value.get('description'),
            'license': stream_value.get('license'),
            'timestamp': int_or_none(stream.get('timestamp')),
            'release_timestamp': int_or_none(stream_value.get('release_time')),
            'tags': stream_value.get('tags'),
            'duration': int_or_none(media.get('duration')),
            'channel': try_get(signing_channel, lambda x: x['value']['title']),
@@ -97,8 +92,6 @@ class LBRYIE(LBRYBaseIE):
            'description': 'md5:f6cb5c704b332d37f5119313c2c98f51',
            'timestamp': 1595694354,
            'upload_date': '20200725',
            'release_timestamp': 1595340697,
            'release_date': '20200721',
            'width': 1280,
            'height': 720,
        }
@@ -113,8 +106,6 @@ class LBRYIE(LBRYBaseIE):
            'description': 'md5:661ac4f1db09f31728931d7b88807a61',
            'timestamp': 1591312601,
            'upload_date': '20200604',
            'release_timestamp': 1591312421,
            'release_date': '20200604',
            'tags': list,
            'duration': 2570,
            'channel': 'The LBRY Foundation',
@@ -122,26 +113,6 @@ class LBRYIE(LBRYBaseIE):
            'channel_url': 'https://lbry.tv/@LBRYFoundation:0ed629d2b9c601300cacf7eabe9da0be79010212',
            'vcodec': 'none',
        }
    }, {
        # HLS
        'url': 'https://odysee.com/@gardeningincanada:b/plants-i-will-never-grow-again.-the:e',
        'md5': 'fc82f45ea54915b1495dd7cb5cc1289f',
        'info_dict': {
            'id': 'e51671357333fe22ae88aad320bde2f6f96b1410',
            'ext': 'mp4',
            'title': 'PLANTS I WILL NEVER GROW AGAIN. THE BLACK LIST PLANTS FOR A CANADIAN GARDEN | Gardening in Canada 🍁',
            'description': 'md5:9c539c6a03fb843956de61a4d5288d5e',
            'timestamp': 1618254123,
            'upload_date': '20210412',
            'release_timestamp': 1618254002,
            'release_date': '20210412',
            'tags': list,
            'duration': 554,
            'channel': 'Gardening In Canada',
            'channel_id': 'b8be0e93b423dad221abe29545fbe8ec36e806bc',
            'channel_url': 'https://odysee.com/@gardeningincanada:b8be0e93b423dad221abe29545fbe8ec36e806bc',
            'formats': 'mincount:3',
        }
    }, {
        'url': 'https://odysee.com/@BrodieRobertson:5/apple-is-tracking-everything-you-do-on:e',
        'only_matching': True,
@@ -166,9 +137,6 @@ class LBRYIE(LBRYBaseIE):
    }, {
        'url': 'https://lbry.tv/@lacajadepandora:a/TRUMP-EST%C3%81-BIEN-PUESTO-con-Pilar-Baselga,-Carlos-Senra,-Luis-Palacios-(720p_30fps_H264-192kbit_AAC):1',
        'only_matching': True,
    }, {
        'url': 'lbry://@lbry#3f/odysee#7',
        'only_matching': True,
    }]
    def _real_extract(self, url):
@@ -188,25 +156,17 @@ class LBRYIE(LBRYBaseIE):
        streaming_url = self._call_api_proxy(
            'get', claim_id, {'uri': uri}, 'streaming url')['streaming_url']
        info = self._parse_stream(result, url)
        urlh = self._request_webpage(
            streaming_url, display_id, note='Downloading streaming redirect url info')
        if determine_ext(urlh.geturl()) == 'm3u8':
            info['formats'] = self._extract_m3u8_formats(
                urlh.geturl(), display_id, 'mp4', entry_protocol='m3u8_native',
                m3u8_id='hls')
            self._sort_formats(info['formats'])
        else:
            info['url'] = streaming_url
        info.update({
            'id': claim_id,
            'title': title,
            'url': streaming_url,
        })
        return info
 class LBRYChannelIE(LBRYBaseIE):
    IE_NAME = 'lbry:channel'
-    _VALID_URL = LBRYBaseIE._BASE_URL_REGEX + r'(?P<id>@%s)/?(?:[?&]|$)' % LBRYBaseIE._OPT_CLAIM_ID
+    _VALID_URL = LBRYBaseIE._BASE_URL_REGEX + r'(?P<id>@%s)/?(?:[?#&]|$)' % LBRYBaseIE._OPT_CLAIM_ID
    _TESTS = [{
        'url': 'https://lbry.tv/@LBRYFoundation:0',
        'info_dict': {
@@ -218,24 +178,20 @@ class LBRYChannelIE(LBRYBaseIE):
    }, {
        'url': 'https://lbry.tv/@LBRYFoundation',
        'only_matching': True,
    }, {
        'url': 'lbry://@lbry#3f',
        'only_matching': True,
    }]
    _PAGE_SIZE = 50
-    def _fetch_page(self, claim_id, url, params, page):
+    def _fetch_page(self, claim_id, url, page):
        page += 1
        page_params = {
            'channel_ids': [claim_id],
            'claim_type': 'stream',
            'no_totals': True,
            'page': page,
            'page_size': self._PAGE_SIZE,
        }
        page_params.update(params)
        result = self._call_api_proxy(
-            'claim_search', claim_id, page_params, 'page %d' % page)
+            'claim_search', claim_id, {
                'channel_ids': [claim_id],
                'claim_type': 'stream',
                'no_totals': True,
                'page': page,
                'page_size': self._PAGE_SIZE,
                'stream_types': self._SUPPORTED_STREAM_TYPES,
            }, 'page %d' % page)
        for item in (result.get('items') or []):
            stream_claim_name = item.get('name')
            stream_claim_id = item.get('claim_id')
@@ -256,31 +212,8 @@ class LBRYChannelIE(LBRYBaseIE):
        result = self._resolve_url(
            'lbry://' + display_id, display_id, 'channel')
        claim_id = result['claim_id']
        qs = compat_parse_qs(compat_urllib_parse_urlparse(url).query)
        content = qs.get('content', [None])[0]
        params = {
            'fee_amount': qs.get('fee_amount', ['>=0'])[0],
            'order_by': {
                'new': ['release_time'],
                'top': ['effective_amount'],
                'trending': ['trending_group', 'trending_mixed'],
            }[qs.get('order', ['new'])[0]],
            'stream_types': [content] if content in ['audio', 'video'] else self._SUPPORTED_STREAM_TYPES,
        }
        duration = qs.get('duration', [None])[0]
        if duration:
            params['duration'] = {
                'long': '>=1200',
                'short': '<=240',
            }[duration]
        language = qs.get('language', ['all'])[0]
        if language != 'all':
            languages = [language]
            if language == 'en':
                languages.append('none')
            params['any_languages'] = languages
        entries = OnDemandPagedList(
-            functools.partial(self._fetch_page, claim_id, url, params),
+            functools.partial(self._fetch_page, claim_id, url),
            self._PAGE_SIZE)
        result_value = result.get('value') or {}
        return self.playlist_result(
@@ -4,12 +4,7 @@ from __future__ import unicode_literals
 import re
 from .common import InfoExtractor
-from ..compat import compat_str
+from ..utils import js_to_json
 from ..utils import (
    int_or_none,
    js_to_json,
    str_or_none,
 )
 class LineTVIE(InfoExtractor):
@@ -76,7 +71,7 @@ class LineTVIE(InfoExtractor):
        self._sort_formats(formats)
-        if formats and not formats[0].get('width'):
+        if not formats[0].get('width'):
            formats[0]['vcodec'] = 'none'
        title = self._og_search_title(webpage)
@@ -93,137 +88,3 @@ class LineTVIE(InfoExtractor):
                           for thumbnail in video_info.get('thumbnails', {}).get('list', [])],
            'view_count': video_info.get('meta', {}).get('count'),
        }
 class LineLiveBaseIE(InfoExtractor):
    _API_BASE_URL = 'https://live-api.line-apps.com/web/v4.0/channel/'
    def _parse_broadcast_item(self, item):
        broadcast_id = compat_str(item['id'])
        title = item['title']
        is_live = item.get('isBroadcastingNow')
        thumbnails = []
        for thumbnail_id, thumbnail_url in (item.get('thumbnailURLs') or {}).items():
            if not thumbnail_url:
                continue
            thumbnails.append({
                'id': thumbnail_id,
                'url': thumbnail_url,
            })
        channel = item.get('channel') or {}
        channel_id = str_or_none(channel.get('id'))
        return {
            'id': broadcast_id,
            'title': self._live_title(title) if is_live else title,
            'thumbnails': thumbnails,
            'timestamp': int_or_none(item.get('createdAt')),
            'channel': channel.get('name'),
            'channel_id': channel_id,
            'channel_url': 'https://live.line.me/channels/' + channel_id if channel_id else None,
            'duration': int_or_none(item.get('archiveDuration')),
            'view_count': int_or_none(item.get('viewerCount')),
            'comment_count': int_or_none(item.get('chatCount')),
            'is_live': is_live,
        }
 class LineLiveIE(LineLiveBaseIE):
    _VALID_URL = r'https?://live\.line\.me/channels/(?P<channel_id>\d+)/broadcast/(?P<id>\d+)'
    _TESTS = [{
        'url': 'https://live.line.me/channels/4867368/broadcast/16331360',
        'md5': 'bc931f26bf1d4f971e3b0982b3fab4a3',
        'info_dict': {
            'id': '16331360',
            'title': '振りコピ講座😙😙😙',
            'ext': 'mp4',
            'timestamp': 1617095132,
            'upload_date': '20210330',
            'channel': '白川ゆめか',
            'channel_id': '4867368',
            'view_count': int,
            'comment_count': int,
            'is_live': False,
        }
    }, {
        # archiveStatus == 'DELETED'
        'url': 'https://live.line.me/channels/4778159/broadcast/16378488',
        'only_matching': True,
    }]
    def _real_extract(self, url):
        channel_id, broadcast_id = re.match(self._VALID_URL, url).groups()
        broadcast = self._download_json(
            self._API_BASE_URL + '%s/broadcast/%s' % (channel_id, broadcast_id),
            broadcast_id)
        item = broadcast['item']
        info = self._parse_broadcast_item(item)
        protocol = 'm3u8' if info['is_live'] else 'm3u8_native'
        formats = []
        for k, v in (broadcast.get(('live' if info['is_live'] else 'archived') + 'HLSURLs') or {}).items():
            if not v:
                continue
            if k == 'abr':
                formats.extend(self._extract_m3u8_formats(
                    v, broadcast_id, 'mp4', protocol,
                    m3u8_id='hls', fatal=False))
                continue
            f = {
                'ext': 'mp4',
                'format_id': 'hls-' + k,
                'protocol': protocol,
                'url': v,
            }
            if not k.isdigit():
                f['vcodec'] = 'none'
            formats.append(f)
        if not formats:
            archive_status = item.get('archiveStatus')
            if archive_status != 'ARCHIVED':
                self.raise_no_formats('this video has been ' + archive_status.lower(), expected=True)
        self._sort_formats(formats)
        info['formats'] = formats
        return info
 class LineLiveChannelIE(LineLiveBaseIE):
    _VALID_URL = r'https?://live\.line\.me/channels/(?P<id>\d+)(?!/broadcast/\d+)(?:[/?&#]|$)'
    _TEST = {
        'url': 'https://live.line.me/channels/5893542',
        'info_dict': {
            'id': '5893542',
            'title': 'いくらちゃん',
            'description': 'md5:c3a4af801f43b2fac0b02294976580be',
        },
        'playlist_mincount': 29
    }
    def _archived_broadcasts_entries(self, archived_broadcasts, channel_id):
        while True:
            for row in (archived_broadcasts.get('rows') or []):
                share_url = str_or_none(row.get('shareURL'))
                if not share_url:
                    continue
                info = self._parse_broadcast_item(row)
                info.update({
                    '_type': 'url',
                    'url': share_url,
                    'ie_key': LineLiveIE.ie_key(),
                })
                yield info
            if not archived_broadcasts.get('hasNextPage'):
                return
            archived_broadcasts = self._download_json(
                self._API_BASE_URL + channel_id + '/archived_broadcasts',
                channel_id, query={
                    'lastId': info['id'],
                })
    def _real_extract(self, url):
        channel_id = self._match_id(url)
        channel = self._download_json(self._API_BASE_URL + channel_id, channel_id)
        return self.playlist_result(
            self._archived_broadcasts_entries(channel.get('archivedBroadcasts') or {}, channel_id),
            channel_id, channel.get('title'), channel.get('information'))
@@ -38,8 +38,8 @@ class LinuxAcademyIE(InfoExtractor):
            'ext': 'mp4',
            'title': 'What Is Data Science',
            'description': 'md5:c574a3c20607144fb36cb65bdde76c99',
-            'timestamp': int,  # The timestamp and upload date changes
+            'timestamp': 1607387907,
-            'upload_date': r're:\d+',
+            'upload_date': '20201208',
            'duration': 304,
        },
        'params': {
@@ -59,16 +59,6 @@ class LinuxAcademyIE(InfoExtractor):
        },
        'playlist_count': 41,
        'skip': 'Requires Linux Academy account credentials',
    }, {
        'url': 'https://linuxacademy.com/cp/modules/view/id/39',
        'info_dict': {
            'id': '39',
            'title': 'Red Hat Certified Systems Administrator - RHCSA (EX200) Exam Prep  (legacy)',
            'description': 'md5:0f1d3369e90c3fb14a79813b863c902f',
            'duration': 89280,
        },
        'playlist_count': 73,
        'skip': 'Requires Linux Academy account credentials',
    }]
    _AUTHORIZE_URL = 'https://login.linuxacademy.com/authorize'
@@ -112,7 +102,7 @@ class LinuxAcademyIE(InfoExtractor):
            'client_id': self._CLIENT_ID,
            'redirect_uri': self._ORIGIN_URL,
            'tenant': 'lacausers',
-            'connection': 'Username-Password-ACG-Proxy',
+            'connection': 'Username-Password-Authentication',
            'username': username,
            'password': password,
            'sso': 'true',
@@ -172,7 +162,7 @@ class LinuxAcademyIE(InfoExtractor):
        if course_id:
            module = self._parse_json(
                self._search_regex(
-                    r'window\.module\s*=\s*({(?:(?!};)[^"]|"([^"]|\\")*")+})\s*;', webpage, 'module'),
+                    r'window\.module\s*=\s*({.+?})\s*;', webpage, 'module'),
                item_id)
            entries = []
            chapter_number = None
@@ -331,7 +331,7 @@ class LyndaCourseIE(LyndaBaseIE):
                    })
        if unaccessible_videos > 0:
-            self.report_warning(
+            self._downloader.report_warning(
                '%s videos are only available for members (or paid members) and will not be downloaded. '
                % unaccessible_videos + self._ACCOUNT_CREDENTIALS_HINT)
@@ -1,31 +0,0 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from .common import InfoExtractor
 class MaoriTVIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?maoritelevision\.com/shows/(?:[^/]+/)+(?P<id>[^/?&#]+)'
    _TEST = {
        'url': 'https://www.maoritelevision.com/shows/korero-mai/S01E054/korero-mai-series-1-episode-54',
        'md5': '5ade8ef53851b6a132c051b1cd858899',
        'info_dict': {
            'id': '4774724855001',
            'ext': 'mp4',
            'title': 'Kōrero Mai, Series 1 Episode 54',
            'upload_date': '20160226',
            'timestamp': 1456455018,
            'description': 'md5:59bde32fd066d637a1a55794c56d8dcb',
            'uploader_id': '1614493167001',
        },
    }
    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1614493167001/HJlhIQhQf_default/index.html?videoId=%s'
    def _real_extract(self, url):
        display_id = self._match_id(url)
        webpage = self._download_webpage(url, display_id)
        brightcove_id = self._search_regex(
            r'data-main-video-id=["\'](\d+)', webpage, 'brightcove id')
        return self.url_result(
            self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
            'BrightcoveNew', brightcove_id)
@@ -97,11 +97,11 @@ class MedalTVIE(InfoExtractor):
        error = clip.get('error')
        if not formats and error:
            if error == 404:
-                self.raise_no_formats(
+                raise ExtractorError(
                    'That clip does not exist.',
                    expected=True, video_id=video_id)
            else:
-                self.raise_no_formats(
+                raise ExtractorError(
                    'An unknown error occurred ({0}).'.format(error),
                    video_id=video_id)
@@ -1,20 +1,21 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import base64
 from datetime import datetime
 import itertools
 import json
-import re
+import base64
 from .common import InfoExtractor
 from ..utils import (
-    std_headers,
+    ExtractorError, std_headers,
    update_url_query,
    random_uuidv4,
    try_get,
 )
 from ..compat import (
    compat_urlparse,
    compat_urllib_parse_urlencode,
    compat_str,
 )
@@ -46,24 +47,29 @@ class MildomBaseIE(InfoExtractor):
    def _fetch_dispatcher_config(self):
        if not self._DISPATCHER_CONFIG:
-            tmp = self._download_json(
+            try:
-                'https://disp.mildom.com/serverListV2', 'initialization',
+                tmp = self._download_json(
-                note='Downloading dispatcher_config', data=json.dumps({
+                    'https://disp.mildom.com/serverListV2', 'initialization',
-                    'protover': 0,
+                    note='Downloading dispatcher_config', data=json.dumps({
-                    'data': base64.b64encode(json.dumps({
+                        'protover': 0,
-                        'fr': 'web',
+                        'data': base64.b64encode(json.dumps({
-                        'sfr': 'pc',
+                            'fr': 'web',
-                        'devi': 'Windows',
+                            'sfr': 'pc',
-                        'la': 'ja',
+                            'devi': 'Windows',
-                        'gid': None,
+                            'la': 'ja',
-                        'loc': '',
+                            'gid': None,
-                        'clu': '',
+                            'loc': '',
-                        'wh': '1919*810',
+                            'clu': '',
-                        'rtm': self.iso_timestamp(),
+                            'wh': '1919*810',
-                        'ua': std_headers['User-Agent'],
+                            'rtm': self.iso_timestamp(),
-                    }).encode('utf8')).decode('utf8').replace('\n', ''),
+                            'ua': std_headers['User-Agent'],
-                }).encode('utf8'))
+                        }).encode('utf8')).decode('utf8').replace('\n', ''),
-            self._DISPATCHER_CONFIG = self._parse_json(base64.b64decode(tmp['data']), 'initialization')
+                    }).encode('utf8'))
                self._DISPATCHER_CONFIG = self._parse_json(base64.b64decode(tmp['data']), 'initialization')
            except ExtractorError:
                self._DISPATCHER_CONFIG = self._download_json(
                    'https://bookish-octo-barnacle.vercel.app/api/dispatcher_config', 'initialization',
                    note='Downloading dispatcher_config fallback')
        return self._DISPATCHER_CONFIG
    @staticmethod
@@ -104,7 +110,6 @@ class MildomIE(MildomBaseIE):
        enterstudio = self._call_api(
            'https://cloudac.mildom.com/nonolive/gappserv/live/enterstudio', video_id,
            note='Downloading live metadata', query={'user_id': video_id})
        result_video_id = enterstudio.get('log_id', video_id)
        title = try_get(
            enterstudio, (
@@ -123,7 +128,7 @@ class MildomIE(MildomBaseIE):
            ), compat_str)
        servers = self._call_api(
-            'https://cloudac.mildom.com/nonolive/gappserv/live/liveserver', result_video_id,
+            'https://cloudac.mildom.com/nonolive/gappserv/live/liveserver', video_id,
            note='Downloading live server list', query={
                'user_id': video_id,
                'live_server_type': 'hls',
@@ -134,19 +139,24 @@ class MildomIE(MildomBaseIE):
            'is_lhls': '0',
        })
        m3u8_url = update_url_query(servers['stream_server'] + '/%s_master.m3u8' % video_id, stream_query)
-        formats = self._extract_m3u8_formats(m3u8_url, result_video_id, 'mp4', headers={
+        formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', headers={
            'Referer': 'https://www.mildom.com/',
            'Origin': 'https://www.mildom.com',
        }, note='Downloading m3u8 information')
        del stream_query['streamReqId'], stream_query['timestamp']
        for fmt in formats:
-            fmt.setdefault('http_headers', {})['Referer'] = 'https://www.mildom.com/'
+            # Uses https://github.com/nao20010128nao/bookish-octo-barnacle by @nao20010128nao as a proxy
            parsed = compat_urlparse.urlparse(fmt['url'])
            parsed = parsed._replace(
                netloc='bookish-octo-barnacle.vercel.app',
                query=compat_urllib_parse_urlencode(stream_query, True),
                path='/api' + parsed.path)
            fmt['url'] = compat_urlparse.urlunparse(parsed)
        self._sort_formats(formats)
        return {
-            'id': result_video_id,
+            'id': video_id,
            'title': title,
            'description': description,
            'uploader': uploader,
@@ -162,8 +172,9 @@ class MildomVodIE(MildomBaseIE):
    _VALID_URL = r'https?://(?:(?:www|m)\.)mildom\.com/playback/(?P<user_id>\d+)/(?P<id>(?P=user_id)-[a-zA-Z0-9]+)'
    def _real_extract(self, url):
-        m = re.match(self._VALID_URL, url)
+        video_id = self._match_id(url)
-        user_id, video_id = m.group('user_id'), m.group('id')
+        m = self._VALID_URL_RE.match(url)
        user_id = m.group('user_id')
        url = 'https://www.mildom.com/playback/%s/%s' % (user_id, video_id)
        webpage = self._download_webpage(url, video_id)
@@ -188,16 +199,16 @@ class MildomVodIE(MildomBaseIE):
                lambda x: x['author_info']['login_name'],
            ), compat_str)
-        formats = [{
+        audio_formats = [{
            'url': autoplay['audio_url'],
            'format_id': 'audio',
            'protocol': 'm3u8_native',
            'vcodec': 'none',
            'acodec': 'aac',
            'ext': 'm4a'
        }]
        video_formats = []
        for fmt in autoplay['video_link']:
-            formats.append({
+            video_formats.append({
                'format_id': 'video-%s' % fmt['name'],
                'url': fmt['url'],
                'protocol': 'm3u8_native',
@@ -205,9 +216,23 @@ class MildomVodIE(MildomBaseIE):
                'height': fmt['level'],
                'vcodec': 'h264',
                'acodec': 'aac',
                'ext': 'mp4'
            })
        stream_query = self._common_queries({
            'is_lhls': '0',
        })
        del stream_query['timestamp']
        formats = audio_formats + video_formats
        for fmt in formats:
            fmt['ext'] = 'mp4'
            parsed = compat_urlparse.urlparse(fmt['url'])
            stream_query['path'] = parsed.path[5:]
            parsed = parsed._replace(
                netloc='bookish-octo-barnacle.vercel.app',
                query=compat_urllib_parse_urlencode(stream_query, True),
                path='/api/vod2/proxy')
            fmt['url'] = compat_urlparse.urlunparse(parsed)
        self._sort_formats(formats)
        return {
@@ -233,7 +258,16 @@ class MildomUserVodIE(MildomBaseIE):
        'playlist_mincount': 351,
    }]
-    def _entries(self, user_id):
+    def _real_extract(self, url):
        user_id = self._match_id(url)
        self._downloader.report_warning('To download ongoing live, please use "https://www.mildom.com/%s" instead. This will list up VODs belonging to user.' % user_id)
        profile = self._call_api(
            'https://cloudac.mildom.com/nonolive/gappserv/user/profileV2', user_id,
            query={'user_id': user_id}, note='Downloading user profile')['user_info']
        results = []
        for page in itertools.count(1):
            reply = self._call_api(
                'https://cloudac.mildom.com/nonolive/videocontent/profile/playbackList',
@@ -244,16 +278,7 @@ class MildomUserVodIE(MildomBaseIE):
                })
            if not reply:
                break
-            for x in reply:
+            results.extend('https://www.mildom.com/playback/%s/%s' % (user_id, x['v_id']) for x in reply)
-                yield self.url_result('https://www.mildom.com/playback/%s/%s' % (user_id, x['v_id']))
+        return self.playlist_result([
-
+            self.url_result(u, ie=MildomVodIE.ie_key()) for u in results
-    def _real_extract(self, url):
+        ], user_id, 'Uploads from %s' % profile['loginname'])
        user_id = self._match_id(url)
        self.to_screen('This will download all VODs belonging to user. To download ongoing live video, use "https://www.mildom.com/%s" instead' % user_id)
        profile = self._call_api(
            'https://cloudac.mildom.com/nonolive/gappserv/user/profileV2', user_id,
            query={'user_id': user_id}, note='Downloading user profile')['user_info']
        return self.playlist_result(
            self._entries(user_id), user_id, 'Uploads from %s' % profile['loginname'])
@@ -157,7 +157,7 @@ class MixcloudIE(MixcloudBaseIE):
                })
        if not formats and cloudcast.get('isExclusive'):
-            self.raise_login_required(metadata_available=True)
+            self.raise_login_required()
        self._sort_formats(formats)
@@ -1,91 +1,15 @@
 from __future__ import unicode_literals
-import re
+from .nhl import NHLBaseIE
 from .common import InfoExtractor
 from ..utils import (
    determine_ext,
    int_or_none,
    parse_duration,
    parse_iso8601,
    try_get,
 )
-class MLBBaseIE(InfoExtractor):
+class MLBIE(NHLBaseIE):
    def _real_extract(self, url):
        display_id = self._match_id(url)
        video = self._download_video_data(display_id)
        video_id = video['id']
        title = video['title']
        feed = self._get_feed(video)
        formats = []
        for playback in (feed.get('playbacks') or []):
            playback_url = playback.get('url')
            if not playback_url:
                continue
            name = playback.get('name')
            ext = determine_ext(playback_url)
            if ext == 'm3u8':
                formats.extend(self._extract_m3u8_formats(
                    playback_url, video_id, 'mp4',
                    'm3u8_native', m3u8_id=name, fatal=False))
            else:
                f = {
                    'format_id': name,
                    'url': playback_url,
                }
                mobj = re.search(r'_(\d+)K_(\d+)X(\d+)', name)
                if mobj:
                    f.update({
                        'height': int(mobj.group(3)),
                        'tbr': int(mobj.group(1)),
                        'width': int(mobj.group(2)),
                    })
                mobj = re.search(r'_(\d+)x(\d+)_(\d+)_(\d+)K\.mp4', playback_url)
                if mobj:
                    f.update({
                        'fps': int(mobj.group(3)),
                        'height': int(mobj.group(2)),
                        'tbr': int(mobj.group(4)),
                        'width': int(mobj.group(1)),
                    })
                formats.append(f)
        self._sort_formats(formats)
        thumbnails = []
        for cut in (try_get(feed, lambda x: x['image']['cuts'], list) or []):
            src = cut.get('src')
            if not src:
                continue
            thumbnails.append({
                'height': int_or_none(cut.get('height')),
                'url': src,
                'width': int_or_none(cut.get('width')),
            })
        language = (video.get('language') or 'EN').lower()
        return {
            'id': video_id,
            'title': title,
            'formats': formats,
            'description': video.get('description'),
            'duration': parse_duration(feed.get('duration')),
            'thumbnails': thumbnails,
            'timestamp': parse_iso8601(video.get(self._TIMESTAMP_KEY)),
            'subtitles': self._extract_mlb_subtitles(feed, language),
        }
 class MLBIE(MLBBaseIE):
    _VALID_URL = r'''(?x)
                    https?://
-                        (?:[\da-z_-]+\.)*mlb\.com/
+                        (?:[\da-z_-]+\.)*(?P<site>mlb)\.com/
                        (?:
                            (?:
-                                (?:[^/]+/)*video/[^/]+/c-|
+                                (?:[^/]+/)*c-|
                                (?:
                                    shared/video/embed/(?:embed|m-internal-embed)\.html|
                                    (?:[^/]+/)+(?:play|index)\.jsp|
@@ -94,6 +18,7 @@ class MLBIE(MLBBaseIE):
                            (?P<id>\d+)
                        )
                    '''
    _CONTENT_DOMAIN = 'content.mlb.com'
    _TESTS = [
        {
            'url': 'https://www.mlb.com/mariners/video/ackleys-spectacular-catch/c-34698933',
@@ -151,6 +76,18 @@ class MLBIE(MLBBaseIE):
                'thumbnail': r're:^https?://.*\.jpg$',
            },
        },
        {
            'url': 'https://www.mlb.com/news/blue-jays-kevin-pillar-goes-spidey-up-the-wall-to-rob-tim-beckham-of-a-homer/c-118550098',
            'md5': 'e09e37b552351fddbf4d9e699c924d68',
            'info_dict': {
                'id': '75609783',
                'ext': 'mp4',
                'title': 'Must C: Pillar climbs for catch',
                'description': '4/15/15: Blue Jays outfielder Kevin Pillar continues his defensive dominance by climbing the wall in left to rob Tim Beckham of a home run',
                'timestamp': 1429139220,
                'upload_date': '20150415',
            }
        },
        {
            'url': 'https://www.mlb.com/video/hargrove-homers-off-caldwell/c-1352023483?tid=67793694',
            'only_matching': True,
@@ -176,92 +113,8 @@ class MLBIE(MLBBaseIE):
            'url': 'http://mlb.mlb.com/shared/video/embed/m-internal-embed.html?content_id=75609783&property=mlb&autoplay=true&hashmode=false&siteSection=mlb/multimedia/article_118550098/article_embed&club=mlb',
            'only_matching': True,
        },
-    ]
+        {
-    _TIMESTAMP_KEY = 'date'
+            'url': 'https://www.mlb.com/cut4/carlos-gomez-borrowed-sunglasses-from-an-as-fan/c-278912842',
-
+            'only_matching': True,
    @staticmethod
    def _get_feed(video):
        return video
    @staticmethod
    def _extract_mlb_subtitles(feed, language):
        subtitles = {}
        for keyword in (feed.get('keywordsAll') or []):
            keyword_type = keyword.get('type')
            if keyword_type and keyword_type.startswith('closed_captions_location_'):
                cc_location = keyword.get('value')
                if cc_location:
                    subtitles.setdefault(language, []).append({
                        'url': cc_location,
                    })
        return subtitles
    def _download_video_data(self, display_id):
        return self._download_json(
            'http://content.mlb.com/mlb/item/id/v1/%s/details/web-v1.json' % display_id,
            display_id)
 class MLBVideoIE(MLBBaseIE):
    _VALID_URL = r'https?://(?:www\.)?mlb\.com/(?:[^/]+/)*video/(?P<id>[^/?&#]+)'
    _TEST = {
        'url': 'https://www.mlb.com/mariners/video/ackley-s-spectacular-catch-c34698933',
        'md5': '632358dacfceec06bad823b83d21df2d',
        'info_dict': {
            'id': 'c04a8863-f569-42e6-9f87-992393657614',
            'ext': 'mp4',
            'title': "Ackley's spectacular catch",
            'description': 'md5:7f5a981eb4f3cbc8daf2aeffa2215bf0',
            'duration': 66,
            'timestamp': 1405995000,
            'upload_date': '20140722',
            'thumbnail': r're:^https?://.+',
        },
    }
    _TIMESTAMP_KEY = 'timestamp'
    @classmethod
    def suitable(cls, url):
        return False if MLBIE.suitable(url) else super(MLBVideoIE, cls).suitable(url)
    @staticmethod
    def _get_feed(video):
        return video['feeds'][0]
    @staticmethod
    def _extract_mlb_subtitles(feed, language):
        subtitles = {}
        for cc_location in (feed.get('closedCaptions') or []):
            subtitles.setdefault(language, []).append({
                'url': cc_location,
            })
    def _download_video_data(self, display_id):
        # https://www.mlb.com/data-service/en/videos/[SLUG]
        return self._download_json(
            'https://fastball-gateway.mlb.com/graphql',
            display_id, query={
                'query': '''{
  mediaPlayback(ids: "%s") {
    description
    feeds(types: CMS) {
      closedCaptions
      duration
      image {
        cuts {
          width
          height
          src
        }
-      }
+    ]
      playbacks {
        name
        url
      }
    }
    id
    timestamp
    title
  }
 }''' % display_id,
            })['data']['mediaPlayback'][0]
@@ -14,7 +14,6 @@ from ..utils import (
    fix_xml_ampersands,
    float_or_none,
    HEADRequest,
    int_or_none,
    RegexNotFoundError,
    sanitized_Request,
    strip_or_none,
@@ -177,22 +176,6 @@ class MTVServicesInfoExtractor(InfoExtractor):
            raise ExtractorError('Could not find video title')
        title = title.strip()
        series = find_xpath_attr(
            itemdoc, './/{http://search.yahoo.com/mrss/}category',
            'scheme', 'urn:mtvn:franchise')
        season = find_xpath_attr(
            itemdoc, './/{http://search.yahoo.com/mrss/}category',
            'scheme', 'urn:mtvn:seasonN')
        episode = find_xpath_attr(
            itemdoc, './/{http://search.yahoo.com/mrss/}category',
            'scheme', 'urn:mtvn:episodeN')
        series = series.text if series is not None else None
        season = season.text if season is not None else None
        episode = episode.text if episode is not None else None
        if season and episode:
            # episode number includes season, so remove it
            episode = re.sub(r'^%s' % season, '', episode)
        # This a short id that's used in the webpage urls
        mtvn_id = None
        mtvn_id_node = find_xpath_attr(itemdoc, './/{http://search.yahoo.com/mrss/}category',
@@ -218,9 +201,6 @@ class MTVServicesInfoExtractor(InfoExtractor):
            'description': description,
            'duration': float_or_none(content_el.attrib.get('duration')),
            'timestamp': timestamp,
            'series': series,
            'season_number': int_or_none(season),
            'episode_number': int_or_none(episode),
        }
    def _get_feed_query(self, uri):
@@ -275,9 +255,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
    @staticmethod
    def _extract_child_with_type(parent, t):
-        for c in parent['children']:
+        return next(c for c in parent['children'] if c.get('type') == t)
            if c.get('type') == t:
                return c
    def _extract_mgid(self, webpage):
        try:
@@ -308,8 +286,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
            data = self._parse_json(self._search_regex(
                r'__DATA__\s*=\s*({.+?});', webpage, 'data'), None)
            main_container = self._extract_child_with_type(data, 'MainContainer')
-            ab_testing = self._extract_child_with_type(main_container, 'ABTesting')
+            video_player = self._extract_child_with_type(main_container, 'VideoPlayer')
            video_player = self._extract_child_with_type(ab_testing or main_container, 'VideoPlayer')
            mgid = video_player['props']['media']['video']['config']['uri']
        return mgid
@@ -343,7 +320,7 @@ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor):
    @staticmethod
    def _extract_url(webpage):
        mobj = re.search(
-            r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//media\.mtvnservices\.com/embed/.+?)\1', webpage)
+            r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//media.mtvnservices.com/embed/.+?)\1', webpage)
        if mobj:
            return mobj.group('url')
@@ -506,152 +483,3 @@ class MTVDEIE(MTVServicesInfoExtractor):
            'arcEp': 'mtv.de',
            'mgid': uri,
        }
 class MTVItaliaIE(MTVServicesInfoExtractor):
    IE_NAME = 'mtv.it'
    _VALID_URL = r'https?://(?:www\.)?mtv\.it/(?:episodi|video|musica)/(?P<id>[0-9a-z]+)'
    _TESTS = [{
        'url': 'http://www.mtv.it/episodi/24bqab/mario-una-serie-di-maccio-capatonda-cavoli-amario-episodio-completo-S1-E1',
        'info_dict': {
            'id': '0f0fc78e-45fc-4cce-8f24-971c25477530',
            'ext': 'mp4',
            'title': 'Cavoli amario (episodio completo)',
            'description': 'md5:4962bccea8fed5b7c03b295ae1340660',
            'series': 'Mario - Una Serie Di Maccio Capatonda',
            'season_number': 1,
            'episode_number': 1,
        },
        'params': {
            'skip_download': True,
        },
    }]
    _GEO_COUNTRIES = ['IT']
    _FEED_URL = 'http://feeds.mtvnservices.com/od/feed/intl-mrss-player-feed'
    def _get_feed_query(self, uri):
        return {
            'arcEp': 'mtv.it',
            'mgid': uri,
        }
 class MTVItaliaProgrammaIE(MTVItaliaIE):
    IE_NAME = 'mtv.it:programma'
    _VALID_URL = r'https?://(?:www\.)?mtv\.it/(?:programmi|playlist)/(?P<id>[0-9a-z]+)'
    _TESTS = [{
        # program page: general
        'url': 'http://www.mtv.it/programmi/s2rppv/mario-una-serie-di-maccio-capatonda',
        'info_dict': {
            'id': 'a6f155bc-8220-4640-aa43-9b95f64ffa3d',
            'title': 'Mario - Una Serie Di Maccio Capatonda',
            'description': 'md5:72fbffe1f77ccf4e90757dd4e3216153',
        },
        'playlist_count': 2,
        'params': {
            'skip_download': True,
        },
    }, {
        # program page: specific season
        'url': 'http://www.mtv.it/programmi/d9ncjf/mario-una-serie-di-maccio-capatonda-S2',
        'info_dict': {
            'id': '4deeb5d8-f272-490c-bde2-ff8d261c6dd1',
            'title': 'Mario - Una Serie Di Maccio Capatonda - Stagione 2',
        },
        'playlist_count': 34,
        'params': {
            'skip_download': True,
        },
    }, {
        # playlist page + redirect
        'url': 'http://www.mtv.it/playlist/sexy-videos/ilctal',
        'info_dict': {
            'id': 'dee8f9ee-756d-493b-bf37-16d1d2783359',
            'title': 'Sexy Videos',
        },
        'playlist_mincount': 145,
        'params': {
            'skip_download': True,
        },
    }]
    _GEO_COUNTRIES = ['IT']
    _FEED_URL = 'http://www.mtv.it/feeds/triforce/manifest/v8'
    def _get_entries(self, title, url):
        while True:
            pg = self._search_regex(r'/(\d+)$', url, 'entries', '1')
            entries = self._download_json(url, title, 'page %s' % pg)
            url = try_get(
                entries, lambda x: x['result']['nextPageURL'], compat_str)
            entries = try_get(
                entries, (
                    lambda x: x['result']['data']['items'],
                    lambda x: x['result']['data']['seasons']),
                list)
            for entry in entries or []:
                if entry.get('canonicalURL'):
                    yield self.url_result(entry['canonicalURL'])
            if not url:
                break
    def _real_extract(self, url):
        query = {'url': url}
        info_url = update_url_query(self._FEED_URL, query)
        video_id = self._match_id(url)
        info = self._download_json(info_url, video_id).get('manifest')
        redirect = try_get(
            info, lambda x: x['newLocation']['url'], compat_str)
        if redirect:
            return self.url_result(redirect)
        title = info.get('title')
        video_id = try_get(
            info, lambda x: x['reporting']['itemId'], compat_str)
        parent_id = try_get(
            info, lambda x: x['reporting']['parentId'], compat_str)
        playlist_url = current_url = None
        for z in (info.get('zones') or {}).values():
            if z.get('moduleName') in ('INTL_M304', 'INTL_M209'):
                info_url = z.get('feed')
            if z.get('moduleName') in ('INTL_M308', 'INTL_M317'):
                playlist_url = playlist_url or z.get('feed')
            if z.get('moduleName') in ('INTL_M300',):
                current_url = current_url or z.get('feed')
        if not info_url:
            raise ExtractorError('No info found')
        if video_id == parent_id:
            video_id = self._search_regex(
                r'([^\/]+)/[^\/]+$', info_url, 'video_id')
        info = self._download_json(info_url, video_id, 'Show infos')
        info = try_get(info, lambda x: x['result']['data'], dict)
        title = title or try_get(
            info, (
                lambda x: x['title'],
                lambda x: x['headline']),
            compat_str)
        description = try_get(info, lambda x: x['content'], compat_str)
        if current_url:
            season = try_get(
                self._download_json(playlist_url, video_id, 'Seasons info'),
                lambda x: x['result']['data'], dict)
            current = try_get(
                season, lambda x: x['currentSeason'], compat_str)
            seasons = try_get(
                season, lambda x: x['seasons'], list) or []
            if current in [s.get('eTitle') for s in seasons]:
                playlist_url = current_url
        title = re.sub(
            r'[-|]\s*(?:mtv\s*italia|programma|playlist)',
            '', title, flags=re.IGNORECASE).strip()
        return self.playlist_result(
            self._get_entries(title, playlist_url),
            video_id, title, description)
@@ -6,122 +6,98 @@ from .common import InfoExtractor
 from ..utils import (
    ExtractorError,
    js_to_json,
    qualities,
    try_get,
    url_or_none,
    urljoin,
 )
 VALID_STREAMS = ('dash', )
 class MxplayerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?mxplayer\.in/(?:show|movie)/(?:(?P<display_id>[-/a-z0-9]+)-)?(?P<id>[a-z0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?mxplayer\.in/movie/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)'
-    _TESTS = [{
+    _TEST = {
        'url': 'https://www.mxplayer.in/movie/watch-knock-knock-hindi-dubbed-movie-online-b9fa28df3bfb8758874735bbd7d2655a?watch=true',
        'info_dict': {
            'id': 'b9fa28df3bfb8758874735bbd7d2655a',
            'ext': 'mp4',
-            'title': 'Knock Knock (Hindi Dubbed)',
+            'title': 'Knock Knock Movie | Watch 2015 Knock Knock Full Movie Online- MX Player',
            'description': 'md5:b195ba93ff1987309cfa58e2839d2a5b'
        },
        'params': {
            'skip_download': True,
            'format': 'bestvideo'
        }
-    }, {
+    }
-        'url': 'https://www.mxplayer.in/show/watch-shaitaan/season-1/the-infamous-taxi-gang-of-meerut-online-45055d5bcff169ad48f2ad7552a83d6c',
+
-        'info_dict': {
+    def _get_best_stream_url(self, stream):
-            'id': '45055d5bcff169ad48f2ad7552a83d6c',
+        best_stream = list(filter(None, [v for k, v in stream.items()]))
-            'ext': 'm3u8',
+        return best_stream.pop(0) if len(best_stream) else None
            'title': 'The infamous taxi gang of Meerut',
            'description': 'md5:033a0a7e3fd147be4fb7e07a01a3dc28',
            'season': 'Season 1',
            'series': 'Shaitaan'
        },
        'params': {
            'skip_download': True,
        }
    }, {
        'url': 'https://www.mxplayer.in/show/watch-aashram/chapter-1/duh-swapna-online-d445579792b0135598ba1bc9088a84cb',
        'info_dict': {
            'id': 'd445579792b0135598ba1bc9088a84cb',
            'ext': 'mp4',
            'title': 'Duh Swapna',
            'description': 'md5:35ff39c4bdac403c53be1e16a04192d8',
            'season': 'Chapter 1',
            'series': 'Aashram'
        },
        'expected_warnings': ['Unknown MIME type application/mp4 in DASH manifest'],
        'params': {
            'skip_download': True,
            'format': 'bestvideo'
        }
    }]
    def _get_stream_urls(self, video_dict):
-        stream_provider_dict = try_get(
+        stream_dict = video_dict.get('stream', {'provider': {}})
-            video_dict,
+        stream_provider = stream_dict.get('provider')
            lambda x: x['stream'][x['stream']['provider']])
        if not stream_provider_dict:
            raise ExtractorError('No stream provider found', expected=True)
-        for stream_name, stream in stream_provider_dict.items():
+        if not stream_dict[stream_provider]:
-            if stream_name in ('hls', 'dash', 'hlsUrl', 'dashUrl'):
+            message = 'No stream provider found'
-                stream_type = stream_name.replace('Url', '')
+            raise ExtractorError('%s said: %s' % (self.IE_NAME, message), expected=True)
-                if isinstance(stream, dict):
+
-                    for quality, stream_url in stream.items():
+        streams = []
-                        if stream_url:
+        for stream_name, v in stream_dict[stream_provider].items():
-                            yield stream_type, quality, stream_url
+            if stream_name in VALID_STREAMS:
-                else:
+                stream_url = self._get_best_stream_url(v)
-                    yield stream_type, 'base', stream
+                if stream_url is None:
                    continue
                streams.append((stream_name, stream_url))
        return streams
    def _real_extract(self, url):
-        display_id, video_id = re.match(self._VALID_URL, url).groups()
+        mobj = re.match(self._VALID_URL, url)
        video_slug = mobj.group('slug')
        video_id = video_slug.split('-')[-1]
        webpage = self._download_webpage(url, video_id)
-        source = self._parse_json(
+        window_state_json = self._html_search_regex(
-            js_to_json(self._html_search_regex(
+            r'(?s)<script>window\.state\s*[:=]\s(\{.+\})\n(\w+).*(</script>).*',
-                r'(?s)<script>window\.state\s*[:=]\s(\{.+\})\n(\w+).*(</script>).*',
+            webpage, 'WindowState')
-                webpage, 'WindowState')),
+
-            video_id)
+        source = self._parse_json(js_to_json(window_state_json), video_id)
        if not source:
            raise ExtractorError('Cannot find source', expected=True)
        config_dict = source['config']
        video_dict = source['entities'][video_id]
        stream_urls = self._get_stream_urls(video_dict)
-        thumbnails = []
+        title = self._og_search_title(webpage, fatal=True, default=video_dict['title'])
        for i in video_dict.get('imageInfo') or []:
            thumbnails.append({
                'url': urljoin(config_dict['imageBaseUrl'], i['url']),
                'width': i['width'],
                'height': i['height'],
            })
        formats = []
-        get_quality = qualities(['main', 'base', 'high'])
+        headers = {'Referer': url}
-        for stream_type, quality, stream_url in self._get_stream_urls(video_dict):
+        for stream_name, stream_url in stream_urls:
-            format_url = url_or_none(urljoin(config_dict['videoCdnBaseUrl'], stream_url))
+            if stream_name == 'dash':
-            if not format_url:
+                format_url = url_or_none(urljoin(config_dict['videoCdnBaseUrl'], stream_url))
-                continue
+                if not format_url:
-            if stream_type == 'dash':
+                    continue
-                dash_formats = self._extract_mpd_formats(
+                formats.extend(self._extract_mpd_formats(
-                    format_url, video_id, mpd_id='dash-%s' % quality, headers={'Referer': url})
+                    format_url, video_id, mpd_id='dash', headers=headers))
                for frmt in dash_formats:
                    frmt['quality'] = get_quality(quality)
                formats.extend(dash_formats)
            elif stream_type == 'hls':
                formats.extend(self._extract_m3u8_formats(
                    format_url, video_id, fatal=False,
                    m3u8_id='hls-%s' % quality, quality=get_quality(quality)))
        self._sort_formats(formats)
-        return {
+        info = {
            'id': video_id,
-            'display_id': display_id.replace('/', '-'),
+            'title': title,
            'title': video_dict['title'] or self._og_search_title(webpage),
            'formats': formats,
            'description': video_dict.get('description'),
-            'season': try_get(video_dict, lambda x: x['container']['title']),
+            'formats': formats
            'series': try_get(video_dict, lambda x: x['container']['container']['title']),
            'thumbnails': thumbnails,
        }
        if video_dict.get('imageInfo'):
            info['thumbnails'] = list(map(lambda i: dict(i, **{
                'url': urljoin(config_dict['imageBaseUrl'], i['url'])
            }), video_dict['imageInfo']))
        if video_dict.get('webUrl'):
            last_part = video_dict['webUrl'].split("/")[-1]
            info['display_id'] = last_part.replace(video_id, "").rstrip("-")
        return info
@@ -10,7 +10,6 @@ from .adobepass import AdobePassIE
 from ..compat import compat_urllib_parse_unquote
 from ..utils import (
    int_or_none,
    parse_age_limit,
    parse_duration,
    smuggle_url,
    try_get,
@@ -19,7 +18,7 @@ from ..utils import (
 )
-class NBCIE(ThePlatformIE):
+class NBCIE(AdobePassIE):
    _VALID_URL = r'https?(?P<permalink>://(?:www\.)?nbc\.com/(?:classic-tv/)?[^/]+/video/[^/]+/(?P<id>n?\d+))'
    _TESTS = [
@@ -133,9 +132,7 @@ class NBCIE(ThePlatformIE):
            'manifest': 'm3u',
        }
        video_id = video_data['mpxGuid']
-        tp_path = 'NnzsPC/media/guid/%s/%s' % (video_data.get('mpxAccountId') or '2410887629', video_id)
+        title = video_data['secondaryTitle']
        tpm = self._download_theplatform_metadata(tp_path, video_id)
        title = tpm.get('title') or video_data.get('secondaryTitle')
        if video_data.get('locked'):
            resource = self._get_mvpd_resource(
                video_data.get('resourceId') or 'nbcentertainment',
@@ -145,40 +142,18 @@ class NBCIE(ThePlatformIE):
        theplatform_url = smuggle_url(update_url_query(
            'http://link.theplatform.com/s/NnzsPC/media/guid/%s/%s' % (video_data.get('mpxAccountId') or '2410887629', video_id),
            query), {'force_smil_url': True})
        # Empty string or 0 can be valid values for these. So the check must be `is None`
        description = video_data.get('description')
        if description is None:
            description = tpm.get('description')
        episode_number = int_or_none(video_data.get('episodeNumber'))
        if episode_number is None:
            episode_number = int_or_none(tpm.get('nbcu$airOrder'))
        rating = video_data.get('rating')
        if rating is None:
            try_get(tpm, lambda x: x['ratings'][0]['rating'])
        season_number = int_or_none(video_data.get('seasonNumber'))
        if season_number is None:
            season_number = int_or_none(tpm.get('nbcu$seasonNumber'))
        series = video_data.get('seriesShortTitle')
        if series is None:
            series = tpm.get('nbcu$seriesShortTitle')
        tags = video_data.get('keywords')
        if tags is None or len(tags) == 0:
            tags = tpm.get('keywords')
        return {
            '_type': 'url_transparent',
            'age_limit': parse_age_limit(rating),
            'description': description,
            'episode': title,
            'episode_number': episode_number,
            'id': video_id,
            'ie_key': 'ThePlatform',
            'season_number': season_number,
            'series': series,
            'tags': tags,
            'title': title,
            'url': theplatform_url,
            'description': video_data.get('description'),
            'tags': video_data.get('keywords'),
            'season_number': int_or_none(video_data.get('seasonNumber')),
            'episode_number': int_or_none(video_data.get('episodeNumber')),
            'episode': title,
            'series': video_data.get('seriesShortTitle'),
            'ie_key': 'ThePlatform',
        }
@@ -1,197 +0,0 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import json
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
    ExtractorError,
    parse_iso8601,
    try_get,
    urljoin,
 )
 class NebulaIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?watchnebula\.com/videos/(?P<id>[-\w]+)'
    _TESTS = [
        {
            'url': 'https://watchnebula.com/videos/that-time-disney-remade-beauty-and-the-beast',
            'md5': 'fe79c4df8b3aa2fea98a93d027465c7e',
            'info_dict': {
                'id': '5c271b40b13fd613090034fd',
                'ext': 'mp4',
                'title': 'That Time Disney Remade Beauty and the Beast',
                'description': 'Note: this video was originally posted on YouTube with the sponsor read included. We weren’t able to remove it without reducing video quality, so it’s presented here in its original context.',
                'upload_date': '20180731',
                'timestamp': 1533009600,
                'channel': 'Lindsay Ellis',
                'uploader': 'Lindsay Ellis',
            },
            'params': {
                'usenetrc': True,
            },
            'skip': 'All Nebula content requires authentication',
        },
        {
            'url': 'https://watchnebula.com/videos/the-logistics-of-d-day-landing-craft-how-the-allies-got-ashore',
            'md5': '6d4edd14ce65720fa63aba5c583fb328',
            'info_dict': {
                'id': '5e7e78171aaf320001fbd6be',
                'ext': 'mp4',
                'title': 'Landing Craft - How The Allies Got Ashore',
                'description': r're:^In this episode we explore the unsung heroes of D-Day, the landing craft.',
                'upload_date': '20200327',
                'timestamp': 1585348140,
                'channel': 'The Logistics of D-Day',
                'uploader': 'The Logistics of D-Day',
            },
            'params': {
                'usenetrc': True,
            },
            'skip': 'All Nebula content requires authentication',
        },
        {
            'url': 'https://watchnebula.com/videos/money-episode-1-the-draw',
            'md5': '8c7d272910eea320f6f8e6d3084eecf5',
            'info_dict': {
                'id': '5e779ebdd157bc0001d1c75a',
                'ext': 'mp4',
                'title': 'Episode 1: The Draw',
                'description': r'contains:There’s free money on offer… if the players can all work together.',
                'upload_date': '20200323',
                'timestamp': 1584980400,
                'channel': 'Tom Scott Presents: Money',
                'uploader': 'Tom Scott Presents: Money',
            },
            'params': {
                'usenetrc': True,
            },
            'skip': 'All Nebula content requires authentication',
        },
    ]
    _NETRC_MACHINE = 'watchnebula'
    def _retrieve_nebula_auth(self, video_id):
        """
        Log in to Nebula, and returns a Nebula API token
        """
        username, password = self._get_login_info()
        if not (username and password):
            self.raise_login_required()
        self.report_login()
        data = json.dumps({'email': username, 'password': password}).encode('utf8')
        response = self._download_json(
            'https://api.watchnebula.com/api/v1/auth/login/',
            data=data, fatal=False, video_id=video_id,
            headers={
                'content-type': 'application/json',
                # Submitting the 'sessionid' cookie always causes a 403 on auth endpoint
                'cookie': ''
            },
            note='Authenticating to Nebula with supplied credentials',
            errnote='Authentication failed or rejected')
        if not response or not response.get('key'):
            self.raise_login_required()
        return response['key']
    def _retrieve_zype_api_key(self, page_url, display_id):
        """
        Retrieves the Zype API key
        """
        # Find the js that has the API key from the webpage and download it
        webpage = self._download_webpage(page_url, video_id=display_id)
        main_script_relpath = self._search_regex(
            r'<script[^>]*src="(?P<script_relpath>[^"]*main.[0-9a-f]*.chunk.js)"[^>]*>', webpage,
            group='script_relpath', name='script relative path', fatal=True)
        main_script_abspath = urljoin(page_url, main_script_relpath)
        main_script = self._download_webpage(main_script_abspath, video_id=display_id,
                                             note='Retrieving Zype API key')
        api_key = self._search_regex(
            r'REACT_APP_ZYPE_API_KEY\s*:\s*"(?P<api_key>[\w-]*)"', main_script,
            group='api_key', name='API key', fatal=True)
        return api_key
    def _call_zype_api(self, path, params, video_id, api_key, note):
        """
        A helper for making calls to the Zype API.
        """
        query = {'api_key': api_key, 'per_page': 1}
        query.update(params)
        return self._download_json('https://api.zype.com' + path, video_id, query=query, note=note)
    def _call_nebula_api(self, path, video_id, access_token, note):
        """
        A helper for making calls to the Nebula API.
        """
        return self._download_json('https://api.watchnebula.com/api/v1' + path, video_id, headers={
            'Authorization': 'Token {access_token}'.format(access_token=access_token)
        }, note=note)
    def _fetch_zype_access_token(self, video_id, nebula_token):
        user_object = self._call_nebula_api('/auth/user/', video_id, nebula_token, note='Retrieving Zype access token')
        access_token = try_get(user_object, lambda x: x['zype_auth_info']['access_token'], compat_str)
        if not access_token:
            if try_get(user_object, lambda x: x['is_subscribed'], bool):
                # TODO: Reimplement the same Zype token polling the Nebula frontend implements
                # see https://github.com/ytdl-org/youtube-dl/pull/24805#issuecomment-749231532
                raise ExtractorError(
                    'Unable to extract Zype access token from Nebula API authentication endpoint. '
                    'Open an arbitrary video in a browser with this account to generate a token',
                    expected=True)
            raise ExtractorError('Unable to extract Zype access token from Nebula API authentication endpoint')
        return access_token
    def _extract_channel_title(self, video_meta):
        # TODO: Implement the API calls giving us the channel list,
        # so that we can do the title lookup and then figure out the channel URL
        categories = video_meta.get('categories', []) if video_meta else []
        # the channel name is the value of the first category
        for category in categories:
            if category.get('value'):
                return category['value'][0]
    def _real_extract(self, url):
        display_id = self._match_id(url)
        nebula_token = self._retrieve_nebula_auth(display_id)
        api_key = self._retrieve_zype_api_key(url, display_id)
        response = self._call_zype_api('/videos', {'friendly_title': display_id},
                                       display_id, api_key, note='Retrieving metadata from Zype')
        if len(response.get('response') or []) != 1:
            raise ExtractorError('Unable to find video on Zype API')
        video_meta = response['response'][0]
        video_id = video_meta['_id']
        zype_access_token = self._fetch_zype_access_token(display_id, nebula_token=nebula_token)
        channel_title = self._extract_channel_title(video_meta)
        return {
            'id': video_id,
            'display_id': display_id,
            '_type': 'url_transparent',
            'ie_key': 'Zype',
            'url': 'https://player.zype.com/embed/%s.html?access_token=%s' % (video_id, zype_access_token),
            'title': video_meta.get('title'),
            'description': video_meta.get('description'),
            'timestamp': parse_iso8601(video_meta.get('published_at')),
            'thumbnails': [
                {
                    'id': tn.get('name'),  # this appears to be null
                    'url': tn['url'],
                    'width': tn.get('width'),
                    'height': tn.get('height'),
                } for tn in video_meta.get('thumbnails', [])],
            'duration': video_meta.get('duration'),
            'channel': channel_title,
            'uploader': channel_title,  # we chose uploader = channel name
            # TODO: uploader_url, channel_id, channel_url
        }
@@ -1,144 +0,0 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from .common import InfoExtractor
 from ..utils import (
    try_get,
    unified_strdate,
    unified_timestamp
 )
 class NFHSNetworkIE(InfoExtractor):
    IE_NAME = 'NFHSNetwork'
    _VALID_URL = r'https?://(?:www\.)?nfhsnetwork\.com/events/[\w-]+/(?P<id>(?:gam|evt|dd|)?[\w\d]{0,10})'
    _TESTS = [{
        # Auto-generated two-team sport (pixellot)
        'url': 'https://www.nfhsnetwork.com/events/rockford-high-school-rockford-mi/gamcf7e54cfbc',
        'info_dict': {
            'id': 'gamcf7e54cfbc',
            'ext': 'mp4',
            'title': 'Rockford vs Spring Lake - Girls Varsity Lacrosse 03/27/2021',
            'uploader': 'MHSAA - Michigan: Rockford High School, Rockford, MI',
            'uploader_id': 'cd2622cf76',
            'uploader_url': 'https://www.nfhsnetwork.com/schools/rockford-high-school-rockford-mi',
            'location': 'Rockford, Michigan',
            'timestamp': 1616859000,
            'upload_date': '20210327'
        },
        'params': {
            # m3u8 download
            'skip_download': True,
        }
    }, {
        # Non-sport activity with description
        'url': 'https://www.nfhsnetwork.com/events/limon-high-school-limon-co/evt4a30e3726c',
        'info_dict': {
            'id': 'evt4a30e3726c',
            'ext': 'mp4',
            'title': 'Drama Performance Limon High School vs. Limon High School - 12/13/2020',
            'description': 'Join the broadcast of the Limon High School Musical Performance at 2 PM.',
            'uploader': 'CHSAA: Limon High School, Limon, CO',
            'uploader_id': '7d2d121332',
            'uploader_url': 'https://www.nfhsnetwork.com/schools/limon-high-school-limon-co',
            'location': 'Limon, Colorado',
            'timestamp': 1607893200,
            'upload_date': '20201213'
        },
        'params': {
            # m3u8 download
            'skip_download': True,
        }
    }, {
        # Postseason game
        'url': 'https://www.nfhsnetwork.com/events/nfhs-network-special-events/dd8de71d45',
        'info_dict': {
            'id': 'dd8de71d45',
            'ext': 'mp4',
            'title': '2015 UA Holiday Classic Tournament: National Division  - 12/26/2015',
            'uploader': 'SoCal Sports Productions',
            'uploader_id': '063dba0150',
            'uploader_url': 'https://www.nfhsnetwork.com/affiliates/socal-sports-productions',
            'location': 'San Diego, California',
            'timestamp': 1451187000,
            'upload_date': '20151226'
        },
        'params': {
            # m3u8 download
            'skip_download': True,
        }
    }, {
        # Video with no broadcasts object
        'url': 'https://www.nfhsnetwork.com/events/wiaa-wi/9aa2f92f82',
        'info_dict': {
            'id': '9aa2f92f82',
            'ext': 'mp4',
            'title': 'Competitive Equity  - 01/21/2015',
            'description': 'Committee members discuss points of their research regarding a competitive equity plan',
            'uploader': 'WIAA - Wisconsin: Wisconsin Interscholastic Athletic Association',
            'uploader_id': 'a49f7d1002',
            'uploader_url': 'https://www.nfhsnetwork.com/associations/wiaa-wi',
            'location': 'Stevens Point, Wisconsin',
            'timestamp': 1421856000,
            'upload_date': '20150121'
        },
        'params': {
            # m3u8 download
            'skip_download': True,
        }
    }
    ]
    def _real_extract(self, url):
        video_id = self._match_id(url)
        webpage = self._download_webpage(url, video_id)
        data = self._download_json(
            'https://cfunity.nfhsnetwork.com/v2/game_or_event/' + video_id,
            video_id)
        publisher = data.get('publishers')[0]  # always exists
        broadcast = (publisher.get('broadcasts') or publisher.get('vods'))[0]  # some (older) videos don't have a broadcasts object
        uploader = publisher.get('formatted_name') or publisher.get('name')
        uploaderID = publisher.get('publisher_key')
        pubType = publisher.get('type')
        uploaderPrefix = (
            "schools" if pubType == "school"
            else "associations" if "association" in pubType
            else "affiliates" if (pubType == "publisher" or pubType == "affiliate")
            else "schools")
        uploaderPage = 'https://www.nfhsnetwork.com/%s/%s' % (uploaderPrefix, publisher.get('slug'))
        location = '%s, %s' % (data.get('city'), data.get('state_name'))
        description = broadcast.get('description')
        isLive = broadcast.get('on_air') or broadcast.get('status') == 'on_air' or False
        timestamp = unified_timestamp(data.get('local_start_time'))
        upload_date = unified_strdate(data.get('local_start_time'))
        title = (
            self._og_search_title(webpage)
            or self._html_search_regex(r'<h1 class="sr-hidden">(.*?)</h1>', webpage, 'title'))
        title = title.split('|')[0].strip()
        video_type = 'broadcasts' if isLive else 'vods'
        key = broadcast.get('key') if isLive else try_get(publisher, lambda x: x['vods'][0]['key'])
        m3u8_url = self._download_json(
            'https://cfunity.nfhsnetwork.com/v2/%s/%s/url' % (video_type, key),
            video_id).get('video_url')
        formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', live=isLive)
        self._sort_formats(formats, ['res', 'tbr'])
        return {
            'id': video_id,
            'title': title,
            'formats': formats,
            'description': description,
            'timestamp': timestamp,
            'uploader': uploader,
            'uploader_id': uploaderID,
            'uploader_url': uploaderPage,
            'location': location,
            'upload_date': upload_date,
            'is_live': isLive
        }
@@ -8,7 +8,6 @@ import datetime
 from .common import InfoExtractor
 from ..postprocessor.ffmpeg import FFmpegPostProcessor
 from ..compat import (
    compat_str,
    compat_parse_qs,
    compat_urllib_parse_urlparse,
 )
@@ -21,7 +20,6 @@ from ..utils import (
    parse_duration,
    parse_iso8601,
    PostProcessingError,
    str_or_none,
    remove_start,
    try_get,
    unified_timestamp,
@@ -36,7 +34,7 @@ class NiconicoIE(InfoExtractor):
    _TESTS = [{
        'url': 'http://www.nicovideo.jp/watch/sm22312215',
-        'md5': 'a5bad06f1347452102953f323c69da34s',
+        'md5': 'd1a75c0823e2f629128c43e1212760f9',
        'info_dict': {
            'id': 'sm22312215',
            'ext': 'mp4',
@@ -190,7 +188,7 @@ class NiconicoIE(InfoExtractor):
            if compat_parse_qs(parts.query).get('message', [None])[0] == 'cant_login':
                login_ok = False
        if not login_ok:
-            self.report_warning('unable to log in: bad username or password')
+            self._downloader.report_warning('unable to log in: bad username or password')
        return login_ok
    def _get_heartbeat_info(self, info_dict):
@@ -205,7 +203,7 @@ class NiconicoIE(InfoExtractor):
            'data-api-data="([^"]+)"', webpage,
            'API data', default='{}'), video_id)
-        session_api_data = try_get(api_data, lambda x: x['media']['delivery']['movie']['session'])
+        session_api_data = try_get(api_data, lambda x: x['video']['dmcInfo']['session_api'])
        session_api_endpoint = try_get(session_api_data, lambda x: x['urls'][0])
        # ping
@@ -222,7 +220,7 @@ class NiconicoIE(InfoExtractor):
        yesno = lambda x: 'yes' if x else 'no'
        # m3u8 (encryption)
-        if 'encryption' in (try_get(api_data, lambda x: x['media']['delivery']['movie']) or {}):
+        if 'encryption' in try_get(api_data, lambda x: x['video']['dmcInfo']) or {}:
            protocol = 'm3u8'
            session_api_http_parameters = {
                'parameters': {
@@ -246,8 +244,8 @@ class NiconicoIE(InfoExtractor):
            session_api_http_parameters = {
                'parameters': {
                    'http_output_download_parameters': {
-                        'use_ssl': yesno(session_api_endpoint['isSsl']),
+                        'use_ssl': yesno(session_api_endpoint['is_ssl']),
-                        'use_well_known_port': yesno(session_api_endpoint['isWellKnownPort']),
+                        'use_well_known_port': yesno(session_api_endpoint['is_well_known_port']),
                    }
                }
            }
@@ -260,15 +258,15 @@ class NiconicoIE(InfoExtractor):
            data=json.dumps({
                'session': {
                    'client_info': {
-                        'player_id': session_api_data.get('playerId'),
+                        'player_id': session_api_data.get('player_id'),
                    },
                    'content_auth': {
-                        'auth_type': try_get(session_api_data, lambda x: x['authTypes'][session_api_data['protocols'][0]]),
+                        'auth_type': try_get(session_api_data, lambda x: x['auth_types'][session_api_data['protocols'][0]]),
-                        'content_key_timeout': session_api_data.get('contentKeyTimeout'),
+                        'content_key_timeout': session_api_data.get('content_key_timeout'),
                        'service_id': 'nicovideo',
-                        'service_user_id': session_api_data.get('serviceUserId')
+                        'service_user_id': session_api_data.get('service_user_id')
                    },
-                    'content_id': session_api_data.get('contentId'),
+                    'content_id': session_api_data.get('content_id'),
                    'content_src_id_sets': [{
                        'content_src_ids': [{
                            'src_id_to_mux': {
@@ -281,7 +279,7 @@ class NiconicoIE(InfoExtractor):
                    'content_uri': '',
                    'keep_method': {
                        'heartbeat': {
-                            'lifetime': session_api_data.get('heartbeatLifetime')
+                            'lifetime': session_api_data.get('heartbeat_lifetime')
                        }
                    },
                    'priority': session_api_data.get('priority'),
@@ -291,7 +289,7 @@ class NiconicoIE(InfoExtractor):
                            'http_parameters': session_api_http_parameters
                        }
                    },
-                    'recipe_id': session_api_data.get('recipeId'),
+                    'recipe_id': session_api_data.get('recipe_id'),
                    'session_operation_auth': {
                        'session_operation_auth_by_signature': {
                            'signature': session_api_data.get('signature'),
@@ -310,7 +308,7 @@ class NiconicoIE(InfoExtractor):
            'url': session_api_endpoint['url'] + '/' + session_response['data']['session']['id'] + '?_format=json&_method=PUT',
            'data': json.dumps(session_response['data']),
            # interval, convert milliseconds to seconds, then halve to make a buffer.
-            'interval': float_or_none(session_api_data.get('heartbeatLifetime'), scale=2000),
+            'interval': float_or_none(session_api_data.get('heartbeat_lifetime'), scale=2000),
        }
        return info_dict, heartbeat_info_dict
@@ -329,17 +327,15 @@ class NiconicoIE(InfoExtractor):
        format_id = '-'.join(map(lambda s: remove_start(s['id'], 'archive_'), [video_quality, audio_quality]))
        vdict = parse_format_id(video_quality['id'])
        adict = parse_format_id(audio_quality['id'])
-        resolution = try_get(video_quality, lambda x: x['metadata']['resolution'], dict) or {'height': vdict.get('res')}
+        resolution = video_quality.get('resolution', {'height': vdict.get('res')})
        vbr = try_get(video_quality, lambda x: x['metadata']['bitrate'], float)
        return {
            'url': '%s:%s/%s/%s' % (protocol, video_id, video_quality['id'], audio_quality['id']),
            'format_id': format_id,
            'format_note': 'DMC %s' % try_get(video_quality, lambda x: x['metadata']['label'], compat_str),
            'ext': 'mp4',  # Session API are used in HTML5, which always serves mp4
            'vcodec': vdict.get('codec'),
            'acodec': adict.get('codec'),
-            'vbr': float_or_none(vbr, 1000) or float_or_none(vdict.get('br')),
+            'vbr': float_or_none(video_quality.get('bitrate'), 1000) or float_or_none(vdict.get('br')),
            'abr': float_or_none(audio_quality.get('bitrate'), 1000) or float_or_none(adict.get('br')),
            'height': int_or_none(resolution.get('height', vdict.get('res'))),
            'width': int_or_none(resolution.get('width')),
@@ -398,93 +394,92 @@ class NiconicoIE(InfoExtractor):
        formats = []
        # Get HTML5 videos info
-        quality_info = try_get(api_data, lambda x: x['media']['delivery']['movie'])
+        try:
-        if not quality_info:
+            dmc_info = api_data['video']['dmcInfo']
-            raise ExtractorError('The video can\'t downloaded.', expected=True)
+        except KeyError:
            raise ExtractorError('The video can\'t downloaded.',
                                 expected=True)
        quality_info = dmc_info.get('quality')
        for audio_quality in quality_info.get('audios') or {}:
            for video_quality in quality_info.get('videos') or {}:
-                if not audio_quality.get('isAvailable') or not video_quality.get('isAvailable'):
+                if not audio_quality.get('available') or not video_quality.get('available'):
                    continue
                formats.append(self._extract_format_for_quality(
                    api_data, video_id, audio_quality, video_quality))
        # Get flv/swf info
        timestamp = None
        video_real_url = try_get(api_data, lambda x: x['video']['smileInfo']['url'])
-        if not video_real_url:
+        is_economy = video_real_url.endswith('low')
            self.report_warning('Unable to obtain smile video information')
        else:
            is_economy = video_real_url.endswith('low')
-            if is_economy:
+        if is_economy:
-                self.report_warning('Site is currently in economy mode! You will only have access to lower quality streams')
+            self.report_warning('Site is currently in economy mode! You will only have access to lower quality streams')
-            # Invoking ffprobe to determine resolution
+        # Invoking ffprobe to determine resolution
-            pp = FFmpegPostProcessor(self._downloader)
+        pp = FFmpegPostProcessor(self._downloader)
-            cookies = self._get_cookies('https://nicovideo.jp').output(header='', sep='; path=/; domain=nicovideo.jp;\n')
+        cookies = self._get_cookies('https://nicovideo.jp').output(header='', sep='; path=/; domain=nicovideo.jp;\n')
-            self.to_screen('%s: %s' % (video_id, 'Checking smile format with ffprobe'))
+        self.to_screen('%s: %s' % (video_id, 'Checking smile format with ffprobe'))
-            try:
+        try:
-                metadata = pp.get_metadata_object(video_real_url, ['-cookies', cookies])
+            metadata = pp.get_metadata_object(video_real_url, ['-cookies', cookies])
-            except PostProcessingError as err:
+        except PostProcessingError as err:
-                raise ExtractorError(err.msg, expected=True)
+            raise ExtractorError(err.msg, expected=True)
-            v_stream = a_stream = {}
+        v_stream = a_stream = {}
-            # Some complex swf files doesn't have video stream (e.g. nm4809023)
+        # Some complex swf files doesn't have video stream (e.g. nm4809023)
-            for stream in metadata['streams']:
+        for stream in metadata['streams']:
-                if stream['codec_type'] == 'video':
+            if stream['codec_type'] == 'video':
-                    v_stream = stream
+                v_stream = stream
-                elif stream['codec_type'] == 'audio':
+            elif stream['codec_type'] == 'audio':
-                    a_stream = stream
+                a_stream = stream
-            # Community restricted videos seem to have issues with the thumb API not returning anything at all
+        # Community restricted videos seem to have issues with the thumb API not returning anything at all
-            filesize = int(
+        filesize = int(
-                (get_video_info_xml('size_high') if not is_economy else get_video_info_xml('size_low'))
+            (get_video_info_xml('size_high') if not is_economy else get_video_info_xml('size_low'))
-                or metadata['format']['size']
+            or metadata['format']['size']
-            )
+        )
-            extension = (
+        extension = (
-                get_video_info_xml('movie_type')
+            get_video_info_xml('movie_type')
-                or 'mp4' if 'mp4' in metadata['format']['format_name'] else metadata['format']['format_name']
+            or 'mp4' if 'mp4' in metadata['format']['format_name'] else metadata['format']['format_name']
-            )
+        )
-            # 'creation_time' tag on video stream of re-encoded SMILEVIDEO mp4 files are '1970-01-01T00:00:00.000000Z'.
+        # 'creation_time' tag on video stream of re-encoded SMILEVIDEO mp4 files are '1970-01-01T00:00:00.000000Z'.
-            timestamp = (
+        timestamp = (
-                parse_iso8601(get_video_info_web('first_retrieve'))
+            parse_iso8601(get_video_info_web('first_retrieve'))
-                or unified_timestamp(get_video_info_web('postedDateTime'))
+            or unified_timestamp(get_video_info_web('postedDateTime'))
-            )
+        )
-            metadata_timestamp = (
+        metadata_timestamp = (
-                parse_iso8601(try_get(v_stream, lambda x: x['tags']['creation_time']))
+            parse_iso8601(try_get(v_stream, lambda x: x['tags']['creation_time']))
-                or timestamp if extension != 'mp4' else 0
+            or timestamp if extension != 'mp4' else 0
-            )
+        )
-            # According to compconf, smile videos from pre-2017 are always better quality than their DMC counterparts
+        # According to compconf, smile videos from pre-2017 are always better quality than their DMC counterparts
-            smile_threshold_timestamp = parse_iso8601('2016-12-08T00:00:00+09:00')
+        smile_threshold_timestamp = parse_iso8601('2016-12-08T00:00:00+09:00')
-            is_source = timestamp < smile_threshold_timestamp or metadata_timestamp > 0
+        is_source = timestamp < smile_threshold_timestamp or metadata_timestamp > 0
-            # If movie file size is unstable, old server movie is not source movie.
+        # If movie file size is unstable, old server movie is not source movie.
-            if filesize > 1:
+        if filesize > 1:
-                formats.append({
+            formats.append({
-                    'url': video_real_url,
+                'url': video_real_url,
-                    'format_id': 'smile' if not is_economy else 'smile_low',
+                'format_id': 'smile' if not is_economy else 'smile_low',
-                    'format_note': 'SMILEVIDEO source' if not is_economy else 'SMILEVIDEO low quality',
+                'format_note': 'SMILEVIDEO source' if not is_economy else 'SMILEVIDEO low quality',
-                    'ext': extension,
+                'ext': extension,
-                    'container': extension,
+                'container': extension,
-                    'vcodec': v_stream.get('codec_name'),
+                'vcodec': v_stream.get('codec_name'),
-                    'acodec': a_stream.get('codec_name'),
+                'acodec': a_stream.get('codec_name'),
-                    # Some complex swf files doesn't have total bit rate metadata (e.g. nm6049209)
+                # Some complex swf files doesn't have total bit rate metadata (e.g. nm6049209)
-                    'tbr': int_or_none(metadata['format'].get('bit_rate'), scale=1000),
+                'tbr': int_or_none(metadata['format'].get('bit_rate'), scale=1000),
-                    'vbr': int_or_none(v_stream.get('bit_rate'), scale=1000),
+                'vbr': int_or_none(v_stream.get('bit_rate'), scale=1000),
-                    'abr': int_or_none(a_stream.get('bit_rate'), scale=1000),
+                'abr': int_or_none(a_stream.get('bit_rate'), scale=1000),
-                    'height': int_or_none(v_stream.get('height')),
+                'height': int_or_none(v_stream.get('height')),
-                    'width': int_or_none(v_stream.get('width')),
+                'width': int_or_none(v_stream.get('width')),
-                    'source_preference': 5 if not is_economy else -2,
+                'source_preference': 5 if not is_economy else -2,
-                    'quality': 5 if is_source and not is_economy else None,
+                'quality': 5 if is_source and not is_economy else None,
-                    'filesize': filesize
+                'filesize': filesize
-                })
+            })
        if len(formats) == 0:
            raise ExtractorError('Unable to find video info.')
@@ -492,12 +487,13 @@ class NiconicoIE(InfoExtractor):
        self._sort_formats(formats)
        # Start extracting information
-        title = (
+        title = get_video_info_web('originalTitle')
-            get_video_info_web(['originalTitle', 'title'])
+        if not title:
-            or self._og_search_title(webpage, default=None)
+            title = self._og_search_title(webpage, default=None)
-            or self._html_search_regex(
+        if not title:
            title = self._html_search_regex(
                r'<span[^>]+class="videoHeaderTitle"[^>]*>([^<]+)</span>',
-                webpage, 'video title'))
+                webpage, 'video title')
        watch_api_data_string = self._html_search_regex(
            r'<div[^>]+id="watchAPIDataContainer"[^>]+>([^<]+)</div>',
@@ -521,7 +517,6 @@ class NiconicoIE(InfoExtractor):
            timestamp = parse_iso8601(
                video_detail['postedAt'].replace('/', '-'),
                delimiter=' ', timezone=datetime.timedelta(hours=9))
        timestamp = timestamp or try_get(api_data, lambda x: parse_iso8601(x['video']['registeredAt']))
        view_count = int_or_none(get_video_info_web(['view_counter', 'viewCount']))
        if not view_count:
@@ -530,16 +525,11 @@ class NiconicoIE(InfoExtractor):
                webpage, 'view count', default=None)
            if match:
                view_count = int_or_none(match.replace(',', ''))
-        view_count = (
+        view_count = view_count or video_detail.get('viewCount')
            view_count
            or video_detail.get('viewCount')
            or try_get(api_data, lambda x: x['video']['count']['view']))
        comment_count = (
            int_or_none(get_video_info_web('comment_num'))
            or video_detail.get('commentCount')
            or try_get(api_data, lambda x: x['video']['count']['comment']))
        comment_count = (int_or_none(get_video_info_web('comment_num'))
                         or video_detail.get('commentCount')
                         or try_get(api_data, lambda x: x['thread']['commentCount']))
        if not comment_count:
            match = self._html_search_regex(
                r'>Comments: <strong[^>]*>([^<]+)</strong>',
@@ -569,7 +559,7 @@ class NiconicoIE(InfoExtractor):
        # Note: cannot use api_data.get('owner', {}) because owner may be set to "null"
        # in the JSON, which will cause None to be returned instead of {}.
        owner = try_get(api_data, lambda x: x.get('owner'), dict) or {}
-        uploader_id = str_or_none(
+        uploader_id = (
            get_video_info_web(['ch_id', 'user_id'])
            or owner.get('id')
            or channel_id
@@ -599,7 +589,7 @@ class NiconicoIE(InfoExtractor):
 class NiconicoPlaylistIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/(?:user/\d+/|my/)?mylist/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/(?:user/\d+/)?mylist/(?P<id>\d+)'
    _TESTS = [{
        'url': 'http://www.nicovideo.jp/mylist/27411728',
@@ -657,40 +647,3 @@ class NiconicoPlaylistIE(InfoExtractor):
            'uploader_id': uploader_id,
            'entries': OnDemandPagedList(pagefunc, 25),
        }
 class NiconicoUserIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/user/(?P<id>\d+)/?(?:$|[#?])'
    _TEST = {
        'url': 'https://www.nicovideo.jp/user/419948',
        'info_dict': {
            'id': '419948',
        },
        'playlist_mincount': 101,
    }
    _API_URL = "https://nvapi.nicovideo.jp/v1/users/%s/videos?sortKey=registeredAt&sortOrder=desc&pageSize=%s&page=%s"
    _api_headers = {
        'X-Frontend-ID': '6',
        'X-Frontend-Version': '0',
        'X-Niconico-Language': 'en-us'
    }
    _PAGE_SIZE = 100
    def _entries(self, list_id, ):
        total_count = 1
        count = page_num = 0
        while count < total_count:
            json_parsed = self._download_json(
                self._API_URL % (list_id, self._PAGE_SIZE, page_num + 1), list_id,
                headers=self._api_headers,
                note='Downloading JSON metadata%s' % (' page %d' % page_num if page_num else ''))
            if not page_num:
                total_count = int_or_none(json_parsed['data'].get('totalCount'))
            for entry in json_parsed["data"]["items"]:
                count += 1
                yield self.url_result('https://www.nicovideo.jp/watch/%s' % entry['id'])
            page_num += 1
    def _real_extract(self, url):
        list_id = self._match_id(url)
        return self.playlist_result(self._entries(list_id), list_id, ie=NiconicoIE.ie_key())
@@ -11,100 +11,60 @@ from ..utils import (
    determine_ext,
 )
 import re
 import random
 class NitterIE(InfoExtractor):
    # Taken from https://github.com/zedeus/nitter/wiki/Instances
-
+    INSTANCES = ('nitter.net',
-    NON_HTTP_INSTANCES = (
+                 'nitter.snopyta.org',
-        '3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion',
+                 'nitter.42l.fr',
-        'nitter.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd.onion',
+                 'nitter.nixnet.services',
-        'nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion',
+                 'nitter.13ad.de',
-        'npf37k3mtzwxreiw52ccs5ay4e6qt2fkcs2ndieurdyn2cuzzsfyfvid.onion',
+                 'nitter.pussthecat.org',
-        'nitter.v6vgyqpa7yefkorazmg5d5fimstmvm2vtbirt6676mt7qmllrcnwycqd.onion',
+                 'nitter.mastodont.cat',
-        'i23nv6w3juvzlw32xzoxcqzktegd4i4fu3nmnc2ewv4ggiu4ledwklad.onion',
+                 'nitter.dark.fail',
-        '26oq3gioiwcmfojub37nz5gzbkdiqp7fue5kvye7d4txv4ny6fb4wwid.onion',
+                 'nitter.tedomum.net',
-
+                 'nitter.cattube.org',
-        'nitter.i2p',
+                 'nitter.fdn.fr',
-        'u6ikd6zndl3c4dsdq4mmujpntgeevdk5qzkfb57r4tnfeccrn2qa.b32.i2p',
+                 'nitter.1d4.us',
-
+                 'nitter.kavin.rocks',
-        'nitterlgj3n5fgwesu3vxc5h67ruku33nqaoeoocae2mvlzhsu6k7fqd.onion',
+                 'tweet.lambda.dance',
-    )
+                 'nitter.cc',
-
+                 'nitter.weaponizedhumiliation.com',
-    HTTP_INSTANCES = (
+                 '3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion',
-        'nitter.42l.fr',
+                 'nitter.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd.onion',
-        'nitter.pussthecat.org',
+                 'nitterlgj3n5fgwesu3vxc5h67ruku33nqaoeoocae2mvlzhsu6k7fqd.onion')
        'nitter.nixnet.services',
        'nitter.mastodont.cat',
        'nitter.tedomum.net',
        'nitter.fdn.fr',
        'nitter.1d4.us',
        'nitter.kavin.rocks',
        'tweet.lambda.dance',
        'nitter.cc',
        'nitter.vxempire.xyz',
        'nitter.unixfox.eu',
        'nitter.domain.glass',
        'nitter.himiko.cloud',
        'nitter.eu',
        'nitter.namazso.eu',
        'nitter.mailstation.de',
        'nitter.actionsack.com',
        'nitter.cattube.org',
        'nitter.dark.fail',
        'birdsite.xanny.family',
        'nitter.40two.app',
        'nitter.skrep.in',
        # not in the list anymore
        'nitter.snopyta.org',
    )
    DEAD_INSTANCES = (
        # maintenance
        'nitter.ethibox.fr',
        # official, rate limited
        'nitter.net',
        # offline
        'nitter.13ad.de',
        'nitter.weaponizedhumiliation.com',
    )
    INSTANCES = NON_HTTP_INSTANCES + HTTP_INSTANCES + DEAD_INSTANCES
    _INSTANCES_RE = '(?:' + '|'.join([re.escape(instance) for instance in INSTANCES]) + ')'
    _VALID_URL = r'https?://%(instance)s/(?P<uploader_id>.+)/status/(?P<id>[0-9]+)(#.)?' % {'instance': _INSTANCES_RE}
-    current_instance = random.choice(HTTP_INSTANCES)
+    current_instance = INSTANCES[0]  # the test and official instance
    _TESTS = [
        {
            # GIF (wrapped in mp4)
-            'url': 'https://%s/firefox/status/1314279897502629888#m' % current_instance,
+            'url': 'https://' + current_instance + '/firefox/status/1314279897502629888#m',
            'info_dict': {
                'id': '1314279897502629888',
                'ext': 'mp4',
-                'title': 'Firefox 🔥 - You know the old saying, if you see something say something. Now you actually can with the YouTube regrets extension. \n\nReport harmful YouTube recommendations so others can avoid watching them. ➡️ https://mzl.la/3iFIiyg\n\n#UnfckTheInternet',
+                'title': 'Firefox 🔥 - You know the old saying, if you see something say something. Now you actually can with the YouTube regrets extension.   Report harmful YouTube recommendations so others can avoid watching them. ➡️ https://mzl.la/3iFIiyg  #UnfckTheInternet',
-                'description': 'You know the old saying, if you see something say something. Now you actually can with the YouTube regrets extension. \n\nReport harmful YouTube recommendations so others can avoid watching them. ➡️ https://mzl.la/3iFIiyg\n\n#UnfckTheInternet',
+                'description': 'You know the old saying, if you see something say something. Now you actually can with the YouTube regrets extension.   Report harmful YouTube recommendations so others can avoid watching them. ➡️ https://mzl.la/3iFIiyg  #UnfckTheInternet',
                'thumbnail': r're:^https?://.*\.jpg$',
                'uploader': 'Firefox 🔥',
                'uploader_id': 'firefox',
-                'uploader_url': 'https://%s/firefox' % current_instance,
+                'uploader_url': 'https://' + current_instance + '/firefox',
                'upload_date': '20201008',
                'timestamp': 1602183720,
            },
        }, {  # normal video
-            'url': 'https://%s/Le___Doc/status/1299715685392756737#m' % current_instance,
+            'url': 'https://' + current_instance + '/Le___Doc/status/1299715685392756737#m',
            'info_dict': {
                'id': '1299715685392756737',
                'ext': 'mp4',
-                'title': 'Le Doc - "Je ne prédis jamais rien"\nD Raoult, Août 2020...',
+                'title': 'Le Doc - "Je ne prédis jamais rien" D Raoult, Août 2020...',
-                'description': '"Je ne prédis jamais rien"\nD Raoult, Août 2020...',
+                'description': '"Je ne prédis jamais rien" D Raoult, Août 2020...',
                'thumbnail': r're:^https?://.*\.jpg$',
                'uploader': 'Le Doc',
                'uploader_id': 'Le___Doc',
-                'uploader_url': 'https://%s/Le___Doc' % current_instance,
+                'uploader_url': 'https://' + current_instance + '/Le___Doc',
                'upload_date': '20200829',
                'timestamp': 1598711341,
                'view_count': int,
@@ -113,51 +73,31 @@ class NitterIE(InfoExtractor):
                'comment_count': int,
            },
        }, {  # video embed in a "Streaming Political Ads" box
-            'url': 'https://%s/mozilla/status/1321147074491092994#m' % current_instance,
+            'url': 'https://' + current_instance + '/mozilla/status/1321147074491092994#m',
            'info_dict': {
                'id': '1321147074491092994',
                'ext': 'mp4',
-                'title': "Mozilla - Are you being targeted with weird, ominous or just plain annoying political ads while streaming your favorite shows?\n\nThis isn't a real political ad, but if you're watching streaming TV in the U.S., chances are you've seen quite a few. \n\nLearn more ➡️ https://mzl.la/StreamingAds",
+                'title': "Mozilla - Are you being targeted with weird, ominous or just plain annoying political ads while streaming your favorite shows?  This isn't a real political ad, but if you're watching streaming TV in the U.S., chances are you've seen quite a few.   Learn more ➡️ https://mzl.la/StreamingAds",
-                'description': "Are you being targeted with weird, ominous or just plain annoying political ads while streaming your favorite shows?\n\nThis isn't a real political ad, but if you're watching streaming TV in the U.S., chances are you've seen quite a few. \n\nLearn more ➡️ https://mzl.la/StreamingAds",
+                'description': "Are you being targeted with weird, ominous or just plain annoying political ads while streaming your favorite shows?  This isn't a real political ad, but if you're watching streaming TV in the U.S., chances are you've seen quite a few.   Learn more ➡️ https://mzl.la/StreamingAds",
                'thumbnail': r're:^https?://.*\.jpg$',
                'uploader': 'Mozilla',
                'uploader_id': 'mozilla',
-                'uploader_url': 'https://%s/mozilla' % current_instance,
+                'uploader_url': 'https://' + current_instance + '/mozilla',
                'upload_date': '20201027',
                'timestamp': 1603820982
            },
-        }, {  # not the first tweet but main-tweet
+        },
            'url': 'https://%s/TheNaturalNu/status/1379050895539724290#m' % current_instance,
            'info_dict': {
                'id': '1379050895539724290',
                'ext': 'mp4',
                'title': 'Dorothy Zbornak - This had me hollering!!',
                'description': 'This had me hollering!!',
                'thumbnail': r're:^https?://.*\.jpg$',
                'uploader': 'Dorothy Zbornak',
                'uploader_id': 'TheNaturalNu',
                'uploader_url': 'https://%s/TheNaturalNu' % current_instance,
                'timestamp': 1617626329,
                'upload_date': '20210405'
            }
        }
    ]
    def _real_extract(self, url):
        video_id = self._match_id(url)
        parsed_url = compat_urlparse.urlparse(url)
-        base_url = '%s://%s' % (parsed_url.scheme, parsed_url.netloc)
+        base_url = parsed_url.scheme + '://' + parsed_url.netloc
        self._set_cookie(parsed_url.netloc, 'hlsPlayback', 'on')
-        full_webpage = self._download_webpage(url, video_id)
+        webpage = self._download_webpage(url, video_id)
-        main_tweet_start = full_webpage.find('class="main-tweet"')
+        video_url = base_url + self._html_search_regex(r'(?:<video[^>]+data-url|<source[^>]+src)="([^"]+)"', webpage, 'video url')
        if main_tweet_start > 0:
            webpage = full_webpage[main_tweet_start:]
        if not webpage:
            webpage = full_webpage
        video_url = '%s%s' % (base_url, self._html_search_regex(r'(?:<video[^>]+data-url|<source[^>]+src)="([^"]+)"', webpage, 'video url'))
        ext = determine_ext(video_url)
        if ext == 'unknown_video':
@@ -168,34 +108,33 @@ class NitterIE(InfoExtractor):
                'ext': ext
            }]
-        title = self._og_search_description(full_webpage)
+        title = (
-        if not title:
+            self._og_search_description(webpage).replace('\n', ' ')
-            title = self._html_search_regex(r'<div class="tweet-content[^>]+>([^<]+)</div>', webpage, 'title')
+            or self._html_search_regex(r'<div class="tweet-content[^>]+>([^<]+)</div>', webpage, 'title'))
        description = title
        mobj = re.match(self._VALID_URL, url)
        uploader_id = (
            mobj.group('uploader_id')
-            or self._html_search_regex(r'<a class="fullname"[^>]+title="([^"]+)"', webpage, 'uploader name', fatal=False)
+            or self._html_search_regex(r'<a class="fullname"[^>]+title="([^"]+)"', webpage, 'uploader name', fatal=False))
        )
        if uploader_id:
-            uploader_url = '%s/%s' % (base_url, uploader_id)
+            uploader_url = base_url + '/' + uploader_id
        uploader = self._html_search_regex(r'<a class="fullname"[^>]+title="([^"]+)"', webpage, 'uploader name', fatal=False)
        if uploader:
-            title = '%s - %s' % (uploader, title)
+            title = uploader + ' - ' + title
        view_count = parse_count(self._html_search_regex(r'<span[^>]+class="icon-play[^>]*></span>\s([^<]+)</div>', webpage, 'view count', fatal=False))
        like_count = parse_count(self._html_search_regex(r'<span[^>]+class="icon-heart[^>]*></span>\s([^<]+)</div>', webpage, 'like count', fatal=False))
        repost_count = parse_count(self._html_search_regex(r'<span[^>]+class="icon-retweet[^>]*></span>\s([^<]+)</div>', webpage, 'repost count', fatal=False))
        comment_count = parse_count(self._html_search_regex(r'<span[^>]+class="icon-comment[^>]*></span>\s([^<]+)</div>', webpage, 'repost count', fatal=False))
-        thumbnail = self._html_search_meta('og:image', full_webpage, 'thumbnail url')
+        thumbnail = base_url + (self._html_search_meta('og:image', webpage, 'thumbnail url')
-        if not thumbnail:
+                                or self._html_search_regex(r'<video[^>]+poster="([^"]+)"', webpage, 'thumbnail url', fatal=False))
-            thumbnail = '%s%s' % (base_url, self._html_search_regex(r'<video[^>]+poster="([^"]+)"', webpage, 'thumbnail url', fatal=False))
+
-            thumbnail = remove_end(thumbnail, '%3Asmall')
+        thumbnail = remove_end(thumbnail, '%3Asmall')  # if parsed with regex, it should contain this
        thumbnails = []
        thumbnail_ids = ('thumb', 'small', 'large', 'medium', 'orig')
@@ -247,7 +247,7 @@ class NPOIE(NPOBaseIE):
        if not formats:
            if not self._downloader.params.get('allow_unplayable_formats') and drm:
-                self.raise_no_formats('This video is DRM protected.', expected=True)
+                raise ExtractorError('This video is DRM protected.', expected=True)
            return
        self._sort_formats(formats)
@@ -260,7 +260,7 @@ class OdnoklassnikiIE(InfoExtractor):
        if not formats:
            payment_info = metadata.get('paymentInfo')
            if payment_info:
-                self.raise_no_formats('This video is paid, subscribe to download it', expected=True)
+                raise ExtractorError('This video is paid, subscribe to download it', expected=True)
        self._sort_formats(formats)
@@ -10,6 +10,7 @@ from ..compat import (
 )
 from ..utils import (
    determine_ext,
    ExtractorError,
    float_or_none,
    int_or_none,
    try_get,
@@ -84,7 +85,7 @@ class OoyalaBaseIE(InfoExtractor):
                    'fps': float_or_none(stream.get('framerate')),
                })
        if not formats and not auth_data.get('authorized'):
-            self.raise_no_formats('%s said: %s' % (
+            raise ExtractorError('%s said: %s' % (
                self.IE_NAME, auth_data['message']), expected=True)
        self._sort_formats(formats)
@@ -1,148 +0,0 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import re
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
    int_or_none,
    str_or_none,
    try_get,
 )
 class PalcoMP3BaseIE(InfoExtractor):
    _GQL_QUERY_TMPL = '''{
  artist(slug: "%s") {
    %s
  }
 }'''
    _ARTIST_FIELDS_TMPL = '''music(slug: "%%s") {
      %s
    }'''
    _MUSIC_FIELDS = '''duration
      hls
      mp3File
      musicID
      plays
      title'''
    def _call_api(self, artist_slug, artist_fields):
        return self._download_json(
            'https://www.palcomp3.com.br/graphql/', artist_slug, query={
                'query': self._GQL_QUERY_TMPL % (artist_slug, artist_fields),
            })['data']
    def _parse_music(self, music):
        music_id = compat_str(music['musicID'])
        title = music['title']
        formats = []
        hls_url = music.get('hls')
        if hls_url:
            formats.append({
                'url': hls_url,
                'protocol': 'm3u8_native',
                'ext': 'mp4',
            })
        mp3_file = music.get('mp3File')
        if mp3_file:
            formats.append({
                'url': mp3_file,
            })
        return {
            'id': music_id,
            'title': title,
            'formats': formats,
            'duration': int_or_none(music.get('duration')),
            'view_count': int_or_none(music.get('plays')),
        }
    def _real_initialize(self):
        self._ARTIST_FIELDS_TMPL = self._ARTIST_FIELDS_TMPL % self._MUSIC_FIELDS
    def _real_extract(self, url):
        artist_slug, music_slug = re.match(self._VALID_URL, url).groups()
        artist_fields = self._ARTIST_FIELDS_TMPL % music_slug
        music = self._call_api(artist_slug, artist_fields)['artist']['music']
        return self._parse_music(music)
 class PalcoMP3IE(PalcoMP3BaseIE):
    IE_NAME = 'PalcoMP3:song'
    _VALID_URL = r'https?://(?:www\.)?palcomp3\.com(?:\.br)?/(?P<artist>[^/]+)/(?P<id>[^/?&#]+)'
    _TESTS = [{
        'url': 'https://www.palcomp3.com/maiaraemaraisaoficial/nossas-composicoes-cuida-bem-dela/',
        'md5': '99fd6405b2d8fd589670f6db1ba3b358',
        'info_dict': {
            'id': '3162927',
            'ext': 'mp3',
            'title': 'Nossas Composições - CUIDA BEM DELA',
            'duration': 210,
            'view_count': int,
        }
    }]
    @classmethod
    def suitable(cls, url):
        return False if PalcoMP3VideoIE.suitable(url) else super(PalcoMP3IE, cls).suitable(url)
 class PalcoMP3ArtistIE(PalcoMP3BaseIE):
    IE_NAME = 'PalcoMP3:artist'
    _VALID_URL = r'https?://(?:www\.)?palcomp3\.com(?:\.br)?/(?P<id>[^/?&#]+)'
    _TESTS = [{
        'url': 'https://www.palcomp3.com.br/condedoforro/',
        'info_dict': {
            'id': '358396',
            'title': 'Conde do Forró',
        },
        'playlist_mincount': 188,
    }]
    _ARTIST_FIELDS_TMPL = '''artistID
    musics {
      nodes {
        %s
      }
    }
    name'''
    @ classmethod
    def suitable(cls, url):
        return False if re.match(PalcoMP3IE._VALID_URL, url) else super(PalcoMP3ArtistIE, cls).suitable(url)
    def _real_extract(self, url):
        artist_slug = self._match_id(url)
        artist = self._call_api(artist_slug, self._ARTIST_FIELDS_TMPL)['artist']
        def entries():
            for music in (try_get(artist, lambda x: x['musics']['nodes'], list) or []):
                yield self._parse_music(music)
        return self.playlist_result(
            entries(), str_or_none(artist.get('artistID')), artist.get('name'))
 class PalcoMP3VideoIE(PalcoMP3BaseIE):
    IE_NAME = 'PalcoMP3:video'
    _VALID_URL = r'https?://(?:www\.)?palcomp3\.com(?:\.br)?/(?P<artist>[^/]+)/(?P<id>[^/?&#]+)/?#clipe'
    _TESTS = [{
        'url': 'https://www.palcomp3.com/maiaraemaraisaoficial/maiara-e-maraisa-voce-faz-falta-aqui-ao-vivo-em-vicosa-mg/#clipe',
        'add_ie': ['Youtube'],
        'info_dict': {
            'id': '_pD1nR2qqPg',
            'ext': 'mp4',
            'title': 'Maiara e Maraisa - Você Faz Falta Aqui - DVD Ao Vivo Em Campo Grande',
            'description': 'md5:7043342c09a224598e93546e98e49282',
            'upload_date': '20161107',
            'uploader_id': 'maiaramaraisaoficial',
            'uploader': 'Maiara e Maraisa',
        }
    }]
    _MUSIC_FIELDS = 'youtubeID'
    def _parse_music(self, music):
        youtube_id = music['youtubeID']
        return self.url_result(youtube_id, 'Youtube', youtube_id)
@@ -599,13 +599,11 @@ class PeerTubeIE(InfoExtractor):
        else:
            age_limit = None
        webpage_url = 'https://%s/videos/watch/%s' % (host, video_id)
        return {
            'id': video_id,
            'title': title,
            'description': description,
-            'thumbnail': urljoin(webpage_url, video.get('thumbnailPath')),
+            'thumbnail': urljoin(url, video.get('thumbnailPath')),
            'timestamp': unified_timestamp(video.get('publishedAt')),
            'uploader': account_data('displayName', compat_str),
            'uploader_id': str_or_none(account_data('id', int)),
@@ -623,6 +621,5 @@ class PeerTubeIE(InfoExtractor):
            'tags': try_get(video, lambda x: x['tags'], list),
            'categories': categories,
            'formats': formats,
-            'subtitles': subtitles,
+            'subtitles': subtitles
            'webpage_url': webpage_url,
        }
@@ -79,7 +79,7 @@ class PhilharmonieDeParisIE(InfoExtractor):
                formats.extend(self._extract_m3u8_formats(
                    m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native',
                    m3u8_id='hls', fatal=False))
-            if not formats and not self._downloader.params.get('ignore_no_formats'):
+            if not formats:
                return
            self._sort_formats(formats)
            return {
@@ -1,15 +1,22 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import re
 import time
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
    ExtractorError,
    js_to_json,
    try_get,
    update_url_query,
    urlencode_postdata,
 )
 class PicartoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www.)?picarto\.tv/(?P<id>[a-zA-Z0-9]+)'
+    _VALID_URL = r'https?://(?:www.)?picarto\.tv/(?P<id>[a-zA-Z0-9]+)(?:/(?P<token>[a-zA-Z0-9]+))?'
    _TEST = {
        'url': 'https://picarto.tv/Setz',
        'info_dict': {
@@ -27,46 +34,65 @@ class PicartoIE(InfoExtractor):
        return False if PicartoVodIE.suitable(url) else super(PicartoIE, cls).suitable(url)
    def _real_extract(self, url):
-        channel_id = self._match_id(url)
+        mobj = re.match(self._VALID_URL, url)
        channel_id = mobj.group('id')
-        data = self._download_json(
+        metadata = self._download_json(
-            'https://ptvintern.picarto.tv/ptvapi', channel_id, query={
+            'https://api.picarto.tv/v1/channel/name/' + channel_id,
-                'query': '''{
+            channel_id)
  channel(name: "%s") {
    adult
    id
    online
    stream_name
    title
  }
  getLoadBalancerUrl(channel_name: "%s") {
    url
  }
 }''' % (channel_id, channel_id),
            })['data']
        metadata = data['channel']
-        if metadata.get('online') == 0:
+        if metadata.get('online') is False:
            raise ExtractorError('Stream is offline', expected=True)
        title = metadata['title']
        cdn_data = self._download_json(
-            data['getLoadBalancerUrl']['url'] + '/stream/json_' + metadata['stream_name'] + '.js',
+            'https://picarto.tv/process/channel', channel_id,
-            channel_id, 'Downloading load balancing info')
+            data=urlencode_postdata({'loadbalancinginfo': channel_id}),
            note='Downloading load balancing info')
        token = mobj.group('token') or 'public'
        params = {
            'con': int(time.time() * 1000),
            'token': token,
        }
        prefered_edge = cdn_data.get('preferedEdge')
        formats = []
-        for source in (cdn_data.get('source') or []):
+
-            source_url = source.get('url')
+        for edge in cdn_data['edges']:
-            if not source_url:
+            edge_ep = edge.get('ep')
            if not edge_ep or not isinstance(edge_ep, compat_str):
                continue
-            source_type = source.get('type')
+            edge_id = edge.get('id')
-            if source_type == 'html5/application/vnd.apple.mpegurl':
+            for tech in cdn_data['techs']:
-                formats.extend(self._extract_m3u8_formats(
+                tech_label = tech.get('label')
-                    source_url, channel_id, 'mp4', m3u8_id='hls', fatal=False))
+                tech_type = tech.get('type')
-            elif source_type == 'html5/video/mp4':
+                preference = 0
-                formats.append({
+                if edge_id == prefered_edge:
-                    'url': source_url,
+                    preference += 1
-                })
+                format_id = []
                if edge_id:
                    format_id.append(edge_id)
                if tech_type == 'application/x-mpegurl' or tech_label == 'HLS':
                    format_id.append('hls')
                    formats.extend(self._extract_m3u8_formats(
                        update_url_query(
                            'https://%s/hls/%s/index.m3u8'
                            % (edge_ep, channel_id), params),
                        channel_id, 'mp4', quality=preference,
                        m3u8_id='-'.join(format_id), fatal=False))
                    continue
                elif tech_type == 'video/mp4' or tech_label == 'MP4':
                    format_id.append('mp4')
                    formats.append({
                        'url': update_url_query(
                            'https://%s/mp4/%s.mp4' % (edge_ep, channel_id),
                            params),
                        'format_id': '-'.join(format_id),
                        'quality': preference,
                    })
                else:
                    # rtmp format does not seem to work
                    continue
        self._sort_formats(formats)
        mature = metadata.get('adult')
@@ -77,10 +103,10 @@ class PicartoIE(InfoExtractor):
        return {
            'id': channel_id,
-            'title': self._live_title(title.strip()),
+            'title': self._live_title(metadata.get('title') or channel_id),
            'is_live': True,
            'thumbnail': try_get(metadata, lambda x: x['thumbnails']['web']),
            'channel': channel_id,
            'channel_id': metadata.get('id'),
            'channel_url': 'https://picarto.tv/%s' % channel_id,
            'age_limit': age_limit,
            'formats': formats,
@@ -31,7 +31,6 @@ class PinterestBaseIE(InfoExtractor):
        title = (data.get('title') or data.get('grid_title') or video_id).strip()
        urls = []
        formats = []
        duration = None
        if extract_formats:
@@ -39,9 +38,8 @@ class PinterestBaseIE(InfoExtractor):
                if not isinstance(format_dict, dict):
                    continue
                format_url = url_or_none(format_dict.get('url'))
-                if not format_url or format_url in urls:
+                if not format_url:
                    continue
                urls.append(format_url)
                duration = float_or_none(format_dict.get('duration'), scale=1000)
                ext = determine_ext(format_url)
                if 'hls' in format_id.lower() or ext == 'm3u8':
@@ -393,7 +393,7 @@ query viewClip {
                # To somewhat reduce the probability of these consequences
                # we will sleep random amount of time before each call to ViewClip.
                self._sleep(
-                    random.randint(5, 10), display_id,
+                    random.randint(2, 5), display_id,
                    '%(video_id)s: Waiting for %(timeout)s seconds to avoid throttling')
                if not viewclip:
@@ -1,164 +0,0 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import re
 import uuid
 from .common import InfoExtractor
 from ..compat import (
    compat_str,
    compat_urlparse,
 )
 from ..utils import (
    ExtractorError,
    float_or_none,
    int_or_none,
    try_get,
    url_or_none,
 )
 class PlutoTVIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?pluto\.tv/on-demand/(?P<video_type>movies|series)/(?P<slug>.*)/?$'
    _INFO_URL = 'https://service-vod.clusters.pluto.tv/v3/vod/slugs/'
    _INFO_QUERY_PARAMS = {
        'appName': 'web',
        'appVersion': 'na',
        'clientID': compat_str(uuid.uuid1()),
        'clientModelNumber': 'na',
        'serverSideAds': 'false',
        'deviceMake': 'unknown',
        'deviceModel': 'web',
        'deviceType': 'web',
        'deviceVersion': 'unknown',
        'sid': compat_str(uuid.uuid1()),
    }
    _TESTS = [
        {
            'url': 'https://pluto.tv/on-demand/series/i-love-money/season/2/episode/its-in-the-cards-2009-2-3',
            'md5': 'ebcdd8ed89aaace9df37924f722fd9bd',
            'info_dict': {
                'id': '5de6c598e9379ae4912df0a8',
                'ext': 'mp4',
                'title': 'It\'s In The Cards',
                'episode': 'It\'s In The Cards',
                'description': 'The teams face off against each other in a 3-on-2 soccer showdown.  Strategy comes into play, though, as each team gets to select their opposing teams’ two defenders.',
                'series': 'I Love Money',
                'season_number': 2,
                'episode_number': 3,
                'duration': 3600,
            }
        },
        {
            'url': 'https://pluto.tv/on-demand/series/i-love-money/season/1/',
            'playlist_count': 11,
            'info_dict': {
                'id': '5de6c582e9379ae4912dedbd',
                'title': 'I Love Money - Season 1',
            }
        },
        {
            'url': 'https://pluto.tv/on-demand/series/i-love-money/',
            'playlist_count': 26,
            'info_dict': {
                'id': '5de6c582e9379ae4912dedbd',
                'title': 'I Love Money',
            }
        },
        {
            'url': 'https://pluto.tv/on-demand/movies/arrival-2015-1-1',
            'md5': '3cead001d317a018bf856a896dee1762',
            'info_dict': {
                'id': '5e83ac701fa6a9001bb9df24',
                'ext': 'mp4',
                'title': 'Arrival',
                'description': 'When mysterious spacecraft touch down across the globe, an elite team - led by expert translator Louise Banks (Academy Award® nominee Amy Adams) – races against time to decipher their intent.',
                'duration': 9000,
            }
        },
    ]
    def _to_ad_free_formats(self, video_id, formats):
        ad_free_formats = []
        m3u8_urls = set()
        for format in formats:
            res = self._download_webpage(
                format.get('url'), video_id, note='Downloading m3u8 playlist',
                fatal=False)
            if not res:
                continue
            first_segment_url = re.search(
                r'^(https?://.*/)0\-(end|[0-9]+)/[^/]+\.ts$', res,
                re.MULTILINE)
            if not first_segment_url:
                continue
            m3u8_urls.add(
                compat_urlparse.urljoin(first_segment_url.group(1), '0-end/master.m3u8'))
        for m3u8_url in m3u8_urls:
            ad_free_formats.extend(
                self._extract_m3u8_formats(
                    m3u8_url, video_id, 'mp4', 'm3u8_native',
                    m3u8_id='hls', fatal=False))
        self._sort_formats(ad_free_formats)
        return ad_free_formats
    def _get_video_info(self, video_json, slug, series_name=None):
        video_id = video_json.get('_id', slug)
        formats = []
        for video_url in try_get(video_json, lambda x: x['stitched']['urls'], list) or []:
            if video_url.get('type') != 'hls':
                continue
            url = url_or_none(video_url.get('url'))
            formats.extend(
                self._extract_m3u8_formats(
                    url, video_id, 'mp4', 'm3u8_native',
                    m3u8_id='hls', fatal=False))
        info = {
            'id': video_id,
            'formats': self._to_ad_free_formats(video_id, formats),
            'title': video_json.get('name'),
            'description': video_json.get('description'),
            'duration': float_or_none(video_json.get('duration'), scale=1000),
        }
        if series_name:
            info.update({
                'series': series_name,
                'episode': video_json.get('name'),
                'season_number': int_or_none(video_json.get('season')),
                'episode_number': int_or_none(video_json.get('number')),
            })
        return info
    def _real_extract(self, url):
        path = compat_urlparse.urlparse(url).path
        path_components = path.split('/')
        video_type = path_components[2]
        info_slug = path_components[3]
        video_json = self._download_json(self._INFO_URL + info_slug, info_slug,
                                         query=self._INFO_QUERY_PARAMS)
        if video_type == 'series':
            series_name = video_json.get('name', info_slug)
            season_number = int_or_none(try_get(path_components, lambda x: x[5]))
            episode_slug = try_get(path_components, lambda x: x[7])
            videos = []
            for season in video_json['seasons']:
                if season_number is not None and season_number != int_or_none(season.get('number')):
                    continue
                for episode in season['episodes']:
                    if episode_slug is not None and episode_slug != episode.get('slug'):
                        continue
                    videos.append(self._get_video_info(episode, episode_slug, series_name))
            if not videos:
                raise ExtractorError('Failed to find any videos to extract')
            if episode_slug is not None and len(videos) == 1:
                return videos[0]
            playlist_title = series_name
            if season_number is not None:
                playlist_title += ' - Season %d' % season_number
            return self.playlist_result(videos,
                                        playlist_id=video_json.get('_id', info_slug),
                                        playlist_title=playlist_title)
        return self._get_video_info(video_json, info_slug)
@@ -167,7 +167,6 @@ class PornHubIE(PornHubBaseIE):
        'params': {
            'skip_download': True,
        },
        'skip': 'Video has been flagged for verification in accordance with our trust and safety policy',
    }, {
        # subtitles
        'url': 'https://www.pornhub.com/view_video.php?viewkey=ph5af5fef7c2aa7',
@@ -266,8 +265,7 @@ class PornHubIE(PornHubBaseIE):
        webpage = dl_webpage('pc')
        error_msg = self._html_search_regex(
-            (r'(?s)<div[^>]+class=(["\'])(?:(?!\1).)*\b(?:removed|userMessageSection)\b(?:(?!\1).)*\1[^>]*>(?P<error>.+?)</div>',
+            r'(?s)<div[^>]+class=(["\'])(?:(?!\1).)*\b(?:removed|userMessageSection)\b(?:(?!\1).)*\1[^>]*>(?P<error>.+?)</div>',
             r'(?s)<section[^>]+class=["\']noVideo["\'][^>]*>(?P<error>.+?)</section>'),
            webpage, 'error message', default=None, group='error')
        if error_msg:
            error_msg = re.sub(r'\s+', ' ', error_msg)
@@ -396,50 +394,34 @@ class PornHubIE(PornHubBaseIE):
        upload_date = None
        formats = []
        def add_format(format_url, height=None):
            ext = determine_ext(format_url)
            if ext == 'mpd':
                formats.extend(self._extract_mpd_formats(
                    format_url, video_id, mpd_id='dash', fatal=False))
                return
            if ext == 'm3u8':
                formats.extend(self._extract_m3u8_formats(
                    format_url, video_id, 'mp4', entry_protocol='m3u8_native',
                    m3u8_id='hls', fatal=False))
                return
            tbr = None
            mobj = re.search(r'(?P<height>\d+)[pP]?_(?P<tbr>\d+)[kK]', format_url)
            if mobj:
                if not height:
                    height = int(mobj.group('height'))
                tbr = int(mobj.group('tbr'))
            formats.append({
                'url': format_url,
                'format_id': '%dp' % height if height else None,
                'height': height,
                'tbr': tbr,
            })
        for video_url, height in video_urls:
            if not upload_date:
                upload_date = self._search_regex(
                    r'/(\d{6}/\d{2})/', video_url, 'upload data', default=None)
                if upload_date:
                    upload_date = upload_date.replace('/', '')
-            if '/video/get_media' in video_url:
+            ext = determine_ext(video_url)
-                medias = self._download_json(video_url, video_id, fatal=False)
+            if ext == 'mpd':
-                if isinstance(medias, list):
+                formats.extend(self._extract_mpd_formats(
-                    for media in medias:
+                    video_url, video_id, mpd_id='dash', fatal=False))
                        if not isinstance(media, dict):
                            continue
                        video_url = url_or_none(media.get('videoUrl'))
                        if not video_url:
                            continue
                        height = int_or_none(media.get('quality'))
                        add_format(video_url, height)
                continue
-            add_format(video_url)
+            elif ext == 'm3u8':
                formats.extend(self._extract_m3u8_formats(
                    video_url, video_id, 'mp4', entry_protocol='m3u8_native',
                    m3u8_id='hls', fatal=False))
                continue
            tbr = None
            mobj = re.search(r'(?P<height>\d+)[pP]?_(?P<tbr>\d+)[kK]', video_url)
            if mobj:
                if not height:
                    height = int(mobj.group('height'))
                tbr = int(mobj.group('tbr'))
            formats.append({
                'url': video_url,
                'format_id': '%dp' % height if height else None,
                'height': height,
                'tbr': tbr,
            })
        self._sort_formats(formats)
        video_uploader = self._html_search_regex(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pukkandan	9963cda115	Release 2021.03.03	2021-03-03 16:25:04 +05:30
pukkandan	c1be5231b9	[build] fix bug from `da7f321e93`	2021-03-03 16:25:04 +05:30
`@@ -1,2 +1,2 @@`
	`#!/bin/sh`	`#!/bin/bash`
	`exec python3 "$(dirname "$(realpath "$0")")/yt_dlp/__main__.py" "$@"`	`python3 "$(dirname $(realpath $0))/yt_dlp/__main__.py" "$@"`