[version] update

Created by: pukkandan

:ci skip all

.editorconfig

@@ -1,8 +0,0 @@
-root = true
-
-[**.py]
-charset = utf-8
-indent_size = 4
-indent_style = space
-trim_trailing_whitespace = true
-insert_final_newline = true

.gitattributes

@@ -2,5 +2,3 @@
 
 Makefile* text whitespace=-tab-in-indent
 *.sh text eol=lf
-*.md diff=markdown
-*.py diff=python

.github/ISSUE_TEMPLATE/1_broken_site.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I'm reporting a broken site
           required: true
-        - label: I've verified that I'm running yt-dlp version **2022.04.08** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've checked that all provided URLs are alive and playable in a browser
           required: true
@@ -51,12 +51,12 @@ body:
         [debug] Portable config file: yt-dlp.conf
         [debug] Portable config: ['-i']
         [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2022.04.08 (exe)
+        [debug] yt-dlp version 2022.03.08 (exe)
         [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
         [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
         [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [debug] Proxy map: {}
-        yt-dlp is up to date (2022.04.08)
+        yt-dlp is up to date (2022.03.08)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I'm reporting a new site support request
           required: true
-        - label: I've verified that I'm running yt-dlp version **2022.04.08** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've checked that all provided URLs are alive and playable in a browser
           required: true
@@ -62,12 +62,12 @@ body:
         [debug] Portable config file: yt-dlp.conf
         [debug] Portable config: ['-i']
         [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2022.04.08 (exe)
+        [debug] yt-dlp version 2022.03.08 (exe)
         [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
         [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
         [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [debug] Proxy map: {}
-        yt-dlp is up to date (2022.04.08)
+        yt-dlp is up to date (2022.03.08)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I'm reporting a site feature request
           required: true
-        - label: I've verified that I'm running yt-dlp version **2022.04.08** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've checked that all provided URLs are alive and playable in a browser
           required: true
@@ -60,12 +60,12 @@ body:
         [debug] Portable config file: yt-dlp.conf
         [debug] Portable config: ['-i']
         [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2022.04.08 (exe)
+        [debug] yt-dlp version 2022.03.08 (exe)
         [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
         [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
         [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [debug] Proxy map: {}
-        yt-dlp is up to date (2022.04.08)
+        yt-dlp is up to date (2022.03.08)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I'm reporting a bug unrelated to a specific site
           required: true
-        - label: I've verified that I'm running yt-dlp version **2022.04.08** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've checked that all provided URLs are alive and playable in a browser
           required: true
@@ -45,12 +45,12 @@ body:
         [debug] Portable config file: yt-dlp.conf
         [debug] Portable config: ['-i']
         [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2022.04.08 (exe)
+        [debug] yt-dlp version 2022.03.08 (exe)
         [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
         [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
         [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [debug] Proxy map: {}
-        yt-dlp is up to date (2022.04.08)
+        yt-dlp is up to date (2022.03.08)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -13,7 +13,7 @@ body:
           required: true
         - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
           required: true
-        - label: I've verified that I'm running yt-dlp version **2022.04.08** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues including closed ones. DO NOT post duplicates
           required: true
@@ -30,24 +30,3 @@ body:
       placeholder: WRITE DESCRIPTION HERE
     validations:
       required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        If your feature request involves an existing yt-dlp command, provide the complete verbose output of that command.
-        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2021.12.01 (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (2021.12.01)
-        <more lines>
-      render: shell

.github/ISSUE_TEMPLATE/6_question.yml

@@ -35,7 +35,7 @@ body:
     attributes:
       label: Verbose log
       description: |
-        If your question involves a yt-dlp command, provide the complete verbose output of that command.
+        If your question involes a yt-dlp command, provide the complete verbose output of that command.
         Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
         It should look similar to this:
       placeholder: |

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I'm reporting a broken site
           required: true
-        - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **%(version)s**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've checked that all provided URLs are alive and playable in a browser
           required: true

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I'm reporting a new site support request
           required: true
-        - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **%(version)s**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've checked that all provided URLs are alive and playable in a browser
           required: true

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I'm reporting a site feature request
           required: true
-        - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **%(version)s**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've checked that all provided URLs are alive and playable in a browser
           required: true

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I'm reporting a bug unrelated to a specific site
           required: true
-        - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **%(version)s**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've checked that all provided URLs are alive and playable in a browser
           required: true

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

@@ -13,7 +13,7 @@ body:
           required: true
         - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
           required: true
-        - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **%(version)s**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
         - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues including closed ones. DO NOT post duplicates
           required: true
@@ -30,24 +30,3 @@ body:
       placeholder: WRITE DESCRIPTION HERE
     validations:
       required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        If your feature request involves an existing yt-dlp command, provide the complete verbose output of that command.
-        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2021.12.01 (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (2021.12.01)
-        <more lines>
-      render: shell

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -35,7 +35,7 @@ body:
     attributes:
       label: Verbose log
       description: |
-        If your question involves a yt-dlp command, provide the complete verbose output of that command.
+        If your question involes a yt-dlp command, provide the complete verbose output of that command.
         Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
         It should look similar to this:
       placeholder: |

.gitignore

@@ -116,6 +116,3 @@ yt-dlp.zip
 ytdlp_plugins/extractor/*
 !ytdlp_plugins/extractor/__init__.py
 !ytdlp_plugins/extractor/sample.py
-ytdlp_plugins/postprocessor/*
-!ytdlp_plugins/postprocessor/__init__.py
-!ytdlp_plugins/postprocessor/sample.py

.readthedocs.yml

@@ -0,0 +1,22 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+    configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF
+formats:
+    - epub
+    - pdf
+    - htmlzip
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+    version: 3
+    install:
+    - requirements: docs/requirements.txt

CONTRIBUTING.md

@@ -534,13 +534,13 @@ Extracting variables is acceptable for reducing code duplication and improving r
 Correct:
 
 ```python
-title = self._html_search_regex(r'<h1>([^<]+)</h1>', webpage, 'title')
+title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title')
 ```
 
 Incorrect:
 
 ```python
-TITLE_RE = r'<h1>([^<]+)</h1>'
+TITLE_RE = r'<title>([^<]+)</title>'
 # ...some lines of code...
 title = self._html_search_regex(TITLE_RE, webpage, 'title')
 ```
@@ -643,7 +643,7 @@ Wrap all extracted numeric data into safe functions from [`yt_dlp/utils.py`](yt_
 
 Use `url_or_none` for safe URL processing.
 
-Use `traverse_obj` and `try_call` (superseeds `dict_get` and `try_get`) for safe metadata extraction from parsed JSON.
+Use `try_get`, `dict_get` and `traverse_obj` for safe metadata extraction from parsed JSON.
 
 Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction. 
 

CONTRIBUTORS

@@ -214,20 +214,3 @@ pycabbage
 regarten
 Ronnnny
 schn0sch
-s0u1h
-MrRawes
-cffswb
-danielyli
-1-Byte
-mehq
-dzek69
-aaearon
-panatexxa
-kmark
-un-def
-goggle
-Soebb
-Fam0r
-bohwaz
-dodrian
-vvto33

Changelog.md

@@ -11,149 +11,6 @@
 -->
 
 
-### 2022.04.08
-
-* Use certificates from `certifi` if installed by [coletdjnz](https://github.com/coletdjnz)
-* Treat multiple `--match-filters` as OR
-* File locking improvevemnts:
-    * Do not lock downloading file on Windows
-    * Do not prevent download if locking is unsupported
-    * Do not truncate files before locking by [jakeogh](https://github.com/jakeogh), [pukkandan](https://github.com/pukkandan)
-    * Fix non-blocking non-exclusive lock
-* De-prioritize automatic-subtitles when no `--sub-lang` is given
-* Exit after `--dump-user-agent`
-* Fallback to video-only format when selecting by extension
-* Fix `--abort-on-error` for subtitles
-* Fix `--no-overwrite` for playlist infojson
-* Fix `--print` with `--ignore-no-formats` when url is `None` by [flashdagger](https://github.com/flashdagger)
-* Fix `--sleep-interval`
-* Fix `--throttled-rate`
-* Fix `autonumber`
-* Fix case of `http_headers`
-* Fix filepath sanitization in `--print-to-file`
-* Handle float in `--wait-for-video`
-* Ignore `mhtml` formats from `-f mergeall`
-* Ignore format-specific fields in initial pass of `--match-filter`
-* Protect stdout from unexpected progress and console-title
-* Remove `Accept-Encoding` header from `std_headers` by [coletdjnz](https://github.com/coletdjnz)
-* Remove incorrect warning for `--dateafter`
-* Show warning when all media formats have DRM
-* [downloader] Fix invocation of `HttpieFD`
-* [http] Fix #3215
-* [http] Reject broken range before request by [Lesmiscore](https://github.com/Lesmiscore), [Jules-A](https://github.com/Jules-A), [pukkandan](https://github.com/pukkandan)
-* [fragment] Read downloaded fragments only when needed by [Lesmiscore](https://github.com/Lesmiscore)
-* [http] Retry on more errors by [coletdjnz](https://github.com/coletdjnz)
-* [mhtml] Fix fragments with absolute urls by [coletdjnz](https://github.com/coletdjnz)
-* [extractor] Add `_perform_login` function
-* [extractor] Allow control characters inside json
-* [extractor] Support merging subtitles with data by [coletdjnz](https://github.com/coletdjnz)
-* [generic] Extract subtitles from video.js by [Lesmiscore](https://github.com/Lesmiscore)
-* [ffmpeg] Cache version data
-* [FFmpegConcat] Ensure final directory exists
-* [FfmpegMetadata] Write id3v1 tags
-* [FFmpegVideoConvertor] Add more formats to `--remux-video`
-* [FFmpegVideoConvertor] Ensure all streams are copied
-* [MetadataParser] Validate outtmpl early
-* [outtmpl] Fix replacement/default when used with alternate
-* [outtmpl] Limit changes during sanitization
-* [phantomjs] Fix bug
-* [test] Add `test_locked_file`
-* [utils] `format_decimal_suffix`: Fix for very large numbers by [s0u1h](https://github.com/s0u1h)
-* [utils] `traverse_obj`: Allow filtering by value
-* [utils] Add `filter_dict`, `get_first`, `try_call`
-* [utils] ExtractorError: Fix for older python versions
-* [utils] WebSocketsWrapper: Allow omitting `__enter__` invocation by [Lesmiscore](https://github.com/Lesmiscore)
-* [docs] Add an `.editorconfig` file by [fstirlitz](https://github.com/fstirlitz)
-* [docs] Clarify the exact `BSD` license of dependencies by [MrRawes](https://github.com/MrRawes)
-* [docs] Minor improvements by [pukkandan](https://github.com/pukkandan), [cffswb](https://github.com/cffswb), [danielyli](https://github.com/danielyli)
-* [docs] Remove readthedocs
-* [build] Add `requirements.txt` to pip distributions
-* [cleanup, postprocessor] Create `_download_json`
-* [cleanup, vimeo] Fix tests
-* [cleanup] Misc fixes and minor cleanup
-* [cleanup] Use `_html_extract_title`
-* [AfreecaTV] Add `AfreecaTVUserIE` by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [arte] Add `format_note` to m3u8 formats
-* [azmedien] Add TVO Online to supported hosts by [1-Byte](https://github.com/1-Byte)
-* [BanBye] Add extractor by [mehq](https://github.com/mehq)
-* [bilibili] Fix extraction of title with quotes by [dzek69](https://github.com/dzek69)
-* [Craftsy] Add extractor by [Bricio](https://github.com/Bricio)
-* [Cybrary] Add extractor by [aaearon](https://github.com/aaearon)
-* [Huya] Add extractor by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [ITProTV] Add extractor by [aaearon](https://github.com/aaearon)
-* [Jable] Add extractors by [mehq](https://github.com/mehq)
-* [LastFM] Add extractors by [mehq](https://github.com/mehq)
-* [Moviepilot] Add extractor by [panatexxa](https://github.com/panatexxa)
-* [panopto] Add extractors by [coletdjnz](https://github.com/coletdjnz), [kmark](https://github.com/kmark)
-* [PokemonSoundLibrary] Add extractor by [Lesmiscore](https://github.com/Lesmiscore)
-* [WasdTV] Add extractor by [un-def](https://github.com/un-def), [hatienl0i261299](https://github.com/hatienl0i261299)
-* [adobepass] Fix Suddenlink MSO by [CplPwnies](https://github.com/CplPwnies)
-* [afreecatv] Match new vod url by [wlritchi](https://github.com/wlritchi)
-* [AZMedien] Support `tv.telezueri.ch` by [goggle](https://github.com/goggle)
-* [BiliIntl] Support user-generated videos by [wlritchi](https://github.com/wlritchi)
-* [BRMediathek] Fix VALID_URL
-* [crunchyroll:playlist] Implement beta API by [tejing1](https://github.com/tejing1)
-* [crunchyroll] Fix inheritance
-* [daftsex] Fix extractor by [Soebb](https://github.com/Soebb)
-* [dailymotion] Support `geo.dailymotion.com` by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [ellentube] Extract subtitles from manifest
-* [elonet] Rewrite extractor by [Fam0r](https://github.com/Fam0r), [pukkandan](https://github.com/pukkandan)
-* [fptplay] Fix metadata extraction by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [FranceCulture] Support playlists by [bohwaz](https://github.com/bohwaz)
-* [go, viu] Extract subtitles from the m3u8 manifest by [fstirlitz](https://github.com/fstirlitz)
-* [Imdb] Improve extractor by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [MangoTV] Improve extractor by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [Nebula] Fix bug in 52efa4b31200119adaa8acf33e50b84fcb6948f0
-* [niconico] Fix extraction of thumbnails and uploader (#3266)
-* [niconico] Rewrite NiconicoIE by [Lesmiscore](https://github.com/Lesmiscore)
-* [nitter] Minor fixes and update instance list by [foghawk](https://github.com/foghawk)
-* [NRK] Extract timestamp by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [openrec] Download archived livestreams by [Lesmiscore](https://github.com/Lesmiscore)
-* [openrec] Refactor extractors by [Lesmiscore](https://github.com/Lesmiscore)
-* [panopto] Improve subtitle extraction and support slides by [coletdjnz](https://github.com/coletdjnz)
-* [ParamountPlus, CBS] Change VALID_URL by [Sipherdrakon](https://github.com/Sipherdrakon)
-* [ParamountPlusSeries] Support multiple pages by [dodrian](https://github.com/dodrian)
-* [Piapro] Extract description with break lines by [Lesmiscore](https://github.com/Lesmiscore)
-* [rai] Fix extraction of http formas by [nixxo](https://github.com/nixxo)
-* [rumble] unescape title
-* [RUTV] Fix format sorting by [Lesmiscore](https://github.com/Lesmiscore)
-* [ruutu] Detect embeds by [tpikonen](https://github.com/tpikonen)
-* [tenplay] Improve extractor by [aarubui](https://github.com/aarubui)
-* [TikTok] Fix URLs with user id by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [TikTokVM] Fix redirect to user URL
-* [TVer] Fix extractor by [Lesmiscore](https://github.com/Lesmiscore)
-* [TVer] Support landing page by [vvto33](https://github.com/vvto33)
-* [twitcasting] Don't return multi_video for archive with single hls manifest by [Lesmiscore](https://github.com/Lesmiscore)
-* [veo] Fix `_VALID_URL`
-* [Veo] Fix extractor by [i6t](https://github.com/i6t)
-* [viki] Don't attempt to modify URLs with signature by [nyuszika7h](https://github.com/nyuszika7h)
-* [viu] Fix bypass for preview by [zackmark29](https://github.com/zackmark29)
-* [viu] Fixed extractor by [zackmark29](https://github.com/zackmark29), [pukkandan](https://github.com/pukkandan)
-* [web.archive:youtube] Make CDX API requests non-fatal by [coletdjnz](https://github.com/coletdjnz)
-* [wget] Fix proxy by [kikuyan](https://github.com/kikuyan), [coletdjnz](https://github.com/coletdjnz)
-* [xnxx] Add `xnxx3.com` by [rozari0](https://github.com/rozari0)
-* [youtube] **Add new age-gate bypass** by [zerodytrash](https://github.com/zerodytrash), [pukkandan](https://github.com/pukkandan)
-* [youtube] Add extractor-arg to skip auto-translated subs
-* [youtube] Avoid false positives when detecting damaged formats
-* [youtube] Detect DRM better by [shirt](https://github.com/shirt-dev)
-* [youtube] Fix auto-translated automatic captions
-* [youtube] Fix pagination of `membership` tab
-* [youtube] Fix uploader for collaborative playlists by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Improve video upload date handling by [coletdjnz](https://github.com/coletdjnz)
-* [youtube:api] Prefer minified JSON response by [coletdjnz](https://github.com/coletdjnz)
-* [youtube:search] Support hashtag entries by [coletdjnz](https://github.com/coletdjnz)
-* [youtube:tab] Fix duration extraction for shorts by [coletdjnz](https://github.com/coletdjnz)
-* [youtube:tab] Minor improvements
-* [youtube:tab] Return shorts url if video is a short by [coletdjnz](https://github.com/coletdjnz)
-* [Zattoo] Fix extractors by [goggle](https://github.com/goggle)
-* [Zingmp3] Fix signature by [hatienl0i261299](https://github.com/hatienl0i261299)
-
-
-### 2022.03.08.1
-
-* [cleanup] Refactor `__init__.py`
-* [build] Fix bug
-
 ### 2022.03.08
 
 * Merge youtube-dl: Upto [commit/6508688](https://github.com/ytdl-org/youtube-dl/commit/6508688e88c83bb811653083db9351702cd39a6a) (except NDR)
@@ -172,14 +29,14 @@
 * Set `webpage_url_...` from `webpage_url` and not input URL
 * Tolerate failure to `--write-link` due to unknown URL
 * [aria2c] Add `--http-accept-gzip=true`
-* [build] Update pyinstaller to 4.10 by [shirt](https://github.com/shirt-dev)
+* [build] Update pyinstaller to 4.10 by [shirt-dev](https://github.com/shirt-dev)
 * [cookies] Update MacOS12 `Cookies.binarycookies` location by [mdpauley](https://github.com/mdpauley)
 * [devscripts] Improve `prepare_manpage`
 * [downloader] Do not use aria2c for non-native `m3u8`
 * [downloader] Obey `--file-access-retries` when deleting/renaming by [ehoogeveen-medweb](https://github.com/ehoogeveen-medweb)
 * [extractor] Allow `http_headers` to be specified for `thumbnails`
 * [extractor] Extract subtitles from manifests for vimeo, globo, kaltura, svt by [fstirlitz](https://github.com/fstirlitz)
-* [extractor] Fix for manifests without period duration by [dirkf](https://github.com/dirkf), [pukkandan](https://github.com/pukkandan)
+* [extractor] Fix for manifests without period duration by [dirkf,](https://github.com/dirkf,) [pukkandan](https://github.com/pukkandan)
 * [extractor] Support `--mark-watched` without `_NETRC_MACHINE` by [coletdjnz](https://github.com/coletdjnz)
 * [FFmpegConcat] Abort on `--simulate`
 * [FormatSort] Consider `acodec`=`ogg` as `vorbis`
@@ -214,9 +71,9 @@
 * [nfb] Add extractor by [ofkz](https://github.com/ofkz)
 * [niconico] Add playlist extractors and refactor by [Lesmiscore](https://github.com/Lesmiscore)
 * [peekvids] Add extractor by [schn0sch](https://github.com/schn0sch)
-* [piapro] Add extractor by [pycabbage](https://github.com/pycabbage), [Lesmiscore](https://github.com/Lesmiscore)
+* [piapro] Add extractor by [pycabbage,](https://github.com/pycabbage,) [Lesmiscore](https://github.com/Lesmiscore)
-* [rokfin] Add extractor by [P-reducible](https://github.com/P-reducible), [pukkandan](https://github.com/pukkandan)
+* [rokfin] Add extractor by [P-reducible,](https://github.com/P-reducible,) [pukkandan](https://github.com/pukkandan)
-* [rokfin] Add stack and channel extractors by [P-reducible](https://github.com/P-reducible), [pukkandan](https://github.com/pukkandan)
+* [rokfin] Add stack and channel extractors by [P-reducible,](https://github.com/P-reducible,) [pukkandan](https://github.com/pukkandan)
 * [ruv.is] Add extractor by [iw0nderhow](https://github.com/iw0nderhow)
 * [telegram] Add extractor by [hatienl0i261299](https://github.com/hatienl0i261299)
 * [VideocampusSachsen] Add extractors by [FestplattenSchnitzel](https://github.com/FestplattenSchnitzel)

Collaborators.md

@@ -29,7 +29,6 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho
 
 * YouTube improvements including: age-gate bypass, private playlists, multiple-clients (to avoid throttling) and a lot of under-the-hood improvements
 * Added support for downloading YoutubeWebArchive videos
-* Added support for new websites MainStreaming, PRX, nzherald, etc
 
 
 

MANIFEST.in

@@ -5,6 +5,5 @@ include README.md
 include completions/*/*
 include supportedsites.md
 include yt-dlp.1
-include requirements.txt
 recursive-include devscripts *
 recursive-include test *

README.md

@@ -3,14 +3,15 @@
 
 [![YT-DLP](https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/.github/banner.svg)](#readme)
 
-[![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=brightgreen&label=Download&style=for-the-badge)](#release-files "Release")
+[![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=blue&label=Download&style=for-the-badge)](#release-files "Release")
-[![PyPi](https://img.shields.io/badge/-PyPi-blue.svg?logo=pypi&labelColor=555555&style=for-the-badge)](https://pypi.org/project/yt-dlp "PyPi")
+[![License: Unlicense](https://img.shields.io/badge/-Unlicense-brightgreen.svg?style=for-the-badge)](LICENSE "License")
 [![Donate](https://img.shields.io/badge/_-Donate-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](Collaborators.md#collaborators "Donate")
-[![Matrix](https://img.shields.io/matrix/yt-dlp:matrix.org?color=brightgreen&labelColor=555555&label=&logo=element&style=for-the-badge)](https://matrix.to/#/#yt-dlp:matrix.org "Matrix")
+[![Docs](https://img.shields.io/badge/-Docs-blue.svg?color=blue&style=for-the-badge)](https://readthedocs.org/projects/yt-dlp/ "Docs")
-[![Discord](https://img.shields.io/discord/807245652072857610?color=blue&labelColor=555555&label=&logo=discord&style=for-the-badge)](https://discord.gg/H5MNcFW63r "Discord")
 [![Supported Sites](https://img.shields.io/badge/-Supported_Sites-brightgreen.svg?style=for-the-badge)](supportedsites.md "Supported Sites")
-[![License: Unlicense](https://img.shields.io/badge/-Unlicense-blue.svg?style=for-the-badge)](LICENSE "License")
+[![PyPi](https://img.shields.io/badge/-PyPi-blue.svg?logo=pypi&labelColor=555555&style=for-the-badge)](https://pypi.org/project/yt-dlp "PyPi")
 [![CI Status](https://img.shields.io/github/workflow/status/yt-dlp/yt-dlp/Core%20Tests/master?label=Tests&style=for-the-badge)](https://github.com/yt-dlp/yt-dlp/actions "CI Status")
+[![Discord](https://img.shields.io/discord/807245652072857610?color=blue&labelColor=555555&label=&logo=discord&style=for-the-badge)](https://discord.gg/H5MNcFW63r "Discord")
+[![Matrix](https://img.shields.io/matrix/yt-dlp:matrix.org?color=brightgreen&labelColor=555555&label=&logo=element&style=for-the-badge)](https://matrix.to/#/#yt-dlp:matrix.org "Matrix")
 [![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 "Commit History")
 [![Last Commit](https://img.shields.io/github/last-commit/yt-dlp/yt-dlp/master?label=&style=for-the-badge)](https://github.com/yt-dlp/yt-dlp/commits "Commit History")
 
@@ -70,13 +71,13 @@ yt-dlp is a [youtube-dl](https://github.com/ytdl-org/youtube-dl) fork based on t
 
 # NEW FEATURES
 
-* Based on **youtube-dl 2021.12.17 [commit/6508688](https://github.com/ytdl-org/youtube-dl/commit/6508688e88c83bb811653083db9351702cd39a6a)** ([exceptions](https://github.com/yt-dlp/yt-dlp/issues/21)) and **youtube-dlc 2020.11.11-3 [commit/f9401f2](https://github.com/blackjack4494/yt-dlc/commit/f9401f2a91987068139c5f757b12fc711d4c0cee)**: You get all the features and patches of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) in addition to the latest [youtube-dl](https://github.com/ytdl-org/youtube-dl)
+* Based on **youtube-dl 2021.12.17 [commit/5add3f4](https://github.com/ytdl-org/youtube-dl/commit/5add3f4373287e6346ca3551239edab549284db3)** and **youtube-dlc 2020.11.11-3 [commit/f9401f2](https://github.com/blackjack4494/yt-dlc/commit/f9401f2a91987068139c5f757b12fc711d4c0cee)**: You get all the features and patches of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) in addition to the latest [youtube-dl](https://github.com/ytdl-org/youtube-dl)
 
 * **[SponsorBlock Integration](#sponsorblock-options)**: You can mark/remove sponsor sections in youtube videos by utilizing the [SponsorBlock](https://sponsor.ajay.app) API
 
 * **[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 than what is possible by simply using `--format` ([examples](#format-selection-examples))
 
-* **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--write-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, playlist infojson etc. Note that the NicoNico livestreams are not available. See [#31](https://github.com/yt-dlp/yt-dlp/pull/31) for details.
+* **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--write-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 Feeds (`:ytfav`, `:ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`) and private playlists supports downloading multiple pages of content
@@ -125,7 +126,6 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu
 
 * The options `--auto-number` (`-A`), `--title` (`-t`) and `--literal` (`-l`), no longer work. See [removed options](#Removed) for details
 * `avconv` is not supported as an alternative to `ffmpeg`
-* yt-dlp stores config files in slightly different locations to youtube-dl. See [configuration](#configuration) for a list of correct locations
 * The default [output template](#output-template) is `%(title)s [%(id)s].%(ext)s`. There is no real reason for this change. This was changed before yt-dlp was ever made public and now there are no plans to change it back to `%(title)s-%(id)s.%(ext)s`. Instead, you may use `--compat-options filename`
 * The default [format sorting](#sorting-formats) is different from youtube-dl and prefers higher resolution and better codecs rather than higher bitrates. You can use the `--format-sort` option to change this to any order you prefer, or use `--compat-options format-sort` to use youtube-dl's sorting order
 * The default format selector is `bv*+ba/b`. This means that if a combined video + audio format that is better than the best video-only format is found, the former will be preferred. Use `-f bv+ba/b` or `--compat-options format-spec` to revert this
@@ -144,8 +144,6 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu
 * Thumbnail embedding in `mp4` is done with mutagen if possible. Use `--compat-options embed-thumbnail-atomicparsley` to force the use of AtomicParsley instead
 * Some private fields such as filenames are removed by default from the infojson. Use `--no-clean-infojson` or `--compat-options no-clean-infojson` to revert this
 * When `--embed-subs` and `--write-subs` are used together, the subtitles are written to disk and also embedded in the media file. You can use just `--embed-subs` to embed the subs and automatically delete the separate file. See [#630 (comment)](https://github.com/yt-dlp/yt-dlp/issues/630#issuecomment-893659460) for more info. `--compat-options no-keep-subs` can be used to revert this
-* `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`
-* youtube-dl tries to remove some superfluous punctuations from filenames. While this can sometimes be helpfull, it is often undesirable. So yt-dlp tries to keep the fields in the filenames as close to their original values as possible. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior
 
 For ease of use, a few more compat options are available:
 * `--compat-options all`: Use all compat options
@@ -204,7 +202,7 @@ python3 -m pip install --no-deps -U yt-dlp
 
 If you want to be on the cutting edge, you can also install the master branch with:
 ```
-python3 -m pip install --force-reinstall https://github.com/yt-dlp/yt-dlp/archive/master.tar.gz
+python3 -m pip install --force-reinstall https://github.com/yt-dlp/yt-dlp/archive/master.zip
 ```
 
 Note that on some systems, you may need to use `py` or `python` instead of `python3`
@@ -232,14 +230,14 @@ If you [installed using Homebrew](#with-homebrew), run `brew upgrade yt-dlp/taps
 
 File|Description
 :---|:---
-[yt-dlp](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp)|Platform-independant binary. Needs Python (recommended for **Linux/BSD**)
+[yt-dlp](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp)|Platform-independant binary. Needs Python (recommended for **UNIX-like systems**)
 [yt-dlp.exe](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.exe)|Windows (Win7 SP1+) standalone x64 binary (recommended for **Windows**)
-[yt-dlp_macos](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_macos)|MacOS (10.15+) standalone executable (recommended for **MacOS**)
 
 #### Alternatives
 
 File|Description
 :---|:---
+[yt-dlp_macos](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_macos)|MacOS (10.15+) standalone executable
 [yt-dlp_x86.exe](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_x86.exe)|Windows (Vista SP2+) standalone x86 (32-bit) binary
 [yt-dlp_min.exe](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_min.exe)|Windows (Win7 SP1+) standalone x64 binary built with `py2exe`.<br/> Does not contain `pycryptodomex`, needs VC++14
 [yt-dlp_win.zip](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_win.zip)|Unpackaged Windows executable (no auto-update)
@@ -265,22 +263,21 @@ On windows, [Microsoft Visual C++ 2010 SP1 Redistributable Package (x86)](https:
 While all the other dependencies are optional, `ffmpeg` and `ffprobe` are highly recommended
 
 * [**ffmpeg** and **ffprobe**](https://www.ffmpeg.org) - Required for [merging separate video and audio files](#format-selection) as well as for various [post-processing](#post-processing-options) tasks. License [depends on the build](https://www.ffmpeg.org/legal.html)
-* [**mutagen**](https://github.com/quodlibet/mutagen)\* - For embedding thumbnail in certain formats. Licensed under [GPLv2+](https://github.com/quodlibet/mutagen/blob/master/COPYING)
+* [**mutagen**](https://github.com/quodlibet/mutagen) - For embedding thumbnail in certain formats. Licensed under [GPLv2+](https://github.com/quodlibet/mutagen/blob/master/COPYING)
-* [**pycryptodomex**](https://github.com/Legrandin/pycryptodome)\* - For decrypting AES-128 HLS streams and various other data. Licensed under [BSD-2-Clause](https://github.com/Legrandin/pycryptodome/blob/master/LICENSE.rst)
+* [**pycryptodomex**](https://github.com/Legrandin/pycryptodome) - For decrypting AES-128 HLS streams and various other data. Licensed under [BSD2](https://github.com/Legrandin/pycryptodome/blob/master/LICENSE.rst)
-* [**websockets**](https://github.com/aaugustin/websockets)\* - For downloading over websocket. Licensed under [BSD-3-Clause](https://github.com/aaugustin/websockets/blob/main/LICENSE)
+* [**websockets**](https://github.com/aaugustin/websockets) - For downloading over websocket. Licensed under [BSD3](https://github.com/aaugustin/websockets/blob/main/LICENSE)
-* [**secretstorage**](https://github.com/mitya57/secretstorage)\* - For accessing the Gnome keyring while decrypting cookies of Chromium-based browsers on Linux. Licensed under [BSD-3-Clause](https://github.com/mitya57/secretstorage/blob/master/LICENSE)
+* [**secretstorage**](https://github.com/mitya57/secretstorage) - For accessing the Gnome keyring while decrypting cookies of Chromium-based browsers on Linux. Licensed under [BSD](https://github.com/mitya57/secretstorage/blob/master/LICENSE)
-* [**brotli**](https://github.com/google/brotli)\* or [**brotlicffi**](https://github.com/python-hyper/brotlicffi) - [Brotli](https://en.wikipedia.org/wiki/Brotli) content encoding support. Both licensed under MIT <sup>[1](https://github.com/google/brotli/blob/master/LICENSE) [2](https://github.com/python-hyper/brotlicffi/blob/master/LICENSE) </sup>
-* [**certifi**](https://github.com/certifi/python-certifi)\* - Provides Mozilla's root certificate bundle. Licensed under [MPLv2](https://github.com/certifi/python-certifi/blob/master/LICENSE)
 * [**AtomicParsley**](https://github.com/wez/atomicparsley) - For embedding thumbnail in mp4/m4a if mutagen/ffmpeg cannot. Licensed under [GPLv2+](https://github.com/wez/atomicparsley/blob/master/COPYING)
+* [**brotli**](https://github.com/google/brotli) or [**brotlicffi**](https://github.com/python-hyper/brotlicffi) - [Brotli](https://en.wikipedia.org/wiki/Brotli) content encoding support. Both licensed under MIT <sup>[1](https://github.com/google/brotli/blob/master/LICENSE) [2](https://github.com/python-hyper/brotlicffi/blob/master/LICENSE) </sup>
 * [**rtmpdump**](http://rtmpdump.mplayerhq.hu) - For downloading `rtmp` streams. ffmpeg will be used as a fallback. Licensed under [GPLv2+](http://rtmpdump.mplayerhq.hu)
 * [**mplayer**](http://mplayerhq.hu/design7/info.html) or [**mpv**](https://mpv.io) - For downloading `rstp` streams. ffmpeg will be used as a fallback. Licensed under [GPLv2+](https://github.com/mpv-player/mpv/blob/master/Copyright)
-* [**phantomjs**](https://github.com/ariya/phantomjs) - Used in extractors where javascript needs to be run. Licensed under [BSD-3-Clause](https://github.com/ariya/phantomjs/blob/master/LICENSE.BSD)
+* [**phantomjs**](https://github.com/ariya/phantomjs) - Used in extractors where javascript needs to be run. Licensed under [BSD3](https://github.com/ariya/phantomjs/blob/master/LICENSE.BSD)
 * [**sponskrub**](https://github.com/faissaloo/SponSkrub) - For using the now **deprecated** [sponskrub options](#sponskrub-options). Licensed under [GPLv3+](https://github.com/faissaloo/SponSkrub/blob/master/LICENCE.md)
 * Any external downloader that you want to use with `--downloader`
 
 To use or redistribute the dependencies, you must agree to their respective licensing terms.
 
-The Windows and MacOS standalone release binaries are already built with the python interpreter and all optional python packages (marked with \*) included.
+The Windows and MacOS standalone release binaries are already built with the python interpreter, mutagen, pycryptodomex and websockets included.
 
 <!-- TODO: ffmpeg has merged this patch. Remove this note once there is new release -->
 **Note**: There are some regressions in newer ffmpeg versions that causes various issues when used alongside yt-dlp. Since ffmpeg is such an important dependency, we provide [custom builds](https://github.com/yt-dlp/FFmpeg-Builds#ffmpeg-static-auto-builds) with patches for these issues at [yt-dlp/FFmpeg-Builds](https://github.com/yt-dlp/FFmpeg-Builds). See [the readme](https://github.com/yt-dlp/FFmpeg-Builds#patches-applied) for details on the specific issues solved by these builds
@@ -370,7 +367,8 @@ You can also fork the project on github and run your fork's [build workflow](.gi
                                      available. Pass the minimum number of
                                      seconds (or range) to wait between retries
     --no-wait-for-video              Do not wait for scheduled streams (default)
-    --mark-watched                   Mark videos watched (even with --simulate)
+    --mark-watched                   Mark videos watched (even with --simulate).
+                                     Currently only supported for YouTube
     --no-mark-watched                Do not mark videos watched (default)
     --no-colors                      Do not emit color codes in output
     --compat-options OPTS            Options that can help keep compatibility
@@ -432,24 +430,24 @@ You can also fork the project on github and run your fork's [build workflow](.gi
     --dateafter DATE                 Download only videos uploaded on or after
                                      this date. The date formats accepted is the
                                      same as --date
-    --match-filters FILTER           Generic video filter. Any field (see
+    --match-filter FILTER            Generic video filter. Any field (see
                                      "OUTPUT TEMPLATE") can be compared with a
                                      number or a string using the operators
                                      defined in "Filtering formats". You can
                                      also simply specify a field to match if the
-                                     field is present, use "!field" to check if
+                                     field is present and "!field" to check if
-                                     the field is not present, and "&" to check
+                                     the field is not present. In addition,
-                                     multiple conditions. Use a "\" to escape
+                                     Python style regular expression matching
-                                     "&" or quotes if needed. If used multiple
+                                     can be done using "~=", and multiple
-                                     times, the filter matches if atleast one of
+                                     filters can be checked with "&". Use a "\"
-                                     the conditions are met. Eg: --match-filter
+                                     to escape "&" or quotes if needed. Eg:
-                                     !is_live --match-filter "like_count>?100 &
+                                     --match-filter "!is_live & like_count>?100
-                                     description~='(?i)\bcats \& dogs\b'"
+                                     & description~='(?i)\bcats \& dogs\b'"
-                                     matches only videos that are not live OR
+                                     matches only videos that are not live, has
-                                     those that have a like count more than 100
+                                     a like count more than 100 (or the like
-                                     (or the like field is not available) and
+                                     field is not available), and also has a
-                                     also has a description that contains the
+                                     description that contains the phrase "cats
-                                     phrase "cats & dogs" (ignoring case)
+                                     & dogs" (ignoring case)
     --no-match-filter                Do not use generic video filter (default)
     --no-playlist                    Download only the video, if the URL refers
                                      to a video and a playlist
@@ -783,8 +781,8 @@ You can also fork the project on github and run your fork's [build workflow](.gi
                                      containers irrespective of quality
     --no-prefer-free-formats         Don't give any special preference to free
                                      containers (default)
-    --check-formats                  Make sure formats are selected only from
+    --check-formats                  Check that the selected formats are
-                                     those that are actually downloadable
+                                     actually downloadable
     --check-all-formats              Check all formats for whether they are
                                      actually downloadable
     --no-check-formats               Do not check that the formats are actually
@@ -841,17 +839,15 @@ You can also fork the project on github and run your fork's [build workflow](.gi
                                      (requires ffmpeg and ffprobe)
     --audio-format FORMAT            Specify audio format to convert the audio
                                      to when -x is used. Currently supported
-                                     formats are: best (default) or one of aac,
+                                     formats are: best (default) or one of
-                                     flac, mp3, m4a, opus, vorbis, wav, alac
+                                     best|aac|flac|mp3|m4a|opus|vorbis|wav|alac
-    --audio-quality QUALITY          Specify ffmpeg audio quality to use when
+    --audio-quality QUALITY          Specify ffmpeg audio quality, insert a
-                                     converting the audio with -x. Insert a
                                      value between 0 (best) and 10 (worst) for
                                      VBR or a specific bitrate like 128K
                                      (default 5)
     --remux-video FORMAT             Remux the video into another container if
-                                     necessary (currently supported: mp4, mkv,
+                                     necessary (currently supported: mp4|mkv|flv
-                                     flv, webm, mov, avi, mka, ogg, aac, flac,
+                                     |webm|mov|avi|mp3|mka|m4a|ogg|opus). If
-                                     mp3, m4a, opus, vorbis, wav, alac). If
                                      target container does not support the
                                      video/audio codec, remuxing will fail. You
                                      can specify multiple rules; Eg.
@@ -951,10 +947,10 @@ You can also fork the project on github and run your fork's [build workflow](.gi
                                      option can be used multiple times
     --no-exec                        Remove any previously defined --exec
     --convert-subs FORMAT            Convert the subtitles to another format
-                                     (currently supported: srt, vtt, ass, lrc)
+                                     (currently supported: srt|vtt|ass|lrc)
                                      (Alias: --convert-subtitles)
     --convert-thumbnails FORMAT      Convert the thumbnails to another format
-                                     (currently supported: jpg, png, webp)
+                                     (currently supported: jpg|png|webp)
     --split-chapters                 Split video into multiple files based on
                                      internal chapters. The "chapter:" prefix
                                      can be used with "--paths" and "--output"
@@ -1158,11 +1154,11 @@ The available fields are:
  - `license` (string): License name the video is licensed under
  - `creator` (string): The creator of the video
  - `timestamp` (numeric): UNIX timestamp of the moment the video became available
- - `upload_date` (string): Video upload date in UTC (YYYYMMDD)
+ - `upload_date` (string): Video upload date (YYYYMMDD)
  - `release_timestamp` (numeric): UNIX timestamp of the moment the video was released
- - `release_date` (string): The date (YYYYMMDD) when the video was released in UTC
+ - `release_date` (string): The date (YYYYMMDD) when the video was released
  - `modified_timestamp` (numeric): UNIX timestamp of the moment the video was last modified
- - `modified_date` (string): The date (YYYYMMDD) when the video was last modified in UTC
+ - `modified_date` (string): The date (YYYYMMDD) when the video was last modified
  - `uploader_id` (string): Nickname or id of the video uploader
  - `channel` (string): Full name of the channel the video is uploaded on
  - `channel_id` (string): Id of the channel
@@ -1367,7 +1363,7 @@ You can also use special names to select particular edge case formats:
  - `bv`, `bestvideo`: Select the best quality **video-only** format. Equivalent to `best*[acodec=none]`
  - `bv*`, `bestvideo*`: Select the best quality format that **contains video**. It may also contain audio. Equivalent to `best*[vcodec!=none]`
  - `ba`, `bestaudio`: Select the best quality **audio-only** format. Equivalent to `best*[vcodec=none]`
- - `ba*`, `bestaudio*`: Select the best quality format that **contains audio**. It may also contain video. Equivalent to `best*[acodec!=none]` ([Do not use!](https://github.com/yt-dlp/yt-dlp/issues/979#issuecomment-919629354))
+ - `ba*`, `bestaudio*`: Select the best quality format that **contains audio**. It may also contain video. Equivalent to `best*[acodec!=none]`
  - `w*`, `worst*`: Select the worst quality format that contains either a video or an audio
  - `w`, `worst`: Select the worst quality format that contains both video and audio. Equivalent to `worst*[vcodec!=none][acodec!=none]`
  - `wv`, `worstvideo`: Select the worst quality video-only format. Equivalent to `worst*[acodec=none]`
@@ -1375,7 +1371,7 @@ You can also use special names to select particular edge case formats:
  - `wa`, `worstaudio`: Select the worst quality audio-only format. Equivalent to `worst*[vcodec=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 `-S +size` or more rigorously, `-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 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.
 
 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.
 
@@ -1641,11 +1637,7 @@ $ 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"
 
-# Prioritize uploader as the "artist" field in video metadata
+# Set "comment" field in video metadata using description instead of webpage_url
-$ yt-dlp --parse-metadata "%(uploader|)s:%(meta_artist)s" --add-metadata
-
-# Set "comment" field in video metadata using description instead of webpage_url,
-# handling multiple lines correctly
 $ yt-dlp --parse-metadata "description:(?s)(?P<meta_comment>.+)" --add-metadata
 
 # Remove "formats" field from the infojson by setting it to an empty string
@@ -1658,18 +1650,20 @@ $ yt-dlp --replace-in-metadata "title,uploader" "[ _]" "-"
 
 # EXTRACTOR ARGUMENTS
 
-Some extractors accept additional arguments which can be passed using `--extractor-args KEY:ARGS`. `ARGS` is a `;` (semicolon) separated string of `ARG=VAL1,VAL2`. Eg: `--extractor-args "youtube:player-client=android_embedded,web;include_live_dash" --extractor-args "funimation:version=uncut"`
+Some extractors accept additional arguments which can be passed using `--extractor-args KEY:ARGS`. `ARGS` is a `;` (semicolon) separated string of `ARG=VAL1,VAL2`. Eg: `--extractor-args "youtube:player-client=android_agegate,web;include_live_dash" --extractor-args "funimation:version=uncut"`
 
 The following extractors use this feature:
 
 #### youtube
-* `skip`: One or more of `hls`, `dash` or `translated_subs` to skip extraction of the m3u8 manifests, dash manifests and auto-translated subtitles respectively
+* `skip`: `hls` or `dash` (or both) to skip download of the respective manifests
-* `player_client`: Clients to extract video data from. The main clients are `web`, `android` and `ios` with variants `_music`, `_embedded`, `_embedscreen`, `_creator` (Eg: `web_embedded`); and `mweb` and `tv_embedded` (agegate bypass) with no variants. By default, `android,web` is used, but tv_embedded and creator variants are added as required for age-gated videos. Similarly the music variants are added for `music.youtube.com` urls. You can use `all` to use all the clients, and `default` for the default clients.
+* `player_client`: Clients to extract video data from. The main clients are `web`, `android`, `ios`, `mweb`. These also have `_music`, `_embedded`, `_agegate`, and `_creator` variants (Eg: `web_embedded`) (`mweb` has only `_agegate`). By default, `android,web` is used, but the agegate and creator variants are added as required for age-gated videos. Similarly the music variants are added for `music.youtube.com` urls. You can also use `all` to use all the clients, and `default` for the default clients.
 * `player_skip`: Skip some network requests that are generally needed for robust extraction. One or more of `configs` (skip client configs), `webpage` (skip initial webpage), `js` (skip js player). While these options can help reduce the number of requests needed or avoid some rate-limiting, they could cause some issues. See [#860](https://github.com/yt-dlp/yt-dlp/pull/860) for more details
 * `include_live_dash`: Include live dash formats even without `--live-from-start` (These formats don't download properly)
 * `comment_sort`: `top` or `new` (default) - choose comment sorting mode (on YouTube's side)
-* `max_comments`: Limit the amount of comments to gather. Comma-separated list of integers representing `max-comments,max-parents,max-replies,max-replies-per-thread`. Default is `all,all,all,all`
+* `max_comments`: Limit the amount of comments to gather. Comma-separated list of integers representing `max-comments,max-parents,max-replies,max-replies-per-thread`. Default is `all,all,all,all`.
-    * E.g. `all,all,1000,10` will get a maximum of 1000 replies total, with up to 10 replies per thread. `1000,all,100` will get a maximum of 1000 comments, with a maximum of 100 replies total
+    * E.g. `all,all,1000,10` will get a maximum of 1000 replies total, with up to 10 replies per thread. `1000,all,100` will get a maximum of 1000 comments, with a maximum of 100 replies total.
+* `max_comment_depth` Maximum depth for nested comments. YouTube supports depths 1 or 2 (default)
+    * **Deprecated**: Set `max-replies` to `0` or `all` in `max_comments` instead (e.g. `max_comments=all,all,0` to get no replies) 
 
 #### youtubetab (YouTube playlists, channels, feeds, etc.)
 * `skip`: One or more of `webpage` (skip initial webpage download), `authcheck` (allow the download of playlists requiring authentication when no initial webpage is downloaded. This may cause unwanted behavior, see [#1122](https://github.com/yt-dlp/yt-dlp/pull/1122) for more details)
@@ -1683,7 +1677,7 @@ The following extractors use this feature:
 * `language`: Languages to extract. Eg: `crunchyroll:language=jaJp`
 * `hardsub`: Which hard-sub versions to extract. Eg: `crunchyroll:hardsub=None,enUS`
 
-#### crunchyrollbeta
+#### crunchyroll:beta
 * `format`: Which stream type(s) to extract. Default is `adaptive_hls` Eg: `crunchyrollbeta:format=vo_adaptive_hls`
     * Potentially useful values include `adaptive_hls`, `adaptive_dash`, `vo_adaptive_hls`, `vo_adaptive_dash`, `download_hls`, `trailer_hls`, `trailer_dash`
 * `hardsub`: Preference order for which hardsub versions to extract. Default is `None` (no hardsubs). Eg: `crunchyrollbeta:hardsub=en-US,None`
@@ -1691,9 +1685,6 @@ The following extractors use this feature:
 #### vikichannel
 * `video_types`: Types of videos to download - one or more of `episodes`, `movies`, `clips`, `trailers`
 
-#### niconico
-* `segment_duration`: Segment duration in milliseconds for HLS-DMC formats. Use it at your own risk since this feature **may result in your account termination.**
-
 #### youtubewebarchive
 * `check_all`: Try to check more at the cost of more requests. One or more of `thumbnails`, `captures`
 
@@ -1748,7 +1739,7 @@ with YoutubeDL(ydl_opts) as ydl:
     ydl.download(['https://www.youtube.com/watch?v=BaW_jenozKc'])
 ```
 
-Most likely, you'll want to use various options. For a list of options available, have a look at [`yt_dlp/YoutubeDL.py`](yt_dlp/YoutubeDL.py#L197).
+Most likely, you'll want to use various options. For a list of options available, have a look at [`yt_dlp/YoutubeDL.py`](yt_dlp/YoutubeDL.py#L191).
 
 Here's a more complete example demonstrating various functionality:
 

devscripts/make_supportedsites.py

@@ -24,9 +24,10 @@ def main():
     def gen_ies_md(ies):
         for ie in ies:
             ie_md = '**{0}**'.format(ie.IE_NAME)
-            if ie.IE_DESC is False:
+            ie_desc = getattr(ie, 'IE_DESC', None)
+            if ie_desc is False:
                 continue
-            if ie.IE_DESC is not None:
+            if ie_desc is not None:
                 ie_md += ': {0}'.format(ie.IE_DESC)
             search_key = getattr(ie, 'SEARCH_KEY', None)
             if search_key is not None:

docs/.gitignore

@@ -0,0 +1 @@
+_build/

docs/Changelog.md

@@ -0,0 +1,5 @@
+---
+orphan: true
+---
+```{include} ../Changelog.md
+```

docs/Collaborators.md

@@ -0,0 +1,5 @@
+---
+orphan: true
+---
+```{include} ../Collaborators.md
+```

docs/Contributing.md

@@ -0,0 +1,5 @@
+---
+orphan: true
+---
+```{include} ../Contributing.md
+```

docs/LICENSE.md

@@ -0,0 +1,6 @@
+---
+orphan: true
+---
+# LICENSE
+```{include} ../LICENSE
+```

docs/Makefile

@@ -0,0 +1,177 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/yt-dlp.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/yt-dlp.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/yt-dlp"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/yt-dlp"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

docs/README.md

@@ -0,0 +1,2 @@
+```{include} ../README.md
+```

docs/conf.py

@@ -0,0 +1,68 @@
+# coding: utf-8
+#
+# yt-dlp documentation build configuration file
+
+import sys
+import os
+
+# Allows to import yt-dlp
+sys.path.insert(0, os.path.abspath('..'))
+
+# -- General configuration ------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'myst_parser',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The master toctree document.
+master_doc = 'README'
+
+# General information about the project.
+project = u'yt-dlp'
+author = u'yt-dlp'
+copyright = u'UNLICENSE'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+from yt_dlp.version import __version__
+version = __version__
+# The full version, including alpha/beta/rc tags.
+release = version
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Disable highlights
+highlight_language = 'none'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+# html_static_path = ['_static']
+
+# Enable heading anchors
+myst_heading_anchors = 4
+
+# Suppress heading warnings
+suppress_warnings = [
+    'myst.header',
+]

docs/requirements.txt

@@ -0,0 +1 @@
+myst-parser

docs/supportedsites.md

@@ -0,0 +1,5 @@
+---
+orphan: true
+---
+```{include} ../supportedsites.md
+```

docs/ytdlp_plugins.md

@@ -0,0 +1,6 @@
+---
+orphan: true
+---
+# ytdlp_plugins
+
+See [https://github.com/yt-dlp/yt-dlp/tree/master/ytdlp_plugins](https://github.com/yt-dlp/yt-dlp/tree/master/ytdlp_plugins).

pyinst.py

@@ -74,7 +74,7 @@ def version_to_list(version):
 
 
 def dependency_options():
-    dependencies = [pycryptodome_module(), 'mutagen', 'brotli', 'certifi'] + collect_submodules('websockets')
+    dependencies = [pycryptodome_module(), 'mutagen', 'brotli'] + collect_submodules('websockets')
     excluded_modules = ['test', 'ytdlp_plugins', 'youtube-dl', 'youtube-dlc']
 
     yield from (f'--hidden-import={module}' for module in dependencies)

requirements.txt

@@ -3,4 +3,3 @@ pycryptodomex
 websockets
 brotli; platform_python_implementation=='CPython'
 brotlicffi; platform_python_implementation!='CPython'
-certifi

setup.py

@@ -21,9 +21,9 @@ DESCRIPTION = 'A youtube-dl fork with additional features and patches'
 LONG_DESCRIPTION = '\n\n'.join((
     'Official repository: <https://github.com/yt-dlp/yt-dlp>',
     '**PS**: Some links in this document will not work since this is a copy of the README.md from Github',
-    open('README.md', encoding='utf-8').read()))
+    open('README.md').read()))
 
-REQUIREMENTS = open('requirements.txt', encoding='utf-8').read().splitlines()
+REQUIREMENTS = open('requirements.txt').read().splitlines()
 
 
 if sys.argv[1:2] == ['py2exe']:

supportedsites.md

@@ -42,7 +42,6 @@
  - **aenetworks:show**
  - **afreecatv**: afreecatv.com
  - **afreecatv:live**: afreecatv.com
- - **afreecatv:user**
  - **AirMozilla**
  - **AliExpressLive**
  - **AlJazeera**
@@ -105,8 +104,6 @@
  - **awaan:video**
  - **AZMedien**: AZ Medien videos
  - **BaiduVideo**: 百度视频
- - **BanBye**
- - **BanByeChannel**
  - **bandaichannel**
  - **Bandcamp**
  - **Bandcamp:album**
@@ -248,7 +245,6 @@
  - **cpac:playlist**
  - **Cracked**
  - **Crackle**
- - **Craftsy**
  - **CrooksAndLiars**
  - **CrowdBunker**
  - **CrowdBunkerChannel**
@@ -267,8 +263,6 @@
  - **curiositystream:collections**
  - **curiositystream:series**
  - **CWTV**
- - **Cybrary**
- - **CybraryCourse**
  - **Daftsex**
  - **DagelijkseKost**: dagelijksekost.een.be
  - **DailyMail**
@@ -490,7 +484,6 @@
  - **Hungama**
  - **HungamaAlbumPlaylist**
  - **HungamaSong**
- - **huya:live**: huya.com
  - **Hypem**
  - **ign.com**
  - **IGNArticle**
@@ -519,8 +512,6 @@
  - **iq.com**: International version of iQiyi
  - **iq.com:album**
  - **iqiyi**: 爱奇艺
- - **ITProTV**
- - **ITProTVCourse**
  - **ITTF**
  - **ITV**
  - **ITVBTCC**
@@ -529,8 +520,6 @@
  - **ivideon**: Ivideon TV
  - **Iwara**
  - **Izlesene**
- - **Jable**
- - **JablePlaylist**
  - **Jamendo**
  - **JamendoAlbum**
  - **JeuxVideo**
@@ -566,9 +555,6 @@
  - **la7.it:podcast**
  - **laola1tv**
  - **laola1tv:embed**
- - **LastFM**
- - **LastFMPlaylist**
- - **LastFMUser**
  - **lbry**
  - **lbry:channel**
  - **LCI**
@@ -617,7 +603,6 @@
  - **MallTV**
  - **mangomolo:live**
  - **mangomolo:video**
- - **MangoTV**: 芒果TV
  - **ManotoTV**: Manoto TV (Episode)
  - **ManotoTVLive**: Manoto TV (Live)
  - **ManotoTVShow**: Manoto TV (Show)
@@ -650,6 +635,7 @@
  - **Metacritic**
  - **mewatch**
  - **Mgoon**
+ - **MGTV**: 芒果TV
  - **MiaoPai**
  - **microsoftstream**: Microsoft Stream
  - **mildom**: Record ongoing live by specific user in Mildom
@@ -685,7 +671,6 @@
  - **Motorsport**: motorsport.com
  - **MovieClips**
  - **MovieFap**
- - **Moviepilot**
  - **Moviezine**
  - **MovingImage**
  - **MSN**
@@ -720,6 +705,7 @@
  - **MyVideoGe**
  - **MyVidster**
  - **MyviEmbed**
+ - **MyVisionTV**
  - **n-tv.de**
  - **N1Info:article**
  - **N1InfoAsset**
@@ -877,9 +863,6 @@
  - **PalcoMP3:song**
  - **PalcoMP3:video**
  - **pandora.tv**: 판도라TV
- - **Panopto**
- - **PanoptoList**
- - **PanoptoPlaylist**
  - **ParamountNetwork**
  - **ParamountPlus**
  - **ParamountPlusSeries**
@@ -929,7 +912,6 @@
  - **PlutoTV**
  - **podomatic**
  - **Pokemon**
- - **PokemonSoundLibrary**
  - **PokemonWatch**
  - **PokerGo**
  - **PokerGoCollection**
@@ -975,6 +957,8 @@
  - **qqmusic:toplist**: QQ音乐 - 排行榜
  - **QuantumTV**
  - **Qub**
+ - **Quickline**
+ - **QuicklineLive**
  - **R7**
  - **R7Article**
  - **Radiko**
@@ -1443,9 +1427,6 @@
  - **Wakanim**
  - **Walla**
  - **WalyTV**
- - **wasdtv:clip**
- - **wasdtv:record**
- - **wasdtv:stream**
  - **washingtonpost**
  - **washingtonpost:article**
  - **wat.tv**
@@ -1539,8 +1520,6 @@
  - **Zapiks**
  - **Zattoo**
  - **ZattooLive**
- - **ZattooMovies**
- - **ZattooRecordings**
  - **ZDF**
  - **ZDFChannel**
  - **Zee5**

test/helper.py

@@ -196,7 +196,15 @@ def expect_dict(self, got_dict, expected_dict):
 
 def sanitize_got_info_dict(got_dict):
     IGNORED_FIELDS = (
-        *YoutubeDL._format_fields,
+        # Format keys
+        'url', 'manifest_url', 'format', 'format_id', 'format_note', 'width', 'height', 'resolution',
+        'dynamic_range', 'tbr', 'abr', 'acodec', 'asr', 'vbr', 'fps', 'vcodec', 'container', 'filesize',
+        'filesize_approx', 'player_url', 'protocol', 'fragment_base_url', 'fragments', 'preference',
+        'language', 'language_preference', 'quality', 'source_preference', 'http_headers',
+        'stretched_ratio', 'no_resume', 'has_drm', 'downloader_options',
+
+        # RTMP formats
+        'page_url', 'app', 'play_path', 'tc_url', 'flash_version', 'rtmp_live', 'rtmp_conn', 'rtmp_protocol', 'rtmp_real_time',
 
         # Lists
         'formats', 'thumbnails', 'subtitles', 'automatic_captions', 'comments', 'entries',

test/test_YoutubeDL.py

@@ -818,8 +818,6 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(id&foo)s.bar', 'foo.bar')
         test('%(title&foo)s.bar', 'NA.bar')
         test('%(title&foo|baz)s.bar', 'baz.bar')
-        test('%(x,id&foo|baz)s.bar', 'foo.bar')
-        test('%(x,title&foo|baz)s.bar', 'baz.bar')
 
         # Laziness
         def gen():
@@ -933,7 +931,7 @@ class TestYoutubeDL(unittest.TestCase):
         res = get_videos()
         self.assertEqual(res, ['1', '2'])
 
-        def f(v, incomplete):
+        def f(v):
             if v['id'] == '1':
                 return None
             else:

test/test_iqiyi_sdk_interpreter.py

@@ -12,6 +12,11 @@ from test.helper import FakeYDL, is_download_test
 from yt_dlp.extractor import IqiyiIE
 
 
+class IqiyiIEWithCredentials(IqiyiIE):
+    def _get_login_info(self):
+        return 'foo', 'bar'
+
+
 class WarningLogger(object):
     def __init__(self):
         self.messages = []
@@ -35,8 +40,8 @@ class TestIqiyiSDKInterpreter(unittest.TestCase):
         If `sign` is incorrect, /validate call throws an HTTP 556 error
         '''
         logger = WarningLogger()
-        ie = IqiyiIE(FakeYDL({'logger': logger}))
+        ie = IqiyiIEWithCredentials(FakeYDL({'logger': logger}))
-        ie._perform_login('foo', 'bar')
+        ie._login()
         self.assertTrue('unable to log in:' in logger.messages[0])
 
 

test/test_netrc.py

@@ -7,19 +7,18 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-from yt_dlp.extractor import gen_extractor_classes
+from yt_dlp.extractor import (
-from yt_dlp.extractor.common import InfoExtractor
+    gen_extractors,
-
+)
-NO_LOGIN = InfoExtractor._perform_login
 
 
 class TestNetRc(unittest.TestCase):
     def test_netrc_present(self):
-        for ie in gen_extractor_classes():
+        for ie in gen_extractors():
-            if ie._perform_login is NO_LOGIN:
+            if not hasattr(ie, '_login'):
                 continue
             self.assertTrue(
-                ie._NETRC_MACHINE,
+                hasattr(ie, '_NETRC_MACHINE'),
                 'Extractor %s supports login, but is missing a _NETRC_MACHINE property' % ie.IE_NAME)
 
 

test/test_utils.py

@@ -56,7 +56,6 @@ from yt_dlp.utils import (
     is_html,
     js_to_json,
     limit_length,
-    locked_file,
     merge_dicts,
     mimetype2ext,
     month_by_name,
@@ -161,12 +160,10 @@ class TestUtil(unittest.TestCase):
             sanitize_filename('New World record at 0:12:34'),
             'New World record at 0_12_34')
 
-        self.assertEqual(sanitize_filename('--gasdgf'), '--gasdgf')
+        self.assertEqual(sanitize_filename('--gasdgf'), '_-gasdgf')
         self.assertEqual(sanitize_filename('--gasdgf', is_id=True), '--gasdgf')
-        self.assertEqual(sanitize_filename('--gasdgf', is_id=False), '_-gasdgf')
+        self.assertEqual(sanitize_filename('.gasdgf'), 'gasdgf')
-        self.assertEqual(sanitize_filename('.gasdgf'), '.gasdgf')
         self.assertEqual(sanitize_filename('.gasdgf', is_id=True), '.gasdgf')
-        self.assertEqual(sanitize_filename('.gasdgf', is_id=False), 'gasdgf')
 
         forbidden = '"\0\\/'
         for fc in forbidden:
@@ -628,8 +625,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(parse_duration('3h 11m 53s'), 11513)
         self.assertEqual(parse_duration('3 hours 11 minutes 53 seconds'), 11513)
         self.assertEqual(parse_duration('3 hours 11 mins 53 secs'), 11513)
-        self.assertEqual(parse_duration('3 hours, 11 minutes, 53 seconds'), 11513)
-        self.assertEqual(parse_duration('3 hours, 11 mins, 53 secs'), 11513)
         self.assertEqual(parse_duration('62m45s'), 3765)
         self.assertEqual(parse_duration('6m59s'), 419)
         self.assertEqual(parse_duration('49s'), 49)
@@ -1785,7 +1780,6 @@ Line 1
         self.assertEqual(format_bytes(1024**6), '1.00EiB')
         self.assertEqual(format_bytes(1024**7), '1.00ZiB')
         self.assertEqual(format_bytes(1024**8), '1.00YiB')
-        self.assertEqual(format_bytes(1024**9), '1024.00YiB')
 
     def test_hide_login_info(self):
         self.assertEqual(Config.hide_login_info(['-u', 'foo', '-p', 'bar']),
@@ -1796,36 +1790,6 @@ Line 1
         self.assertEqual(Config.hide_login_info(['--username=foo']),
                          ['--username=PRIVATE'])
 
-    def test_locked_file(self):
-        TEXT = 'test_locked_file\n'
-        FILE = 'test_locked_file.ytdl'
-        MODES = 'war'  # Order is important
-
-        try:
-            for lock_mode in MODES:
-                with locked_file(FILE, lock_mode, False) as f:
-                    if lock_mode == 'r':
-                        self.assertEqual(f.read(), TEXT * 2, 'Wrong file content')
-                    else:
-                        f.write(TEXT)
-                    for test_mode in MODES:
-                        testing_write = test_mode != 'r'
-                        try:
-                            with locked_file(FILE, test_mode, False):
-                                pass
-                        except (BlockingIOError, PermissionError):
-                            if not testing_write:  # FIXME
-                                print(f'Known issue: Exclusive lock ({lock_mode}) blocks read access ({test_mode})')
-                                continue
-                            self.assertTrue(testing_write, f'{test_mode} is blocked by {lock_mode}')
-                        else:
-                            self.assertFalse(testing_write, f'{test_mode} is not blocked by {lock_mode}')
-        finally:
-            try:
-                os.remove(FILE)
-            except Exception:
-                pass
-
 
 if __name__ == '__main__':
     unittest.main()

yt_dlp/YoutubeDL.py

@@ -65,7 +65,6 @@ from .utils import (
     ExistingVideoReached,
     expand_path,
     ExtractorError,
-    filter_dict,
     float_or_none,
     format_bytes,
     format_field,
@@ -73,7 +72,6 @@ from .utils import (
     formatSeconds,
     GeoRestrictedError,
     get_domain,
-    has_certifi,
     HEADRequest,
     InAdvancePagedList,
     int_or_none,
@@ -88,7 +86,6 @@ from .utils import (
     MaxDownloadsReached,
     merge_headers,
     network_exceptions,
-    NO_DEFAULT,
     number_of_digits,
     orderedSet,
     OUTTMPL_TYPES,
@@ -515,22 +512,23 @@ class YoutubeDL(object):
         'track_number', 'disc_number', 'release_year',
     ))
 
-    _format_fields = {
-        # NB: Keep in sync with the docstring of extractor/common.py
-        'url', 'manifest_url', 'manifest_stream_number', 'ext', 'format', 'format_id', 'format_note',
-        'width', 'height', 'resolution', 'dynamic_range', 'tbr', 'abr', 'acodec', 'asr',
-        'vbr', 'fps', 'vcodec', 'container', 'filesize', 'filesize_approx',
-        'player_url', 'protocol', 'fragment_base_url', 'fragments', 'is_from_start',
-        'preference', 'language', 'language_preference', 'quality', 'source_preference',
-        'http_headers', 'stretched_ratio', 'no_resume', 'has_drm', 'downloader_options',
-        'page_url', 'app', 'play_path', 'tc_url', 'flash_version', 'rtmp_live', 'rtmp_conn', 'rtmp_protocol', 'rtmp_real_time'
-    }
     _format_selection_exts = {
         'audio': {'m4a', 'mp3', 'ogg', 'aac'},
         'video': {'mp4', 'flv', 'webm', '3gp'},
         'storyboards': {'mhtml'},
     }
 
+    params = None
+    _ies = {}
+    _pps = {k: [] for k in POSTPROCESS_WHEN}
+    _printed_messages = set()
+    _first_webpage_request = True
+    _download_retcode = None
+    _num_downloads = None
+    _playlist_level = 0
+    _playlist_urls = set()
+    _screen_file = None
+
     def __init__(self, params=None, auto_init=True):
         """Create a FileDownloader object with the given options.
         @param auto_init    Whether to load the default extractors and print header (if verbose).
@@ -538,7 +536,6 @@ class YoutubeDL(object):
         """
         if params is None:
             params = {}
-        self.params = params
         self._ies = {}
         self._ies_instances = {}
         self._pps = {k: [] for k in POSTPROCESS_WHEN}
@@ -550,21 +547,15 @@ class YoutubeDL(object):
         self._download_retcode = 0
         self._num_downloads = 0
         self._num_videos = 0
-        self._playlist_level = 0
+        self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
-        self._playlist_urls = set()
+        self._err_file = sys.stderr
+        self.params = params
         self.cache = Cache(self)
 
         windows_enable_vt_mode()
-        self._out_files = {
-            'error': sys.stderr,
-            'print': sys.stderr if self.params.get('logtostderr') else sys.stdout,
-            'console': None if compat_os_name == 'nt' else next(
-                filter(supports_terminal_sequences, (sys.stderr, sys.stdout)), None)
-        }
-        self._out_files['screen'] = sys.stderr if self.params.get('quiet') else self._out_files['print']
         self._allow_colors = {
-            type_: not self.params.get('no_color') and supports_terminal_sequences(self._out_files[type_])
+            'screen': not self.params.get('no_color') and supports_terminal_sequences(self._screen_file),
-            for type_ in ('screen', 'error')
+            'err': not self.params.get('no_color') and supports_terminal_sequences(self._err_file),
         }
 
         if sys.version_info < (3, 6):
@@ -629,7 +620,7 @@ class YoutubeDL(object):
                 sp_kwargs = dict(
                     stdin=subprocess.PIPE,
                     stdout=slave,
-                    stderr=self._out_files['error'])
+                    stderr=self._err_file)
                 try:
                     self._output_process = Popen(['bidiv'] + width_args, **sp_kwargs)
                 except OSError:
@@ -797,24 +788,14 @@ class YoutubeDL(object):
             self._printed_messages.add(message)
         write_string(message, out=out, encoding=self.params.get('encoding'))
 
-    def to_stdout(self, message, skip_eol=False, quiet=None):
+    def to_stdout(self, message, skip_eol=False, quiet=False):
         """Print message to stdout"""
-        if quiet is not None:
-            self.deprecation_warning('"YoutubeDL.to_stdout" no longer accepts the argument quiet. Use "YoutubeDL.to_screen" instead')
-        self._write_string(
-            '%s%s' % (self._bidi_workaround(message), ('' if skip_eol else '\n')),
-            self._out_files['print'])
-
-    def to_screen(self, message, skip_eol=False, quiet=None):
-        """Print message to screen if not in quiet mode"""
         if self.params.get('logger'):
             self.params['logger'].debug(message)
-            return
+        elif not quiet or self.params.get('verbose'):
-        if (self.params.get('quiet') if quiet is None else quiet) and not self.params.get('verbose'):
+            self._write_string(
-            return
+                '%s%s' % (self._bidi_workaround(message), ('' if skip_eol else '\n')),
-        self._write_string(
+                self._err_file if quiet else self._screen_file)
-            '%s%s' % (self._bidi_workaround(message), ('' if skip_eol else '\n')),
-            self._out_files['screen'])
 
     def to_stderr(self, message, only_once=False):
         """Print message to stderr"""
@@ -822,12 +803,7 @@ class YoutubeDL(object):
         if self.params.get('logger'):
             self.params['logger'].error(message)
         else:
-            self._write_string('%s\n' % self._bidi_workaround(message), self._out_files['error'], only_once=only_once)
+            self._write_string('%s\n' % self._bidi_workaround(message), self._err_file, only_once=only_once)
-
-    def _send_console_code(self, code):
-        if compat_os_name == 'nt' or not self._out_files['console']:
-            return
-        self._write_string(code, self._out_files['console'])
 
     def to_console_title(self, message):
         if not self.params.get('consoletitle', False):
@@ -838,18 +814,26 @@ class YoutubeDL(object):
                 # c_wchar_p() might not be necessary if `message` is
                 # already of type unicode()
                 ctypes.windll.kernel32.SetConsoleTitleW(ctypes.c_wchar_p(message))
-        else:
+        elif 'TERM' in os.environ:
-            self._send_console_code(f'\033]0;{message}\007')
+            self._write_string('\033]0;%s\007' % message, self._screen_file)
 
     def save_console_title(self):
-        if not self.params.get('consoletitle') or self.params.get('simulate'):
+        if not self.params.get('consoletitle', False):
             return
-        self._send_console_code('\033[22;0t')  # Save the title on stack
+        if self.params.get('simulate'):
+            return
+        if compat_os_name != 'nt' and 'TERM' in os.environ:
+            # Save the title on stack
+            self._write_string('\033[22;0t', self._screen_file)
 
     def restore_console_title(self):
-        if not self.params.get('consoletitle') or self.params.get('simulate'):
+        if not self.params.get('consoletitle', False):
             return
-        self._send_console_code('\033[23;0t')  # Restore the title from stack
+        if self.params.get('simulate'):
+            return
+        if compat_os_name != 'nt' and 'TERM' in os.environ:
+            # Restore the title from stack
+            self._write_string('\033[23;0t', self._screen_file)
 
     def __enter__(self):
         self.save_console_title()
@@ -895,6 +879,11 @@ class YoutubeDL(object):
             raise DownloadError(message, exc_info)
         self._download_retcode = 1
 
+    def to_screen(self, message, skip_eol=False):
+        """Print message to stdout if not in quiet mode"""
+        self.to_stdout(
+            message, skip_eol, quiet=self.params.get('quiet', False))
+
     class Styles(Enum):
         HEADERS = 'yellow'
         EMPHASIS = 'light blue'
@@ -918,11 +907,11 @@ class YoutubeDL(object):
 
     def _format_screen(self, *args, **kwargs):
         return self._format_text(
-            self._out_files['screen'], self._allow_colors['screen'], *args, **kwargs)
+            self._screen_file, self._allow_colors['screen'], *args, **kwargs)
 
     def _format_err(self, *args, **kwargs):
         return self._format_text(
-            self._out_files['error'], self._allow_colors['error'], *args, **kwargs)
+            self._err_file, self._allow_colors['err'], *args, **kwargs)
 
     def report_warning(self, message, only_once=False):
         '''
@@ -938,7 +927,7 @@ class YoutubeDL(object):
 
     def deprecation_warning(self, message):
         if self.params.get('logger') is not None:
-            self.params['logger'].warning(f'DeprecationWarning: {message}')
+            self.params['logger'].warning('DeprecationWarning: {message}')
         else:
             self.to_stderr(f'{self._format_err("DeprecationWarning:", self.Styles.ERROR)} {message}', True)
 
@@ -1101,11 +1090,10 @@ class YoutubeDL(object):
             (?P<fields>{field})
             (?P<maths>(?:{math_op}{math_field})*)
             (?:>(?P<strf_format>.+?))?
-            (?P<remaining>
+            (?P<alternate>(?<!\\),[^|&)]+)?
-                (?P<alternate>(?<!\\),[^|&)]+)?
+            (?:&(?P<replacement>.*?))?
-                (?:&(?P<replacement>.*?))?
+            (?:\|(?P<default>.*?))?
-                (?:\|(?P<default>.*?))?
+            $'''.format(field=FIELD_RE, math_op=MATH_OPERATORS_RE, math_field=MATH_FIELD_RE))
-            )$'''.format(field=FIELD_RE, math_op=MATH_OPERATORS_RE, math_field=MATH_FIELD_RE))
 
         def _traverse_infodict(k):
             k = k.split('.')
@@ -1152,10 +1140,8 @@ class YoutubeDL(object):
         na = self.params.get('outtmpl_na_placeholder', 'NA')
 
         def filename_sanitizer(key, value, restricted=self.params.get('restrictfilenames')):
-            return sanitize_filename(str(value), restricted=restricted, is_id=(
+            return sanitize_filename(str(value), restricted=restricted,
-                bool(re.search(r'(^|[_.])id(\.|$)', key))
+                                     is_id=re.search(r'(^|[_.])id(\.|$)', key))
-                if 'filename-sanitization' in self.params.get('compat_opts', [])
-                else NO_DEFAULT))
 
         sanitizer = sanitize if callable(sanitize) else filename_sanitizer
         sanitize = bool(sanitize)
@@ -1178,7 +1164,7 @@ class YoutubeDL(object):
                 value = get_value(mobj)
                 replacement = mobj['replacement']
                 if value is None and mobj['alternate']:
-                    mobj = re.match(INTERNAL_FORMAT_RE, mobj['remaining'][1:])
+                    mobj = re.match(INTERNAL_FORMAT_RE, mobj['alternate'][1:])
                 else:
                     break
 
@@ -1240,21 +1226,18 @@ class YoutubeDL(object):
         outtmpl, info_dict = self.prepare_outtmpl(outtmpl, info_dict, *args, **kwargs)
         return self.escape_outtmpl(outtmpl) % info_dict
 
-    def _prepare_filename(self, info_dict, *, outtmpl=None, tmpl_type=None):
+    def _prepare_filename(self, info_dict, tmpl_type='default'):
-        assert None in (outtmpl, tmpl_type), 'outtmpl and tmpl_type are mutually exclusive'
-        if outtmpl is None:
-            outtmpl = self.outtmpl_dict.get(tmpl_type or 'default', self.outtmpl_dict['default'])
         try:
-            outtmpl = self._outtmpl_expandpath(outtmpl)
+            outtmpl = self._outtmpl_expandpath(self.outtmpl_dict.get(tmpl_type, self.outtmpl_dict['default']))
             filename = self.evaluate_outtmpl(outtmpl, info_dict, True)
             if not filename:
                 return None
 
-            if tmpl_type in ('', 'temp'):
+            if tmpl_type in ('default', 'temp'):
                 final_ext, ext = self.params.get('final_ext'), info_dict.get('ext')
                 if final_ext and ext and final_ext != ext and filename.endswith(f'.{final_ext}'):
                     filename = replace_extension(filename, ext, final_ext)
-            elif tmpl_type:
+            else:
                 force_ext = OUTTMPL_TYPES[tmpl_type]
                 if force_ext:
                     filename = replace_extension(filename, force_ext, info_dict.get('ext'))
@@ -1270,12 +1253,10 @@ class YoutubeDL(object):
             self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
             return None
 
-    def prepare_filename(self, info_dict, dir_type='', *, outtmpl=None, warn=False):
+    def prepare_filename(self, info_dict, dir_type='', warn=False):
-        """Generate the output filename"""
+        """Generate the output filename."""
-        if outtmpl:
+
-            assert not dir_type, 'outtmpl and dir_type are mutually exclusive'
+        filename = self._prepare_filename(info_dict, dir_type or 'default')
-            dir_type = None
-        filename = self._prepare_filename(info_dict, tmpl_type=dir_type, outtmpl=outtmpl)
         if not filename and dir_type not in ('', 'temp'):
             return ''
 
@@ -1449,7 +1430,7 @@ class YoutubeDL(object):
         min_wait, max_wait = self.params.get('wait_for_video')
         diff = try_get(ie_result, lambda x: x['release_timestamp'] - time.time())
         if diff is None and ie_result.get('live_status') == 'is_upcoming':
-            diff = round(random.uniform(min_wait, max_wait) if (max_wait and min_wait) else (max_wait or min_wait), 0)
+            diff = random.randrange(min_wait, max_wait) if (max_wait and min_wait) else (max_wait or min_wait)
             self.report_warning('Release time of video is not known')
         elif (diff or 0) <= 0:
             self.report_warning('Video should already be available according to extracted info')
@@ -1580,9 +1561,13 @@ class YoutubeDL(object):
             if not info:
                 return info
 
+            force_properties = dict(
+                (k, v) for k, v in ie_result.items() if v is not None)
+            for f in ('_type', 'url', 'id', 'extractor', 'extractor_key', 'ie_key'):
+                if f in force_properties:
+                    del force_properties[f]
             new_result = info.copy()
-            new_result.update(filter_dict(ie_result, lambda k, v: (
+            new_result.update(force_properties)
-                v is not None and k not in {'_type', 'url', 'id', 'extractor', 'extractor_key', 'ie_key'})))
 
             # Extracted info may not be a video result (i.e.
             # info.get('_type', 'video') != video) but rather an url or
@@ -1820,7 +1805,7 @@ class YoutubeDL(object):
         ie_result['entries'] = playlist_results
 
         # Write the updated info to json
-        if _infojson_written is True and self._write_info_json(
+        if _infojson_written and self._write_info_json(
                 'updated playlist', ie_result,
                 self.prepare_filename(ie_copy, 'pl_infojson'), overwrite=True) is None:
             return
@@ -2179,8 +2164,7 @@ class YoutubeDL(object):
                         yield from _check_formats(ctx['formats'][::-1])
                 elif format_spec == 'mergeall':
                     def selector_function(ctx):
-                        formats = list(_check_formats(
+                        formats = list(_check_formats(ctx['formats']))
-                            f for f in ctx['formats'] if f.get('vcodec') != 'none' or f.get('acodec') != 'none'))
                         if not formats:
                             return
                         merged_format = formats[-1]
@@ -2189,7 +2173,7 @@ class YoutubeDL(object):
                         yield merged_format
 
                 else:
-                    format_fallback, seperate_fallback, format_reverse, format_idx = False, None, True, 1
+                    format_fallback, format_reverse, format_idx = False, True, 1
                     mobj = re.match(
                         r'(?P<bw>best|worst|b|w)(?P<type>video|audio|v|a)?(?P<mod>\*)?(?:\.(?P<n>[1-9]\d*))?$',
                         format_spec)
@@ -2216,7 +2200,6 @@ class YoutubeDL(object):
                             filter_f = lambda f: f.get('ext') == format_spec and f.get('acodec') != 'none'
                         elif format_spec in self._format_selection_exts['video']:
                             filter_f = lambda f: f.get('ext') == format_spec and f.get('acodec') != 'none' and f.get('vcodec') != 'none'
-                            seperate_fallback = lambda f: f.get('ext') == format_spec and f.get('vcodec') != 'none'
                         elif format_spec in self._format_selection_exts['storyboards']:
                             filter_f = lambda f: f.get('ext') == format_spec and f.get('acodec') == 'none' and f.get('vcodec') == 'none'
                         else:
@@ -2225,15 +2208,11 @@ class YoutubeDL(object):
                     def selector_function(ctx):
                         formats = list(ctx['formats'])
                         matches = list(filter(filter_f, formats)) if filter_f is not None else formats
-                        if not matches:
+                        if format_fallback and ctx['incomplete_formats'] and not matches:
-                            if format_fallback and ctx['incomplete_formats']:
+                            # for extractors with incomplete formats (audio only (soundcloud)
-                                # for extractors with incomplete formats (audio only (soundcloud)
+                            # or video only (imgur)) best/worst will fallback to
-                                # or video only (imgur)) best/worst will fallback to
+                            # best/worst {video,audio}-only format
-                                # best/worst {video,audio}-only format
+                            matches = formats
-                                matches = formats
-                            elif seperate_fallback and not ctx['has_merged_format']:
-                                # for compatibility with youtube-dl when there is no pre-merged format
-                                matches = list(filter(seperate_fallback, formats))
                         matches = LazyList(_check_formats(matches[::-1 if format_reverse else 1]))
                         try:
                             yield matches[format_idx - 1]
@@ -2467,11 +2446,6 @@ class YoutubeDL(object):
         info_dict['__has_drm'] = any(f.get('has_drm') for f in formats)
         if not self.params.get('allow_unplayable_formats'):
             formats = [f for f in formats if not f.get('has_drm')]
-            if info_dict['__has_drm'] and all(
-                    f.get('acodec') == f.get('vcodec') == 'none' for f in formats):
-                self.report_warning(
-                    'This video is DRM protected and only images are available for download. '
-                    'Use --list-formats to see them')
 
         get_from_start = not info_dict.get('is_live') or bool(self.params.get('live_from_start'))
         if not get_from_start:
@@ -2479,9 +2453,8 @@ class YoutubeDL(object):
         if info_dict.get('is_live') and formats:
             formats = [f for f in formats if bool(f.get('is_from_start')) == get_from_start]
             if get_from_start and not formats:
-                self.raise_no_formats(info_dict, msg=(
+                self.raise_no_formats(info_dict, msg='--live-from-start is passed, but there are no formats that can be downloaded from the start. '
-                    '--live-from-start is passed, but there are no formats that can be downloaded from the start. '
+                                                     'If you want to download from the current time, pass --no-live-from-start')
-                    'If you want to download from the current time, use --no-live-from-start'))
 
         if not formats:
             self.raise_no_formats(info_dict)
@@ -2569,7 +2542,7 @@ class YoutubeDL(object):
 
         info_dict, _ = self.pre_process(info_dict)
 
-        if self._match_entry(info_dict, incomplete=self._format_fields) is not None:
+        if self._match_entry(info_dict) is not None:
             return info_dict
 
         self.post_extract(info_dict)
@@ -2611,15 +2584,33 @@ class YoutubeDL(object):
                     self.report_error(err, tb=False, is_error=False)
                     continue
 
-            formats_to_download = list(format_selector({
+            # While in format selection we may need to have an access to the original
+            # format set in order to calculate some metrics or do some processing.
+            # For now we need to be able to guess whether original formats provided
+            # by extractor are incomplete or not (i.e. whether extractor provides only
+            # video-only or audio-only formats) for proper formats selection for
+            # extractors with such incomplete formats (see
+            # https://github.com/ytdl-org/youtube-dl/pull/5556).
+            # Since formats may be filtered during format selection and may not match
+            # the original formats the results may be incorrect. Thus original formats
+            # or pre-calculated metrics should be passed to format selection routines
+            # as well.
+            # We will pass a context object containing all necessary additional data
+            # instead of just formats.
+            # This fixes incorrect format selection issue (see
+            # https://github.com/ytdl-org/youtube-dl/issues/10083).
+            incomplete_formats = (
+                # All formats are video-only or
+                all(f.get('vcodec') != 'none' and f.get('acodec') == 'none' for f in formats)
+                # all formats are audio-only
+                or all(f.get('vcodec') == 'none' and f.get('acodec') != 'none' for f in formats))
+
+            ctx = {
                 'formats': formats,
-                'has_merged_format': any('none' not in (f.get('acodec'), f.get('vcodec')) for f in formats),
+                'incomplete_formats': incomplete_formats,
-                'incomplete_formats': (
+            }
-                    # All formats are video-only or
+
-                    all(f.get('vcodec') != 'none' and f.get('acodec') == 'none' for f in formats)
+            formats_to_download = list(format_selector(ctx))
-                    # all formats are audio-only
-                    or all(f.get('vcodec') == 'none' and f.get('acodec') != 'none' for f in formats)),
-            }))
             if interactive_format_selection and not formats_to_download:
                 self.report_error('Requested format is not available', tb=False, is_error=False)
                 continue
@@ -2627,9 +2618,8 @@ class YoutubeDL(object):
 
         if not formats_to_download:
             if not self.params.get('ignore_no_formats_error'):
-                raise ExtractorError(
+                raise ExtractorError('Requested format is not available', expected=True,
-                    'Requested format is not available. Use --list-formats for a list of available formats',
+                                     video_id=info_dict['id'], ie=info_dict['extractor'])
-                    expected=True, video_id=info_dict['id'], ie=info_dict['extractor'])
             self.report_warning('Requested format is not available')
             # Process what we can, even without any available formats.
             formats_to_download = [{}]
@@ -2671,10 +2661,9 @@ class YoutubeDL(object):
 
     def process_subtitles(self, video_id, normal_subtitles, automatic_captions):
         """Select the requested subtitles and their format"""
-        available_subs, normal_sub_langs = {}, []
+        available_subs = {}
         if normal_subtitles and self.params.get('writesubtitles'):
             available_subs.update(normal_subtitles)
-            normal_sub_langs = tuple(normal_subtitles.keys())
         if automatic_captions and self.params.get('writeautomaticsub'):
             for lang, cap_info in automatic_captions.items():
                 if lang not in available_subs:
@@ -2685,7 +2674,7 @@ class YoutubeDL(object):
                 available_subs):
             return None
 
-        all_sub_langs = tuple(available_subs.keys())
+        all_sub_langs = available_subs.keys()
         if self.params.get('allsubtitles', False):
             requested_langs = all_sub_langs
         elif self.params.get('subtitleslangs', False):
@@ -2710,10 +2699,10 @@ class YoutubeDL(object):
                 else:
                     requested_langs.extend(current_langs)
             requested_langs = orderedSet(requested_langs)
-        elif normal_sub_langs:
+        elif 'en' in available_subs:
-            requested_langs = ['en'] if 'en' in normal_sub_langs else normal_sub_langs[:1]
+            requested_langs = ['en']
         else:
-            requested_langs = ['en'] if 'en' in all_sub_langs else all_sub_langs[:1]
+            requested_langs = [list(all_sub_langs)[0]]
         if requested_langs:
             self.write_debug('Downloading subtitles: %s' % ', '.join(requested_langs))
 
@@ -2762,7 +2751,7 @@ class YoutubeDL(object):
             self.to_stdout(self.evaluate_outtmpl(format_tmpl(tmpl), info_copy))
 
         for tmpl, file_tmpl in self.params['print_to_file'].get(key, []):
-            filename = self.prepare_filename(info_dict, outtmpl=file_tmpl)
+            filename = self.evaluate_outtmpl(file_tmpl, info_dict)
             tmpl = format_tmpl(tmpl)
             self.to_screen(f'[info] Writing {tmpl!r} to: {filename}')
             if self._ensure_dir_exists(filename):
@@ -2788,7 +2777,7 @@ class YoutubeDL(object):
         if info_dict.get('requested_formats') is not None:
             # For RTMP URLs, also include the playpath
             info_dict['urls'] = '\n'.join(f['url'] + f.get('play_path', '') for f in info_dict['requested_formats'])
-        elif info_dict.get('url'):
+        elif 'url' in info_dict:
             info_dict['urls'] = info_dict['url'] + info_dict.get('play_path', '')
 
         if (self.params.get('forcejson')
@@ -2872,13 +2861,14 @@ class YoutubeDL(object):
 
         # Does nothing under normal operation - for backward compatibility of process_info
         self.post_extract(info_dict)
-        self._num_downloads += 1
 
         # info_dict['_filename'] needs to be set for backward compatibility
         info_dict['_filename'] = full_filename = self.prepare_filename(info_dict, warn=True)
         temp_filename = self.prepare_filename(info_dict, 'temp')
         files_to_move = {}
 
+        self._num_downloads += 1
+
         # Forced printings
         self.__forced_printings(info_dict, full_filename, incomplete=('format' not in info_dict))
 
@@ -3614,7 +3604,7 @@ class YoutubeDL(object):
         encoding_str = 'Encodings: locale %s, fs %s, out %s, err %s, pref %s' % (
             locale.getpreferredencoding(),
             sys.getfilesystemencoding(),
-            get_encoding(self._out_files['screen']), get_encoding(self._out_files['error']),
+            get_encoding(self._screen_file), get_encoding(self._err_file),
             self.get_encoding())
 
         logger = self.params.get('logger')
@@ -3689,7 +3679,6 @@ class YoutubeDL(object):
 
         lib_str = join_nonempty(
             compat_brotli and compat_brotli.__name__,
-            has_certifi and 'certifi',
             compat_pycrypto_AES and compat_pycrypto_AES.__name__.split('.')[0],
             SECRETSTORAGE_AVAILABLE and 'secretstorage',
             has_mutagen and 'mutagen',
@@ -3781,7 +3770,7 @@ class YoutubeDL(object):
         return encoding
 
     def _write_info_json(self, label, ie_result, infofn, overwrite=None):
-        ''' Write infojson and returns True = written, 'exists' = Already exists, False = skip, None = error '''
+        ''' Write infojson and returns True = written, False = skip, None = error '''
         if overwrite is None:
             overwrite = self.params.get('overwrites', True)
         if not self.params.get('writeinfojson'):
@@ -3793,15 +3782,14 @@ class YoutubeDL(object):
             return None
         elif not overwrite and os.path.exists(infofn):
             self.to_screen(f'[info] {label.title()} metadata is already present')
-            return 'exists'
+        else:
-
+            self.to_screen(f'[info] Writing {label} metadata as JSON to: {infofn}')
-        self.to_screen(f'[info] Writing {label} metadata as JSON to: {infofn}')
+            try:
-        try:
+                write_json_file(self.sanitize_info(ie_result, self.params.get('clean_infojson', True)), infofn)
-            write_json_file(self.sanitize_info(ie_result, self.params.get('clean_infojson', True)), infofn)
+            except (OSError, IOError):
-            return True
+                self.report_error(f'Cannot write {label} metadata to JSON file {infofn}')
-        except (OSError, IOError):
+                return None
-            self.report_error(f'Cannot write {label} metadata to JSON file {infofn}')
+        return True
-            return None
 
     def _write_description(self, label, ie_result, descfn):
         ''' Write description and returns True = written, False = skip, None = error '''
@@ -3872,12 +3860,9 @@ class YoutubeDL(object):
                 sub_info['filepath'] = sub_filename
                 ret.append((sub_filename, sub_filename_final))
             except (DownloadError, ExtractorError, IOError, OSError, ValueError) + network_exceptions as err:
-                msg = f'Unable to download video subtitles for {sub_lang!r}: {err}'
                 if self.params.get('ignoreerrors') is not True:  # False or 'only_download'
-                    if not self.params.get('ignoreerrors'):
+                    raise DownloadError(f'Unable to download video subtitles for {sub_lang!r}: {err}', err)
-                        self.report_error(msg)
+                self.report_warning(f'Unable to download video subtitles for {sub_lang!r}: {err}')
-                    raise DownloadError(msg)
-                self.report_warning(msg)
         return ret
 
     def _write_thumbnails(self, label, info_dict, filename, thumb_filename_base=None):

yt_dlp/cookies.py

@@ -21,7 +21,6 @@ from .compat import (
     compat_cookiejar_Cookie,
 )
 from .utils import (
-    error_to_str,
     expand_path,
     Popen,
     YoutubeDLCookieJar,
@@ -722,7 +721,7 @@ def _get_kwallet_network_wallet(logger):
             network_wallet = stdout.decode('utf-8').strip()
             logger.debug('NetworkWallet = "{}"'.format(network_wallet))
             return network_wallet
-    except Exception as e:
+    except BaseException as e:
         logger.warning('exception while obtaining NetworkWallet: {}'.format(e))
         return default_wallet
 
@@ -767,8 +766,8 @@ def _get_kwallet_password(browser_keyring_name, logger):
                 if stdout[-1:] == b'\n':
                     stdout = stdout[:-1]
                 return stdout
-    except Exception as e:
+    except BaseException as e:
-        logger.warning(f'exception running kwallet-query: {error_to_str(e)}')
+        logger.warning(f'exception running kwallet-query: {type(e).__name__}({e})')
         return b''
 
 
@@ -824,8 +823,8 @@ def _get_mac_keyring_password(browser_keyring_name, logger):
         if stdout[-1:] == b'\n':
             stdout = stdout[:-1]
         return stdout
-    except Exception as e:
+    except BaseException as e:
-        logger.warning(f'exception running find-generic-password: {error_to_str(e)}')
+        logger.warning(f'exception running find-generic-password: {type(e).__name__}({e})')
         return None
 
 

yt_dlp/downloader/common.py

@@ -11,7 +11,6 @@ from ..utils import (
     encodeFilename,
     error_to_compat_str,
     format_bytes,
-    LockingUnsupportedError,
     sanitize_open,
     shell_quote,
     timeconvert,
@@ -160,7 +159,7 @@ class FileDownloader(object):
         return int(round(number * multiplier))
 
     def to_screen(self, *args, **kargs):
-        self.ydl.to_screen(*args, quiet=self.params.get('quiet'), **kargs)
+        self.ydl.to_stdout(*args, quiet=self.params.get('quiet'), **kargs)
 
     def to_stderr(self, message):
         self.ydl.to_stderr(message)
@@ -235,10 +234,7 @@ class FileDownloader(object):
 
     @wrap_file_access('open', fatal=True)
     def sanitize_open(self, filename, open_mode):
-        f, filename = sanitize_open(filename, open_mode)
+        return sanitize_open(filename, open_mode)
-        if not getattr(f, 'locked', None):
-            self.write_debug(f'{LockingUnsupportedError.msg}. Proceeding without locking', only_once=True)
-        return f, filename
 
     @wrap_file_access('remove')
     def try_remove(self, filename):
@@ -281,9 +277,9 @@ class FileDownloader(object):
         elif self.ydl.params.get('logger'):
             self._multiline = MultilineLogger(self.ydl.params['logger'], lines)
         elif self.params.get('progress_with_newline'):
-            self._multiline = BreaklineStatusPrinter(self.ydl._out_files['screen'], lines)
+            self._multiline = BreaklineStatusPrinter(self.ydl._screen_file, lines)
         else:
-            self._multiline = MultilinePrinter(self.ydl._out_files['screen'], lines, not self.params.get('quiet'))
+            self._multiline = MultilinePrinter(self.ydl._screen_file, lines, not self.params.get('quiet'))
         self._multiline.allow_colors = self._multiline._HAVE_FULLCAP and not self.params.get('no_color')
 
     def _finish_multiline_status(self):

yt_dlp/downloader/external.py

@@ -13,7 +13,6 @@ from ..compat import (
 )
 from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS
 from ..utils import (
-    classproperty,
     cli_option,
     cli_valueless_option,
     cli_bool_option,
@@ -74,23 +73,17 @@ class ExternalFD(FragmentFD):
     def get_basename(cls):
         return cls.__name__[:-2].lower()
 
-    @classproperty
-    def EXE_NAME(cls):
-        return cls.get_basename()
-
     @property
     def exe(self):
-        return self.EXE_NAME
+        return self.get_basename()
 
     @classmethod
     def available(cls, path=None):
-        path = check_executable(
+        path = check_executable(path or cls.get_basename(), [cls.AVAILABLE_OPT])
-            cls.EXE_NAME if path in (None, cls.get_basename()) else path,
+        if path:
-            [cls.AVAILABLE_OPT])
+            cls.exe = path
-        if not path:
+            return path
-            return False
+        return False
-        cls.exe = path
-        return path
 
     @classmethod
     def supports(cls, info_dict):
@@ -113,7 +106,7 @@ class ExternalFD(FragmentFD):
 
     def _configuration_args(self, keys=None, *args, **kwargs):
         return _configuration_args(
-            self.get_basename(), self.params.get('external_downloader_args'), self.EXE_NAME,
+            self.get_basename(), self.params.get('external_downloader_args'), self.get_basename(),
             keys, *args, **kwargs)
 
     def _call_downloader(self, tmpfilename, info_dict):
@@ -176,7 +169,7 @@ class CurlFD(ExternalFD):
     AVAILABLE_OPT = '-V'
 
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '--location', '-o', tmpfilename, '--compressed']
+        cmd = [self.exe, '--location', '-o', tmpfilename]
         if info_dict.get('http_headers') is not None:
             for key, val in info_dict['http_headers'].items():
                 cmd += ['--header', '%s: %s' % (key, val)]
@@ -226,7 +219,7 @@ class WgetFD(ExternalFD):
     AVAILABLE_OPT = '--version'
 
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '-O', tmpfilename, '-nv', '--no-cookies', '--compression=auto']
+        cmd = [self.exe, '-O', tmpfilename, '-nv', '--no-cookies']
         if info_dict.get('http_headers') is not None:
             for key, val in info_dict['http_headers'].items():
                 cmd += ['--header', '%s: %s' % (key, val)]
@@ -237,10 +230,7 @@ class WgetFD(ExternalFD):
                 retry[1] = '0'
             cmd += retry
         cmd += self._option('--bind-address', 'source_address')
-        proxy = self.params.get('proxy')
+        cmd += self._option('--proxy', 'proxy')
-        if proxy:
-            for var in ('http_proxy', 'https_proxy'):
-                cmd += ['--execute', '%s=%s' % (var, proxy)]
         cmd += self._valueless_option('--no-check-certificate', 'nocheckcertificate')
         cmd += self._configuration_args()
         cmd += ['--', info_dict['url']]
@@ -313,7 +303,10 @@ class Aria2cFD(ExternalFD):
 
 class HttpieFD(ExternalFD):
     AVAILABLE_OPT = '--version'
-    EXE_NAME = 'http'
+
+    @classmethod
+    def available(cls, path=None):
+        return super().available(path or 'http')
 
     def _make_cmd(self, tmpfilename, info_dict):
         cmd = ['http', '--download', '--output', tmpfilename, info_dict['url']]
@@ -514,13 +507,11 @@ class AVconvFD(FFmpegFD):
     pass
 
 
-_BY_NAME = {
+_BY_NAME = dict(
-    klass.get_basename(): klass
+    (klass.get_basename(), klass)
     for name, klass in globals().items()
     if name.endswith('FD') and name not in ('ExternalFD', 'FragmentFD')
-}
+)
-
-_BY_EXE = {klass.EXE_NAME: klass for klass in _BY_NAME.values()}
 
 
 def list_external_downloaders():
@@ -532,4 +523,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, _BY_EXE.get(bn))
+    return _BY_NAME.get(bn)

yt_dlp/downloader/fragment.py

@@ -133,19 +133,19 @@ class FragmentFD(FileDownloader):
         }
         success = ctx['dl'].download(fragment_filename, fragment_info_dict)
         if not success:
-            return False
+            return False, None
         if fragment_info_dict.get('filetime'):
             ctx['fragment_filetime'] = fragment_info_dict.get('filetime')
         ctx['fragment_filename_sanitized'] = fragment_filename
-        return True
+        try:
+            return True, self._read_fragment(ctx)
+        except FileNotFoundError:
+            if not info_dict.get('is_live'):
+                raise
+            return False, None
 
     def _read_fragment(self, ctx):
-        try:
+        down, frag_sanitized = self.sanitize_open(ctx['fragment_filename_sanitized'], 'rb')
-            down, frag_sanitized = self.sanitize_open(ctx['fragment_filename_sanitized'], 'rb')
-        except FileNotFoundError:
-            if ctx.get('live'):
-                return None
-            raise
         ctx['fragment_filename_sanitized'] = frag_sanitized
         frag_content = down.read()
         down.close()
@@ -403,7 +403,7 @@ class FragmentFD(FileDownloader):
                 pass
 
         if compat_os_name == 'nt':
-            def future_result(future):
+            def bindoj_result(future):
                 while True:
                     try:
                         return future.result(0.1)
@@ -412,7 +412,7 @@ class FragmentFD(FileDownloader):
                     except concurrent.futures.TimeoutError:
                         continue
         else:
-            def future_result(future):
+            def bindoj_result(future):
                 return future.result()
 
         def interrupt_trigger_iter(fg):
@@ -430,7 +430,7 @@ class FragmentFD(FileDownloader):
         result = True
         for tpe, job in spins:
             try:
-                result = result and future_result(job)
+                result = result and bindoj_result(job)
             except KeyboardInterrupt:
                 interrupt_trigger[0] = False
             finally:
@@ -457,7 +457,7 @@ class FragmentFD(FileDownloader):
 
         def download_fragment(fragment, ctx):
             if not interrupt_trigger[0]:
-                return
+                return False, fragment['frag_index']
 
             frag_index = ctx['fragment_index'] = fragment['frag_index']
             ctx['last_error'] = None
@@ -467,12 +467,14 @@ class FragmentFD(FileDownloader):
                 headers['Range'] = 'bytes=%d-%d' % (byte_range['start'], byte_range['end'] - 1)
 
             # Never skip the first fragment
-            fatal, count = is_fatal(fragment.get('index') or (frag_index - 1)), 0
+            fatal = is_fatal(fragment.get('index') or (frag_index - 1))
+            count, frag_content = 0, None
             while count <= fragment_retries:
                 try:
-                    if self._download_fragment(ctx, fragment['url'], info_dict, headers):
+                    success, frag_content = self._download_fragment(ctx, fragment['url'], info_dict, headers)
-                        break
+                    if not success:
-                    return
+                        return False, frag_index
+                    break
                 except (compat_urllib_error.HTTPError, http.client.IncompleteRead) as err:
                     # Unavailable (possibly temporary) fragments may be served.
                     # First we try to retry then either skip or abort.
@@ -489,19 +491,25 @@ class FragmentFD(FileDownloader):
                         break
                     raise
 
-            if count > fragment_retries and fatal:
+            if count > fragment_retries:
+                if not fatal:
+                    return False, frag_index
                 ctx['dest_stream'].close()
                 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, ctx):
-            if frag_content:
+            if not frag_content:
-                self._append_fragment(ctx, pack_func(frag_content, frag_index))
+                if not is_fatal(frag_index - 1):
-            elif not is_fatal(frag_index - 1):
+                    self.report_skip_fragment(frag_index, 'fragment not found')
-                self.report_skip_fragment(frag_index, 'fragment not found')
+                    return True
-            else:
+                else:
-                ctx['dest_stream'].close()
+                    ctx['dest_stream'].close()
-                self.report_error(f'fragment {frag_index} not found, unable to continue')
+                    self.report_error(
-                return False
+                        'fragment %s not found, unable to continue' % frag_index)
+                    return False
+            self._append_fragment(ctx, pack_func(frag_content, frag_index))
             return True
 
         decrypt_fragment = self.decrypter(info_dict)
@@ -512,23 +520,23 @@ class FragmentFD(FileDownloader):
 
             def _download_fragment(fragment):
                 ctx_copy = ctx.copy()
-                download_fragment(fragment, ctx_copy)
+                frag_content, frag_index = download_fragment(fragment, ctx_copy)
-                return fragment, fragment['frag_index'], ctx_copy.get('fragment_filename_sanitized')
+                return fragment, frag_content, frag_index, ctx_copy.get('fragment_filename_sanitized')
 
             self.report_warning('The download speed shown is only of one thread. This is a known issue and patches are welcome')
             with tpe or concurrent.futures.ThreadPoolExecutor(max_workers) as pool:
-                for fragment, frag_index, frag_filename in pool.map(_download_fragment, fragments):
+                for fragment, frag_content, frag_index, frag_filename in pool.map(_download_fragment, fragments):
                     ctx['fragment_filename_sanitized'] = frag_filename
                     ctx['fragment_index'] = frag_index
-                    result = append_fragment(decrypt_fragment(fragment, self._read_fragment(ctx)), frag_index, ctx)
+                    result = append_fragment(decrypt_fragment(fragment, frag_content), frag_index, ctx)
                     if not result:
                         return False
         else:
             for fragment in fragments:
                 if not interrupt_trigger[0]:
                     break
-                download_fragment(fragment, ctx)
+                frag_content, frag_index = download_fragment(fragment, ctx)
-                result = append_fragment(decrypt_fragment(fragment, self._read_fragment(ctx)), fragment['frag_index'], ctx)
+                result = append_fragment(decrypt_fragment(fragment, frag_content), frag_index, ctx)
                 if not result:
                     return False
 

yt_dlp/downloader/http.py

@@ -1,14 +1,15 @@
 from __future__ import unicode_literals
 
+import errno
 import os
-import ssl
+import socket
 import time
 import random
 
 from .common import FileDownloader
 from ..compat import (
+    compat_str,
     compat_urllib_error,
-    compat_http_client
 )
 from ..utils import (
     ContentTooShortError,
@@ -17,14 +18,11 @@ from ..utils import (
     parse_http_range,
     sanitized_Request,
     ThrottledDownload,
-    try_call,
     write_xattr,
     XAttrMetadataError,
     XAttrUnavailableError,
 )
 
-RESPONSE_READ_EXCEPTIONS = (TimeoutError, ConnectionError, ssl.SSLError, compat_http_client.HTTPException)
-
 
 class HttpFD(FileDownloader):
     def real_download(self, filename, info_dict):
@@ -55,8 +53,11 @@ class HttpFD(FileDownloader):
 
         ctx.open_mode = 'wb'
         ctx.resume_len = 0
+        ctx.data_len = None
         ctx.block_size = self.params.get('buffersize', 1024)
         ctx.start_time = time.time()
+        ctx.chunk_size = None
+        throttle_start = None
 
         # parse given Range
         req_start, req_end, _ = parse_http_range(headers.get('Range'))
@@ -82,6 +83,12 @@ class HttpFD(FileDownloader):
         class NextFragment(Exception):
             pass
 
+        def set_range(req, start, end):
+            range_header = 'bytes=%d-' % start
+            if end:
+                range_header += compat_str(end)
+            req.add_header('Range', range_header)
+
         def establish_connection():
             ctx.chunk_size = (random.randint(int(chunk_size * 0.95), chunk_size)
                               if not is_test and chunk_size else chunk_size)
@@ -93,8 +100,6 @@ class HttpFD(FileDownloader):
                 if ctx.is_resume:
                     self.report_resuming_byte(ctx.resume_len)
                 ctx.open_mode = 'ab'
-            elif req_start is not None:
-                range_start = req_start
             elif ctx.chunk_size > 0:
                 range_start = 0
             else:
@@ -111,21 +116,23 @@ class HttpFD(FileDownloader):
             else:
                 range_end = None
 
-            if try_call(lambda: range_start > range_end):
+            if range_end and ctx.data_len is not None and range_end >= ctx.data_len:
-                ctx.resume_len = 0
+                range_end = ctx.data_len - 1
-                ctx.open_mode = 'wb'
-                raise RetryDownload(Exception(f'Conflicting range. (start={range_start} > end={range_end})'))
-
-            if try_call(lambda: range_end >= ctx.content_len):
-                range_end = ctx.content_len - 1
-
-            request = sanitized_Request(url, request_data, headers)
             has_range = range_start is not None
+            ctx.has_range = has_range
+            request = sanitized_Request(url, request_data, headers)
             if has_range:
-                request.add_header('Range', f'bytes={int(range_start)}-{int_or_none(range_end) or ""}')
+                set_range(request, range_start, range_end)
             # Establish connection
             try:
-                ctx.data = self.ydl.urlopen(request)
+                try:
+                    ctx.data = self.ydl.urlopen(request)
+                except (compat_urllib_error.URLError, ) as err:
+                    # reason may not be available, e.g. for urllib2.HTTPError on python 2.6
+                    reason = getattr(err, 'reason', None)
+                    if isinstance(reason, socket.timeout):
+                        raise RetryDownload(err)
+                    raise err
                 # When trying to resume, Content-Range HTTP header of response has to be checked
                 # to match the value of requested Range HTTP header. This is due to a webservers
                 # that don't support resuming and serve a whole file with no Content-Range
@@ -144,9 +151,7 @@ class HttpFD(FileDownloader):
                             or content_range_end == range_end
                             or content_len < range_end)
                         if accept_content_len:
-                            ctx.content_len = content_len
+                            ctx.data_len = content_len
-                            if content_len or req_end:
-                                ctx.data_len = min(content_len or req_end, req_end or content_len) - (req_start or 0)
                             return
                     # Content-Range is either not present or invalid. Assuming remote webserver is
                     # trying to send the whole file, resume is not possible, so wiping the local file
@@ -154,7 +159,8 @@ class HttpFD(FileDownloader):
                     self.report_unable_to_resume()
                     ctx.resume_len = 0
                     ctx.open_mode = 'wb'
-                ctx.data_len = ctx.content_len = int_or_none(ctx.data.info().get('Content-length', None))
+                ctx.data_len = int_or_none(ctx.data.info().get('Content-length', None))
+                return
             except (compat_urllib_error.HTTPError, ) as err:
                 if err.code == 416:
                     # Unable to resume (requested range not satisfiable)
@@ -196,16 +202,16 @@ class HttpFD(FileDownloader):
                     # Unexpected HTTP error
                     raise
                 raise RetryDownload(err)
-            except compat_urllib_error.URLError as err:
+            except socket.timeout as err:
-                if isinstance(err.reason, ssl.CertificateError):
-                    raise
-                raise RetryDownload(err)
-            # In urllib.request.AbstractHTTPHandler, the response is partially read on request.
-            # Any errors that occur during this will not be wrapped by URLError
-            except RESPONSE_READ_EXCEPTIONS as err:
                 raise RetryDownload(err)
+            except socket.error as err:
+                if err.errno in (errno.ECONNRESET, errno.ETIMEDOUT):
+                    # Connection reset is no problem, just retry
+                    raise RetryDownload(err)
+                raise
 
         def download():
+            nonlocal throttle_start
             data_len = ctx.data.info().get('Content-length', None)
 
             # Range HTTP header may be ignored/unsupported by a webserver
@@ -248,8 +254,16 @@ class HttpFD(FileDownloader):
                 try:
                     # Download and write
                     data_block = ctx.data.read(block_size if not is_test else min(block_size, data_len - byte_counter))
-                except RESPONSE_READ_EXCEPTIONS as err:
+                # socket.timeout is a subclass of socket.error but may not have
-                    retry(err)
+                # errno set
+                except socket.timeout as e:
+                    retry(e)
+                except socket.error as e:
+                    # SSLError on python 2 (inherits socket.error) may have
+                    # no errno set but this error message
+                    if e.errno in (errno.ECONNRESET, errno.ETIMEDOUT) or getattr(e, 'message', None) == 'The read operation timed out':
+                        retry(e)
+                    raise
 
                 byte_counter += len(data_block)
 
@@ -320,16 +334,16 @@ class HttpFD(FileDownloader):
                 if speed and speed < (self.params.get('throttledratelimit') or 0):
                     # The speed must stay below the limit for 3 seconds
                     # This prevents raising error when the speed temporarily goes down
-                    if ctx.throttle_start is None:
+                    if throttle_start is None:
-                        ctx.throttle_start = now
+                        throttle_start = now
-                    elif now - ctx.throttle_start > 3:
+                    elif now - throttle_start > 3:
                         if ctx.stream is not None and ctx.tmpfilename != '-':
                             ctx.stream.close()
                         raise ThrottledDownload()
                 elif speed:
-                    ctx.throttle_start = None
+                    throttle_start = None
 
-            if not is_test and ctx.chunk_size and ctx.content_len is not None and byte_counter < ctx.content_len:
+            if not is_test and ctx.chunk_size and ctx.data_len is not None and byte_counter < ctx.data_len:
                 ctx.resume_len = byte_counter
                 # ctx.block_size = block_size
                 raise NextFragment()

yt_dlp/downloader/ism.py

@@ -263,11 +263,9 @@ class IsmFD(FragmentFD):
             count = 0
             while count <= fragment_retries:
                 try:
-                    success = self._download_fragment(ctx, segment['url'], info_dict)
+                    success, frag_content = self._download_fragment(ctx, segment['url'], info_dict)
                     if not success:
                         return False
-                    frag_content = self._read_fragment(ctx)
-
                     if not extra_state['ism_track_written']:
                         tfhd_data = extract_box_data(frag_content, [b'moof', b'traf', b'tfhd'])
                         info_dict['_download_params']['track_id'] = u32.unpack(tfhd_data[4:8])[0]

yt_dlp/downloader/mhtml.py

@@ -166,15 +166,10 @@ body > figure > img {
             if (i + 1) <= ctx['fragment_index']:
                 continue
 
-            fragment_url = fragment.get('url')
+            fragment_url = urljoin(fragment_base_url, fragment['path'])
-            if not fragment_url:
+            success, frag_content = self._download_fragment(ctx, fragment_url, info_dict)
-                assert fragment_base_url
-                fragment_url = urljoin(fragment_base_url, fragment['path'])
-
-            success = self._download_fragment(ctx, fragment_url, info_dict)
             if not success:
                 continue
-            frag_content = self._read_fragment(ctx)
 
             mime_type = b'image/jpeg'
             if frag_content.startswith(b'\x89PNG\r\n\x1a\n'):

yt_dlp/downloader/youtube_live_chat.py

@@ -22,7 +22,7 @@ class YoutubeLiveChatFD(FragmentFD):
     def real_download(self, filename, info_dict):
         video_id = info_dict['video_id']
         self.to_screen('[%s] Downloading live chat' % self.FD_NAME)
-        if not self.params.get('skip_download') and info_dict['protocol'] == 'youtube_live_chat':
+        if not self.params.get('skip_download'):
             self.report_warning('Live chat download runs until the livestream ends. '
                                 'If you wish to download the video simultaneously, run a separate yt-dlp instance')
 
@@ -115,10 +115,9 @@ class YoutubeLiveChatFD(FragmentFD):
             count = 0
             while count <= fragment_retries:
                 try:
-                    success = dl_fragment(url, request_data, headers)
+                    success, raw_fragment = dl_fragment(url, request_data, headers)
                     if not success:
                         return False, None, None, None
-                    raw_fragment = self._read_fragment(ctx)
                     try:
                         data = ie.extract_yt_initial_data(video_id, raw_fragment.decode('utf-8', 'replace'))
                     except RegexNotFoundError:
@@ -146,10 +145,9 @@ class YoutubeLiveChatFD(FragmentFD):
 
         self._prepare_and_start_frag_download(ctx, info_dict)
 
-        success = dl_fragment(info_dict['url'])
+        success, raw_fragment = dl_fragment(info_dict['url'])
         if not success:
             return False
-        raw_fragment = self._read_fragment(ctx)
         try:
             data = ie.extract_yt_initial_data(video_id, raw_fragment.decode('utf-8', 'replace'))
         except RegexNotFoundError:

yt_dlp/extractor/abematv.py

@@ -291,7 +291,15 @@ class AbemaTVIE(AbemaTVBaseIE):
 
         return self._MEDIATOKEN
 
-    def _perform_login(self, username, password):
+    def _real_initialize(self):
+        self._login()
+
+    def _login(self):
+        username, password = self._get_login_info()
+        # No authentication to be performed
+        if not username:
+            return True
+
         if '@' in username:  # don't strictly check if it's email address or not
             ep, method = 'user/email', 'email'
         else:

yt_dlp/extractor/adn.py

@@ -126,7 +126,10 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             }])
         return subtitles
 
-    def _perform_login(self, username, password):
+    def _real_initialize(self):
+        username, password = self._get_login_info()
+        if not username:
+            return
         try:
             access_token = (self._download_json(
                 self._API_BASE_URL + 'authentication/login', None,

yt_dlp/extractor/adobeconnect.py

@@ -14,7 +14,7 @@ class AdobeConnectIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
-        title = self._html_extract_title(webpage)
+        title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title')
         qs = compat_parse_qs(self._search_regex(r"swfUrl\s*=\s*'([^']+)'", webpage, 'swf url').split('?')[1])
         is_live = qs.get('isLive', ['false'])[0] == 'true'
         formats = []

yt_dlp/extractor/adobepass.py

@@ -1650,27 +1650,21 @@ class AdobePassIE(InfoExtractor):
                     hidden_data = self._hidden_inputs(first_bookend_page)
                     hidden_data['history_val'] = 1
 
-                    provider_login_redirect_page_res = self._download_webpage_handle(
+                    provider_login_redirect_page = self._download_webpage(
                         urlh.geturl(), video_id, 'Sending First Bookend',
                         query=hidden_data)
 
-                    provider_login_redirect_page, urlh = provider_login_redirect_page_res
+                    provider_tryauth_url = self._html_search_regex(
+                        r'url:\s*[\'"]([^\'"]+)', provider_login_redirect_page, 'ajaxurl')
 
-                    # Some website partners seem to not have the extra ajaxurl redirect step, so we check if we already
+                    provider_tryauth_page = self._download_webpage(
-                    # have the login prompt or not
+                        provider_tryauth_url, video_id, 'Submitting TryAuth',
-                    if 'id="password" type="password" name="password"' in provider_login_redirect_page:
+                        query=hidden_data)
-                        provider_login_page_res = provider_login_redirect_page_res
-                    else:
-                        provider_tryauth_url = self._html_search_regex(
-                            r'url:\s*[\'"]([^\'"]+)', provider_login_redirect_page, 'ajaxurl')
-                        provider_tryauth_page = self._download_webpage(
-                            provider_tryauth_url, video_id, 'Submitting TryAuth',
-                            query=hidden_data)
 
-                        provider_login_page_res = self._download_webpage_handle(
+                    provider_login_page_res = self._download_webpage_handle(
-                            f'https://authorize.suddenlink.net/saml/module.php/authSynacor/login.php?AuthState={provider_tryauth_page}',
+                        f'https://authorize.suddenlink.net/saml/module.php/authSynacor/login.php?AuthState={provider_tryauth_page}',
-                            video_id, 'Getting Login Page',
+                        video_id, 'Getting Login Page',
-                            query=hidden_data)
+                        query=hidden_data)
 
                     provider_association_redirect, urlh = post_form(
                         provider_login_page_res, 'Logging in', {

yt_dlp/extractor/afreecatv.py

@@ -1,16 +1,14 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import functools
 import re
 
 from .common import InfoExtractor
 from ..compat import compat_xpath
 from ..utils import (
-    ExtractorError,
-    OnDemandPagedList,
     date_from_str,
     determine_ext,
+    ExtractorError,
     int_or_none,
     qualities,
     traverse_obj,
@@ -34,7 +32,7 @@ class AfreecaTVIE(InfoExtractor):
                                 /app/(?:index|read_ucc_bbs)\.cgi|
                                 /player/[Pp]layer\.(?:swf|html)
                             )\?.*?\bnTitleNo=|
-                            vod\.afreecatv\.com/(PLAYER/STATION|player)/
+                            vod\.afreecatv\.com/PLAYER/STATION/
                         )
                         (?P<id>\d+)
                     '''
@@ -172,9 +170,6 @@ class AfreecaTVIE(InfoExtractor):
     }, {
         'url': 'http://vod.afreecatv.com/PLAYER/STATION/15055030',
         'only_matching': True,
-    }, {
-        'url': 'http://vod.afreecatv.com/player/15055030',
-        'only_matching': True,
     }]
 
     @staticmethod
@@ -186,7 +181,14 @@ class AfreecaTVIE(InfoExtractor):
             video_key['part'] = int(m.group('part'))
         return video_key
 
-    def _perform_login(self, username, password):
+    def _real_initialize(self):
+        self._login()
+
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+
         login_form = {
             'szWork': 'login',
             'szType': 'json',
@@ -484,57 +486,3 @@ class AfreecaTVLiveIE(AfreecaTVIE):
             'formats': formats,
             'is_live': True,
         }
-
-
-class AfreecaTVUserIE(InfoExtractor):
-    IE_NAME = 'afreecatv:user'
-    _VALID_URL = r'https?://bj\.afreeca(?:tv)?\.com/(?P<id>[^/]+)/vods/?(?P<slug_type>[^/]+)?'
-    _TESTS = [{
-        'url': 'https://bj.afreecatv.com/ryuryu24/vods/review',
-        'info_dict': {
-            '_type': 'playlist',
-            'id': 'ryuryu24',
-            'title': 'ryuryu24 - review',
-        },
-        'playlist_count': 218,
-    }, {
-        'url': 'https://bj.afreecatv.com/parang1995/vods/highlight',
-        'info_dict': {
-            '_type': 'playlist',
-            'id': 'parang1995',
-            'title': 'parang1995 - highlight',
-        },
-        'playlist_count': 997,
-    }, {
-        'url': 'https://bj.afreecatv.com/ryuryu24/vods',
-        'info_dict': {
-            '_type': 'playlist',
-            'id': 'ryuryu24',
-            'title': 'ryuryu24 - all',
-        },
-        'playlist_count': 221,
-    }, {
-        'url': 'https://bj.afreecatv.com/ryuryu24/vods/balloonclip',
-        'info_dict': {
-            '_type': 'playlist',
-            'id': 'ryuryu24',
-            'title': 'ryuryu24 - balloonclip',
-        },
-        'playlist_count': 0,
-    }]
-    _PER_PAGE = 60
-
-    def _fetch_page(self, user_id, user_type, page):
-        page += 1
-        info = self._download_json(f'https://bjapi.afreecatv.com/api/{user_id}/vods/{user_type}', user_id,
-                                   query={'page': page, 'per_page': self._PER_PAGE, 'orderby': 'reg_date'},
-                                   note=f'Downloading {user_type} video page {page}')
-        for item in info['data']:
-            yield self.url_result(
-                f'https://vod.afreecatv.com/player/{item["title_no"]}/', AfreecaTVIE, item['title_no'])
-
-    def _real_extract(self, url):
-        user_id, user_type = self._match_valid_url(url).group('id', 'slug_type')
-        user_type = user_type or 'all'
-        entries = OnDemandPagedList(functools.partial(self._fetch_page, user_id, user_type), self._PER_PAGE)
-        return self.playlist_result(entries, user_id, f'{user_id} - {user_type}')

yt_dlp/extractor/allocine.py

@@ -7,7 +7,6 @@ from ..utils import (
     int_or_none,
     qualities,
     remove_end,
-    strip_or_none,
     try_get,
     unified_timestamp,
     url_basename,
@@ -103,7 +102,10 @@ class AllocineIE(InfoExtractor):
             video_id = display_id
             media_data = self._download_json(
                 'http://www.allocine.fr/ws/AcVisiondataV5.ashx?media=%s' % video_id, display_id)
-            title = remove_end(strip_or_none(self._html_extract_title(webpage), ' - AlloCiné'))
+            title = remove_end(
+                self._html_search_regex(
+                    r'(?s)<title>(.+?)</title>', webpage, 'title').strip(),
+                ' - AlloCiné')
             for key, value in media_data['video'].items():
                 if not key.endswith('Path'):
                     continue

yt_dlp/extractor/alura.py

@@ -74,7 +74,14 @@ class AluraIE(InfoExtractor):
                 "formats": formats
             }
 
-    def _perform_login(self, username, password):
+    def _real_initialize(self):
+        self._login()
+
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+        pass
 
         login_page = self._download_webpage(
             self._LOGIN_URL, None, 'Downloading login popup')

yt_dlp/extractor/animelab.py

@@ -15,21 +15,25 @@ from ..compat import compat_HTTPError
 
 
 class AnimeLabBaseIE(InfoExtractor):
+    _LOGIN_REQUIRED = True
     _LOGIN_URL = 'https://www.animelab.com/login'
     _NETRC_MACHINE = 'animelab'
-    _LOGGED_IN = False
 
-    def _is_logged_in(self, login_page=None):
+    def _login(self):
-        if not self._LOGGED_IN:
+        def is_logged_in(login_webpage):
-            if not login_page:
+            return 'Sign In' not in login_webpage
-                login_page = self._download_webpage(self._LOGIN_URL, None, 'Downloading login page')
-            AnimeLabBaseIE._LOGGED_IN = 'Sign In' not in login_page
-        return self._LOGGED_IN
 
-    def _perform_login(self, username, password):
+        login_page = self._download_webpage(
-        if self._is_logged_in():
+            self._LOGIN_URL, None, 'Downloading login page')
+
+        # Check if already logged in
+        if is_logged_in(login_page):
             return
 
+        (username, password) = self._get_login_info()
+        if username is None and self._LOGIN_REQUIRED:
+            self.raise_login_required('Login is required to access any AnimeLab content')
+
         login_form = {
             'email': username,
             'password': password,
@@ -43,14 +47,17 @@ class AnimeLabBaseIE(InfoExtractor):
         except ExtractorError as e:
             if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400:
                 raise ExtractorError('Unable to log in (wrong credentials?)', expected=True)
-            raise
+            else:
+                raise
 
-        if not self._is_logged_in(response):
+        # if login was successful
-            raise ExtractorError('Unable to login (cannot verify if logged in)')
+        if is_logged_in(response):
+            return
+
+        raise ExtractorError('Unable to login (cannot verify if logged in)')
 
     def _real_initialize(self):
-        if not self._is_logged_in():
+        self._login()
-            self.raise_login_required('Login is required to access any AnimeLab content')
 
 
 class AnimeLabIE(AnimeLabBaseIE):

yt_dlp/extractor/animeondemand.py

@@ -53,7 +53,11 @@ class AnimeOnDemandIE(InfoExtractor):
         'only_matching': True,
     }]
 
-    def _perform_login(self, username, password):
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+
         login_page = self._download_webpage(
             self._LOGIN_URL, None, 'Downloading login page')
 
@@ -89,6 +93,9 @@ class AnimeOnDemandIE(InfoExtractor):
                 raise ExtractorError('Unable to login: %s' % error, expected=True)
             raise ExtractorError('Unable to log in')
 
+    def _real_initialize(self):
+        self._login()
+
     def _real_extract(self, url):
         anime_id = self._match_id(url)
 

yt_dlp/extractor/archiveorg.py

@@ -457,7 +457,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
     _OLDEST_CAPTURE_DATE = 20050214000000
     _NEWEST_CAPTURE_DATE = 20500101000000
 
-    def _call_cdx_api(self, item_id, url, filters: list = None, collapse: list = None, query: dict = None, note=None, fatal=False):
+    def _call_cdx_api(self, item_id, url, filters: list = None, collapse: list = None, query: dict = None, note='Downloading CDX API JSON'):
         # CDX docs: https://github.com/internetarchive/wayback/blob/master/wayback-cdx-server/README.md
         query = {
             'url': url,
@@ -468,9 +468,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
             'collapse': collapse or [],
             **(query or {})
         }
-        res = self._download_json(
+        res = self._download_json('https://web.archive.org/cdx/search/cdx', item_id, note, query=query)
-            'https://web.archive.org/cdx/search/cdx', item_id,
-            note or 'Downloading CDX API JSON', query=query, fatal=fatal)
         if isinstance(res, list) and len(res) >= 2:
             # format response to make it easier to use
             return list(dict(zip(res[0], v)) for v in res[1:])
@@ -483,7 +481,8 @@ class YoutubeWebArchiveIE(InfoExtractor):
              regex), webpage, name, default='{}'), video_id, fatal=False)
 
     def _extract_webpage_title(self, webpage):
-        page_title = self._html_extract_title(webpage, default='')
+        page_title = self._html_search_regex(
+            r'<title>([^<]*)</title>', webpage, 'title', default='')
         # YouTube video pages appear to always have either 'YouTube -' as prefix or '- YouTube' as suffix.
         return self._html_search_regex(
             r'(?:YouTube\s*-\s*(.*)$)|(?:(.*)\s*-\s*YouTube$)',

yt_dlp/extractor/arte.py

@@ -138,7 +138,6 @@ class ArteTVIE(ArteTVBaseIE):
                     break
             else:
                 lang_pref = -1
-            format_note = '%s, %s' % (f.get('versionCode'), f.get('versionLibelle'))
 
             media_type = f.get('mediaType')
             if media_type == 'hls':
@@ -146,17 +145,14 @@ class ArteTVIE(ArteTVBaseIE):
                     format_url, video_id, 'mp4', entry_protocol='m3u8_native',
                     m3u8_id=format_id, fatal=False)
                 for m3u8_format in m3u8_formats:
-                    m3u8_format.update({
+                    m3u8_format['language_preference'] = lang_pref
-                        'language_preference': lang_pref,
-                        'format_note': format_note,
-                    })
                 formats.extend(m3u8_formats)
                 continue
 
             format = {
                 'format_id': format_id,
                 'language_preference': lang_pref,
-                'format_note': format_note,
+                'format_note': '%s, %s' % (f.get('versionCode'), f.get('versionLibelle')),
                 'width': int_or_none(f.get('width')),
                 'height': int_or_none(f.get('height')),
                 'tbr': int_or_none(f.get('bitrate')),

yt_dlp/extractor/asiancrush.py

@@ -181,7 +181,8 @@ class AsianCrushPlaylistIE(AsianCrushBaseIE):
                 'title', default=None) or self._og_search_title(
                 webpage, default=None) or self._html_search_meta(
                 'twitter:title', webpage, 'title',
-                default=None) or self._html_extract_title(webpage)
+                default=None) or self._search_regex(
+                r'<title>([^<]+)</title>', webpage, 'title', fatal=False)
             if title:
                 title = re.sub(r'\s*\|\s*.+?$', '', title)
 

yt_dlp/extractor/atresplayer.py

@@ -37,6 +37,9 @@ class AtresPlayerIE(InfoExtractor):
     ]
     _API_BASE = 'https://api.atresplayer.com/'
 
+    def _real_initialize(self):
+        self._login()
+
     def _handle_error(self, e, code):
         if isinstance(e.cause, compat_HTTPError) and e.cause.code == code:
             error = self._parse_json(e.cause.read(), None)
@@ -45,7 +48,11 @@ class AtresPlayerIE(InfoExtractor):
             raise ExtractorError(error['error_description'], expected=True)
         raise
 
-    def _perform_login(self, username, password):
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+
         self._request_webpage(
             self._API_BASE + 'login', None, 'Downloading login page')
 

yt_dlp/extractor/azmedien.py

@@ -11,12 +11,11 @@ class AZMedienIE(InfoExtractor):
     IE_DESC = 'AZ Medien videos'
     _VALID_URL = r'''(?x)
                     https?://
-                        (?:www\.|tv\.)?
+                        (?:www\.)?
                         (?P<host>
                             telezueri\.ch|
                             telebaern\.tv|
-                            telem1\.ch|
+                            telem1\.ch
-                            tvo-online\.ch
                         )/
                         [^/]+/
                         (?P<id>
@@ -31,7 +30,7 @@ class AZMedienIE(InfoExtractor):
                     '''
 
     _TESTS = [{
-        'url': 'https://tv.telezueri.ch/sonntalk/bundesrats-vakanzen-eu-rahmenabkommen-133214569',
+        'url': 'https://www.telezueri.ch/sonntalk/bundesrats-vakanzen-eu-rahmenabkommen-133214569',
         'info_dict': {
             'id': '1_anruz3wy',
             'ext': 'mp4',
@@ -39,9 +38,6 @@ class AZMedienIE(InfoExtractor):
             'uploader_id': 'TVOnline',
             'upload_date': '20180930',
             'timestamp': 1538328802,
-            'view_count': int,
-            'thumbnail': 'http://cfvod.kaltura.com/p/1719221/sp/171922100/thumbnail/entry_id/1_anruz3wy/version/100031',
-            'duration': 1930
         },
         'params': {
             'skip_download': True,

yt_dlp/extractor/banbye.py

@@ -1,153 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import math
-
-from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_urlparse,
-    compat_parse_qs,
-)
-from ..utils import (
-    format_field,
-    InAdvancePagedList,
-    traverse_obj,
-    unified_timestamp,
-)
-
-
-class BanByeBaseIE(InfoExtractor):
-    _API_BASE = 'https://api.banbye.com'
-    _CDN_BASE = 'https://cdn.banbye.com'
-    _VIDEO_BASE = 'https://banbye.com/watch'
-
-    @staticmethod
-    def _extract_playlist_id(url, param='playlist'):
-        return compat_parse_qs(
-            compat_urllib_parse_urlparse(url).query).get(param, [None])[0]
-
-    def _extract_playlist(self, playlist_id):
-        data = self._download_json(f'{self._API_BASE}/playlists/{playlist_id}', playlist_id)
-        return self.playlist_result([
-            self.url_result(f'{self._VIDEO_BASE}/{video_id}', BanByeIE)
-            for video_id in data['videoIds']], playlist_id, data.get('name'))
-
-
-class BanByeIE(BanByeBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?banbye.com/(?:en/)?watch/(?P<id>\w+)'
-    _TESTS = [{
-        'url': 'https://banbye.com/watch/v_ytfmvkVYLE8T',
-        'md5': '2f4ea15c5ca259a73d909b2cfd558eb5',
-        'info_dict': {
-            'id': 'v_ytfmvkVYLE8T',
-            'ext': 'mp4',
-            'title': 'md5:5ec098f88a0d796f987648de6322ba0f',
-            'description': 'md5:4d94836e73396bc18ef1fa0f43e5a63a',
-            'uploader': 'wRealu24',
-            'channel_id': 'ch_wrealu24',
-            'channel_url': 'https://banbye.com/channel/ch_wrealu24',
-            'timestamp': 1647604800,
-            'upload_date': '20220318',
-            'duration': 1931,
-            'thumbnail': r're:https?://.*\.webp',
-            'tags': 'count:5',
-            'like_count': int,
-            'dislike_count': int,
-            'view_count': int,
-            'comment_count': int,
-        },
-    }, {
-        'url': 'https://banbye.com/watch/v_2JjQtqjKUE_F?playlistId=p_Ld82N6gBw_OJ',
-        'info_dict': {
-            'title': 'Krzysztof Karoń',
-            'id': 'p_Ld82N6gBw_OJ',
-        },
-        'playlist_count': 9,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        playlist_id = self._extract_playlist_id(url, 'playlistId')
-
-        if self._yes_playlist(playlist_id, video_id):
-            return self._extract_playlist(playlist_id)
-
-        data = self._download_json(f'{self._API_BASE}/videos/{video_id}', video_id)
-        thumbnails = [{
-            'id': f'{quality}p',
-            'url': f'{self._CDN_BASE}/video/{video_id}/{quality}.webp',
-        } for quality in [48, 96, 144, 240, 512, 1080]]
-        formats = [{
-            'format_id': f'http-{quality}p',
-            'quality': quality,
-            'url': f'{self._CDN_BASE}/video/{video_id}/{quality}.mp4',
-        } for quality in data['quality']]
-
-        self._sort_formats(formats)
-
-        return {
-            'id': video_id,
-            'title': data.get('title'),
-            'description': data.get('desc'),
-            'uploader': traverse_obj(data, ('channel', 'name')),
-            'channel_id': data.get('channelId'),
-            'channel_url': format_field(data, 'channelId', 'https://banbye.com/channel/%s'),
-            'timestamp': unified_timestamp(data.get('publishedAt')),
-            'duration': data.get('duration'),
-            'tags': data.get('tags'),
-            'formats': formats,
-            'thumbnails': thumbnails,
-            'like_count': data.get('likes'),
-            'dislike_count': data.get('dislikes'),
-            'view_count': data.get('views'),
-            'comment_count': data.get('commentCount'),
-        }
-
-
-class BanByeChannelIE(BanByeBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?banbye.com/(?:en/)?channel/(?P<id>\w+)'
-    _TESTS = [{
-        'url': 'https://banbye.com/channel/ch_wrealu24',
-        'info_dict': {
-            'title': 'wRealu24',
-            'id': 'ch_wrealu24',
-            'description': 'md5:da54e48416b74dfdde20a04867c0c2f6',
-        },
-        'playlist_mincount': 791,
-    }, {
-        'url': 'https://banbye.com/channel/ch_wrealu24?playlist=p_Ld82N6gBw_OJ',
-        'info_dict': {
-            'title': 'Krzysztof Karoń',
-            'id': 'p_Ld82N6gBw_OJ',
-        },
-        'playlist_count': 9,
-    }]
-    _PAGE_SIZE = 100
-
-    def _real_extract(self, url):
-        channel_id = self._match_id(url)
-        playlist_id = self._extract_playlist_id(url)
-
-        if playlist_id:
-            return self._extract_playlist(playlist_id)
-
-        def page_func(page_num):
-            data = self._download_json(f'{self._API_BASE}/videos', channel_id, query={
-                'channelId': channel_id,
-                'sort': 'new',
-                'limit': self._PAGE_SIZE,
-                'offset': page_num * self._PAGE_SIZE,
-            }, note=f'Downloading page {page_num+1}')
-            return [
-                self.url_result(f"{self._VIDEO_BASE}/{video['_id']}", BanByeIE)
-                for video in data['items']
-            ]
-
-        channel_data = self._download_json(f'{self._API_BASE}/channels/{channel_id}', channel_id)
-        entries = InAdvancePagedList(
-            page_func,
-            math.ceil(channel_data['videoCount'] / self._PAGE_SIZE),
-            self._PAGE_SIZE)
-
-        return self.playlist_result(
-            entries, channel_id, channel_data.get('name'), channel_data.get('description'))

yt_dlp/extractor/bbc.py

@@ -264,7 +264,11 @@ class BBCCoUkIE(InfoExtractor):
             'only_matching': True,
         }]
 
-    def _perform_login(self, username, password):
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+
         login_page = self._download_webpage(
             self._LOGIN_URL, None, 'Downloading signin page')
 
@@ -290,6 +294,9 @@ class BBCCoUkIE(InfoExtractor):
                     'Unable to login: %s' % error, expected=True)
             raise ExtractorError('Unable to log in')
 
+    def _real_initialize(self):
+        self._login()
+
     class MediaSelectionError(Exception):
         def __init__(self, id):
             self.id = id
@@ -906,8 +913,9 @@ class BBCIE(BBCCoUkIE):
 
         playlist_title = json_ld_info.get('title')
         if not playlist_title:
-            playlist_title = (self._og_search_title(webpage, default=None)
+            playlist_title = self._og_search_title(
-                              or self._html_extract_title(webpage, 'playlist title', default=None))
+                webpage, default=None) or self._html_search_regex(
+                r'<title>(.+?)</title>', webpage, 'playlist title', default=None)
             if playlist_title:
                 playlist_title = re.sub(r'(.+)\s*-\s*BBC.*?$', r'\1', playlist_title).strip()
 

yt_dlp/extractor/bilibili.py

@@ -15,7 +15,6 @@ from ..compat import (
 )
 from ..utils import (
     ExtractorError,
-    filter_dict,
     int_or_none,
     float_or_none,
     mimetype2ext,
@@ -51,7 +50,7 @@ class BiliBiliIE(InfoExtractor):
 
     _TESTS = [{
         'url': 'http://www.bilibili.com/video/av1074402/',
-        'md5': '7ac275ec84a99a6552c5d229659a0fe1',
+        'md5': '5f7d29e1a2872f3df0cf76b1f87d3788',
         'info_dict': {
             'id': '1074402_part1',
             'ext': 'mp4',
@@ -61,11 +60,6 @@ class BiliBiliIE(InfoExtractor):
             'upload_date': '20140420',
             'description': 'md5:ce18c2a2d2193f0df2917d270f2e5923',
             'timestamp': 1398012678,
-            'tags': ['顶上去报复社会', '该来的总会来的', '金克拉是检验歌曲的唯一标准', '坷垃教主', '金坷垃', '邓紫棋', '治愈系坷垃'],
-            'bv_id': 'BV11x411K7CN',
-            'cid': '1554319',
-            'thumbnail': 'http://i2.hdslb.com/bfs/archive/c79a8cf0347cd7a897c53a2f756e96aead128e8c.jpg',
-            'duration': 308.36,
         },
     }, {
         # Tested in BiliBiliBangumiIE
@@ -96,11 +90,6 @@ class BiliBiliIE(InfoExtractor):
             'timestamp': 1488382634,
             'uploader_id': '65880958',
             'uploader': '阿滴英文',
-            'thumbnail': 'http://i2.hdslb.com/bfs/archive/49267ce20bc246be6304bf369a3ded0256854c23.jpg',
-            'cid': '14694589',
-            'duration': 554.117,
-            'bv_id': 'BV13x41117TL',
-            'tags': ['人文', '英语', '文化', '公开课', '阿滴英文'],
         },
         'params': {
             'skip_download': True,
@@ -117,27 +106,6 @@ class BiliBiliIE(InfoExtractor):
             'title': '物语中的人物是如何吐槽自己的OP的'
         },
         'playlist_count': 17,
-    }, {
-        # Correct matching of single and double quotes in title
-        'url': 'https://www.bilibili.com/video/BV1NY411E7Rx/',
-        'info_dict': {
-            'id': '255513412_part1',
-            'ext': 'mp4',
-            'title': 'Vid"eo" Te\'st',
-            'cid': '570602418',
-            'thumbnail': 'http://i2.hdslb.com/bfs/archive/0c0de5a90b6d5b991b8dcc6cde0afbf71d564791.jpg',
-            'upload_date': '20220408',
-            'timestamp': 1649436552,
-            'description': 'Vid"eo" Te\'st',
-            'uploader_id': '1630758804',
-            'bv_id': 'BV1NY411E7Rx',
-            'duration': 60.394,
-            'uploader': 'bili_31244483705',
-            'tags': ['VLOG'],
-        },
-        'params': {
-            'skip_download': True,
-        },
     }]
 
     _APP_KEY = 'iVGUTjsxvpLeuDCf'
@@ -289,8 +257,7 @@ class BiliBiliIE(InfoExtractor):
         self._sort_formats(formats)
 
         title = self._html_search_regex((
-            r'<h1[^>]+title=(["])(?P<content>[^"]+)',
+            r'<h1[^>]+title=(["\'])(?P<content>[^"\']+)',
-            r'<h1[^>]+title=([\'])(?P<content>[^\']+)',
             r'(?s)<h1[^>]*>(?P<content>.+?)</h1>',
             self._meta_regex('title')
         ), webpage, 'title', group='content', fatal=False)
@@ -788,21 +755,15 @@ class BiliIntlBaseIE(InfoExtractor):
             for i, line in enumerate(json['body']) if line.get('content'))
         return data
 
-    def _get_subtitles(self, *, ep_id=None, aid=None):
+    def _get_subtitles(self, ep_id):
-        sub_json = self._call_api(
+        sub_json = self._call_api(f'/web/v2/subtitle?episode_id={ep_id}&platform=web', ep_id)
-            '/web/v2/subtitle', ep_id or aid, note='Downloading subtitles list',
-            errnote='Unable to download subtitles list', query=filter_dict({
-                'platform': 'web',
-                'episode_id': ep_id,
-                'aid': aid,
-            }))
         subtitles = {}
         for sub in sub_json.get('subtitles') or []:
             sub_url = sub.get('url')
             if not sub_url:
                 continue
             sub_data = self._download_json(
-                sub_url, ep_id or aid, errnote='Unable to download subtitles', fatal=False,
+                sub_url, ep_id, errnote='Unable to download subtitles', fatal=False,
                 note='Downloading subtitles%s' % f' for {sub["lang"]}' if sub.get('lang') else '')
             if not sub_data:
                 continue
@@ -812,14 +773,9 @@ class BiliIntlBaseIE(InfoExtractor):
             })
         return subtitles
 
-    def _get_formats(self, *, ep_id=None, aid=None):
+    def _get_formats(self, ep_id):
-        video_json = self._call_api(
+        video_json = self._call_api(f'/web/playurl?ep_id={ep_id}&platform=web', ep_id,
-            '/web/playurl', ep_id or aid, note='Downloading video formats',
+                                    note='Downloading video formats', errnote='Unable to download video formats')
-            errnote='Unable to download video formats', query=filter_dict({
-                'platform': 'web',
-                'ep_id': ep_id,
-                'aid': aid,
-            }))
         video_json = video_json['playurl']
         formats = []
         for vid in video_json.get('video') or []:
@@ -853,19 +809,23 @@ class BiliIntlBaseIE(InfoExtractor):
         self._sort_formats(formats)
         return formats
 
-    def _extract_video_info(self, video_data, *, ep_id=None, aid=None):
+    def _extract_ep_info(self, episode_data, ep_id):
         return {
-            'id': ep_id or aid,
+            'id': ep_id,
-            'title': video_data.get('title_display') or video_data.get('title'),
+            'title': episode_data.get('title_display') or episode_data['title'],
-            'thumbnail': video_data.get('cover'),
+            'thumbnail': episode_data.get('cover'),
             'episode_number': int_or_none(self._search_regex(
-                r'^E(\d+)(?:$| - )', video_data.get('title_display') or '', 'episode number', default=None)),
+                r'^E(\d+)(?:$| - )', episode_data.get('title_display'), 'episode number', default=None)),
-            'formats': self._get_formats(ep_id=ep_id, aid=aid),
+            'formats': self._get_formats(ep_id),
-            'subtitles': self._get_subtitles(ep_id=ep_id, aid=aid),
+            'subtitles': self._get_subtitles(ep_id),
             'extractor_key': BiliIntlIE.ie_key(),
         }
 
-    def _perform_login(self, username, password):
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+
         try:
             from Cryptodome.PublicKey import RSA
             from Cryptodome.Cipher import PKCS1_v1_5
@@ -896,9 +856,12 @@ class BiliIntlBaseIE(InfoExtractor):
             else:
                 raise ExtractorError('Unable to log in')
 
+    def _real_initialize(self):
+        self._login()
+
 
 class BiliIntlIE(BiliIntlBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?bili(?:bili\.tv|intl\.com)/(?:[a-z]{2}/)?(play/(?P<season_id>\d+)/(?P<ep_id>\d+)|video/(?P<aid>\d+))'
+    _VALID_URL = r'https?://(?:www\.)?bili(?:bili\.tv|intl\.com)/(?:[a-z]{2}/)?play/(?P<season_id>\d+)/(?P<id>\d+)'
     _TESTS = [{
         # Bstation page
         'url': 'https://www.bilibili.tv/en/play/34613/341736',
@@ -933,35 +896,24 @@ class BiliIntlIE(BiliIntlBaseIE):
     }, {
         'url': 'https://www.biliintl.com/en/play/34613/341736',
         'only_matching': True,
-    }, {
-        # User-generated content (as opposed to a series licensed from a studio)
-        'url': 'https://bilibili.tv/en/video/2019955076',
-        'only_matching': True,
-    }, {
-        # No language in URL
-        'url': 'https://www.bilibili.tv/video/2019955076',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        season_id, ep_id, aid = self._match_valid_url(url).group('season_id', 'ep_id', 'aid')
+        season_id, video_id = self._match_valid_url(url).groups()
-        video_id = ep_id or aid
         webpage = self._download_webpage(url, video_id)
         # Bstation layout
         initial_data = self._parse_json(self._search_regex(
-            r'window\.__INITIAL_(?:DATA|STATE)__\s*=\s*({.+?});', webpage,
+            r'window\.__INITIAL_DATA__\s*=\s*({.+?});', webpage,
             'preload state', default='{}'), video_id, fatal=False) or {}
-        video_data = (
+        episode_data = traverse_obj(initial_data, ('OgvVideo', 'epDetail'), expected_type=dict)
-            traverse_obj(initial_data, ('OgvVideo', 'epDetail'), expected_type=dict)
-            or traverse_obj(initial_data, ('UgcVideo', 'videoData'), expected_type=dict) or {})
 
-        if season_id and not video_data:
+        if not episode_data:
             # Non-Bstation layout, read through episode list
             season_json = self._call_api(f'/web/v2/ogv/play/episodes?season_id={season_id}&platform=web', video_id)
-            video_data = traverse_obj(season_json,
+            episode_data = next(
-                                      ('sections', ..., 'episodes', lambda _, v: str(v['episode_id']) == ep_id),
+                episode for episode in traverse_obj(season_json, ('sections', ..., 'episodes', ...), expected_type=dict)
-                                      expected_type=dict, get_all=False)
+                if str(episode.get('episode_id')) == video_id)
-        return self._extract_video_info(video_data, ep_id=ep_id, aid=aid)
+        return self._extract_ep_info(episode_data, video_id)
 
 
 class BiliIntlSeriesIE(BiliIntlBaseIE):
@@ -989,7 +941,7 @@ class BiliIntlSeriesIE(BiliIntlBaseIE):
         series_json = self._call_api(f'/web/v2/ogv/play/episodes?season_id={series_id}&platform=web', series_id)
         for episode in traverse_obj(series_json, ('sections', ..., 'episodes', ...), expected_type=dict, default=[]):
             episode_id = str(episode.get('episode_id'))
-            yield self._extract_video_info(episode, ep_id=episode_id)
+            yield self._extract_ep_info(episode, episode_id)
 
     def _real_extract(self, url):
         series_id = self._match_id(url)

yt_dlp/extractor/br.py

@@ -175,7 +175,7 @@ class BRIE(InfoExtractor):
 
 class BRMediathekIE(InfoExtractor):
     IE_DESC = 'Bayerischer Rundfunk Mediathek'
-    _VALID_URL = r'https?://(?:www\.)?br\.de/mediathek//?video/(?:[^/?&#]+?-)?(?P<id>av:[0-9a-f]{24})'
+    _VALID_URL = r'https?://(?:www\.)?br\.de/mediathek/video/[^/?&#]*?-(?P<id>av:[0-9a-f]{24})'
 
     _TESTS = [{
         'url': 'https://www.br.de/mediathek/video/gesundheit-die-sendung-vom-28112017-av:5a1e6a6e8fce6d001871cc8e',
@@ -188,9 +188,6 @@ class BRMediathekIE(InfoExtractor):
             'timestamp': 1511942766,
             'upload_date': '20171129',
         }
-    }, {
-        'url': 'https://www.br.de/mediathek//video/av:61b0db581aed360007558c12',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):

yt_dlp/extractor/breitbart.py

@@ -29,8 +29,9 @@ class BreitBartIE(InfoExtractor):
         self._sort_formats(formats)
         return {
             'id': video_id,
-            'title': (self._og_search_title(webpage, default=None)
+            'title': self._og_search_title(
-                      or self._html_extract_title(webpage, 'video title')),
+                webpage, default=None) or self._html_search_regex(
+                r'(?s)<title>(.*?)</title>', webpage, 'video title'),
             'description': self._og_search_description(webpage),
             'thumbnail': self._og_search_thumbnail(webpage),
             'age_limit': self._rta_search(webpage),

yt_dlp/extractor/callin.py

@@ -54,7 +54,7 @@ class CallinIE(InfoExtractor):
         id = episode['id']
         title = (episode.get('title')
                  or self._og_search_title(webpage, fatal=False)
-                 or self._html_extract_title(webpage))
+                 or self._html_search_regex('<title>(.*?)</title>', webpage, 'title'))
         url = episode['m3u8']
         formats = self._extract_m3u8_formats(url, display_id, ext='ts')
         self._sort_formats(formats)

yt_dlp/extractor/canvas.py

@@ -245,6 +245,10 @@ class VrtNUIE(GigyaBaseIE):
             'upload_date': '20200727',
         },
         'skip': 'This video is only available for registered users',
+        'params': {
+            'username': '<snip>',
+            'password': '<snip>',
+        },
         'expected_warnings': ['is not a supported codec'],
     }, {
         # Only available via new API endpoint
@@ -260,13 +264,24 @@ class VrtNUIE(GigyaBaseIE):
             'episode_number': 5,
         },
         'skip': 'This video is only available for registered users',
+        'params': {
+            'username': '<snip>',
+            'password': '<snip>',
+        },
         'expected_warnings': ['Unable to download asset JSON', 'is not a supported codec', 'Unknown MIME type'],
     }]
     _NETRC_MACHINE = 'vrtnu'
     _APIKEY = '3_0Z2HujMtiWq_pkAjgnS2Md2E11a1AwZjYiBETtwNE-EoEHDINgtnvcAOpNgmrVGy'
     _CONTEXT_ID = 'R3595707040'
 
-    def _perform_login(self, username, password):
+    def _real_initialize(self):
+        self._login()
+
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+
         auth_info = self._gigya_login({
             'APIKey': self._APIKEY,
             'targetEnv': 'jssdk',

yt_dlp/extractor/cbc.py

@@ -127,9 +127,9 @@ class CBCIE(InfoExtractor):
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
-        title = (self._og_search_title(webpage, default=None)
+        title = self._og_search_title(webpage, default=None) or self._html_search_meta(
-                 or self._html_search_meta('twitter:title', webpage, 'title', default=None)
+            'twitter:title', webpage, 'title', default=None) or self._html_search_regex(
-                 or self._html_extract_title(webpage))
+                r'<title>([^<]+)</title>', webpage, 'title', fatal=False)
         entries = [
             self._extract_player_init(player_init, display_id)
             for player_init in re.findall(r'CBC\.APP\.Caffeine\.initInstance\(({.+?})\);', webpage)]

yt_dlp/extractor/cbs.py

@@ -77,21 +77,21 @@ class CBSIE(CBSBaseIE):
         (?:
             cbs:|
             https?://(?:www\.)?(?:
-                cbs\.com/(?:shows|movies)/(?:video|[^/]+/video|[^/]+)/|
+                cbs\.com/(?:shows/[^/]+/video|movies/[^/]+)/|
                 colbertlateshow\.com/(?:video|podcasts)/)
         )(?P<id>[\w-]+)'''
 
     # All tests are blocked outside US
     _TESTS = [{
-        'url': 'https://www.cbs.com/shows/video/xrUyNLtl9wd8D_RWWAg9NU2F_V6QpB3R/',
+        'url': 'https://www.cbs.com/shows/garth-brooks/video/_u7W953k6la293J7EPTd9oHkSPs6Xn6_/connect-chat-feat-garth-brooks/',
         'info_dict': {
-            'id': 'xrUyNLtl9wd8D_RWWAg9NU2F_V6QpB3R',
+            'id': '_u7W953k6la293J7EPTd9oHkSPs6Xn6_',
             'ext': 'mp4',
-            'title': 'Tough As Nails - Dreams Never Die',
+            'title': 'Connect Chat feat. Garth Brooks',
-            'description': 'md5:a3535a62531cdd52b0364248a2c1ae33',
+            'description': 'Connect with country music singer Garth Brooks, as he chats with fans on Wednesday November 27, 2013. Be sure to tune in to Garth Brooks: Live from Las Vegas, Friday November 29, at 9/8c on CBS!',
-            'duration': 2588,
+            'duration': 1495,
-            'timestamp': 1639015200,
+            'timestamp': 1385585425,
-            'upload_date': '20211209',
+            'upload_date': '20131127',
             'uploader': 'CBSI-NEW',
         },
         'params': {
@@ -99,14 +99,14 @@ class CBSIE(CBSBaseIE):
             'skip_download': True,
         },
     }, {
-        'url': 'https://www.cbs.com/shows/video/sZH1MGgomIosZgxGJ1l263MFq16oMtW1/',
+        'url': 'https://www.cbs.com/shows/the-late-show-with-stephen-colbert/video/60icOhMb9NcjbcWnF_gub9XXHdeBcNk2/the-late-show-6-23-21-christine-baranski-joy-oladokun-',
         'info_dict': {
-            'id': 'sZH1MGgomIosZgxGJ1l263MFq16oMtW1',
+            'id': '60icOhMb9NcjbcWnF_gub9XXHdeBcNk2',
-            'title': 'The Late Show - 3/16/22 (Michael Buble, Rose Matafeo)',
+            'title': 'The Late Show - 6/23/21 (Christine Baranski, Joy Oladokun)',
-            'timestamp': 1647488100,
+            'timestamp': 1624507140,
-            'description': 'md5:d0e6ec23c544b7fa8e39a8e6844d2439',
+            'description': 'md5:e01af24e95c74d55e8775aef86117b95',
             'uploader': 'CBSI-NEW',
-            'upload_date': '20220317',
+            'upload_date': '20210624',
         },
         'params': {
             'ignore_no_formats_error': True,

yt_dlp/extractor/closertotruth.py

@@ -54,7 +54,8 @@ class CloserToTruthIE(InfoExtractor):
             r'<script[^>]+src=["\'].*?\b(?:partner_id|p)/(\d+)',
             webpage, 'kaltura partner_id')
 
-        title = self._html_extract_title(webpage, 'video title')
+        title = self._search_regex(
+            r'<title>(.+?)\s*\|\s*.+?</title>', webpage, 'video title')
 
         select = self._search_regex(
             r'(?s)<select[^>]+id="select-version"[^>]*>(.+?)</select>',

yt_dlp/extractor/common.py

@@ -23,7 +23,6 @@ from ..compat import (
     compat_getpass,
     compat_http_client,
     compat_os_name,
-    compat_Pattern,
     compat_str,
     compat_urllib_error,
     compat_urllib_parse_unquote,
@@ -42,6 +41,7 @@ from ..utils import (
     base_url,
     bug_reports_message,
     clean_html,
+    compiled_regex_type,
     determine_ext,
     determine_protocol,
     dict_get,
@@ -49,7 +49,6 @@ from ..utils import (
     error_to_compat_str,
     extract_attributes,
     ExtractorError,
-    filter_dict,
     fix_xml_ampersands,
     float_or_none,
     format_field,
@@ -139,8 +138,6 @@ class InfoExtractor(object):
                                    for HDS - URL of the F4M manifest,
                                    for DASH - URL of the MPD manifest,
                                    for MSS - URL of the ISM manifest.
-                    * manifest_stream_number  (For internal use only)
-                                 The index of the stream in the manifest file
                     * ext        Will be calculated from URL if missing
                     * format     A human-readable description of the format
                                  ("mp4 container with h264/opus").
@@ -217,7 +214,7 @@ class InfoExtractor(object):
                                  (HTTP or RTMP) download. Boolean.
                     * has_drm    The format has DRM and cannot be downloaded. Boolean
                     * downloader_options  A dictionary of downloader options as
-                                 described in FileDownloader (For internal use only)
+                                 described in FileDownloader
                     RTMP formats can also have the additional fields: page_url,
                     app, play_path, tc_url, flash_version, rtmp_live, rtmp_conn,
                     rtmp_protocol, rtmp_real_time
@@ -251,14 +248,14 @@ class InfoExtractor(object):
     license:        License name the video is licensed under.
     creator:        The creator of the video.
     timestamp:      UNIX timestamp of the moment the video was uploaded
-    upload_date:    Video upload date in UTC (YYYYMMDD).
+    upload_date:    Video upload date (YYYYMMDD).
                     If not explicitly set, calculated from timestamp
     release_timestamp: UNIX timestamp of the moment the video was released.
                     If it is not clear whether to use timestamp or this, use the former
-    release_date:   The date (YYYYMMDD) when the video was released in UTC.
+    release_date:   The date (YYYYMMDD) when the video was released.
                     If not explicitly set, calculated from release_timestamp
     modified_timestamp: UNIX timestamp of the moment the video was last modified.
-    modified_date:   The date (YYYYMMDD) when the video was last modified in UTC.
+    modified_date:   The date (YYYYMMDD) when the video was last modified.
                     If not explicitly set, calculated from modified_timestamp
     uploader_id:    Nickname or id of the video uploader.
     uploader_url:   Full URL to a personal webpage of the video uploader.
@@ -435,15 +432,7 @@ class InfoExtractor(object):
 
     Subclasses may also override suitable() if necessary, but ensure the function
     signature is preserved and that this function imports everything it needs
-    (except other extractors), so that lazy_extractors works correctly.
+    (except other extractors), so that lazy_extractors works correctly
-
-    To support username + password (or netrc) login, the extractor must define a
-    _NETRC_MACHINE and re-define _perform_login(username, password) and
-    (optionally) _initialize_pre_login() methods. The _perform_login method will
-    be called between _initialize_pre_login and _real_initialize if credentials
-    are passed by the user. In cases where it is necessary to have the login
-    process as part of the extraction rather than initialization, _perform_login
-    can be left undefined.
 
     _GEO_BYPASS attribute may be set to False in order to disable
     geo restriction bypass mechanisms for a particular extractor.
@@ -471,11 +460,9 @@ class InfoExtractor(object):
     _GEO_COUNTRIES = None
     _GEO_IP_BLOCKS = None
     _WORKING = True
-    _NETRC_MACHINE = None
-    IE_DESC = None
 
     _LOGIN_HINTS = {
-        'any': 'Use --cookies, --cookies-from-browser, --username and --password, or --netrc to provide account credentials',
+        'any': 'Use --cookies, --username and --password, or --netrc to provide account credentials',
         'cookies': (
             'Use --cookies-from-browser or --cookies for the authentication. '
             'See  https://github.com/ytdl-org/youtube-dl#how-do-i-pass-cookies-to-youtube-dl  for how to manually pass cookies'),
@@ -525,10 +512,6 @@ class InfoExtractor(object):
         """Getter method for _WORKING."""
         return cls._WORKING
 
-    @classmethod
-    def supports_login(cls):
-        return bool(cls._NETRC_MACHINE)
-
     def initialize(self):
         """Initializes an instance (authentication, etc)."""
         self._printed_messages = set()
@@ -537,13 +520,6 @@ class InfoExtractor(object):
             'ip_blocks': self._GEO_IP_BLOCKS,
         })
         if not self._ready:
-            self._initialize_pre_login()
-            if self.supports_login():
-                username, password = self._get_login_info()
-                if username:
-                    self._perform_login(username, password)
-            elif self.get_param('username') and False not in (self.IE_DESC, self._NETRC_MACHINE):
-                self.report_warning(f'Login with password is not supported for this website. {self._LOGIN_HINTS["cookies"]}')
             self._real_initialize()
             self._ready = True
 
@@ -689,14 +665,6 @@ class InfoExtractor(object):
         """Sets a YoutubeDL instance as the downloader for this IE."""
         self._downloader = downloader
 
-    def _initialize_pre_login(self):
-        """ Intialization before login. Redefine in subclasses."""
-        pass
-
-    def _perform_login(self, username, password):
-        """ Login with username and password. Redefine in subclasses."""
-        pass
-
     def _real_initialize(self):
         """Real initialization process. Redefine in subclasses."""
         pass
@@ -1037,7 +1005,7 @@ class InfoExtractor(object):
         if transform_source:
             json_string = transform_source(json_string)
         try:
-            return json.loads(json_string, strict=False)
+            return json.loads(json_string)
         except ValueError as ve:
             errmsg = '%s: Failed to parse JSON ' % video_id
             if fatal:
@@ -1130,15 +1098,12 @@ class InfoExtractor(object):
 
     def raise_login_required(
             self, msg='This video is only available for registered users',
-            metadata_available=False, method=NO_DEFAULT):
+            metadata_available=False, method='any'):
         if metadata_available and (
                 self.get_param('ignore_no_formats_error') or self.get_param('wait_for_video')):
             self.report_warning(msg)
             return
-        if method is NO_DEFAULT:
-            method = 'any' if self.supports_login() else 'cookies'
         if method is not None:
-            assert method in self._LOGIN_HINTS, 'Invalid login method'
             msg = '%s. %s' % (msg, self._LOGIN_HINTS[method])
         raise ExtractorError(msg, expected=True)
 
@@ -1203,9 +1168,7 @@ class InfoExtractor(object):
         In case of failure return a default value or raise a WARNING or a
         RegexNotFoundError, depending on fatal, specifying the field name.
         """
-        if string is None:
+        if isinstance(pattern, (str, compat_str, compiled_regex_type)):
-            mobj = None
-        elif isinstance(pattern, (str, compat_Pattern)):
             mobj = re.search(pattern, string, flags)
         else:
             for p in pattern:
@@ -1301,8 +1264,8 @@ class InfoExtractor(object):
     @staticmethod
     def _og_regexes(prop):
         content_re = r'content=(?:"([^"]+?)"|\'([^\']+?)\'|\s*([^\s"\'=<>`]+?))'
-        property_re = (r'(?:name|property)=(?:\'og%(sep)s%(prop)s\'|"og%(sep)s%(prop)s"|\s*og%(sep)s%(prop)s\b)'
+        property_re = (r'(?:name|property)=(?:\'og[:-]%(prop)s\'|"og[:-]%(prop)s"|\s*og[:-]%(prop)s\b)'
-                       % {'prop': re.escape(prop), 'sep': '(?:&#x3A;|[:-])'})
+                       % {'prop': re.escape(prop)})
         template = r'<meta[^>]+?%s[^>]+?%s'
         return [
             template % (property_re, content_re),
@@ -1333,8 +1296,9 @@ class InfoExtractor(object):
     def _og_search_description(self, html, **kargs):
         return self._og_search_property('description', html, fatal=False, **kargs)
 
-    def _og_search_title(self, html, *, fatal=False, **kargs):
+    def _og_search_title(self, html, **kargs):
-        return self._og_search_property('title', html, fatal=fatal, **kargs)
+        kargs.setdefault('fatal', False)
+        return self._og_search_property('title', html, **kargs)
 
     def _og_search_video_url(self, html, name='video url', secure=True, **kargs):
         regexes = self._og_regexes('video') + self._og_regexes('video:url')
@@ -1345,8 +1309,9 @@ class InfoExtractor(object):
     def _og_search_url(self, html, **kargs):
         return self._og_search_property('url', html, **kargs)
 
-    def _html_extract_title(self, html, name='title', *, fatal=False, **kwargs):
+    def _html_extract_title(self, html, name, **kwargs):
-        return self._html_search_regex(r'(?s)<title>([^<]+)</title>', html, name, fatal=fatal, **kwargs)
+        return self._html_search_regex(
+            r'(?s)<title>(.*?)</title>', html, name, **kwargs)
 
     def _html_search_meta(self, name, html, display_name=None, fatal=False, **kwargs):
         name = variadic(name)
@@ -1591,7 +1556,7 @@ class InfoExtractor(object):
                     break
         traverse_json_ld(json_ld)
 
-        return filter_dict(info)
+        return dict((k, v) for k, v in info.items() if v is not None)
 
     def _search_nextjs_data(self, webpage, video_id, *, transform_source=None, fatal=True, **kw):
         return self._parse_json(
@@ -3686,11 +3651,11 @@ class InfoExtractor(object):
 
     @staticmethod
     def _merge_subtitle_items(subtitle_list1, subtitle_list2):
-        """ Merge subtitle items for one language. Items with duplicated URLs/data
+        """ Merge subtitle items for one language. Items with duplicated URLs
         will be dropped. """
-        list1_data = set((item.get('url'), item.get('data')) for item in subtitle_list1)
+        list1_urls = set([item['url'] for item in subtitle_list1])
         ret = list(subtitle_list1)
-        ret.extend(item for item in subtitle_list2 if (item.get('url'), item.get('data')) not in list1_data)
+        ret.extend([item for item in subtitle_list2 if item['url'] not in list1_urls])
         return ret
 
     @classmethod
@@ -3715,8 +3680,9 @@ class InfoExtractor(object):
     def mark_watched(self, *args, **kwargs):
         if not self.get_param('mark_watched', False):
             return
-        if (self.supports_login() and self._get_login_info()[0] is not None
+        if (hasattr(self, '_NETRC_MACHINE') and self._get_login_info()[0] is not None
-                or self.get_param('cookiefile') or self.get_param('cookiesfrombrowser')):
+                or self.get_param('cookiefile')
+                or self.get_param('cookiesfrombrowser')):
             self._mark_watched(*args, **kwargs)
 
     def _mark_watched(self, *args, **kwargs):

yt_dlp/extractor/craftsy.py

@@ -1,71 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .brightcove import BrightcoveNewIE
-from .common import InfoExtractor
-
-from ..utils import (
-    dict_get,
-    get_element_by_id,
-    js_to_json,
-    traverse_obj,
-)
-
-
-class CraftsyIE(InfoExtractor):
-    _VALID_URL = r'https?://www.craftsy.com/class/(?P<id>[a-z0-9_-]+)/'
-    _TESTS = [{
-        'url': 'https://www.craftsy.com/class/the-midnight-quilt-show-season-5/',
-        'info_dict': {
-            'id': 'the-midnight-quilt-show-season-5',
-            'title': 'The Midnight Quilt Show Season 5',
-            'description': 'md5:113eda818e985d1a566625fb2f833b7a',
-        },
-        'playlist_count': 10,
-    }, {
-        'url': 'https://www.craftsy.com/class/sew-your-own-designer-handbag/',
-        'info_dict': {
-            'id': 'sew-your-own-designer-handbag',
-            'title': 'Sew Your Own Designer Handbag',
-            'description': 'md5:8270d0ef5427d3c895a27351aeaac276',
-        },
-        'playlist_mincount': 1,
-    }, {
-        'url': 'https://www.craftsy.com/class/all-access-estes-park-wool-market/',
-        'info_dict': {
-            'id': 'all-access-estes-park-wool-market',
-            'title': 'All Access: Estes Park Wool Market',
-            'description': 'md5:aded1bd8d38ae2fae4dae936c0ae01e7',
-        },
-        'playlist_count': 6,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        video_data = self._parse_json(self._search_regex(
-            r'class_video_player_vars\s*=\s*({.*})\s*;',
-            get_element_by_id('vidstore-classes_class-video-player-js-extra', webpage),
-            'video data'), video_id, transform_source=js_to_json)
-
-        account_id = traverse_obj(video_data, ('video_player', 'bc_account_id'))
-
-        entries = []
-        class_preview = traverse_obj(video_data, ('video_player', 'class_preview'))
-        if class_preview:
-            v_id = class_preview.get('video_id')
-            entries.append(self.url_result(
-                f'http://players.brightcove.net/{account_id}/default_default/index.html?videoId={v_id}',
-                BrightcoveNewIE, v_id, class_preview.get('title')))
-
-        if dict_get(video_data, ('is_free', 'user_has_access')):
-            entries += [
-                self.url_result(
-                    f'http://players.brightcove.net/{account_id}/default_default/index.html?videoId={lesson["video_id"]}',
-                    BrightcoveNewIE, lesson['video_id'], lesson.get('title'))
-                for lesson in video_data['lessons']]
-
-        return self.playlist_result(
-            entries, video_id, video_data.get('class_title'),
-            self._html_search_meta(('og:description', 'description'), webpage, default=None))

yt_dlp/extractor/crunchyroll.py

@@ -9,7 +9,7 @@ import zlib
 from hashlib import sha1
 from math import pow, sqrt, floor
 from .common import InfoExtractor
-from .vrv import VRVBaseIE
+from .vrv import VRVIE
 from ..compat import (
     compat_b64decode,
     compat_etree_Element,
@@ -57,7 +57,10 @@ class CrunchyrollBaseIE(InfoExtractor):
                 'Content-Type': 'application/x-www-form-urlencoded',
             })
 
-    def _perform_login(self, username, password):
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
         if self._get_cookies(self._LOGIN_URL).get('etp_rt'):
             return
 
@@ -86,21 +89,8 @@ class CrunchyrollBaseIE(InfoExtractor):
         if not self._get_cookies(self._LOGIN_URL).get('etp_rt'):
             raise ExtractorError('Login succeeded but did not set etp_rt cookie')
 
-    # Beta-specific, but needed for redirects
+    def _real_initialize(self):
-    def _get_beta_embedded_json(self, webpage, display_id):
+        self._login()
-        initial_state = self._parse_json(self._search_regex(
-            r'__INITIAL_STATE__\s*=\s*({.+?})\s*;', webpage, 'initial state'), display_id)
-        app_config = self._parse_json(self._search_regex(
-            r'__APP_CONFIG__\s*=\s*({.+?})\s*;', webpage, 'app config'), display_id)
-        return initial_state, app_config
-
-    def _redirect_to_beta(self, webpage, iekey, video_id):
-        if not self._get_cookies(self._LOGIN_URL).get('etp_rt'):
-            raise ExtractorError('Received a beta page from non-beta url when not logged in.')
-        initial_state, app_config = self._get_beta_embedded_json(webpage, video_id)
-        url = app_config['baseSiteUrl'] + initial_state['router']['locations']['current']['pathname']
-        self.to_screen(f'{video_id}: Redirected to beta site - {url}')
-        return self.url_result(f'{url}', iekey, video_id)
 
     @staticmethod
     def _add_skip_wall(url):
@@ -116,7 +106,7 @@ class CrunchyrollBaseIE(InfoExtractor):
             parsed_url._replace(query=compat_urllib_parse_urlencode(qs, True)))
 
 
-class CrunchyrollIE(CrunchyrollBaseIE, VRVBaseIE):
+class CrunchyrollIE(CrunchyrollBaseIE, VRVIE):
     IE_NAME = 'crunchyroll'
     _VALID_URL = r'https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.(?:com|fr)/(?:media(?:-|/\?id=)|(?:[^/]*/){1,2}[^/?&]*?)(?P<id>[0-9]+))(?:[/?&]|$)'
     _TESTS = [{
@@ -422,8 +412,6 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
         webpage = self._download_webpage(
             self._add_skip_wall(webpage_url), video_id,
             headers=self.geo_verification_headers())
-        if re.search(r'<div id="preload-data">', webpage):
-            return self._redirect_to_beta(webpage, CrunchyrollBetaIE.ie_key(), video_id)
         note_m = self._html_search_regex(
             r'<div class="showmedia-trailer-notice">(.+?)</div>',
             webpage, 'trailer-notice', default='')
@@ -688,8 +676,6 @@ class CrunchyrollShowPlaylistIE(CrunchyrollBaseIE):
             # https:// gives a 403, but http:// does not
             self._add_skip_wall(url).replace('https://', 'http://'), show_id,
             headers=self.geo_verification_headers())
-        if re.search(r'<div id="preload-data">', webpage):
-            return self._redirect_to_beta(webpage, CrunchyrollBetaShowIE.ie_key(), show_id)
         title = self._html_search_meta('name', webpage, default=None)
 
         episode_re = r'<li id="showview_videos_media_(\d+)"[^>]+>.*?<a href="([^"]+)"'
@@ -712,56 +698,9 @@ class CrunchyrollShowPlaylistIE(CrunchyrollBaseIE):
         }
 
 
-class CrunchyrollBetaBaseIE(CrunchyrollBaseIE):
+class CrunchyrollBetaIE(CrunchyrollBaseIE):
-    params = None
-
-    def _get_params(self, lang):
-        if not CrunchyrollBetaBaseIE.params:
-            initial_state, app_config = self._get_beta_embedded_json(self._download_webpage(
-                f'https://beta.crunchyroll.com/{lang}', None, note='Retrieving main page'), None)
-            api_domain = app_config['cxApiParams']['apiDomain']
-            basic_token = str(base64.b64encode(('%s:' % app_config['cxApiParams']['accountAuthClientId']).encode('ascii')), 'ascii')
-            auth_response = self._download_json(
-                f'{api_domain}/auth/v1/token', None, note='Authenticating with cookie',
-                headers={
-                    'Authorization': 'Basic ' + basic_token
-                }, data='grant_type=etp_rt_cookie'.encode('ascii'))
-            policy_response = self._download_json(
-                f'{api_domain}/index/v2', None, note='Retrieving signed policy',
-                headers={
-                    'Authorization': auth_response['token_type'] + ' ' + auth_response['access_token']
-                })
-            bucket = policy_response['cms']['bucket']
-            params = {
-                'Policy': policy_response['cms']['policy'],
-                'Signature': policy_response['cms']['signature'],
-                'Key-Pair-Id': policy_response['cms']['key_pair_id']
-            }
-            locale = traverse_obj(initial_state, ('localization', 'locale'))
-            if locale:
-                params['locale'] = locale
-            CrunchyrollBetaBaseIE.params = (api_domain, bucket, params)
-        return CrunchyrollBetaBaseIE.params
-
-    def _redirect_from_beta(self, url, lang, internal_id, display_id, is_episode, iekey):
-        initial_state, app_config = self._get_beta_embedded_json(self._download_webpage(url, display_id), display_id)
-        content_data = initial_state['content']['byId'][internal_id]
-        if is_episode:
-            video_id = content_data['external_id'].split('.')[1]
-            series_id = content_data['episode_metadata']['series_slug_title']
-        else:
-            series_id = content_data['slug_title']
-        series_id = re.sub(r'-{2,}', '-', series_id)
-        url = f'https://www.crunchyroll.com/{lang}{series_id}'
-        if is_episode:
-            url = url + f'/{display_id}-{video_id}'
-        self.to_screen(f'{display_id}: Not logged in. Redirecting to non-beta site - {url}')
-        return self.url_result(url, iekey, display_id)
-
-
-class CrunchyrollBetaIE(CrunchyrollBetaBaseIE):
     IE_NAME = 'crunchyroll:beta'
-    _VALID_URL = r'https?://beta\.crunchyroll\.com/(?P<lang>(?:\w{1,2}/)?)watch/(?P<id>\w+)/(?P<display_id>[\w\-]*)/?(?:\?|$)'
+    _VALID_URL = r'https?://beta\.crunchyroll\.com/(?P<lang>(?:\w{1,2}/)?)watch/(?P<internal_id>\w+)/(?P<id>[\w\-]+)/?(?:\?|$)'
     _TESTS = [{
         'url': 'https://beta.crunchyroll.com/watch/GY2P1Q98Y/to-the-future',
         'info_dict': {
@@ -772,49 +711,51 @@ class CrunchyrollBetaIE(CrunchyrollBetaBaseIE):
             'uploader': 'Toei Animation',
             'title': 'World Trigger Episode 73 – To the Future',
             'upload_date': '20160402',
-            'episode_number': 73,
-            'series': 'World Trigger',
-            'average_rating': 4.9,
-            'episode': 'To the Future',
-            'season': 'World Trigger',
-            'thumbnail': 'https://img1.ak.crunchyroll.com/i/spire3-tmb/c870dedca1a83137c2d3d144984155ed1459527119_main.jpg',
-            'season_number': 1,
         },
         'params': {'skip_download': 'm3u8'},
         'expected_warnings': ['Unable to download XML']
-    }, {
-        'url': 'https://beta.crunchyroll.com/watch/GYK53DMPR/wicked-lord-shingan-reborn',
-        'info_dict': {
-            'id': '648781',
-            'ext': 'mp4',
-            'episode_number': 1,
-            'timestamp': 1389173400,
-            'series': 'Love, Chunibyo & Other Delusions - Heart Throb -',
-            'description': 'md5:5579d1a0355cc618558ba23d27067a62',
-            'uploader': 'TBS',
-            'episode': 'Wicked Lord Shingan... Reborn',
-            'average_rating': 4.9,
-            'season': 'Love, Chunibyo & Other Delusions - Heart Throb -',
-            'thumbnail': 'https://img1.ak.crunchyroll.com/i/spire3-tmb/2ba0384e225a5370d5f0ee9496d91ea51389046521_main.jpg',
-            'title': 'Love, Chunibyo & Other Delusions - Heart Throb - Episode 1 – Wicked Lord Shingan... Reborn',
-            'season_number': 2,
-            'upload_date': '20140108',
-        },
-        'params': {'skip_download': 'm3u8'},
-        'expected_warnings': ['Unable to download XML']
-    }, {
-        'url': 'https://beta.crunchyroll.com/watch/GY2P1Q98Y/',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        lang, internal_id, display_id = self._match_valid_url(url).group('lang', 'id', 'display_id')
+        lang, internal_id, display_id = self._match_valid_url(url).group('lang', 'internal_id', 'id')
-
+        webpage = self._download_webpage(url, display_id)
+        initial_state = self._parse_json(
+            self._search_regex(r'__INITIAL_STATE__\s*=\s*({.+?})\s*;', webpage, 'initial state'),
+            display_id)
+        episode_data = initial_state['content']['byId'][internal_id]
         if not self._get_cookies(url).get('etp_rt'):
-            return self._redirect_from_beta(url, lang, internal_id, display_id, True, CrunchyrollIE.ie_key())
+            video_id = episode_data['external_id'].split('.')[1]
-
+            series_id = episode_data['episode_metadata']['series_slug_title']
-        api_domain, bucket, params = self._get_params(lang)
+            return self.url_result(f'https://www.crunchyroll.com/{lang}{series_id}/{display_id}-{video_id}',
+                                   CrunchyrollIE.ie_key(), video_id)
 
+        app_config = self._parse_json(
+            self._search_regex(r'__APP_CONFIG__\s*=\s*({.+?})\s*;', webpage, 'app config'),
+            display_id)
+        client_id = app_config['cxApiParams']['accountAuthClientId']
+        api_domain = app_config['cxApiParams']['apiDomain']
+        basic_token = str(base64.b64encode(('%s:' % client_id).encode('ascii')), 'ascii')
+        auth_response = self._download_json(
+            f'{api_domain}/auth/v1/token', display_id,
+            note='Authenticating with cookie',
+            headers={
+                'Authorization': 'Basic ' + basic_token
+            }, data='grant_type=etp_rt_cookie'.encode('ascii'))
+        policy_response = self._download_json(
+            f'{api_domain}/index/v2', display_id,
+            note='Retrieving signed policy',
+            headers={
+                'Authorization': auth_response['token_type'] + ' ' + auth_response['access_token']
+            })
+        bucket = policy_response['cms']['bucket']
+        params = {
+            'Policy': policy_response['cms']['policy'],
+            'Signature': policy_response['cms']['signature'],
+            'Key-Pair-Id': policy_response['cms']['key_pair_id']
+        }
+        locale = traverse_obj(initial_state, ('localization', 'locale'))
+        if locale:
+            params['locale'] = locale
         episode_response = self._download_json(
             f'{api_domain}/cms/v2{bucket}/episodes/{internal_id}', display_id,
             note='Retrieving episode metadata',
@@ -892,9 +833,9 @@ class CrunchyrollBetaIE(CrunchyrollBetaBaseIE):
         }
 
 
-class CrunchyrollBetaShowIE(CrunchyrollBetaBaseIE):
+class CrunchyrollBetaShowIE(CrunchyrollBaseIE):
     IE_NAME = 'crunchyroll:playlist:beta'
-    _VALID_URL = r'https?://beta\.crunchyroll\.com/(?P<lang>(?:\w{1,2}/)?)series/(?P<id>\w+)/(?P<display_id>[\w\-]*)/?(?:\?|$)'
+    _VALID_URL = r'https?://beta\.crunchyroll\.com/(?P<lang>(?:\w{1,2}/)?)series/\w+/(?P<id>[\w\-]+)/?(?:\?|$)'
     _TESTS = [{
         'url': 'https://beta.crunchyroll.com/series/GY19NQ2QR/Girl-Friend-BETA',
         'info_dict': {
@@ -902,57 +843,12 @@ class CrunchyrollBetaShowIE(CrunchyrollBetaBaseIE):
             'title': 'Girl Friend BETA',
         },
         'playlist_mincount': 10,
-    }, {
-        'url': 'https://beta.crunchyroll.com/series/GYJQV73V6/love-chunibyo--other-delusions---heart-throb--',
-        'info_dict': {
-            'id': 'love-chunibyo-other-delusions-heart-throb-',
-            'title': 'Love, Chunibyo & Other Delusions - Heart Throb -',
-        },
-        'playlist_mincount': 10,
     }, {
         'url': 'https://beta.crunchyroll.com/it/series/GY19NQ2QR/Girl-Friend-BETA',
         'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        lang, internal_id, display_id = self._match_valid_url(url).group('lang', 'id', 'display_id')
+        lang, series_id = self._match_valid_url(url).group('lang', 'id')
-
+        return self.url_result(f'https://www.crunchyroll.com/{lang}{series_id.lower()}',
-        if not self._get_cookies(url).get('etp_rt'):
+                               CrunchyrollShowPlaylistIE.ie_key(), series_id)
-            return self._redirect_from_beta(url, lang, internal_id, display_id, False, CrunchyrollShowPlaylistIE.ie_key())
-
-        api_domain, bucket, params = self._get_params(lang)
-
-        series_response = self._download_json(
-            f'{api_domain}/cms/v2{bucket}/series/{internal_id}', display_id,
-            note='Retrieving series metadata', query=params)
-
-        seasons_response = self._download_json(
-            f'{api_domain}/cms/v2{bucket}/seasons?series_id={internal_id}', display_id,
-            note='Retrieving season list', query=params)
-
-        def entries():
-            for season in seasons_response['items']:
-                episodes_response = self._download_json(
-                    f'{api_domain}/cms/v2{bucket}/episodes?season_id={season["id"]}', display_id,
-                    note=f'Retrieving episode list for {season.get("slug_title")}', query=params)
-                for episode in episodes_response['items']:
-                    episode_id = episode['id']
-                    episode_display_id = episode['slug_title']
-                    yield {
-                        '_type': 'url',
-                        'url': f'https://beta.crunchyroll.com/{lang}watch/{episode_id}/{episode_display_id}',
-                        'ie_key': CrunchyrollBetaIE.ie_key(),
-                        'id': episode_id,
-                        'title': '%s Episode %s – %s' % (episode.get('season_title'), episode.get('episode'), episode.get('title')),
-                        'description': try_get(episode, lambda x: x['description'].replace(r'\r\n', '\n')),
-                        'duration': float_or_none(episode.get('duration_ms'), 1000),
-                        'series': episode.get('series_title'),
-                        'series_id': episode.get('series_id'),
-                        'season': episode.get('season_title'),
-                        'season_id': episode.get('season_id'),
-                        'season_number': episode.get('season_number'),
-                        'episode': episode.get('title'),
-                        'episode_number': episode.get('sequence_number')
-                    }
-
-        return self.playlist_result(entries(), internal_id, series_response.get('title'))

yt_dlp/extractor/cspan.py

@@ -278,7 +278,7 @@ class CSpanCongressIE(InfoExtractor):
             video_id, transform_source=js_to_json)
 
         title = (self._og_search_title(webpage, default=None)
-                 or self._html_extract_title(webpage, 'video title'))
+                 or self._html_search_regex(r'(?s)<title>(.*?)</title>', webpage, 'video title'))
         description = (self._og_search_description(webpage, default=None)
                        or self._html_search_meta('description', webpage, 'description', default=None))
 

yt_dlp/extractor/curiositystream.py

@@ -33,11 +33,14 @@ class CuriosityStreamBaseIE(InfoExtractor):
         self._handle_errors(result)
         return result['data']
 
-    def _perform_login(self, username, password):
+    def _real_initialize(self):
+        email, password = self._get_login_info()
+        if email is None:
+            return
         result = self._download_json(
             'https://api.curiositystream.com/v1/login', None,
             note='Logging in', data=urlencode_postdata({
-                'email': username,
+                'email': email,
                 'password': password,
             }))
         self._handle_errors(result)

yt_dlp/extractor/cybrary.py

@@ -1,146 +0,0 @@
-# coding: utf-8
-from .common import InfoExtractor
-
-from ..utils import (
-    ExtractorError,
-    smuggle_url,
-    str_or_none,
-    traverse_obj,
-    urlencode_postdata
-)
-
-
-class CybraryBaseIE(InfoExtractor):
-    _API_KEY = 'AIzaSyCX9ru6j70PX2My1Eq6Q1zoMAhuTdXlzSw'
-    _ENDPOINTS = {
-        'course': 'https://app.cybrary.it/courses/api/catalog/browse/course/{}',
-        'course_enrollment': 'https://app.cybrary.it/courses/api/catalog/{}/enrollment',
-        'enrollment': 'https://app.cybrary.it/courses/api/enrollment/{}',
-        'launch': 'https://app.cybrary.it/courses/api/catalog/{}/launch',
-        'vimeo_oembed': 'https://vimeo.com/api/oembed.json?url=https://vimeo.com/{}',
-    }
-    _NETRC_MACHINE = 'cybrary'
-    _TOKEN = None
-
-    def _perform_login(self, username, password):
-        CybraryBaseIE._TOKEN = self._download_json(
-            f'https://identitytoolkit.googleapis.com/v1/accounts:signInWithPassword?key={self._API_KEY}',
-            None, data=urlencode_postdata({'email': username, 'password': password, 'returnSecureToken': True}),
-            note='Logging in')['idToken']
-
-    def _real_initialize(self):
-        if not self._TOKEN:
-            self.raise_login_required(method='password')
-
-    def _call_api(self, endpoint, item_id):
-        return self._download_json(
-            self._ENDPOINTS[endpoint].format(item_id), item_id,
-            note=f'Downloading {endpoint} JSON metadata',
-            headers={'Authorization': f'Bearer {self._TOKEN}'})
-
-    def _get_vimeo_id(self, activity_id):
-        launch_api = self._call_api('launch', activity_id)
-
-        if launch_api.get('url'):
-            return self._search_regex(r'https?://player\.vimeo\.com/video/(?P<vimeo_id>[0-9]+)', launch_api['url'], 'vimeo_id')
-        return traverse_obj(launch_api, ('vendor_data', 'content', ..., 'videoId'), get_all=False)
-
-
-class CybraryIE(CybraryBaseIE):
-    _VALID_URL = r'https?://app.cybrary.it/immersive/(?P<enrollment>[0-9]+)/activity/(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'https://app.cybrary.it/immersive/12487950/activity/63102',
-        'md5': '9ae12d37e555cb2ed554223a71a701d0',
-        'info_dict': {
-            'id': '646609770',
-            'ext': 'mp4',
-            'title': 'Getting Started',
-            'thumbnail': 'https://i.vimeocdn.com/video/1301817996-76a268f0c56cff18a5cecbbdc44131eb9dda0c80eb0b3a036_1280',
-            'series_id': '63111',
-            'uploader_url': 'https://vimeo.com/user30867300',
-            'duration': 88,
-            'uploader_id': 'user30867300',
-            'series': 'Cybrary Orientation',
-            'uploader': 'Cybrary',
-            'chapter': 'Cybrary Orientation Series',
-            'chapter_id': '63110'
-        },
-        'expected_warnings': ['No authenticators for vimeo']
-    }, {
-        'url': 'https://app.cybrary.it/immersive/12747143/activity/52686',
-        'md5': '62f26547dccc59c44363e2a13d4ad08d',
-        'info_dict': {
-            'id': '445638073',
-            'ext': 'mp4',
-            'title': 'Azure Virtual Network IP Addressing',
-            'thumbnail': 'https://i.vimeocdn.com/video/936667051-1647ace66c627d4a2382185e0dae8deb830309bfddd53f8b2367b2f91e92ed0e-d_1280',
-            'series_id': '52733',
-            'uploader_url': 'https://vimeo.com/user30867300',
-            'duration': 426,
-            'uploader_id': 'user30867300',
-            'series': 'AZ-500: Microsoft Azure Security Technologies',
-            'uploader': 'Cybrary',
-            'chapter': 'Implement Network Security',
-            'chapter_id': '52693'
-        },
-        'expected_warnings': ['No authenticators for vimeo']
-    }]
-
-    def _real_extract(self, url):
-        activity_id, enrollment_id = self._match_valid_url(url).group('id', 'enrollment')
-        course = self._call_api('enrollment', enrollment_id)['content']
-        activity = traverse_obj(course, ('learning_modules', ..., 'activities', lambda _, v: int(activity_id) == v['id']), get_all=False)
-
-        if activity.get('type') not in ['Video Activity', 'Lesson Activity']:
-            raise ExtractorError('The activity is not a video', expected=True)
-
-        module = next((m for m in course.get('learning_modules') or []
-                      if int(activity_id) in traverse_obj(m, ('activities', ..., 'id') or [])), None)
-
-        vimeo_id = self._get_vimeo_id(activity_id)
-
-        return {
-            '_type': 'url_transparent',
-            'series': traverse_obj(course, ('content_description', 'title')),
-            'series_id': str_or_none(traverse_obj(course, ('content_description', 'id'))),
-            'id': vimeo_id,
-            'chapter': module.get('title'),
-            'chapter_id': str_or_none(module.get('id')),
-            'title': activity.get('title'),
-            'url': smuggle_url(f'https://player.vimeo.com/video/{vimeo_id}', {'http_headers': {'Referer': 'https://api.cybrary.it'}})
-        }
-
-
-class CybraryCourseIE(CybraryBaseIE):
-    _VALID_URL = r'https://app.cybrary.it/browse/course/(?P<id>[\w-]+)/?(?:$|[#?])'
-    _TESTS = [{
-        'url': 'https://app.cybrary.it/browse/course/az-500-microsoft-azure-security-technologies',
-        'info_dict': {
-            'id': 898,
-            'title': 'AZ-500: Microsoft Azure Security Technologies',
-            'description': 'md5:69549d379c0fc1dec92926d4e8b6fbd4'
-        },
-        'playlist_count': 59
-    }, {
-        'url': 'https://app.cybrary.it/browse/course/cybrary-orientation',
-        'info_dict': {
-            'id': 1245,
-            'title': 'Cybrary Orientation',
-            'description': 'md5:9e69ff66b32fe78744e0ad4babe2e88e'
-        },
-        'playlist_count': 4
-    }]
-
-    def _real_extract(self, url):
-        course_id = self._match_id(url)
-        course = self._call_api('course', course_id)
-        enrollment_info = self._call_api('course_enrollment', course['id'])
-
-        entries = [self.url_result(
-            f'https://app.cybrary.it/immersive/{enrollment_info["id"]}/activity/{activity["id"]}')
-            for activity in traverse_obj(course, ('content_item', 'learning_modules', ..., 'activities', ...))]
-
-        return self.playlist_result(
-            entries,
-            traverse_obj(course, ('content_item', 'id'), expected_type=str_or_none),
-            course.get('title'), course.get('short_description'))

yt_dlp/extractor/daftsex.py

@@ -4,50 +4,30 @@ from __future__ import unicode_literals
 from .common import InfoExtractor
 from ..compat import compat_b64decode
 from ..utils import (
+    get_elements_by_class,
     int_or_none,
     js_to_json,
     parse_count,
     parse_duration,
-    traverse_obj,
     try_get,
-    unified_timestamp,
 )
 
 
 class DaftsexIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?daftsex\.com/watch/(?P<id>-?\d+_\d+)'
     _TESTS = [{
-        'url': 'https://daftsex.com/watch/-35370899_456246186',
-        'md5': 'd95135e6cea2d905bea20dbe82cda64a',
-        'info_dict': {
-            'id': '-35370899_456246186',
-            'ext': 'mp4',
-            'title': 'just relaxing',
-            'description': 'just relaxing - Watch video Watch video in high quality',
-            'upload_date': '20201113',
-            'timestamp': 1605261911,
-            'thumbnail': r're:https://[^/]+/impf/-43BuMDIawmBGr3GLcZ93CYwWf2PBv_tVWoS1A/dnu41DnARU4\.jpg\?size=800x450&quality=96&keep_aspect_ratio=1&background=000000&sign=6af2c26ff4a45e55334189301c867384&type=video_thumb',
-        },
-    }, {
         'url': 'https://daftsex.com/watch/-156601359_456242791',
         'info_dict': {
             'id': '-156601359_456242791',
             'ext': 'mp4',
             'title': 'Skye Blue - Dinner And A Show',
-            'description': 'Skye Blue - Dinner And A Show - Watch video Watch video in high quality',
-            'upload_date': '20200916',
-            'timestamp': 1600250735,
-            'thumbnail': 'https://psv153-1.crazycloud.ru/videos/-156601359/456242791/thumb.jpg?extra=i3D32KaBbBFf9TqDRMAVmQ',
         },
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
-        title = self._html_search_meta('name', webpage, 'title')
+        title = get_elements_by_class('heading', webpage)[-1]
-        timestamp = unified_timestamp(self._html_search_meta('uploadDate', webpage, 'Upload Date', default=None))
-        description = self._html_search_meta('description', webpage, 'Description', default=None)
-
         duration = parse_duration(self._search_regex(
             r'Duration: ((?:[0-9]{2}:){0,2}[0-9]{2})',
             webpage, 'duration', fatal=False))
@@ -72,75 +52,28 @@ class DaftsexIE(InfoExtractor):
             video_id, transform_source=js_to_json)
 
         server_domain = 'https://%s' % compat_b64decode(video_params['server'][::-1]).decode('utf-8')
-
-        cdn_files = traverse_obj(video_params, ('video', 'cdn_files')) or {}
-        if cdn_files:
-            formats = []
-            for format_id, format_data in cdn_files.items():
-                ext, height = format_id.split('_')
-                formats.append({
-                    'format_id': format_id,
-                    'url': f'{server_domain}/videos/{video_id.replace("_", "/")}/{height}.mp4?extra={format_data.split(".")[-1]}',
-                    'height': int_or_none(height),
-                    'ext': ext,
-                })
-            self._sort_formats(formats)
-
-            return {
-                'id': video_id,
-                'title': title,
-                'formats': formats,
-                'description': description,
-                'duration': duration,
-                'thumbnail': try_get(video_params, lambda vi: 'https:' + compat_b64decode(vi['video']['thumb']).decode('utf-8')),
-                'timestamp': timestamp,
-                'view_count': views,
-                'age_limit': 18,
-            }
-
-        item = self._download_json(
-            f'{server_domain}/method/video.get/{video_id}', video_id,
-            headers={'Referer': url}, query={
-                'token': video_params['video']['access_token'],
-                'videos': video_id,
-                'ckey': video_params['c_key'],
-                'credentials': video_params['video']['credentials'],
-            })['response']['items'][0]
-
         formats = []
-        for f_id, f_url in item.get('files', {}).items():
+        for format_id, format_data in video_params['video']['cdn_files'].items():
-            if f_id == 'external':
+            ext, height = format_id.split('_')
-                return self.url_result(f_url)
+            extra_quality_data = format_data.split('.')[-1]
-            ext, height = f_id.split('_')
+            url = f'{server_domain}/videos/{video_id.replace("_", "/")}/{height}.mp4?extra={extra_quality_data}'
-            height_extra_key = traverse_obj(video_params, ('video', 'partial', 'quality', height))
+            formats.append({
-            if height_extra_key:
+                'format_id': format_id,
-                formats.append({
+                'url': url,
-                    'format_id': f'{height}p',
+                'height': int_or_none(height),
-                    'url': f'{server_domain}/{f_url[8:]}&videos={video_id}&extra_key={height_extra_key}',
+                'ext': ext,
-                    'height': int_or_none(height),
+            })
-                    'ext': ext,
-                })
         self._sort_formats(formats)
 
-        thumbnails = []
+        thumbnail = try_get(video_params,
-        for k, v in item.items():
+                            lambda vi: 'https:' + compat_b64decode(vi['video']['thumb']).decode('utf-8'))
-            if k.startswith('photo_') and v:
-                width = k.replace('photo_', '')
-                thumbnails.append({
-                    'id': width,
-                    'url': v,
-                    'width': int_or_none(width),
-                })
 
         return {
             'id': video_id,
             'title': title,
             'formats': formats,
-            'comment_count': int_or_none(item.get('comments')),
-            'description': description,
             'duration': duration,
-            'thumbnails': thumbnails,
+            'thumbnail': thumbnail,
-            'timestamp': timestamp,
             'view_count': views,
             'age_limit': 18,
         }

yt_dlp/extractor/dailymotion.py

@@ -94,10 +94,10 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
     _VALID_URL = r'''(?ix)
                     https?://
                         (?:
-                            (?:(?:www|touch|geo)\.)?dailymotion\.[a-z]{2,3}/(?:(?:(?:(?:embed|swf|\#)/)|player\.html\?)?video|swf)|
+                            (?:(?:www|touch)\.)?dailymotion\.[a-z]{2,3}/(?:(?:(?:embed|swf|\#)/)?video|swf)|
                             (?:www\.)?lequipe\.fr/video
                         )
-                        [/=](?P<id>[^/?_&]+)(?:.+?\bplaylist=(?P<playlist_id>x[0-9a-z]+))?
+                        /(?P<id>[^/?_]+)(?:.+?\bplaylist=(?P<playlist_id>x[0-9a-z]+))?
                     '''
     IE_NAME = 'dailymotion'
     _TESTS = [{
@@ -115,25 +115,6 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
             'uploader_id': 'x1xm8ri',
             'age_limit': 0,
         },
-    }, {
-        'url': 'https://geo.dailymotion.com/player.html?video=x89eyek&mute=true',
-        'md5': 'e2f9717c6604773f963f069ca53a07f8',
-        'info_dict': {
-            'id': 'x89eyek',
-            'ext': 'mp4',
-            'title': "En quête d'esprit du 27/03/2022",
-            'description': 'md5:66542b9f4df2eb23f314fc097488e553',
-            'duration': 2756,
-            'timestamp': 1648383669,
-            'upload_date': '20220327',
-            'uploader': 'CNEWS',
-            'uploader_id': 'x24vth',
-            'age_limit': 0,
-            'view_count': int,
-            'like_count': int,
-            'tags': ['en_quete_d_esprit'],
-            'thumbnail': 'https://s2.dmcdn.net/v/Tncwi1YGKdvFbDuDY/x1080',
-        }
     }, {
         'url': 'https://www.dailymotion.com/video/x2iuewm_steam-machine-models-pricing-listed-on-steam-store-ign-news_videogames',
         'md5': '2137c41a8e78554bb09225b8eb322406',

yt_dlp/extractor/digitalconcerthall.py

@@ -45,7 +45,10 @@ class DigitalConcertHallIE(InfoExtractor):
         'playlist_count': 3,
     }]
 
-    def _perform_login(self, username, password):
+    def _login(self):
+        username, password = self._get_login_info()
+        if not username:
+            self.raise_login_required()
         token_response = self._download_json(
             self._OAUTH_URL,
             None, 'Obtaining token', errnote='Unable to obtain token', data=urlencode_postdata({
@@ -75,8 +78,7 @@ class DigitalConcertHallIE(InfoExtractor):
             self.raise_login_required(msg='Login info incorrect')
 
     def _real_initialize(self):
-        if not self._ACCESS_TOKEN:
+        self._login()
-            self.raise_login_required(method='password')
 
     def _entries(self, items, language, **kwargs):
         for item in items:

yt_dlp/extractor/dropout.py

@@ -123,7 +123,7 @@ class DropoutIE(InfoExtractor):
             self._login(display_id)
             webpage = self._download_webpage(url, display_id, note='Downloading video webpage')
         finally:
-            self._download_webpage('https://www.dropout.tv/logout', display_id, note='Logging out', fatal=False)
+            self._download_webpage('https://www.dropout.tv/logout', display_id, note='Logging out')
 
         embed_url = self._search_regex(r'embed_url:\s*["\'](.+?)["\']', webpage, 'embed url')
         thumbnail = self._og_search_thumbnail(webpage)
@@ -139,7 +139,7 @@ class DropoutIE(InfoExtractor):
             '_type': 'url_transparent',
             'ie_key': VHXEmbedIE.ie_key(),
             'url': embed_url,
-            'id': self._search_regex(r'embed\.vhx\.tv/videos/(.+?)\?', embed_url, 'id'),
+            'id': self._search_regex(r'embed.vhx.tv/videos/(.+?)\?', embed_url, 'id'),
             'display_id': display_id,
             'title': title,
             'description': self._html_search_meta('description', webpage, fatal=False),

yt_dlp/extractor/ellentube.py

@@ -26,7 +26,7 @@ class EllenTubeBaseIE(InfoExtractor):
         duration = None
         for entry in data.get('media'):
             if entry.get('id') == 'm3u8':
-                formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                formats = self._extract_m3u8_formats(
                     entry['url'], video_id, 'mp4',
                     entry_protocol='m3u8_native', m3u8_id='hls')
                 duration = int_or_none(entry.get('duration'))
@@ -48,7 +48,6 @@ class EllenTubeBaseIE(InfoExtractor):
             'view_count': get_insight('view'),
             'like_count': get_insight('like'),
             'formats': formats,
-            'subtitles': subtitles,
         }
 
 

yt_dlp/extractor/elonet.py

@@ -1,22 +1,30 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import re
+
 from .common import InfoExtractor
-from ..utils import determine_ext
+from ..utils import (
+    base_url,
+    ExtractorError,
+    try_get,
+)
+from ..compat import compat_str
 
 
 class ElonetIE(InfoExtractor):
     _VALID_URL = r'https?://elonet\.finna\.fi/Record/kavi\.elonet_elokuva_(?P<id>[0-9]+)'
     _TESTS = [{
+        # m3u8 with subtitles
         'url': 'https://elonet.finna.fi/Record/kavi.elonet_elokuva_107867',
+        'md5': '8efc954b96c543711707f87de757caea',
         'info_dict': {
             'id': '107867',
             'ext': 'mp4',
             'title': 'Valkoinen peura',
-            'thumbnail': r're:^https?://elonet\.finna\.fi/Cover/Show\?id=kavi\.elonet_elokuva_107867.+',
+            'description': 'Valkoinen peura (1952) on Erik Blombergin ohjaama ja yhdessä Mirjami Kuosmasen kanssa käsikirjoittama tarunomainen kertomus valkoisen peuran hahmossa lii...',
-            'description': 'md5:bded4201c9677fab10854884fe8f7312',
+            'thumbnail': 'https://elonet.finna.fi/Cover/Show?id=kavi.elonet_elokuva_107867&index=0&size=large',
         },
-        'params': {'skip_download': 'dash'},
     }, {
         # DASH with subtitles
         'url': 'https://elonet.finna.fi/Record/kavi.elonet_elokuva_116539',
@@ -24,45 +32,58 @@ class ElonetIE(InfoExtractor):
             'id': '116539',
             'ext': 'mp4',
             'title': 'Minulla on tiikeri',
-            'thumbnail': r're:^https?://elonet\.finna\.fi/Cover/Show\?id=kavi\.elonet_elokuva_116539.+',
+            'description': 'Pienellä pojalla, joka asuu kerrostalossa, on kotieläimenä tiikeri. Se on kuitenkin salaisuus. Kerrostalon räpätäti on Kotilaisen täti, joka on aina vali...',
-            'description': 'md5:5ab72b3fe76d3414e46cc8f277104419',
+            'thumbnail': 'https://elonet.finna.fi/Cover/Show?id=kavi.elonet_elokuva_116539&index=0&size=large&source=Solr',
-        },
+        }
-        'params': {'skip_download': 'dash'},
-    }, {
-        # Page with multiple videos, download the main one
-        'url': 'https://elonet.finna.fi/Record/kavi.elonet_elokuva_117396',
-        'info_dict': {
-            'id': '117396',
-            'ext': 'mp4',
-            'title': 'Sampo',
-            'thumbnail': r're:^https?://elonet\.finna\.fi/Cover/Show\?id=kavi\.elonet_elokuva_117396.+',
-            'description': 'md5:ec69572a5b054d0ecafe8086b1fa96f7',
-        },
-        'params': {'skip_download': 'dash'},
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        src = self._parse_json(self._html_search_regex(
+        title = self._html_search_regex(
-            r'id=\'video-data\'[^>]+data-video-sources="([^"]+)"', webpage, 'json'), video_id)[0]['src']
+            r'<meta .*property="og&#x3A;title" .*content="(.+?)"', webpage, 'title')
-        ext = determine_ext(src)
+        description = self._html_search_regex(
+            r'<meta .*property="og&#x3A;description" .*content="(.+?)"', webpage, 'description')
+        thumbnail = self._html_search_regex(
+            r'<meta .*property="og&#x3A;image" .*content="(.+?)"', webpage, 'thumbnail')
 
-        if ext == 'm3u8':
+        json_s = self._html_search_regex(
-            formats, subtitles = self._extract_m3u8_formats_and_subtitles(src, video_id, fatal=False)
+            r'data-video-sources="(.+?)"', webpage, 'json')
-        elif ext == 'mpd':
+        src = try_get(
-            formats, subtitles = self._extract_mpd_formats_and_subtitles(src, video_id, fatal=False)
+            self._parse_json(json_s, video_id),
+            lambda x: x[0]["src"], compat_str)
+        formats = []
+        subtitles = {}
+        if re.search(r'\.m3u8\??', src):
+            res = self._download_webpage_handle(
+                # elonet servers have certificate problems
+                src.replace('https:', 'http:'), video_id,
+                note='Downloading m3u8 information',
+                errnote='Failed to download m3u8 information')
+            if res:
+                doc, urlh = res
+                url = urlh.geturl()
+                formats, subtitles = self._parse_m3u8_formats_and_subtitles(doc, url)
+                for f in formats:
+                    f['ext'] = 'mp4'
+        elif re.search(r'\.mpd\??', src):
+            res = self._download_xml_handle(
+                src, video_id,
+                note='Downloading MPD manifest',
+                errnote='Failed to download MPD manifest')
+            if res:
+                doc, urlh = res
+                url = base_url(urlh.geturl())
+                formats, subtitles = self._parse_mpd_formats_and_subtitles(doc, mpd_base_url=url)
         else:
-            formats, subtitles = [], {}
+            raise ExtractorError("Unknown streaming format")
-            self.raise_no_formats(f'Unknown streaming format {ext}')
-        self._sort_formats(formats)
 
         return {
             'id': video_id,
-            'title': self._og_search_title(webpage),
+            'title': title,
-            'description': self._og_search_description(webpage),
+            'description': description,
-            'thumbnail': self._og_search_thumbnail(webpage),
+            'thumbnail': thumbnail,
             'formats': formats,
             'subtitles': subtitles,
         }

yt_dlp/extractor/eroprofile.py

@@ -39,7 +39,11 @@ class EroProfileIE(InfoExtractor):
         'skip': 'Requires login',
     }]
 
-    def _perform_login(self, username, password):
+    def _login(self):
+        (username, password) = self._get_login_info()
+        if username is None:
+            return
+
         query = compat_urllib_parse_urlencode({
             'username': username,
             'password': password,
@@ -58,6 +62,9 @@ class EroProfileIE(InfoExtractor):
             r'<script[^>]+?src="([^"]+)"', login_page, 'login redirect url')
         self._download_webpage(redirect_url, None, False)
 
+    def _real_initialize(self):
+        self._login()
+
     def _real_extract(self, url):
         display_id = self._match_id(url)
 

yt_dlp/extractor/extractors.py

@@ -44,7 +44,6 @@ from .aenetworks import (
 from .afreecatv import (
     AfreecaTVIE,
     AfreecaTVLiveIE,
-    AfreecaTVUserIE,
 )
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
@@ -123,10 +122,6 @@ from .awaan import (
 )
 from .azmedien import AZMedienIE
 from .baidu import BaiduVideoIE
-from .banbye import (
-    BanByeIE,
-    BanByeChannelIE,
-)
 from .bandaichannel import BandaiChannelIE
 from .bandcamp import (
     BandcampIE,
@@ -323,7 +318,6 @@ from .cpac import (
 from .cozytv import CozyTVIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE
-from .craftsy import CraftsyIE
 from .crooksandliars import CrooksAndLiarsIE
 from .crowdbunker import (
     CrowdBunkerIE,
@@ -346,10 +340,6 @@ from .curiositystream import (
     CuriosityStreamSeriesIE,
 )
 from .cwtv import CWTVIE
-from .cybrary import (
-    CybraryIE,
-    CybraryCourseIE
-)
 from .daftsex import DaftsexIE
 from .dailymail import DailyMailIE
 from .dailymotion import (
@@ -632,7 +622,6 @@ from .hse import (
     HSEProductIE,
 )
 from .huajiao import HuajiaoIE
-from .huya import HuyaLiveIE
 from .huffpost import HuffPostIE
 from .hungama import (
     HungamaIE,
@@ -684,12 +673,6 @@ from .iqiyi import (
     IqIE,
     IqAlbumIE
 )
-
-from .itprotv import (
-    ITProTVIE,
-    ITProTVCourseIE
-)
-
 from .itv import (
     ITVIE,
     ITVBTCCIE,
@@ -701,10 +684,6 @@ from .ivi import (
 from .ivideon import IvideonIE
 from .iwara import IwaraIE
 from .izlesene import IzleseneIE
-from .jable import (
-    JableIE,
-    JablePlaylistIE,
-)
 from .jamendo import (
     JamendoIE,
     JamendoAlbumIE,
@@ -751,11 +730,6 @@ from .laola1tv import (
     EHFTVIE,
     ITTFIE,
 )
-from .lastfm import (
-    LastFMIE,
-    LastFMPlaylistIE,
-    LastFMUserIE,
-)
 from .lbry import (
     LBRYIE,
     LBRYChannelIE,
@@ -920,7 +894,6 @@ from .motherless import (
 )
 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
-from .moviepilot import MoviepilotIE
 from .moviezine import MoviezineIE
 from .movingimage import MovingImageIE
 from .msn import MSNIE
@@ -1179,11 +1152,6 @@ from .palcomp3 import (
     PalcoMP3VideoIE,
 )
 from .pandoratv import PandoraTVIE
-from .panopto import (
-    PanoptoIE,
-    PanoptoListIE,
-    PanoptoPlaylistIE
-)
 from .paramountplus import (
     ParamountPlusIE,
     ParamountPlusSeriesIE,
@@ -1252,7 +1220,6 @@ from .podomatic import PodomaticIE
 from .pokemon import (
     PokemonIE,
     PokemonWatchIE,
-    PokemonSoundLibraryIE,
 )
 from .pokergo import (
     PokerGoIE,
@@ -1988,11 +1955,6 @@ from .washingtonpost import (
     WashingtonPostIE,
     WashingtonPostArticleIE,
 )
-from .wasdtv import (
-    WASDTVStreamIE,
-    WASDTVRecordIE,
-    WASDTVClipIE,
-)
 from .wat import WatIE
 from .watchbox import WatchBoxIE
 from .watchindianporn import WatchIndianPornIE
@@ -2123,17 +2085,18 @@ from .zattoo import (
     EWETVIE,
     GlattvisionTVIE,
     MNetTVIE,
+    MyVisionTVIE,
     NetPlusIE,
     OsnatelTVIE,
     QuantumTVIE,
+    QuicklineIE,
+    QuicklineLiveIE,
     SaltTVIE,
     SAKTVIE,
     VTXTVIE,
     WalyTVIE,
     ZattooIE,
     ZattooLiveIE,
-    ZattooMoviesIE,
-    ZattooRecordingsIE,
 )
 from .zdf import ZDFIE, ZDFChannelIE
 from .zee5 import (

yt_dlp/extractor/facebook.py

@@ -18,7 +18,6 @@ from ..utils import (
     ExtractorError,
     float_or_none,
     get_element_by_id,
-    get_first,
     int_or_none,
     js_to_json,
     merge_dicts,
@@ -329,7 +328,11 @@ class FacebookIE(InfoExtractor):
             urls.append(mobj.group('url'))
         return urls
 
-    def _perform_login(self, username, password):
+    def _login(self):
+        useremail, password = self._get_login_info()
+        if useremail is None:
+            return
+
         login_page_req = sanitized_Request(self._LOGIN_URL)
         self._set_cookie('facebook.com', 'locale', 'en_US')
         login_page = self._download_webpage(login_page_req, None,
@@ -341,7 +344,7 @@ class FacebookIE(InfoExtractor):
         lgnrnd = self._search_regex(r'name="lgnrnd" value="([^"]*?)"', login_page, 'lgnrnd')
 
         login_form = {
-            'email': username,
+            'email': useremail,
             'pass': password,
             'lsd': lsd,
             'lgnrnd': lgnrnd,
@@ -388,6 +391,9 @@ class FacebookIE(InfoExtractor):
             self.report_warning('unable to log in: %s' % error_to_compat_str(err))
             return
 
+    def _real_initialize(self):
+        self._login()
+
     def _extract_from_url(self, url, video_id):
         webpage = self._download_webpage(
             url.replace('://m.facebook.com/', '://www.facebook.com/'), video_id)
@@ -397,13 +403,13 @@ class FacebookIE(InfoExtractor):
                 r'handleWithCustomApplyEach\(\s*ScheduledApplyEach\s*,\s*(\{.+?\})\s*\);', webpage)]
             post = traverse_obj(post_data, (
                 ..., 'require', ..., ..., ..., '__bbox', 'result', 'data'), expected_type=dict) or []
-            media = traverse_obj(
+            media = [m for m in traverse_obj(post, (..., 'attachments', ..., 'media'), expected_type=dict) or []
-                post,
+                     if str(m.get('id')) == video_id and m.get('__typename') == 'Video']
-                (..., 'attachments', ..., 'media', lambda _, m: str(m['id']) == video_id and m['__typename'] == 'Video'),
+            title = traverse_obj(media, (..., 'title', 'text'), get_all=False)
-                expected_type=dict)
+            description = traverse_obj(media, (
-            title = get_first(media, ('title', 'text'))
+                ..., 'creation_story', 'comet_sections', 'message', 'story', 'message', 'text'), get_all=False)
-            description = get_first(media, ('creation_story', 'comet_sections', 'message', 'story', 'message', 'text'))
+            uploader_data = (traverse_obj(media, (..., 'owner'), get_all=False)
-            uploader_data = get_first(media, 'owner') or get_first(post, ('node', 'actors', ...)) or {}
+                             or traverse_obj(post, (..., 'node', 'actors', ...), get_all=False) or {})
 
             page_title = title or self._html_search_regex((
                 r'<h2\s+[^>]*class="uiHeaderTitle"[^>]*>(?P<content>[^<]*)</h2>',

yt_dlp/extractor/fancode.py

@@ -49,26 +49,30 @@ class FancodeVodIE(InfoExtractor):
         'referer': 'https://fancode.com',
     }
 
-    def _perform_login(self, username, password):
+    def _login(self):
         # Access tokens are shortlived, so get them using the refresh token.
-        if username != 'refresh':
+        username, password = self._get_login_info()
+        if username == 'refresh' and password is not None:
+            self.report_login()
+            data = '''{
+                "query":"mutation RefreshToken($refreshToken: String\\u0021) { refreshToken(refreshToken: $refreshToken) { accessToken }}",
+                "variables":{
+                    "refreshToken":"%s"
+                },
+                "operationName":"RefreshToken"
+            }''' % password
+
+            token_json = self.download_gql('refresh token', data, "Getting the Access token")
+            self._ACCESS_TOKEN = try_get(token_json, lambda x: x['data']['refreshToken']['accessToken'])
+            if self._ACCESS_TOKEN is None:
+                self.report_warning('Failed to get Access token')
+            else:
+                self.headers.update({'Authorization': 'Bearer %s' % self._ACCESS_TOKEN})
+        elif username is not None:
             self.report_warning(f'Login using username and password is not currently supported. {self._LOGIN_HINT}')
 
-        self.report_login()
+    def _real_initialize(self):
-        data = '''{
+        self._login()
-            "query":"mutation RefreshToken($refreshToken: String\\u0021) { refreshToken(refreshToken: $refreshToken) { accessToken }}",
-            "variables":{
-                "refreshToken":"%s"
-            },
-            "operationName":"RefreshToken"
-        }''' % password
-
-        token_json = self.download_gql('refresh token', data, "Getting the Access token")
-        self._ACCESS_TOKEN = try_get(token_json, lambda x: x['data']['refreshToken']['accessToken'])
-        if self._ACCESS_TOKEN is None:
-            self.report_warning('Failed to get Access token')
-        else:
-            self.headers.update({'Authorization': 'Bearer %s' % self._ACCESS_TOKEN})
 
     def _check_login_required(self, is_available, is_premium):
         msg = None

yt_dlp/extractor/fc2.py

@@ -212,6 +212,7 @@ class FC2LiveIE(InfoExtractor):
             'Accept': '*/*',
             'User-Agent': std_headers['User-Agent'],
         })
+        ws.__enter__()
 
         self.write_debug('[debug] Sending HLS server request')
 

yt_dlp/extractor/fivetv.py

@@ -75,7 +75,8 @@ class FiveTVIE(InfoExtractor):
              r'<a[^>]+?href="([^"]+)"[^>]+?class="videoplayer"'],
             webpage, 'video url')
 
-        title = self._og_search_title(webpage, default=None) or self._html_extract_title(webpage)
+        title = self._og_search_title(webpage, default=None) or self._search_regex(
+            r'<title>([^<]+)</title>', webpage, 'title')
         duration = int_or_none(self._og_search_property(
             'video:duration', webpage, 'duration', default=None))
 

yt_dlp/extractor/foxgay.py

@@ -29,7 +29,8 @@ class FoxgayIE(InfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        title = remove_end(self._html_extract_title(webpage), ' - Foxgay.com')
+        title = remove_end(self._html_search_regex(
+            r'<title>([^<]+)</title>', webpage, 'title'), ' - Foxgay.com')
         description = get_element_by_id('inf_tit', webpage)
 
         # The default user-agent with foxgay cookies leads to pages without videos

yt_dlp/extractor/fptplay.py

@@ -7,14 +7,12 @@ import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
     join_nonempty,
-    strip_or_none,
 )
 
 
 class FptplayIE(InfoExtractor):
-    _VALID_URL = r'https?://fptplay\.vn/xem-video/[^/]+\-(?P<id>\w+)(?:/tap-(?P<episode>\d+)?/?(?:[?#]|$)|)'
+    _VALID_URL = r'https?://fptplay\.vn/(?P<type>xem-video)/[^/]+\-(?P<id>\w+)(?:/tap-(?P<episode>[^/]+)?/?(?:[?#]|$)|)'
     _GEO_COUNTRIES = ['VN']
     IE_NAME = 'fptplay'
     IE_DESC = 'fptplay.vn'
@@ -24,7 +22,7 @@ class FptplayIE(InfoExtractor):
         'info_dict': {
             'id': '621a123016f369ebbde55945',
             'ext': 'mp4',
-            'title': 'Nhân Duyên Đại Nhân Xin Dừng Bước - Tập 1A',
+            'title': 'Nhân Duyên Đại Nhân Xin Dừng Bước - Ms. Cupid In Love',
             'description': 'md5:23cf7d1ce0ade8e21e76ae482e6a8c6c',
         },
     }, {
@@ -33,42 +31,25 @@ class FptplayIE(InfoExtractor):
         'info_dict': {
             'id': '61f3aa8a6b3b1d2e73c60eb5',
             'ext': 'mp4',
-            'title': 'Má Tôi Là Đại Gia - Tập 3',
+            'title': 'Má Tôi Là Đại Gia - 3',
             'description': 'md5:ff8ba62fb6e98ef8875c42edff641d1c',
         },
-    }, {
-        'url': 'https://fptplay.vn/xem-video/lap-toi-do-giam-under-the-skin-6222d9684ec7230fa6e627a2/tap-4',
-        'md5': 'bcb06c55ec14786d7d4eda07fa1ccbb9',
-        'info_dict': {
-            'id': '6222d9684ec7230fa6e627a2',
-            'ext': 'mp4',
-            'title': 'Lạp Tội Đồ Giám - Tập 2B',
-            'description': 'md5:e5a47e9d35fbf7e9479ca8a77204908b',
-        },
     }, {
         'url': 'https://fptplay.vn/xem-video/nha-co-chuyen-hi-alls-well-ends-well-1997-6218995f6af792ee370459f0',
         'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        video_id, slug_episode = self._match_valid_url(url).group('id', 'episode')
+        type_url, video_id, episode = self._match_valid_url(url).group('type', 'id', 'episode')
-        webpage = self._download_webpage(url, video_id=video_id, fatal=False) or ''
+        webpage = self._download_webpage(url, video_id=video_id, fatal=False)
-        title = self._search_regex(
+        info = self._download_json(self.get_api_with_st_token(video_id, episode or 0), video_id)
-            r'(?s)<h4\s+class="mb-1 text-2xl text-white"[^>]*>(.+)</h4>', webpage, 'title', fatal=False)
-        real_episode = slug_episode if not title else self._search_regex(
-            r'<p.+title="(?P<episode>[^">]+)"\s+class="epi-title active"', webpage, 'episode', fatal=False)
-        title = strip_or_none(title) or self._html_search_meta(('og:title', 'twitter:title'), webpage)
-
-        info = self._download_json(
-            self.get_api_with_st_token(video_id, int(slug_episode) - 1 if slug_episode else 0), video_id)
         formats, subtitles = self._extract_m3u8_formats_and_subtitles(info['data']['url'], video_id, 'mp4')
         self._sort_formats(formats)
         return {
             'id': video_id,
-            'title': join_nonempty(title, real_episode, delim=' - '),
+            'title': join_nonempty(
-            'description': (
+                self._html_search_meta(('og:title', 'twitter:title'), webpage), episode, delim=' - '),
-                clean_html(self._search_regex(r'<p\s+class="overflow-hidden"[^>]*>(.+)</p>', webpage, 'description'))
+            'description': self._html_search_meta(['og:description', 'twitter:description'], webpage),
-                or self._html_search_meta(('og:description', 'twitter:description'), webpage)),
             'formats': formats,
             'subtitles': subtitles,
         }

yt_dlp/extractor/franceculture.py

@@ -1,45 +1,18 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import re
 from .common import InfoExtractor
 from ..utils import (
     determine_ext,
     extract_attributes,
     int_or_none,
-    traverse_obj,
-    unified_strdate,
 )
 
 
 class FranceCultureIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?franceculture\.fr/emissions/(?:[^/]+/)*(?P<id>[^/?#&]+)'
     _TESTS = [{
-        # playlist
+        'url': 'http://www.franceculture.fr/emissions/carnet-nomade/rendez-vous-au-pays-des-geeks',
-        'url': 'https://www.franceculture.fr/emissions/serie/hasta-dente',
-        'playlist_count': 12,
-        'info_dict': {
-            'id': 'hasta-dente',
-            'title': 'Hasta Dente',
-            'description': 'md5:57479af50648d14e9bb649e6b1f8f911',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'upload_date': '20201024',
-        },
-        'playlist': [{
-            'info_dict': {
-                'id': '3c1c2e55-41a0-11e5-9fe0-005056a87c89',
-                'ext': 'mp3',
-                'title': 'Jeudi, vous avez dit bizarre ?',
-                'description': 'md5:47cf1e00cc21c86b0210279996a812c6',
-                'duration': 604,
-                'upload_date': '20201024',
-                'thumbnail': r're:^https?://.*\.jpg$',
-                'timestamp': 1603576680
-            },
-        },
-        ],
-    }, {
-        'url': 'https://www.franceculture.fr/emissions/carnet-nomade/rendez-vous-au-pays-des-geeks',
         'info_dict': {
             'id': 'rendez-vous-au-pays-des-geeks',
             'display_id': 'rendez-vous-au-pays-des-geeks',
@@ -47,9 +20,9 @@ class FranceCultureIE(InfoExtractor):
             'title': 'Rendez-vous au pays des geeks',
             'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20140301',
+            'timestamp': 1393700400,
             'vcodec': 'none',
-            'duration': 3569,
+        }
-        },
     }, {
         # no thumbnail
         'url': 'https://www.franceculture.fr/emissions/la-recherche-montre-en-main/la-recherche-montre-en-main-du-mercredi-10-octobre-2018',
@@ -58,54 +31,9 @@ class FranceCultureIE(InfoExtractor):
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
+
         webpage = self._download_webpage(url, display_id)
 
-        info = {
-            'id': display_id,
-            'title': self._html_search_regex(
-                r'(?s)<h1[^>]*itemprop="[^"]*name[^"]*"[^>]*>(.+?)</h1>',
-                webpage, 'title', default=self._og_search_title(webpage)),
-            'description': self._html_search_regex(
-                r'(?s)<div[^>]+class="excerpt"[^>]*>(.*?)</div>', webpage, 'description', default=None),
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'uploader': self._html_search_regex(
-                r'(?s)<span class="author">(.*?)</span>', webpage, 'uploader', default=None),
-            'upload_date': unified_strdate(self._html_search_regex(
-                r'(?s)class="teaser-text-date".*?(\d{2}/\d{2}/\d{4})', webpage, 'date', default=None)),
-        }
-
-        playlist_data = self._search_regex(
-            r'''(?sx)
-                <section[^>]+data-xiti-place="[^"]*?liste_episodes[^"?]*?"[^>]*>
-                (.*?)
-                </section>
-            ''',
-            webpage, 'playlist data', fatal=False, default=None)
-
-        if playlist_data:
-            entries = []
-            for item, item_description in re.findall(
-                    r'(?s)(<button[^<]*class="[^"]*replay-button[^>]*>).*?<p[^>]*class="[^"]*teaser-text-chapo[^>]*>(.*?)</p>',
-                    playlist_data):
-
-                item_attributes = extract_attributes(item)
-                entries.append({
-                    'id': item_attributes.get('data-emission-uuid'),
-                    'url': item_attributes.get('data-url'),
-                    'title': item_attributes.get('data-diffusion-title'),
-                    'duration': int_or_none(traverse_obj(item_attributes, 'data-duration-seconds', 'data-duration-seconds')),
-                    'description': item_description,
-                    'timestamp': int_or_none(item_attributes.get('data-start-time')),
-                    'thumbnail': info['thumbnail'],
-                    'uploader': info['uploader'],
-                })
-
-            return {
-                '_type': 'playlist',
-                'entries': entries,
-                **info
-            }
-
         video_data = extract_attributes(self._search_regex(
             r'''(?sx)
                 (?:
@@ -115,14 +43,31 @@ class FranceCultureIE(InfoExtractor):
                 (<button[^>]+data-(?:url|asset-source)="[^"]+"[^>]+>)
             ''',
             webpage, 'video data'))
-        video_url = traverse_obj(video_data, 'data-url', 'data-asset-source')
+
+        video_url = video_data.get('data-url') or video_data['data-asset-source']
+        title = video_data.get('data-asset-title') or video_data.get('data-diffusion-title') or self._og_search_title(webpage)
+
+        description = self._html_search_regex(
+            r'(?s)<div[^>]+class="intro"[^>]*>.*?<h2>(.+?)</h2>',
+            webpage, 'description', default=None)
+        thumbnail = self._search_regex(
+            r'(?s)<figure[^>]+itemtype="https://schema.org/ImageObject"[^>]*>.*?<img[^>]+(?:data-dejavu-)?src="([^"]+)"',
+            webpage, 'thumbnail', default=None)
+        uploader = self._html_search_regex(
+            r'(?s)<span class="author">(.*?)</span>',
+            webpage, 'uploader', default=None)
         ext = determine_ext(video_url.lower())
 
         return {
+            'id': display_id,
             'display_id': display_id,
             'url': video_url,
+            'title': title,
+            'description': description,
+            'thumbnail': thumbnail,
             'ext': ext,
             'vcodec': 'none' if ext == 'mp3' else None,
+            'uploader': uploader,
+            'timestamp': int_or_none(video_data.get('data-start-time')) or int_or_none(video_data.get('data-asset-created-date')),
             'duration': int_or_none(video_data.get('data-duration')),
-            **info
         }

yt_dlp/extractor/francetv.py

@@ -187,7 +187,7 @@ class FranceTVIE(InfoExtractor):
                 'protocol': 'mhtml',
                 'url': 'about:invalid',
                 'fragments': [{
-                    'url': sheet,
+                    'path': sheet,
                     # XXX: not entirely accurate; each spritesheet seems to be
                     # a 10×10 grid of thumbnails corresponding to approximately
                     # 2 seconds of the video; the last spritesheet may be shorter

yt_dlp/extractor/frontendmasters.py

@@ -28,7 +28,14 @@ class FrontendMastersBaseIE(InfoExtractor):
         'high': {'width': 1920, 'height': 1080}
     }
 
-    def _perform_login(self, username, password):
+    def _real_initialize(self):
+        self._login()
+
+    def _login(self):
+        (username, password) = self._get_login_info()
+        if username is None:
+            return
+
         login_page = self._download_webpage(
             self._LOGIN_URL, None, 'Downloading login page')