Release 2021.03.03

.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

@@ -1,6 +1 @@
-* text=auto
-
 Makefile* text whitespace=-tab-in-indent
-*.sh text eol=lf
-*.md diff=markdown
-*.py diff=python

.github/FUNDING.yml

@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-
-custom: ['https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators']

.github/ISSUE_TEMPLATE/1_broken_site.md

@@ -0,0 +1,70 @@
+---
+name: Broken site support
+about: Report broken or misfunctioning site
+title: "[Broken]"
+labels: Broken
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
+- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a broken site support
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
+- [ ] I've checked that all provided URLs are alive and playable in a browser
+- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
+- [ ] I've searched the bugtracker for similar issues including closed ones
+
+
+## Verbose log
+
+<!--
+Provide the complete verbose output of yt-dlp that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
+ [debug] System config: []
+ [debug] User config: []
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
+ [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
+ [debug] yt-dlp version 2021.03.01
+ [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
+ [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
+ [debug] Proxy map: {}
+ <more lines>
+-->
+
+```
+PASTE VERBOSE LOG HERE
+
+```
+<!--
+Do not remove the above ```
+-->
+
+
+## Description
+
+<!--
+Provide an explanation of your issue in an arbitrary form. Provide any additional information, suggested solution and as much context and examples as possible.
+If work on your issue requires account credentials please provide them or explain how one can obtain them.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE/1_broken_site.yml

@@ -1,78 +0,0 @@
-name: Broken site
-description: Report broken or misfunctioning site
-labels: [triage, site-bug]
-body:
-  - type: checkboxes
-    attributes:
-      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-      description: Fill all fields even if you think it is irrelevant for the issue
-      options:
-        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
-          required: true
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      options:
-        - label: I'm reporting a broken site
-          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.08.14** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
-          required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
-          required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-        - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
-  - type: input
-    id: region
-    attributes:
-      label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  - type: checkboxes
-    id: verbose
-    attributes:
-      label: Provide verbose output that clearly demonstrates the problem
-      options:
-        - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-          required: true
-        - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
-          required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'test:youtube']
-        [debug] Portable config "yt-dlp.conf": ['-i']
-        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.08.14 [9d339c4] (win32_exe)
-        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
-        [debug] Checking exe version: ffmpeg -bsfs
-        [debug] Checking exe version: ffprobe -bsfs
-        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
-        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
-        [debug] Proxy map: {}
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.08.14, Current version: 2022.08.14
-        yt-dlp is up to date (2022.08.14)
-        <more lines>
-      render: shell
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/2_site_support_request.md

@@ -0,0 +1,56 @@
+---
+name: Site support request
+about: Request support for a new site
+title: "[Site Request]"
+labels: Request
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
+- Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/yt-dlp/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
+- Search the bugtracker for similar site support requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a new site support request
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
+- [ ] I've checked that all provided URLs are alive and playable in a browser
+- [ ] I've checked that none of provided URLs violate any copyrights
+- [ ] I've searched the bugtracker for similar site support requests including closed ones
+
+
+## Example URLs
+
+<!--
+Provide all kinds of example URLs support for which should be included. Replace following example URLs by yours.
+-->
+
+- Single video: https://www.youtube.com/watch?v=BaW_jenozKc
+- Single video: https://youtu.be/BaW_jenozKc
+- Playlist: https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc
+
+
+## Description
+
+<!--
+Provide any additional information.
+If work on your issue requires account credentials please provide them or explain how one can obtain them.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -1,90 +0,0 @@
-name: Site support request
-description: Request support for a new site
-labels: [triage, site-request]
-body:
-  - type: checkboxes
-    attributes:
-      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-      description: Fill all fields even if you think it is irrelevant for the issue
-      options:
-        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
-          required: true
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      options:
-        - label: I'm reporting a new site support request
-          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.08.14** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
-          required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
-          required: true
-        - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-        - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
-  - type: input
-    id: region
-    attributes:
-      label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
-  - type: textarea
-    id: example-urls
-    attributes:
-      label: Example URLs
-      description: |
-        Provide all kinds of example URLs for which support should be added
-      placeholder: |
-        - Single video: https://www.youtube.com/watch?v=BaW_jenozKc
-        - Single video: https://youtu.be/BaW_jenozKc
-        - Playlist: https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  - type: checkboxes
-    id: verbose
-    attributes:
-      label: Provide verbose output that clearly demonstrates the problem
-      options:
-        - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-          required: true
-        - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
-          required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'test:youtube']
-        [debug] Portable config "yt-dlp.conf": ['-i']
-        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.08.14 [9d339c4] (win32_exe)
-        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
-        [debug] Checking exe version: ffmpeg -bsfs
-        [debug] Checking exe version: ffprobe -bsfs
-        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
-        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
-        [debug] Proxy map: {}
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.08.14, Current version: 2022.08.14
-        yt-dlp is up to date (2022.08.14)
-        <more lines>
-      render: shell
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/3_site_feature_request.md

@@ -0,0 +1,40 @@
+---
+name: Site feature request
+about: Request a new functionality for a site
+title: "[Site Request]"
+labels: Request
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar site feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a site feature request
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
+- [ ] I've searched the bugtracker for similar site feature requests including closed ones
+
+
+## Description
+
+<!--
+Provide an explanation of your site feature request in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -1,86 +0,0 @@
-name: Site feature request
-description: Request a new functionality for a supported site
-labels: [triage, site-enhancement]
-body:
-  - type: checkboxes
-    attributes:
-      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-      description: Fill all fields even if you think it is irrelevant for the issue
-      options:
-        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
-          required: true
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      options:
-        - label: I'm requesting a site-specific feature
-          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.08.14** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
-          required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-        - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
-  - type: input
-    id: region
-    attributes:
-      label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
-  - type: textarea
-    id: example-urls
-    attributes:
-      label: Example URLs
-      description: |
-        Example URLs that can be used to demonstrate the requested feature
-      placeholder: |
-        https://www.youtube.com/watch?v=BaW_jenozKc
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  - type: checkboxes
-    id: verbose
-    attributes:
-      label: Provide verbose output that clearly demonstrates the problem
-      options:
-        - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-          required: true
-        - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
-          required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'test:youtube']
-        [debug] Portable config "yt-dlp.conf": ['-i']
-        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.08.14 [9d339c4] (win32_exe)
-        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
-        [debug] Checking exe version: ffmpeg -bsfs
-        [debug] Checking exe version: ffprobe -bsfs
-        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
-        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
-        [debug] Proxy map: {}
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.08.14, Current version: 2022.08.14
-        yt-dlp is up to date (2022.08.14)
-        <more lines>
-      render: shell
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/4_bug_report.md

@@ -0,0 +1,72 @@
+---
+name: Bug report
+about: Report a bug unrelated to any particular site or extractor
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
+- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Read bugs section in FAQ: https://github.com/yt-dlp/yt-dlp
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a broken site support issue
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
+- [ ] I've checked that all provided URLs are alive and playable in a browser
+- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
+- [ ] I've searched the bugtracker for similar bug reports including closed ones
+- [ ] I've read bugs section in FAQ
+
+
+## Verbose log
+
+<!--
+Provide the complete verbose output of yt-dlp that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
+ [debug] System config: []
+ [debug] User config: []
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
+ [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
+ [debug] yt-dlp version 2021.03.01
+ [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
+ [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
+ [debug] Proxy map: {}
+ <more lines>
+-->
+
+```
+PASTE VERBOSE LOG HERE
+
+```
+<!--
+Do not remove the above ```
+-->
+
+
+## Description
+
+<!--
+Provide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
+If work on your issue requires account credentials please provide them or explain how one can obtain them.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -1,71 +0,0 @@
-name: Bug report
-description: Report a bug unrelated to any particular site or extractor
-labels: [triage, bug]
-body:
-  - type: checkboxes
-    attributes:
-      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-      description: Fill all fields even if you think it is irrelevant for the issue
-      options:
-        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
-          required: true
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      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.08.14** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
-          required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
-          required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  - type: checkboxes
-    id: verbose
-    attributes:
-      label: Provide verbose output that clearly demonstrates the problem
-      options:
-        - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-          required: true
-        - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
-          required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'test:youtube']
-        [debug] Portable config "yt-dlp.conf": ['-i']
-        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.08.14 [9d339c4] (win32_exe)
-        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
-        [debug] Checking exe version: ffmpeg -bsfs
-        [debug] Checking exe version: ffprobe -bsfs
-        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
-        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
-        [debug] Proxy map: {}
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.08.14, Current version: 2022.08.14
-        yt-dlp is up to date (2022.08.14)
-        <more lines>
-      render: shell
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/5_feature_request.md

@@ -0,0 +1,40 @@
+---
+name: Feature request
+about: Request a new functionality unrelated to any particular site or extractor
+title: "[Feature Request]"
+labels: Request
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a feature request
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
+- [ ] I've searched the bugtracker for similar feature requests including closed ones
+
+
+## Description
+
+<!--
+Provide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -1,65 +0,0 @@
-name: Feature request
-description: Request a new functionality unrelated to any particular site or extractor
-labels: [triage, enhancement]
-body:
-  - type: checkboxes
-    attributes:
-      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-      description: Fill all fields even if you think it is irrelevant for the issue
-      options:
-        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
-          required: true
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      options:
-        - label: I'm requesting a feature unrelated to a specific site
-          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.08.14** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  - type: checkboxes
-    id: verbose
-    attributes:
-      label: Provide verbose output that clearly demonstrates the problem
-      options:
-        - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-        - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
-  - type: textarea
-    id: log
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'test:youtube']
-        [debug] Portable config "yt-dlp.conf": ['-i']
-        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.08.14 [9d339c4] (win32_exe)
-        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
-        [debug] Checking exe version: ffmpeg -bsfs
-        [debug] Checking exe version: ffprobe -bsfs
-        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
-        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
-        [debug] Proxy map: {}
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.08.14, Current version: 2022.08.14
-        yt-dlp is up to date (2022.08.14)
-        <more lines>
-      render: shell

.github/ISSUE_TEMPLATE/6_question.md

@@ -0,0 +1,40 @@
+---
+name: Ask question
+about: Ask youtube-dl related question
+title: "[Question]"
+labels: question
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- Look through the README (https://github.com/yt-dlp/yt-dlp) and FAQ (https://github.com/yt-dlp/yt-dlp) for similar questions
+- Search the bugtracker for similar questions: https://github.com/yt-dlp/yt-dlp
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm asking a question
+- [ ] I've looked through the README and FAQ for similar questions
+- [ ] I've searched the bugtracker for similar questions including closed ones
+
+
+## Question
+
+<!--
+Ask your question in an arbitrary form. Please make sure it's worded well enough to be understood, see https://github.com/yt-dlp/yt-dlp.
+-->
+
+WRITE QUESTION HERE

.github/ISSUE_TEMPLATE/6_question.yml

@@ -1,71 +0,0 @@
-name: Ask question
-description: Ask yt-dlp related question
-labels: [question]
-body:
-  - type: checkboxes
-    attributes:
-      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-      description: Fill all fields even if you think it is irrelevant for the issue
-      options:
-        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
-          required: true
-  - type: markdown
-    attributes:
-      value: |
-        ### Make sure you are **only** asking a question and not reporting a bug or requesting a feature.
-        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
-        If you are in doubt whether this is the right template, **USE ANOTHER TEMPLATE**!
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      options:
-        - label: I'm asking a question and **not** reporting a bug or requesting a feature
-          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.08.14** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
-          required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
-          required: true
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-  - type: textarea
-    id: question
-    attributes:
-      label: Please make sure the question is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information and as much context and examples as possible
-    validations:
-      required: true
-  - type: checkboxes
-    id: verbose
-    attributes:
-      label: Provide verbose output that clearly demonstrates the problem
-      options:
-        - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-        - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
-  - type: textarea
-    id: log
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'test:youtube']
-        [debug] Portable config "yt-dlp.conf": ['-i']
-        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.08.14 [9d339c4] (win32_exe)
-        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
-        [debug] Checking exe version: ffmpeg -bsfs
-        [debug] Checking exe version: ffprobe -bsfs
-        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
-        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
-        [debug] Proxy map: {}
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.08.14, Current version: 2022.08.14
-        yt-dlp is up to date (2022.08.14)
-        <more lines>
-      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Get help from the community on Discord
-    url: https://discord.gg/H5MNcFW63r
-    about: Join the yt-dlp Discord for community-powered support!
-  - name: Matrix Bridge to the Discord server
-    url: https://matrix.to/#/#yt-dlp:matrix.org
-    about: For those who do not want to use Discord

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md

@@ -0,0 +1,70 @@
+---
+name: Broken site support
+about: Report broken or misfunctioning site
+title: "[Broken]"
+labels: Broken
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
+- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a broken site support
+- [ ] I've verified that I'm running yt-dlp version **%(version)s**
+- [ ] I've checked that all provided URLs are alive and playable in a browser
+- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
+- [ ] I've searched the bugtracker for similar issues including closed ones
+
+
+## Verbose log
+
+<!--
+Provide the complete verbose output of yt-dlp that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
+ [debug] System config: []
+ [debug] User config: []
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
+ [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
+ [debug] yt-dlp version %(version)s
+ [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
+ [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
+ [debug] Proxy map: {}
+ <more lines>
+-->
+
+```
+PASTE VERBOSE LOG HERE
+
+```
+<!--
+Do not remove the above ```
+-->
+
+
+## Description
+
+<!--
+Provide an explanation of your issue in an arbitrary form. Provide any additional information, suggested solution and as much context and examples as possible.
+If work on your issue requires account credentials please provide them or explain how one can obtain them.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml

@@ -1,40 +0,0 @@
-name: Broken site
-description: Report broken or misfunctioning site
-labels: [triage, site-bug]
-body:
-  %(no_skip)s
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      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)
-          required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
-          required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-        - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
-  - type: input
-    id: region
-    attributes:
-      label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  %(verbose)s

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md

@@ -0,0 +1,56 @@
+---
+name: Site support request
+about: Request support for a new site
+title: "[Site Request]"
+labels: Request
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
+- Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/yt-dlp/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
+- Search the bugtracker for similar site support requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a new site support request
+- [ ] I've verified that I'm running yt-dlp version **%(version)s**
+- [ ] I've checked that all provided URLs are alive and playable in a browser
+- [ ] I've checked that none of provided URLs violate any copyrights
+- [ ] I've searched the bugtracker for similar site support requests including closed ones
+
+
+## Example URLs
+
+<!--
+Provide all kinds of example URLs support for which should be included. Replace following example URLs by yours.
+-->
+
+- Single video: https://www.youtube.com/watch?v=BaW_jenozKc
+- Single video: https://youtu.be/BaW_jenozKc
+- Playlist: https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc
+
+
+## Description
+
+<!--
+Provide any additional information.
+If work on your issue requires account credentials please provide them or explain how one can obtain them.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

@@ -1,52 +0,0 @@
-name: Site support request
-description: Request support for a new site
-labels: [triage, site-request]
-body:
-  %(no_skip)s
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      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)
-          required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
-          required: true
-        - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-        - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
-  - type: input
-    id: region
-    attributes:
-      label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
-  - type: textarea
-    id: example-urls
-    attributes:
-      label: Example URLs
-      description: |
-        Provide all kinds of example URLs for which support should be added
-      placeholder: |
-        - Single video: https://www.youtube.com/watch?v=BaW_jenozKc
-        - Single video: https://youtu.be/BaW_jenozKc
-        - Playlist: https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  %(verbose)s

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md

@@ -0,0 +1,40 @@
+---
+name: Site feature request
+about: Request a new functionality for a site
+title: "[Site Request]"
+labels: Request
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar site feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a site feature request
+- [ ] I've verified that I'm running yt-dlp version **%(version)s**
+- [ ] I've searched the bugtracker for similar site feature requests including closed ones
+
+
+## Description
+
+<!--
+Provide an explanation of your site feature request in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -1,48 +0,0 @@
-name: Site feature request
-description: Request a new functionality for a supported site
-labels: [triage, site-enhancement]
-body:
-  %(no_skip)s
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      options:
-        - label: I'm requesting a site-specific feature
-          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)
-          required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-        - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
-  - type: input
-    id: region
-    attributes:
-      label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
-  - type: textarea
-    id: example-urls
-    attributes:
-      label: Example URLs
-      description: |
-        Example URLs that can be used to demonstrate the requested feature
-      placeholder: |
-        https://www.youtube.com/watch?v=BaW_jenozKc
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  %(verbose)s

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md

@@ -0,0 +1,72 @@
+---
+name: Bug report
+about: Report a bug unrelated to any particular site or extractor
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
+- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Read bugs section in FAQ: https://github.com/yt-dlp/yt-dlp
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a broken site support issue
+- [ ] I've verified that I'm running yt-dlp version **%(version)s**
+- [ ] I've checked that all provided URLs are alive and playable in a browser
+- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
+- [ ] I've searched the bugtracker for similar bug reports including closed ones
+- [ ] I've read bugs section in FAQ
+
+
+## Verbose log
+
+<!--
+Provide the complete verbose output of yt-dlp that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
+ [debug] System config: []
+ [debug] User config: []
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
+ [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
+ [debug] yt-dlp version %(version)s
+ [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
+ [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
+ [debug] Proxy map: {}
+ <more lines>
+-->
+
+```
+PASTE VERBOSE LOG HERE
+
+```
+<!--
+Do not remove the above ```
+-->
+
+
+## Description
+
+<!--
+Provide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
+If work on your issue requires account credentials please provide them or explain how one can obtain them.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -1,33 +0,0 @@
-name: Bug report
-description: Report a bug unrelated to any particular site or extractor
-labels: [triage, bug]
-body:
-  %(no_skip)s
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      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)
-          required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
-          required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  %(verbose)s

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.md

@@ -0,0 +1,40 @@
+---
+name: Feature request
+about: Request a new functionality unrelated to any particular site or extractor
+title: "[Feature Request]"
+labels: Request
+assignees: ''
+
+---
+
+<!--
+
+######################################################################
+  WARNING!
+  IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
+######################################################################
+
+-->
+
+
+## Checklist
+
+<!--
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
+-->
+
+- [ ] I'm reporting a feature request
+- [ ] I've verified that I'm running yt-dlp version **%(version)s**
+- [ ] I've searched the bugtracker for similar feature requests including closed ones
+
+
+## Description
+
+<!--
+Provide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
+-->
+
+WRITE DESCRIPTION HERE

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

@@ -1,31 +0,0 @@
-name: Feature request
-description: Request a new functionality unrelated to any particular site or extractor
-labels: [triage, enhancement]
-body:
-  %(no_skip)s
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      options:
-        - label: I'm requesting a feature unrelated to a specific site
-          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)
-          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
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
-    validations:
-      required: true
-  %(verbose_optional)s

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -1,37 +0,0 @@
-name: Ask question
-description: Ask yt-dlp related question
-labels: [question]
-body:
-  %(no_skip)s
-  - type: markdown
-    attributes:
-      value: |
-        ### Make sure you are **only** asking a question and not reporting a bug or requesting a feature.
-        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
-        If you are in doubt whether this is the right template, **USE ANOTHER TEMPLATE**!
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      description: |
-        Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-      options:
-        - label: I'm asking a question and **not** reporting a bug or requesting a feature
-          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)
-          required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
-          required: true
-        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
-          required: true
-  - type: textarea
-    id: question
-    attributes:
-      label: Please make sure the question is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information and as much context and examples as possible
-    validations:
-      required: true
-  %(verbose_optional)s

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,43 +1,28 @@
-**IMPORTANT**: PRs without the template will be CLOSED
-
-### Description of your *pull request* and other information
-
-</details>
-
-<!--
-
-Explanation of your *pull request* in arbitrary form goes here. Please **make sure the description explains the purpose and effect** of your *pull request* and is worded well enough to be understood. Provide as much **context and examples** as possible
-
--->
-
-ADD DESCRIPTION HERE
-
-Fixes #
-
-
-<details open><summary>Template</summary> <!-- OPEN is intentional -->
-
-<!--
-
-# PLEASE FOLLOW THE GUIDE BELOW
+## Please follow the guide below
 
 - You will be asked some questions, please read them **carefully** and answer honestly
-- Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])
+- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])
 - Use *Preview* tab to see how your *pull request* will actually look like
 
--->
+---
 
 ### Before submitting a *pull request* make sure you have:
-- [ ] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)
+- [ ] At least skimmed through [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site) and [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) sections
 - [ ] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
-- [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8) and [ran relevant tests](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions)
+- [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)
 
-### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:
+### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:
 - [ ] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/)
 - [ ] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)
 
 ### What is the purpose of your *pull request*?
-- [ ] Fix or improvement to an extractor (Make sure to add/update tests)
-- [ ] New extractor ([Piracy websites will not be accepted](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy))
-- [ ] Core bug fix/improvement
-- [ ] New feature (It is strongly [recommended to open an issue first](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#adding-new-feature-or-making-overarching-changes))
+- [ ] Bug fix
+- [ ] Improvement
+- [ ] New extractor
+- [ ] New feature
+
+---
+
+### Description of your *pull request* and other information
+
+Explanation of your *pull request* in arbitrary form goes here. Please make sure the description explains the purpose and effect of your *pull request* and is worded well enough to be understood. Provide as much context and examples as possible.

.github/workflows/build.yml

@@ -1,324 +1,177 @@
 name: Build
-on: workflow_dispatch
+
+on:
+  push:
+    branches:
+      - release
 
 jobs:
-  prepare:
-    runs-on: ubuntu-latest
-    outputs:
-      version_suffix: ${{ steps.version_suffix.outputs.version_suffix }}
-      ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
-      head_sha: ${{ steps.push_release.outputs.head_sha }}
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - uses: actions/setup-python@v4
-      with:
-          python-version: '3.10'
+  build_unix:
 
-    - name: Set version suffix
-      id: version_suffix
-      env:
-        PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
-      if: "env.PUSH_VERSION_COMMIT == ''"
-      run: echo ::set-output name=version_suffix::$(date -u +"%H%M%S")
+    runs-on: ubuntu-latest
+
+    outputs:
+      ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      sha2_unix: ${{ steps.sha2_file.outputs.sha2_unix }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+          python-version: '3.8'
+    - name: Install packages
+      run: sudo apt-get -y install zip pandoc man
     - name: Bump version
       id: bump_version
-      run: |
-        python devscripts/update-version.py ${{ steps.version_suffix.outputs.version_suffix }}
-        make issuetemplates
-
-    - name: Push to release
-      id: push_release
-      run: |
-        git config --global user.name github-actions
-        git config --global user.email github-actions@example.com
-        git add -u
-        git commit -m "[version] update" -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all :ci run dl"
-        git push origin --force ${{ github.event.ref }}:release
-        echo ::set-output name=head_sha::$(git rev-parse HEAD)
-    - name: Update master
+      run: python devscripts/update-version.py
+    - name: Print version
+      run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
+    - name: Run Make
+      run: make yt-dlp
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1
       env:
-        PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
-      if: "env.PUSH_VERSION_COMMIT != ''"
-      run: git push origin ${{ github.event.ref }}
-
-
-  build_unix:
-    needs: prepare
-    runs-on: ubuntu-18.04  # Standalone executable should be built on minimum supported OS
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-          python-version: '3.10'
-    - name: Install Requirements
-      run: |
-          sudo apt-get -y install zip pandoc man
-          python -m pip install --upgrade pip setuptools wheel twine
-          python -m pip install Pyinstaller -r requirements.txt
-
-    - name: Prepare
-      run: |
-          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
-          python devscripts/make_lazy_extractors.py
-    - name: Build Unix executables
-      run: |
-          make all tar
-          python pyinst.py --onedir
-          (cd ./dist/yt-dlp_linux && zip -r ../yt-dlp_linux.zip .)
-          python pyinst.py
-    - name: Get SHA2-SUMS
-      id: get_sha
-      run: |
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+        tag_name: ${{ steps.bump_version.outputs.ytdlp_version }}
+        release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlp_version }}
+        body: |
+          Changelog:
+          PLACEHOLDER
+        draft: false
+        prerelease: false
+    - name: Upload yt-dlp Unix binary
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        path: |
-          yt-dlp
-          yt-dlp.tar.gz
-          dist/yt-dlp_linux
-          dist/yt-dlp_linux.zip
-
-    - name: Build and publish on PyPi
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./yt-dlp
+        asset_name: yt-dlp
+        asset_content_type: application/octet-stream
+    - name: Get SHA2-256SUMS for yt-dlp
+      id: sha2_file
+      run: echo "::set-output name=sha2_unix::$(sha256sum yt-dlp | awk '{print $1}')"
+    - name: Install dependencies for pypi
+      env:
+        PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+      if: "env.PYPI_TOKEN != ''"
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+    - name: Build and publish on pypi
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
       if: "env.TWINE_PASSWORD != ''"
       run: |
         rm -rf dist/*
-        python devscripts/set-variant.py pip -M "You installed yt-dlp with pip or using the wheel from PyPi; Use that to update"
         python setup.py sdist bdist_wheel
         twine upload dist/*
 
-    - name: Install SSH private key for Homebrew
-      env:
-        BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
-      if: "env.BREW_TOKEN != ''"
-      uses: yt-dlp/ssh-agent@v0.5.3
-      with:
-          ssh-private-key: ${{ env.BREW_TOKEN }}
-    - name: Update Homebrew Formulae
-      env:
-        BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
-      if: "env.BREW_TOKEN != ''"
-      run: |
-        git clone git@github.com:yt-dlp/homebrew-taps taps/
-        python devscripts/update-formulae.py taps/Formula/yt-dlp.rb "${{ needs.prepare.outputs.ytdlp_version }}"
-        git -C taps/ config user.name github-actions
-        git -C taps/ config user.email github-actions@example.com
-        git -C taps/ commit -am 'yt-dlp: ${{ needs.prepare.outputs.ytdlp_version }}'
-        git -C taps/ push
-
-
-  build_macos:
-    runs-on: macos-11
-    needs: prepare
-
-    steps:
-    - uses: actions/checkout@v3
-    # NB: In order to create a universal2 application, the version of python3 in /usr/bin has to be used
-    - name: Install Requirements
-      run: |
-          brew install coreutils
-          /usr/bin/python3 -m pip install -U --user pip Pyinstaller -r requirements.txt
-
-    - name: Prepare
-      run: |
-          /usr/bin/python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
-          /usr/bin/python3 devscripts/make_lazy_extractors.py
-    - name: Build
-      run: |
-          /usr/bin/python3 pyinst.py --target-architecture universal2 --onedir
-          (cd ./dist/yt-dlp_macos && zip -r ../yt-dlp_macos.zip .)
-          /usr/bin/python3 pyinst.py --target-architecture universal2
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        path: |
-          dist/yt-dlp_macos
-          dist/yt-dlp_macos.zip
-
-
-  build_macos_legacy:
-    runs-on: macos-latest
-    needs: prepare
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Install Python
-      # We need the official Python, because the GA ones only support newer macOS versions
-      env:
-        PYTHON_VERSION: 3.10.5
-        MACOSX_DEPLOYMENT_TARGET: 10.9  # Used up by the Python build tools
-      run: |
-          # Hack to get the latest patch version. Uncomment if needed
-          #brew install python@3.10
-          #export PYTHON_VERSION=$( $(brew --prefix)/opt/python@3.10/bin/python3 --version | cut -d ' ' -f 2 )
-          curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o "python.pkg"
-          sudo installer -pkg python.pkg -target /
-          python3 --version
-    - name: Install Requirements
-      run: |
-          brew install coreutils
-          python3 -m pip install -U --user pip Pyinstaller -r requirements.txt
-
-    - name: Prepare
-      run: |
-          python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
-          python3 devscripts/make_lazy_extractors.py
-    - name: Build
-      run: |
-          python3 pyinst.py
-          mv dist/yt-dlp_macos dist/yt-dlp_macos_legacy
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        path: |
-          dist/yt-dlp_macos_legacy
-
-
   build_windows:
+
     runs-on: windows-latest
-    needs: prepare
+
+    outputs:
+      sha2_windows: ${{ steps.sha2_file_win.outputs.sha2_windows }}
+
+    needs: build_unix
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-      with:  # 3.8 is used for Win7 support
-          python-version: '3.8'
-    - name: Install Requirements
-      run: |  # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
-          python -m pip install --upgrade pip setuptools wheel py2exe
-          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.2-py3-none-any.whl" -r requirements.txt
-
-    - name: Prepare
-      run: |
-          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
-          python devscripts/make_lazy_extractors.py
-    - name: Build
-      run: |
-          python setup.py py2exe
-          Move-Item ./dist/yt-dlp.exe ./dist/yt-dlp_min.exe
-          python pyinst.py
-          python pyinst.py --onedir
-          Compress-Archive -Path ./dist/yt-dlp/* -DestinationPath ./dist/yt-dlp_win.zip
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
       with:
-        path: |
-          dist/yt-dlp.exe
-          dist/yt-dlp_min.exe
-          dist/yt-dlp_win.zip
-
+          python-version: '3.8'
+    - name: Upgrade pip and enable wheel support
+      run: python -m pip install --upgrade pip setuptools wheel
+    - name: Install Requirements
+      run: pip install pyinstaller mutagen pycryptodome
+    - name: Bump version
+      id: bump_version
+      run: python devscripts/update-version.py
+    - name: Print version
+      run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
+    - name: Run PyInstaller Script
+      run: python pyinst.py 64
+    - name: Upload yt-dlp.exe Windows binary
+      id: upload-release-windows
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.build_unix.outputs.upload_url }}
+        asset_path: ./dist/yt-dlp.exe
+        asset_name: yt-dlp.exe
+        asset_content_type: application/vnd.microsoft.portable-executable
+    - name: Get SHA2-256SUMS for yt-dlp.exe
+      id: sha2_file_win
+      run: echo "::set-output name=sha2_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"
 
   build_windows32:
+
     runs-on: windows-latest
-    needs: prepare
+
+    outputs:
+      sha2_windows32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }}
+
+    needs: [build_unix, build_windows]
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-      with:  # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
-          python-version: '3.7'
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.4.4 32-Bit
+      uses: actions/setup-python@v2
+      with:
+          python-version: '3.4.4'
           architecture: 'x86'
-    - name: Install Requirements
-      run: |
-          python -m pip install --upgrade pip setuptools wheel
-          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.2-py3-none-any.whl" -r requirements.txt
-
-    - name: Prepare
-      run: |
-          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
-          python devscripts/make_lazy_extractors.py
-    - name: Build
-      run: |
-          python pyinst.py
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+    - name: Upgrade pip and enable wheel support
+      run: python -m pip install pip==19.1.1 setuptools==43.0.0 wheel==0.33.6
+    - name: Install Requirements for 32 Bit
+      run: pip install pyinstaller==3.5 mutagen==1.42.0 pycryptodome==3.9.4
+    - name: Bump version
+      id: bump_version
+      run: python devscripts/update-version.py
+    - name: Print version
+      run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
+    - name: Run PyInstaller Script for 32 Bit
+      run: python pyinst.py 32
+    - name: Upload Executable yt-dlp_x86.exe
+      id: upload-release-windows32
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        path: |
-          dist/yt-dlp_x86.exe
-
-
-  publish_release:
-    runs-on: ubuntu-latest
-    needs: [prepare, build_unix, build_windows, build_windows32, build_macos, build_macos_legacy]
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
-
-    - name: Get Changelog
+        upload_url: ${{ needs.build_unix.outputs.upload_url }}
+        asset_path: ./dist/yt-dlp_x86.exe
+        asset_name: yt-dlp_x86.exe
+        asset_content_type: application/vnd.microsoft.portable-executable
+    - name: Get SHA2-256SUMS for yt-dlp_x86.exe
+      id: sha2_file_win32
+      run: echo "::set-output name=sha2_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())"
+    - name: Make SHA2-256SUMS file
+      env:
+        SHA2_WINDOWS: ${{ needs.build_windows.outputs.sha2_windows }}
+        SHA2_WINDOWS32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }}
+        SHA2_UNIX: ${{ needs.build_unix.outputs.sha2_unix }}
+        YTDLP_VERSION: ${{ needs.build_unix.outputs.ytdlp_version }}
       run: |
-        changelog=$(grep -oPz '(?s)(?<=### ${{ needs.prepare.outputs.ytdlp_version }}\n{2}).+?(?=\n{2,3}###)' Changelog.md) || true
-        echo "changelog<<EOF" >> $GITHUB_ENV
-        echo "$changelog" >> $GITHUB_ENV
-        echo "EOF" >> $GITHUB_ENV
-    - name: Make Update spec
-      run: |
-        echo "# This file is used for regulating self-update" >> _update_spec
-        echo "lock 2022.07.18 .+ Python 3.6" >> _update_spec
-    - name: Make SHA2-SUMS files
-      run: |
-          sha256sum artifact/yt-dlp | awk '{print $1 "  yt-dlp"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp.tar.gz | awk '{print $1 "  yt-dlp.tar.gz"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp.exe | awk '{print $1 "  yt-dlp.exe"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp_win.zip | awk '{print $1 "  yt-dlp_win.zip"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp_min.exe | awk '{print $1 "  yt-dlp_min.exe"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp_x86.exe | awk '{print $1 "  yt-dlp_x86.exe"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp_macos | awk '{print $1 "  yt-dlp_macos"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp_macos.zip | awk '{print $1 "  yt-dlp_macos.zip"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp_macos_legacy | awk '{print $1 "  yt-dlp_macos_legacy"}' >> SHA2-256SUMS
-          sha256sum artifact/dist/yt-dlp_linux | awk '{print $1 "  yt-dlp_linux"}' >> SHA2-256SUMS
-          sha256sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 "  yt-dlp_linux.zip"}' >> SHA2-256SUMS
-          sha512sum artifact/yt-dlp | awk '{print $1 "  yt-dlp"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp.tar.gz | awk '{print $1 "  yt-dlp.tar.gz"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp.exe | awk '{print $1 "  yt-dlp.exe"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp_win.zip | awk '{print $1 "  yt-dlp_win.zip"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp_min.exe | awk '{print $1 "  yt-dlp_min.exe"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp_x86.exe | awk '{print $1 "  yt-dlp_x86.exe"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp_macos | awk '{print $1 "  yt-dlp_macos"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp_macos.zip | awk '{print $1 "  yt-dlp_macos.zip"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp_macos_legacy | awk '{print $1 "  yt-dlp_macos_legacy"}' >> SHA2-512SUMS
-          sha512sum artifact/dist/yt-dlp_linux | awk '{print $1 "  yt-dlp_linux"}' >> SHA2-512SUMS
-          sha512sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 "  yt-dlp_linux.zip"}' >> SHA2-512SUMS
+        echo "version:${env:YTDLP_VERSION}" >> SHA2-256SUMS
+        echo "yt-dlp.exe:${env:SHA2_WINDOWS}" >> SHA2-256SUMS
+        echo "yt-dlp_x86.exe:${env:SHA2_WINDOWS32}" >> SHA2-256SUMS
+        echo "yt-dlp:${env:SHA2_UNIX}" >> SHA2-256SUMS
 
-    - name: Publish Release
-      uses: yt-dlp/action-gh-release@v1
+    - name: Upload 256SUMS file
+      id: upload-sums
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        tag_name: ${{ needs.prepare.outputs.ytdlp_version }}
-        name: yt-dlp ${{ needs.prepare.outputs.ytdlp_version }}
-        target_commitish: ${{ needs.prepare.outputs.head_sha }}
-        body: |
-          #### [A description of the various files]((https://github.com/yt-dlp/yt-dlp#release-files)) are in the README
-
-          ---
-          <details open><summary><h3>Changelog</summary>
-          <p>
-
-          ${{ env.changelog }}
-
-          </p>
-          </details>
-        files: |
-          SHA2-256SUMS
-          SHA2-512SUMS
-          artifact/yt-dlp
-          artifact/yt-dlp.tar.gz
-          artifact/yt-dlp.exe
-          artifact/yt-dlp_win.zip
-          artifact/yt-dlp_min.exe
-          artifact/yt-dlp_x86.exe
-          artifact/yt-dlp_macos
-          artifact/yt-dlp_macos.zip
-          artifact/yt-dlp_macos_legacy
-          artifact/dist/yt-dlp_linux
-          artifact/dist/yt-dlp_linux.zip
-          _update_spec
+        upload_url: ${{ needs.build_unix.outputs.upload_url }}
+        asset_path: ./SHA2-256SUMS
+        asset_name: SHA2-256SUMS
+        asset_content_type: text/plain

.github/workflows/core.yml

@@ -6,29 +6,49 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
-        os: [ubuntu-latest]
-        # CPython 3.9 is in quick-test
-        python-version: ['3.7', '3.10', 3.11-dev, pypy-3.7, pypy-3.8]
+        os: [ubuntu-18.04]
+        # TODO: python 2.6
+        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
+        python-impl: [cpython]
+        ytdl-test-set: [core]
         run-tests-ext: [sh]
         include:
-        # atleast one of each CPython/PyPy tests must be in windows
+        # python 3.2 is only available on windows via setup-python
         - os: windows-latest
-          python-version: '3.8'
-          run-tests-ext: bat
-        - os: windows-latest
-          python-version: pypy-3.9
+          python-version: 3.2
+          python-impl: cpython
+          ytdl-test-set: core
           run-tests-ext: bat
+        # jython
+        - os: ubuntu-latest
+          python-impl: jython
+          ytdl-test-set: core
+          run-tests-ext: sh
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install pytest
-      run: pip install pytest
+    - name: Set up Java 8
+      if: ${{ matrix.python-impl == 'jython' }}
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: Install Jython
+      if: ${{ matrix.python-impl == 'jython' }}
+      run: |
+        wget http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
+        java -jar jython-installer.jar -s -d "$HOME/jython"
+        echo "$HOME/jython/bin" >> $GITHUB_PATH
+    - name: Install nose
+      run: pip install nose
     - name: Run tests
-      continue-on-error: False
-      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} core
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
+      env:
+        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}
   # Linter is in quick-test

.github/workflows/download.yml

@@ -1,48 +1,53 @@
 name: Download Tests
 on: [push, pull_request]
 jobs:
-  quick:
-    name: Quick Download Tests
+  tests:
+    name: Download Tests
     if: "contains(github.event.head_commit.message, 'ci run dl')"
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-    - name: Install test requirements
-      run: pip install pytest
-    - name: Run tests
-      continue-on-error: true
-      run: ./devscripts/run_tests.sh download
-
-  full:
-    name: Full Download Tests
-    if: "contains(github.event.head_commit.message, 'ci run dl all')"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
-        python-version: ['3.7', '3.10', 3.11-dev, pypy-3.7, pypy-3.8]
+        os: [ubuntu-18.04]
+        # TODO: python 2.6
+        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
+        python-impl: [cpython]
+        ytdl-test-set: [download]
         run-tests-ext: [sh]
         include:
-        # atleast one of each CPython/PyPy tests must be in windows
+        # python 3.2 is only available on windows via setup-python
         - os: windows-latest
-          python-version: '3.8'
-          run-tests-ext: bat
-        - os: windows-latest
-          python-version: pypy-3.9
+          python-version: 3.2
+          python-impl: cpython
+          ytdl-test-set: download
           run-tests-ext: bat
+        # jython - disable for now since it takes too long to complete
+        # - os: ubuntu-latest
+        #   python-impl: jython
+        #   ytdl-test-set: download
+        #   run-tests-ext: sh
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install pytest
-      run: pip install pytest
+    - name: Set up Java 8
+      if: ${{ matrix.python-impl == 'jython' }}
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: Install Jython
+      if: ${{ matrix.python-impl == 'jython' }}
+      run: |
+        wget http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
+        java -jar jython-installer.jar -s -d "$HOME/jython"
+        echo "$HOME/jython/bin" >> $GITHUB_PATH
+    - name: Install nose
+      run: pip install nose
     - name: Run tests
-      continue-on-error: true
-      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} download
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
+      env:
+        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}

.github/workflows/quick-test.yml

@@ -6,28 +6,28 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
       with:
         python-version: 3.9
-    - name: Install test requirements
-      run: pip install pytest pycryptodomex
+    - name: Install nose
+      run: pip install nose
     - name: Run tests
-      run: ./devscripts/run_tests.sh core
+      env:
+        YTDL_TEST_SET: core
+      run: ./devscripts/run_tests.sh
   flake8:
     name: Linter
     if: "!contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
       with:
         python-version: 3.9
     - name: Install flake8
       run: pip install flake8
-    - name: Make lazy extractors
-      run: python devscripts/make_lazy_extractors.py
     - name: Run flake8
-      run: flake8 .
+      run: flake8 .

.gitignore

@@ -1,67 +1,6 @@
-# Config
-*.conf
-cookies
-*cookies.txt
-.netrc
-
-# Downloaded
-*.annotations.xml
-*.aria2
-*.description
-*.dump
-*.frag
-*.frag.aria2
-*.frag.urls
-*.info.json
-*.live_chat.json
-*.meta
-*.part*
-*.tmp
-*.temp
-*.unknown_video
-*.ytdl
-.cache/
-
-*.3gp
-*.ape
-*.ass
-*.avi
-*.desktop
-*.f4v
-*.flac
-*.flv
-*.jpeg
-*.jpg
-*.m4a
-*.mpga
-*.m4v
-*.mhtml
-*.mkv
-*.mov
-*.mp3
-*.mp4
-*.ogg
-*.opus
-*.png
-*.sbv
-*.srt
-*.swf
-*.swp
-*.ttml
-*.url
-*.vtt
-*.wav
-*.webloc
-*.webm
-*.webp
-
-# Allow config/media files in testdata
-!test/**
-
 # Python
 *.pyc
 *.pyo
-.pytest_cache
 wine-py2exe/
 py2exe.log
 build/
@@ -84,7 +23,6 @@ updates_key.pem
 *.egg-info
 .tox
 *.class
-*.isorted
 
 # Generated
 AUTHORS
@@ -93,10 +31,10 @@ README.txt
 *.1
 *.bash-completion
 *.fish
+*.exe
 *.tar.gz
 *.zsh
 *.spec
-test/testdata/sigs/player-*.js
 
 # Binary
 /youtube-dl
@@ -105,12 +43,52 @@ test/testdata/sigs/player-*.js
 yt-dlp.zip
 *.exe
 
+# Downloaded
+*.srt
+*.ttml
+*.sbv
+*.vtt
+*.flv
+*.mp4
+*.m4a
+*.m4v
+*.mp3
+*.3gp
+*.webm
+*.wav
+*.ape
+*.mkv
+*.swf
+*.part
+*.ytdl
+*.dump
+*.frag
+*.frag.urls
+*.aria2
+*.swp
+*.ogg
+*.opus
+*.info.json
+*.live_chat.json
+*.jpg
+*.png
+*.webp
+*.annotations.xml
+*.description
+
+# Config
+*.conf
+*.spec
+cookies
+cookies.txt
+
+
+
 # Text Editor / IDE
 .idea
 *.iml
 .vscode
 *.sublime-*
-*.code-workspace
 
 # Lazy extractors
 */extractor/lazy_extractors.py
@@ -119,6 +97,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

@@ -1,63 +1,26 @@
-# CONTRIBUTING TO YT-DLP
-
-- [OPENING AN ISSUE](#opening-an-issue)
-    - [Is the description of the issue itself sufficient?](#is-the-description-of-the-issue-itself-sufficient)
-    - [Are you using the latest version?](#are-you-using-the-latest-version)
-    - [Is the issue already documented?](#is-the-issue-already-documented)
-    - [Why are existing options not enough?](#why-are-existing-options-not-enough)
-    - [Have you read and understood the changes, between youtube-dl and yt-dlp](#have-you-read-and-understood-the-changes-between-youtube-dl-and-yt-dlp)
-    - [Is there enough context in your bug report?](#is-there-enough-context-in-your-bug-report)
-    - [Does the issue involve one problem, and one problem only?](#does-the-issue-involve-one-problem-and-one-problem-only)
-    - [Is anyone going to need the feature?](#is-anyone-going-to-need-the-feature)
-    - [Is your question about yt-dlp?](#is-your-question-about-yt-dlp)
-    - [Are you willing to share account details if needed?](#are-you-willing-to-share-account-details-if-needed)
-    - [Is the website primarily used for piracy](#is-the-website-primarily-used-for-piracy)
-- [DEVELOPER INSTRUCTIONS](#developer-instructions)
-    - [Adding new feature or making overarching changes](#adding-new-feature-or-making-overarching-changes)
-    - [Adding support for a new site](#adding-support-for-a-new-site)
-    - [yt-dlp coding conventions](#yt-dlp-coding-conventions)
-        - [Mandatory and optional metafields](#mandatory-and-optional-metafields)
-        - [Provide fallbacks](#provide-fallbacks)
-        - [Regular expressions](#regular-expressions)
-        - [Long lines policy](#long-lines-policy)
-        - [Quotes](#quotes)
-        - [Inline values](#inline-values)
-        - [Collapse fallbacks](#collapse-fallbacks)
-        - [Trailing parentheses](#trailing-parentheses)
-        - [Use convenience conversion and parsing functions](#use-convenience-conversion-and-parsing-functions)
-    - [My pull request is labeled pending-fixes](#my-pull-request-is-labeled-pending-fixes)
-- [EMBEDDING YT-DLP](README.md#embedding-yt-dlp)
-
-
-
-# OPENING AN ISSUE
-
-Bugs and suggestions should be reported at: [yt-dlp/yt-dlp/issues](https://github.com/yt-dlp/yt-dlp/issues). Unless you were prompted to or there is another pertinent reason (e.g. GitHub fails to accept the bug report), please do not send bug reports via personal email. For discussions, join us in our [discord server](https://discord.gg/H5MNcFW63r).
-
-**Please include the full output of yt-dlp when run with `-vU`**, i.e. **add** `-vU` flag to **your command line**, copy the **whole** output and post it in the issue body wrapped in \`\`\` for better formatting. It should look similar to this:
+**Please include the full output of youtube-dl when run with `-v`**, i.e. **add** `-v` flag to **your command line**, copy the **whole** output and post it in the issue body wrapped in \`\`\` for better formatting. It should look similar to this:
 ```
-$ yt-dlp -vU <your command line>
-[debug] Command-line config: ['-v', 'demo.com']
-[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, pref UTF-8
-[debug] yt-dlp version 2021.09.25 (zip)
-[debug] Python version 3.8.10 (CPython 64bit) - Linux-5.4.0-74-generic-x86_64-with-glibc2.29
-[debug] exe versions: ffmpeg 4.2.4, ffprobe 4.2.4
+$ youtube-dl -v <your command line>
+[debug] System config: []
+[debug] User config: []
+[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=BaW_jenozKcj']
+[debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
+[debug] youtube-dl version 2015.12.06
+[debug] Git HEAD: 135392e
+[debug] Python version 2.6.6 - Windows-2003Server-5.2.3790-SP2
+[debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
 [debug] Proxy map: {}
-Current Build Hash 25cc412d1d3c0725a1f2f5b7e4682f6fb40e6d15f7024e96f7afd572e9919535
-yt-dlp is up to date (2021.09.25)
 ...
 ```
 **Do not post screenshots of verbose logs; only plain text is acceptable.**
 
-The output (including the first lines) contains important debugging information. Issues without the full output are often not reproducible and therefore will be closed as `incomplete`.
-
-The templates provided for the Issues, should be completed and **not removed**, this helps aide the resolution of the issue.
+The output (including the first lines) contains important debugging information. Issues without the full output are often not reproducible and therefore do not get solved in short order, if ever.
 
 Please re-read your issue once again to avoid a couple of common mistakes (you can and should use this as a checklist):
 
 ### Is the description of the issue itself sufficient?
 
-We often get issue reports that we cannot really decipher. While in most cases we eventually get the required information after asking back multiple times, this poses an unnecessary drain on our resources.
+We often get issue reports that we cannot really decipher. While in most cases we eventually get the required information after asking back multiple times, this poses an unnecessary drain on our resources. Many contributors, including myself, are also not native speakers, so we may misread some parts.
 
 So please elaborate on what feature you are requesting, or what bug you want to be fixed. Make sure that it's obvious
 
@@ -65,31 +28,25 @@ ### Is the description of the issue itself sufficient?
 - How it could be fixed
 - How your proposed solution would look like
 
-If your report is shorter than two lines, it is almost certainly missing some of these, which makes it hard for us to respond to it. We're often too polite to close the issue outright, but the missing info makes misinterpretation likely. We often get frustrated by these issues, since the only possible way for us to move forward on them is to ask for clarification over and over.
+If your report is shorter than two lines, it is almost certainly missing some of these, which makes it hard for us to respond to it. We're often too polite to close the issue outright, but the missing info makes misinterpretation likely. As a committer myself, I often get frustrated by these issues, since the only possible way for me to move forward on them is to ask for clarification over and over.
 
-For bug reports, this means that your report should contain the **complete** output of yt-dlp when called with the `-vU` flag. The error message you get for (most) bugs even says so, but you would not believe how many of our bug reports do not contain this information.
+For bug reports, this means that your report should contain the *complete* output of youtube-dl when called with the `-v` flag. The error message you get for (most) bugs even says so, but you would not believe how many of our bug reports do not contain this information.
 
-If the error is `ERROR: Unable to extract ...` and you cannot reproduce it from multiple countries, add `--write-pages` and upload the `.dump` files you get [somewhere](https://gist.github.com).
+If your server has multiple IPs or you suspect censorship, adding `--call-home` may be a good idea to get more diagnostics. If the error is `ERROR: Unable to extract ...` and you cannot reproduce it from multiple countries, add `--dump-pages` (warning: this will yield a rather large output, redirect it to the file `log.txt` by adding `>log.txt 2>&1` to your command-line) or upload the `.dump` files you get when you add `--write-pages` [somewhere](https://gist.github.com/).
 
 **Site support requests must contain an example URL**. An example URL is a URL you might want to download, like `https://www.youtube.com/watch?v=BaW_jenozKc`. There should be an obvious video present. Except under very special circumstances, the main page of a video service (e.g. `https://www.youtube.com/`) is *not* an example URL.
 
 ###  Are you using the latest version?
 
-Before reporting any issue, type `yt-dlp -U`. This should report that you're up-to-date. This goes for feature requests as well.
+Before reporting any issue, type `youtube-dl -U`. This should report that you're up-to-date. About 20% of the reports we receive are already fixed, but people are using outdated versions. This goes for feature requests as well.
 
 ###  Is the issue already documented?
 
-Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/yt-dlp/yt-dlp/search?type=Issues) of this repository. If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2021.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
-
-Additionally, it is also helpful to see if the issue has already been documented in the [youtube-dl issue tracker](https://github.com/ytdl-org/youtube-dl/issues). If similar issues have already been reported in youtube-dl (but not in our issue tracker), links to them can be included in your issue report here.
+Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/ytdl-org/youtube-dl/search?type=Issues) of this repository. If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2015.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
 
 ###  Why are existing options not enough?
 
-Before requesting a new feature, please have a quick peek at [the list of supported options](README.md#usage-and-options). Many feature requests are for features that actually exist already! Please, absolutely do show off your work in the issue report and detail how the existing similar options do *not* solve your problem.
-
-###  Have you read and understood the changes, between youtube-dl and yt-dlp
-
-There are many changes between youtube-dl and yt-dlp [(changes to default behavior)](README.md#differences-in-default-behavior), and some of the options available have a different behaviour in yt-dlp, or have been removed all together [(list of changes to options)](README.md#deprecated-options). Make sure you have read and understand the differences in the options and how this may impact your downloads before opening an issue.
+Before requesting a new feature, please have a quick peek at [the list of supported options](https://github.com/ytdl-org/youtube-dl/blob/master/README.md#options). Many feature requests are for features that actually exist already! Please, absolutely do show off your work in the issue report and detail how the existing similar options do *not* solve your problem.
 
 ###  Is there enough context in your bug report?
 
@@ -101,89 +58,68 @@ ###  Does the issue involve one problem, and one problem only?
 
 Some of our users seem to think there is a limit of issues they can or should open. There is no limit of issues they can or should open. While it may seem appealing to be able to dump all your issues into one ticket, that means that someone who solves one of your issues cannot mark the issue as closed. Typically, reporting a bunch of issues leads to the ticket lingering since nobody wants to attack that behemoth, until someone mercifully splits the issue into multiple ones.
 
-In particular, every site support request issue should only pertain to services at one site (generally under a common domain, but always using the same backend technology). Do not request support for vimeo user videos, White house podcasts, and Google Plus pages in the same issue. Also, make sure that you don't post bug reports alongside feature requests. As a rule of thumb, a feature request does not include outputs of yt-dlp that are not immediately related to the feature at hand. Do not post reports of a network error alongside the request for a new video service.
+In particular, every site support request issue should only pertain to services at one site (generally under a common domain, but always using the same backend technology). Do not request support for vimeo user videos, White house podcasts, and Google Plus pages in the same issue. Also, make sure that you don't post bug reports alongside feature requests. As a rule of thumb, a feature request does not include outputs of youtube-dl that are not immediately related to the feature at hand. Do not post reports of a network error alongside the request for a new video service.
 
 ###  Is anyone going to need the feature?
 
 Only post features that you (or an incapacitated friend you can personally talk to) require. Do not post features because they seem like a good idea. If they are really useful, they will be requested by someone who requires them.
 
-###  Is your question about yt-dlp?
-
-Some bug reports are completely unrelated to yt-dlp and relate to a different, or even the reporter's own, application. Please make sure that you are actually using yt-dlp. If you are using a UI for yt-dlp, report the bug to the maintainer of the actual application providing the UI. In general, if you are unable to provide the verbose log, you should not be opening the issue here.
-
-If the issue is with `youtube-dl` (the upstream fork of yt-dlp) and not with yt-dlp, the issue should be raised in the youtube-dl project.
-
-### Are you willing to share account details if needed?
-
-The maintainers and potential contributors of the project often do not have an account for the website you are asking support for. So any developer interested in solving your issue may ask you for account details. It is your personal discretion whether you are willing to share the account in order for the developer to try and solve your issue. However, if you are unwilling or unable to provide details, they obviously cannot work on the issue and it cannot be solved unless some developer who both has an account and is willing/able to contribute decides to solve it.
-
-By sharing an account with anyone, you agree to bear all risks associated with it. The maintainers and yt-dlp can't be held responsible for any misuse of the credentials.
-
-While these steps won't necessarily ensure that no misuse of the account takes place, these are still some good practices to follow.
-
-- Look for people with `Member` (maintainers of the project) or `Contributor` (people who have previously contributed code) tag on their messages.
-- Change the password before sharing the account to something random (use [this](https://passwordsgenerator.net/) if you don't have a random password generator).
-- Change the password after receiving the account back.
-
-### Is the website primarily used for piracy?
-
-We follow [youtube-dl's policy](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) to not support services that is primarily used for infringing copyright. Additionally, it has been decided to not to support porn sites that specialize in deep fake. We also cannot support any service that serves only [DRM protected content](https://en.wikipedia.org/wiki/Digital_rights_management). 
-
-
+###  Is your question about youtube-dl?
 
+It may sound strange, but some bug reports we receive are completely unrelated to youtube-dl and relate to a different, or even the reporter's own, application. Please make sure that you are actually using youtube-dl. If you are using a UI for youtube-dl, report the bug to the maintainer of the actual application providing the UI. On the other hand, if your UI for youtube-dl fails in some way you believe is related to youtube-dl, by all means, go ahead and report the bug.
 
 # DEVELOPER INSTRUCTIONS
 
-Most users do not need to build yt-dlp and can [download the builds](https://github.com/yt-dlp/yt-dlp/releases) or get them via [the other installation methods](README.md#installation).
+Most users do not need to build youtube-dl and can [download the builds](https://ytdl-org.github.io/youtube-dl/download.html) or get them from their distribution.
 
-To run yt-dlp as a developer, you don't need to build anything either. Simply execute
+To run youtube-dl as a developer, you don't need to build anything either. Simply execute
 
-    python -m yt_dlp
+    python -m youtube_dl
 
 To run the test, simply invoke your favorite test runner, or execute a test file directly; any of the following work:
 
     python -m unittest discover
     python test/test_download.py
     nosetests
-    pytest
 
 See item 6 of [new extractor tutorial](#adding-support-for-a-new-site) for how to run extractor specific test cases.
 
-If you want to create a build of yt-dlp yourself, you can follow the instructions [here](README.md#compile).
+If you want to create a build of youtube-dl yourself, you'll need
 
+* python
+* make (only GNU make is supported)
+* pandoc
+* zip
+* nosetests
 
-## Adding new feature or making overarching changes
+### Adding support for a new site
 
-Before you start writing code for implementing a new feature, open an issue explaining your feature request and atleast one use case. This allows the maintainers to decide whether such a feature is desired for the project in the first place, and will provide an avenue to discuss some implementation details. If you open a pull request for a new feature without discussing with us first, do not be surprised when we ask for large changes to the code, or even reject it outright.
-
-The same applies for changes to the documentation, code style, or overarching changes to the architecture
-
-
-## Adding support for a new site
-
-If you want to add support for a new site, first of all **make sure** this site is **not dedicated to [copyright infringement](https://www.github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free)**. yt-dlp does **not support** such sites thus pull requests adding support for them **will be rejected**.
+If you want to add support for a new site, first of all **make sure** this site is **not dedicated to [copyright infringement](README.md#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free)**. youtube-dl does **not support** such sites thus pull requests adding support for them **will be rejected**.
 
 After you have ensured this site is distributing its content legally, you can follow this quick list (assuming your service is called `yourextractor`):
 
-1. [Fork this repository](https://github.com/yt-dlp/yt-dlp/fork)
-1. Check out the source code with:
+1. [Fork this repository](https://github.com/ytdl-org/youtube-dl/fork)
+2. Check out the source code with:
 
-        git clone git@github.com:YOUR_GITHUB_USERNAME/yt-dlp.git
+        git clone git@github.com:YOUR_GITHUB_USERNAME/youtube-dl.git
 
-1. Start a new git branch with
+3. Start a new git branch with
 
-        cd yt-dlp
+        cd youtube-dl
         git checkout -b yourextractor
 
-1. Start with this simple template and save it to `yt_dlp/extractor/yourextractor.py`:
+4. Start with this simple template and save it to `youtube_dl/extractor/yourextractor.py`:
 
     ```python
+    # coding: utf-8
+    from __future__ import unicode_literals
+
     from .common import InfoExtractor
-    
-    
+
+
     class YourExtractorIE(InfoExtractor):
         _VALID_URL = r'https?://(?:www\.)?yourextractor\.com/watch/(?P<id>[0-9]+)'
-        _TESTS = [{
+        _TEST = {
             'url': 'https://yourextractor.com/watch/42',
             'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)',
             'info_dict': {
@@ -195,14 +131,14 @@ ## Adding support for a new site
                 # * A value
                 # * MD5 checksum; start the string with md5:
                 # * A regular expression; start the string with re:
-                # * Any Python type, e.g. int or float
+                # * Any Python type (for example int or float)
             }
-        }]
+        }
 
         def _real_extract(self, url):
             video_id = self._match_id(url)
             webpage = self._download_webpage(url, video_id)
-    
+
             # TODO more code goes here, for example ...
             title = self._html_search_regex(r'<h1>(.+?)</h1>', webpage, 'title')
 
@@ -211,59 +147,45 @@ ## Adding support for a new site
                 'title': title,
                 'description': self._og_search_description(webpage),
                 'uploader': self._search_regex(r'<div[^>]+id="uploader"[^>]*>([^<]+)<', webpage, 'uploader', fatal=False),
-                # TODO more properties (see yt_dlp/extractor/common.py)
+                # TODO more properties (see youtube_dl/extractor/common.py)
             }
     ```
-1. Add an import in [`yt_dlp/extractor/_extractors.py`](yt_dlp/extractor/_extractors.py). Note that the class name must end with `IE`.
-1. Run `python test/test_download.py TestDownload.test_YourExtractor` (note that `YourExtractor` doesn't end with `IE`). This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, the tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in. You can also run all the tests in one go with `TestDownload.test_YourExtractor_all`
-1. Make sure you have atleast one test for your extractor. Even if all videos covered by the extractor are expected to be inaccessible for automated testing, tests should still be added with a `skip` parameter indicating why the particular test is disabled from running.
-1. Have a look at [`yt_dlp/extractor/common.py`](yt_dlp/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](yt_dlp/extractor/common.py#L91-L426). Add tests and code for as many as you want.
-1. Make sure your code follows [yt-dlp coding conventions](#yt-dlp-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
+5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
+6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
+7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
+8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
 
-        $ flake8 yt_dlp/extractor/yourextractor.py
+        $ flake8 youtube_dl/extractor/yourextractor.py
 
-1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython and PyPy for Python 3.7 and above. Backward compatibility is not required for even older versions of Python.
-1. When the tests pass, [add](https://git-scm.com/docs/git-add) the new files, [commit](https://git-scm.com/docs/git-commit) them and [push](https://git-scm.com/docs/git-push) the result, like this:
+9. Make sure your code works under all [Python](https://www.python.org/) versions claimed supported by youtube-dl, namely 2.6, 2.7, and 3.2+.
+10. When the tests pass, [add](https://git-scm.com/docs/git-add) the new files and [commit](https://git-scm.com/docs/git-commit) them and [push](https://git-scm.com/docs/git-push) the result, like this:
 
-        $ git add yt_dlp/extractor/_extractors.py
-        $ git add yt_dlp/extractor/yourextractor.py
-        $ git commit -m '[yourextractor] Add extractor'
+        $ git add youtube_dl/extractor/extractors.py
+        $ git add youtube_dl/extractor/yourextractor.py
+        $ git commit -m '[yourextractor] Add new extractor'
         $ git push origin yourextractor
 
-1. Finally, [create a pull request](https://help.github.com/articles/creating-a-pull-request). We'll then review and merge it.
+11. Finally, [create a pull request](https://help.github.com/articles/creating-a-pull-request). We'll then review and merge it.
 
 In any case, thank you very much for your contributions!
 
-**Tip:** To test extractors that require login information, create a file `test/local_parameters.json` and add `"usenetrc": true` or your username and password in it:
-```json
-{
-    "username": "your user name",
-    "password": "your password"
-}
-```
-
-## yt-dlp coding conventions
+## youtube-dl coding conventions
 
 This section introduces a guide lines for writing idiomatic, robust and future-proof extractor code.
 
-Extractors are very fragile by nature since they depend on the layout of the source data provided by 3rd party media hosters out of your control and this layout tends to change. As an extractor implementer your task is not only to write code that will extract media links and metadata correctly but also to minimize dependency on the source's layout and even to make the code foresee potential future changes and be ready for that. This is important because it will allow the extractor not to break on minor layout changes thus keeping old yt-dlp versions working. Even though this breakage issue may be easily fixed by a new version of yt-dlp, this could take some time, during which the the extractor will remain broken.
-
+Extractors are very fragile by nature since they depend on the layout of the source data provided by 3rd party media hosters out of your control and this layout tends to change. As an extractor implementer your task is not only to write code that will extract media links and metadata correctly but also to minimize dependency on the source's layout and even to make the code foresee potential future changes and be ready for that. This is important because it will allow the extractor not to break on minor layout changes thus keeping old youtube-dl versions working. Even though this breakage issue is easily fixed by emitting a new version of youtube-dl with a fix incorporated, all the previous versions become broken in all repositories and distros' packages that may not be so prompt in fetching the update from us. Needless to say, some non rolling release distros may never receive an update at all.
 
 ### Mandatory and optional metafields
 
-For extraction to work yt-dlp relies on metadata your extractor extracts and provides to yt-dlp expressed by an [information dictionary](yt_dlp/extractor/common.py#L91-L426) or simply *info dict*. Only the following meta fields in the *info dict* are considered mandatory for a successful extraction process by yt-dlp:
+For extraction to work youtube-dl relies on metadata your extractor extracts and provides to youtube-dl expressed by an [information dictionary](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303) or simply *info dict*. Only the following meta fields in the *info dict* are considered mandatory for a successful extraction process by youtube-dl:
 
  - `id` (media identifier)
  - `title` (media title)
  - `url` (media download URL) or `formats`
 
-The aforementioned metafields are the critical data that the extraction does not make any sense without and if any of them fail to be extracted then the extractor is considered completely broken. While all extractors must return a `title`, they must also allow it's extraction to be non-fatal.
+In fact only the last option is technically mandatory (i.e. if you can't figure out the download location of the media the extraction does not make any sense). But by convention youtube-dl also treats `id` and `title` as mandatory. Thus the aforementioned metafields are the critical data that the extraction does not make any sense without and if any of them fail to be extracted then the extractor is considered completely broken.
 
-For pornographic sites, appropriate `age_limit` must also be returned.
-
-The extractor is allowed to return the info dict without url or formats in some special cases if it allows the user to extract usefull information with `--ignore-no-formats-error` - e.g. when the video is a live stream that has not started yet.
-
-[Any field](yt_dlp/extractor/common.py#219-L426) apart from the aforementioned ones are considered **optional**. That means that extraction should be **tolerant** to situations when sources for these fields can potentially be unavailable (even if they are always available at the moment) and **future-proof** in order not to break the extraction of general purpose mandatory fields.
+[Any field](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L188-L303) apart from the aforementioned ones are considered **optional**. That means that extraction should be **tolerant** to situations when sources for these fields can potentially be unavailable (even if they are always available at the moment) and **future-proof** in order not to break the extraction of general purpose mandatory fields.
 
 #### Example
 
@@ -277,10 +199,8 @@ #### Example
 
 ```python
 {
+    ...
     "summary": "some fancy summary text",
-    "user": {
-        "name": "uploader name"
-    },
     ...
 }
 ```
@@ -299,30 +219,6 @@ #### Example
 
 The latter will break extraction process with `KeyError` if `summary` disappears from `meta` at some later time but with the former approach extraction will just go ahead with `description` set to `None` which is perfectly fine (remember `None` is equivalent to the absence of data).
 
-
-If the data is nested, do not use `.get` chains, but instead make use of `traverse_obj`.
-
-Considering the above `meta` again, assume you want to extract `["user"]["name"]` and put it in the resulting info dict as `uploader`
-
-```python
-uploader = traverse_obj(meta, ('user', 'name'))  # correct
-```
-
-and not like:
-
-```python
-uploader = meta['user']['name']  # incorrect
-```
-or
-```python
-uploader = meta.get('user', {}).get('name')  # incorrect
-```
-or
-```python
-uploader = try_get(meta, lambda x: x['user']['name'])  # old utility
-```
-
-
 Similarly, you should pass `fatal=False` when extracting optional data from a webpage with `_search_regex`, `_html_search_regex` or similar methods, for instance:
 
 ```python
@@ -342,54 +238,28 @@ #### Example
 ```
 
 On failure this code will silently continue the extraction with `description` set to `None`. That is useful for metafields that may or may not be present.
-
-
-Another thing to remember is not to try to iterate over `None`
-
-Say you extracted a list of thumbnails into `thumbnail_data` and want to iterate over them
-
-```python
-thumbnail_data = data.get('thumbnails') or []
-thumbnails = [{
-    'url': item['url']
-} for item in thumbnail_data]  # correct
-```
-
-and not like:
-
-```python
-thumbnail_data = data.get('thumbnails')
-thumbnails = [{
-    'url': item['url']
-} for item in thumbnail_data]  # incorrect
-```
-
-In this case, `thumbnail_data` will be `None` if the field was not found and this will cause the loop `for item in thumbnail_data` to raise a fatal error. Using `or []` avoids this error and results in setting an empty list in `thumbnails` instead.
-
-
+ 
 ### Provide fallbacks
 
 When extracting metadata try to do so from multiple sources. For example if `title` is present in several places, try extracting from at least some of them. This makes it more future-proof in case some of the sources become unavailable.
 
-
 #### Example
 
-Say `meta` from the previous example has a `title` and you are about to extract it like:
+Say `meta` from the previous example has a `title` and you are about to extract it. Since `title` is a mandatory meta field you should end up with something like:
 
 ```python
-title = meta.get('title')
+title = meta['title']
 ```
 
-If `title` disappears from `meta` in future due to some changes on the hoster's side the title extraction would fail.
+If `title` disappears from `meta` in future due to some changes on the hoster's side the extraction would fail since `title` is mandatory. That's expected.
 
-Assume that you have some another source you can extract `title` from, for example `og:title` HTML meta of a `webpage`. In this case you can provide a fallback like:
+Assume that you have some another source you can extract `title` from, for example `og:title` HTML meta of a `webpage`. In this case you can provide a fallback scenario:
 
 ```python
 title = meta.get('title') or self._og_search_title(webpage)
 ```
 
-This code will try to extract from `meta` first and if it fails it will try extracting `og:title` from a `webpage`, making the extractor more robust.
-
+This code will try to extract from `meta` first and if it fails it will try extracting `og:title` from a `webpage`.
 
 ### Regular expressions
 
@@ -412,10 +282,11 @@ ##### Example
 r'(id|ID)=(?P<id>\d+)'
 ```
 
+
 #### Make regular expressions relaxed and flexible
 
 When using regular expressions try to write them fuzzy, relaxed and flexible, skipping insignificant parts that are more likely to change, allowing both single and double quotes for quoted values and so on.
-
+ 
 ##### Example
 
 Say you need to extract `title` from the following HTML code:
@@ -427,84 +298,34 @@ ##### Example
 The code for that task should look similar to:
 
 ```python
-title = self._search_regex(  # correct
+title = self._search_regex(
     r'<span[^>]+class="title"[^>]*>([^<]+)', webpage, 'title')
 ```
 
-which tolerates potential changes in the `style` attribute's value. Or even better:
+Or even better:
 
 ```python
-title = self._search_regex(  # correct
+title = self._search_regex(
     r'<span[^>]+class=(["\'])title\1[^>]*>(?P<title>[^<]+)',
     webpage, 'title', group='title')
 ```
 
-which also handles both single quotes in addition to double quotes.
+Note how you tolerate potential changes in the `style` attribute's value or switch from using double quotes to single for `class` attribute: 
 
 The code definitely should not look like:
 
 ```python
-title = self._search_regex(  # incorrect
+title = self._search_regex(
     r'<span style="position: absolute; left: 910px; width: 90px; float: right; z-index: 9999;" class="title">(.*?)</span>',
     webpage, 'title', group='title')
 ```
 
-or even
-
-```python
-title = self._search_regex(  # incorrect
-    r'<span style=".*?" class="title">(.*?)</span>',
-    webpage, 'title', group='title')
-```
-
-Here the presence or absence of other attributes including `style` is irrelevant for the data we need, and so the regex must not depend on it
-
-
-#### Keep the regular expressions as simple as possible, but no simpler
-
-Since many extractors deal with unstructured data provided by websites, we will often need to use very complex regular expressions. You should try to use the *simplest* regex that can accomplish what you want. In other words, each part of the regex must have a reason for existing. If you can take out a symbol and the functionality does not change, the symbol should not be there.
-
-##### Example
-
-Correct:
-
-```python
-_VALID_URL = r'https?://(?:www\.)?website\.com/(?:[^/]+/){3,4}(?P<display_id>[^/]+)_(?P<id>\d+)'
-```
-
-Incorrect:
-
-```python
-_VALID_URL = r'https?:\/\/(?:www\.)?website\.com\/[^\/]+/[^\/]+/[^\/]+(?:\/[^\/]+)?\/(?P<display_id>[^\/]+)_(?P<id>\d+)'
-```
-
-#### Do not misuse `.` and use the correct quantifiers (`+*?`)
-
-Avoid creating regexes that over-match because of wrong use of quantifiers. Also try to avoid non-greedy matching (`?`) where possible since they could easily result in [catastrophic backtracking](https://www.regular-expressions.info/catastrophic.html)
-
-Correct:
-
-```python
-title = self._search_regex(r'<span\b[^>]+class="title"[^>]*>([^<]+)', webpage, 'title')
-```
-
-Incorrect:
-
-```python
-title = self._search_regex(r'<span\b.*class="title".*>(.+?)<', webpage, 'title')
-```
-
-
 ### Long lines policy
 
-There is a soft limit to keep lines of code under 100 characters long. This means it should be respected if possible and if it does not make readability and code maintenance worse. Sometimes, it may be reasonable to go upto 120 characters and sometimes even 80 can be unreadable. Keep in mind that this is not a hard limit and is just one of many tools to make the code more readable.
+There is a soft limit to keep lines of code under 80 characters long. This means it should be respected if possible and if it does not make readability and code maintenance worse.
 
 For example, you should **never** split long string literals like URLs or some other often copied entities over multiple lines to fit this limit:
 
-Conversely, don't unnecessarily split small lines further. As a rule of thumb, if removing the line split keeps the code under 80 characters, it should be a single line.
-
-##### Examples
-
 Correct:
 
 ```python
@@ -518,76 +339,26 @@ ##### Examples
 'PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4'
 ```
 
-Correct:
-
-```python
-uploader = traverse_obj(info, ('uploader', 'name'), ('author', 'fullname'))
-```
-
-Incorrect:
-
-```python
-uploader = traverse_obj(
-    info,
-    ('uploader', 'name'),
-    ('author', 'fullname'))
-```
-
-Correct:
-
-```python
-formats = self._extract_m3u8_formats(
-    m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls',
-    note='Downloading HD m3u8 information', errnote='Unable to download HD m3u8 information')
-```
-
-Incorrect:
-
-```python
-formats = self._extract_m3u8_formats(m3u8_url,
-                                     video_id,
-                                     'mp4',
-                                     'm3u8_native',
-                                     m3u8_id='hls',
-                                     note='Downloading HD m3u8 information',
-                                     errnote='Unable to download HD m3u8 information')
-```
-
-
-### Quotes
-
-Always use single quotes for strings (even if the string has `'`) and double quotes for docstrings. Use `'''` only for multi-line strings. An exception can be made if a string has multiple single quotes in it and escaping makes it *significantly* harder to read. For f-strings, use you can use double quotes on the inside. But avoid f-strings that have too many quotes inside.
-
-
 ### Inline values
 
 Extracting variables is acceptable for reducing code duplication and improving readability of complex expressions. However, you should avoid extracting variables used only once and moving them to opposite parts of the extractor file, which makes reading the linear flow difficult.
 
-#### Examples
+#### Example
 
 Correct:
 
 ```python
-return {
-    'title': self._html_search_regex(r'<h1>([^<]+)</h1>', webpage, 'title'),
-    # ...some lines of code...
-}
+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')
-# ...some lines of code...
-return {
-    'title': title,
-    # ...some lines of code...
-}
 ```
 
-
 ### Collapse fallbacks
 
 Multiple fallback values can quickly become unwieldy. Collapse multiple fallback values into a single expression via a list of patterns.
@@ -613,100 +384,51 @@ #### Example
 
 Methods supporting list of patterns are: `_search_regex`, `_html_search_regex`, `_og_search_property`, `_html_search_meta`.
 
-
 ### Trailing parentheses
 
-Always move trailing parentheses used for grouping/functions after the last argument. On the other hand, multi-line literal list/tuple/dict/set should closed be in a new line. Generators and list/dict comprehensions may use either style
+Always move trailing parentheses after the last argument.
 
-#### Examples
+#### Example
 
 Correct:
 
 ```python
-url = traverse_obj(info, (
-    'context', 'dispatcher', 'stores', 'VideoTitlePageStore', 'data', 'video', 0, 'VideoUrlSet', 'VideoUrl'), list)
-```
-Correct:
-
-```python
-url = traverse_obj(
-    info,
-    ('context', 'dispatcher', 'stores', 'VideoTitlePageStore', 'data', 'video', 0, 'VideoUrlSet', 'VideoUrl'),
+    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
     list)
 ```
 
 Incorrect:
 
 ```python
-url = traverse_obj(
-    info,
-    ('context', 'dispatcher', 'stores', 'VideoTitlePageStore', 'data', 'video', 0, 'VideoUrlSet', 'VideoUrl'),
-    list
+    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
+    list,
 )
 ```
 
-Correct:
-
-```python
-f = {
-    'url': url,
-    'format_id': format_id,
-}
-```
-
-Incorrect:
-
-```python
-f = {'url': url,
-     'format_id': format_id}
-```
-
-Correct:
-
-```python
-formats = [process_formats(f) for f in format_data
-           if f.get('type') in ('hls', 'dash', 'direct') and f.get('downloadable')]
-```
-
-Correct:
-
-```python
-formats = [
-    process_formats(f) for f in format_data
-    if f.get('type') in ('hls', 'dash', 'direct') and f.get('downloadable')
-]
-```
-
-
 ### Use convenience conversion and parsing functions
 
-Wrap all extracted numeric data into safe functions from [`yt_dlp/utils.py`](yt_dlp/utils.py): `int_or_none`, `float_or_none`. Use them for string to number conversions as well.
+Wrap all extracted numeric data into safe functions from [`youtube_dl/utils.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/utils.py): `int_or_none`, `float_or_none`. Use them for string to number conversions as well.
 
 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` 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. 
 
-Explore [`yt_dlp/utils.py`](yt_dlp/utils.py) for more useful convenience functions.
+Explore [`youtube_dl/utils.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/utils.py) for more useful convenience functions.
 
-#### Examples
+#### More examples
 
+##### Safely extract optional description from parsed JSON
 ```python
-description = traverse_obj(response, ('result', 'video', 'summary'), expected_type=str)
-thumbnails = traverse_obj(response, ('result', 'thumbnails', ..., 'url'), expected_type=url_or_none)
-video = traverse_obj(response, ('result', 'video', 0), default={}, expected_type=dict)
+description = try_get(response, lambda x: x['result']['video'][0]['summary'], compat_str)
+```
+
+##### Safely extract more optional metadata
+```python
+video = try_get(response, lambda x: x['result']['video'][0], dict) or {}
+description = video.get('summary')
 duration = float_or_none(video.get('durationMs'), scale=1000)
 view_count = int_or_none(video.get('views'))
 ```
 
-
-# My pull request is labeled pending-fixes
-
-The `pending-fixes` label is added when there are changes requested to a PR. When the necessary changes are made, the label should be removed. However, despite our best efforts, it may sometimes happen that the maintainer did not see the changes or forgot to remove the label. If your PR is still marked as `pending-fixes` a few days after all requested changes have been made, feel free to ping the maintainer who labeled your issue and ask them to re-review and remove the label.
-
-
-
-
-# EMBEDDING YT-DLP
-See [README.md#embedding-yt-dlp](README.md#embedding-yt-dlp) for instructions on how to embed yt-dlp in another Python program

CONTRIBUTORS

@@ -1,8 +1,5 @@
 pukkandan (owner)
 shirt-dev (collaborator)
-coletdjnz/colethedj (collaborator)
-Ashish0804 (collaborator)
-nao20010128nao/Lesmiscore (collaborator)
 h-h-h-h
 pauldubois98
 nixxo
@@ -20,282 +17,14 @@ samiksome
 alxnull
 FelixFrog
 Zocker1999NET
+nao20010128nao
 kurumigi
+tsukumi
 bbepis
-animelover1984/horahoradev
 Pccode66
+Ashish
 RobinD42
 hseg
+colethedj
 DennyDai
 codeasashu
-teesid
-kevinoconnor7
-damianoamatruda
-2ShedsJackson
-CXwudi
-xtkoba
-llacb47
-hheimbuerger
-B0pol
-lkho
-fstirlitz
-Lamieur
-tsukumijima
-Hadi0609
-b5eff52
-craftingmod
-tpikonen
-tripulse
-king-millez
-alex-gedeon
-hhirtz
-louie-github
-MinePlayersPE
-olifre
-rhsmachine/zenerdi0de
-nihil-admirari
-krichbanana
-ohmybahgosh
-nyuszika7h
-blackjack4494
-pyx
-TpmKranz
-mzbaulhaque
-zackmark29
-mbway
-zerodytrash
-wesnm
-pento
-rigstot
-dirkf
-funniray
-Jessecar96
-jhwgh1968
-kikuyan
-max-te
-nchilada
-pgaig
-PSlava
-stdedos
-u-spec-png
-Sipherdrakon
-kidonng
-smege1001
-tandy1000
-IONECarter
-capntrips
-mrfade
-ParadoxGBB
-wlritchi
-NeroBurner
-mahanstreamer
-alerikaisattera
-Derkades
-BunnyHelp
-i6t
-std-move
-Chocobozzz
-ouwou
-korli
-octotherp
-CeruleanSky
-zootedb0t
-chao813
-ChillingPepper
-ConquerorDopy
-dalanmiller
-DigitalDJ
-f4pp3rk1ng
-gesa
-Jules-A
-makeworld-the-better-one
-MKSherbini
-mrx23dot
-poschi3
-raphaeldore
-renalid
-sleaux-meaux
-sulyi
-tmarki
-Vangelis66
-AjaxGb
-ajj8
-jakubadamw
-jfogelman
-timethrow
-sarnoud
-Bojidarist
-18928172992817182/gustaf
-nixklai
-smplayer-dev
-Zirro
-CrypticSignal
-flashdagger
-fractalf
-frafra
-kaz-us
-ozburo
-rhendric
-sdomi
-selfisekai
-stanoarn
-0xA7404A/Aurora
-4a1e2y5
-aarubui
-chio0hai
-cntrl-s
-Deer-Spangle
-DEvmIb
-Grabien/MaximVol
-j54vc1bk
-mpeter50
-mrpapersonic
-pabs3
-staubichsauger
-xenova
-Yakabuff
-zulaport
-ehoogeveen-medweb
-PilzAdam
-zmousm
-iw0nderhow
-unit193
-TwoThousandHedgehogs/KathrynElrod
-Jertzukka
-cypheron
-Hyeeji
-bwildenhain
-C0D3D3V
-kebianizao
-Lapin0t
-abdullah-if
-DavidSkrundz
-mkubecek
-raleeper
-YuenSzeHong
-Sematre
-jaller94
-r5d
-julien-hadleyjack
-git-anony-mouse
-mdawar
-trassshhub
-foghawk
-k3ns1n
-teridon
-mozlima
-timendum
-ischmidt20
-CreaValix
-sian1468
-arkamar
-hyano
-KiberInfinity
-tejing1
-Bricio
-lazypete365
-Aniruddh-J
-blackgear
-CplPwnies
-cyberfox1691
-FestplattenSchnitzel
-hatienl0i261299
-iphoting
-jakeogh
-lukasfink1
-lyz-code
-marieell
-mdpauley
-Mipsters
-mxmehl
-ofkz
-P-reducible
-pycabbage
-regarten
-Ronnnny
-schn0sch
-s0u1h
-MrRawes
-cffswb
-danielyli
-1-Byte
-mehq
-dzek69
-aaearon
-panatexxa
-kmark
-un-def
-goggle
-Soebb
-Fam0r
-bohwaz
-dodrian
-vvto33
-ca-za
-connercsbn
-diegorodriguezv
-ekangmonyet
-elyse0
-evansp
-GiedriusS
-HE7086
-JordanWeatherby
-m4tu4g
-MarwenDallel
-nevack
-putnam
-rand-net
-vertan
-Wikidepia
-Yipten
-moench-tegeder
-christoph-heinrich
-HobbyistDev
-LunarFang416
-sbor23
-aurelg
-adamanldo
-gamer191
-vkorablin
-Burve
-mnn
-ZhymabekRoman
-mozbugbox
-aejdl
-ping
-sqrtNOT
-bubbleguuum
-darkxex
-miseran
-StefanLobbenmeier
-crazymoose77756
-nomevi
-Brett824
-pingiun
-dosy4ev
-EhtishamSabir
-Ferdi265
-FirefoxMetzger
-ftk
-lamby
-llamasblade
-lockmatrix
-misaelaguayo
-odo2063
-pritam20ps05
-scy
-sheerluck
-AxiosDeminence
-DjesonPV
-eren-kemer
-freezboltz
-Galiley
-haobinliang
-Mehavoid
-winterbird-code
-yashkc2025
-aldoridhoni
-bashonly
-jacobtruman
-masta79
-palewire

Collaborators.md

@@ -1,52 +0,0 @@
-# Collaborators
-
-This is a list of the collaborators of the project and their major contributions. See the [Changelog](Changelog.md) for more details.
-
-You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [authors of youtube-dl](https://github.com/ytdl-org/youtube-dl/blob/master/AUTHORS)
-
-
-## [pukkandan](https://github.com/pukkandan)
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/pukkandan)
-
-* Owner of the fork
-
-
-
-## [shirt](https://github.com/shirt-dev)
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/shirt)
-
-* Multithreading (`-N`) and aria2c support for fragment downloads
-* Support for media initialization and discontinuity in HLS
-* The self-updater (`-U`)
-
-
-
-## [coletdjnz](https://github.com/coletdjnz)
-
-[![gh-sponsor](https://img.shields.io/badge/_-Sponsor-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/coletdjnz)
-
-* YouTube improvements including: age-gate bypass, private playlists, multiple-clients (to avoid throttling) and a lot of under-the-hood improvements
-* Added support for new websites YoutubeWebArchive, MainStreaming, PRX, nzherald, Mediaklikk, StarTV etc
-* Improved/fixed support for Patreon, panopto, gfycat, itv, pbs, SouthParkDE etc
-
-
-
-## [Ashish0804](https://github.com/Ashish0804) <sub><sup>[Inactive]</sup></sub>
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/ashish0804)
-
-* Added support for new websites BiliIntl, DiscoveryPlusIndia, OlympicsReplay, PlanetMarathi, ShemarooMe, Utreon, Zee5 etc
-* Added playlist/series downloads for Hotstar, ParamountPlus, Rumble, SonyLIV, Trovo, TubiTv, Voot etc
-* Improved/fixed support for HiDive, HotStar, Hungama, LBRY, LinkedInLearning, Mxplayer, SonyLiv, TV2, Vimeo, VLive etc
-
-
-## [Lesmiscore](https://github.com/Lesmiscore) (nao20010128nao)
-
-**Bitcoin**: bc1qfd02r007cutfdjwjmyy9w23rjvtls6ncve7r3s  
-**Monacoin**: mona1q3tf7dzvshrhfe3md379xtvt2n22duhglv5dskr
-
-* Download live from start to end for YouTube
-* Added support for new websites AbemaTV, mildom, PixivSketch, skeb, radiko, voicy, mirrativ, openrec, whowatch, damtomo, 17.live, mixch etc
-* Improved/fixed support for fc2, YahooJapanNews, tver, iwara 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 *

Makefile

@@ -1,6 +1,5 @@
-all: lazy-extractors yt-dlp doc pypi-files
-clean: clean-test clean-dist
-clean-all: clean clean-cache
+all: yt-dlp doc
+clean: clean-test clean-dist clean-cache
 completions: completion-bash completion-fish completion-zsh
 doc: README.md CONTRIBUTING.md issuetemplates supportedsites
 ot: offlinetest
@@ -9,23 +8,16 @@ tar: yt-dlp.tar.gz
 # Keep this list in sync with MANIFEST.in
 # intended use: when building a source distribution,
 # make pypi-files && python setup.py sdist
-pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites \
-	        completions yt-dlp.1 requirements.txt setup.cfg devscripts/* test/*
+pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites completions yt-dlp.1 devscripts/* test/*
 
 .PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites
 
 clean-test:
-	rm -rf test/testdata/sigs/player-*.js tmp/ *.annotations.xml *.aria2 *.description *.dump *.frag \
-	*.frag.aria2 *.frag.urls *.info.json *.live_chat.json *.meta *.part* *.tmp *.temp *.unknown_video *.ytdl \
-	*.3gp *.ape *.ass *.avi *.desktop *.f4v *.flac *.flv *.jpeg *.jpg *.m4a *.mpga *.m4v *.mhtml *.mkv *.mov \
-	*.mp3 *.mp4 *.ogg *.opus *.png *.sbv *.srt *.swf *.swp *.ttml *.url *.vtt *.wav *.webloc *.webm *.webp
+	rm -rf *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.frag *.frag.urls *.frag.aria2
 clean-dist:
-	rm -rf yt-dlp.1.temp.md yt-dlp.1 README.txt MANIFEST build/ dist/ .coverage cover/ yt-dlp.tar.gz completions/ \
-	yt_dlp/extractor/lazy_extractors.py *.spec CONTRIBUTING.md.tmp yt-dlp yt-dlp.exe yt_dlp.egg-info/ AUTHORS .mailmap
+	rm -rf yt-dlp.1.temp.md yt-dlp.1 README.txt MANIFEST build/ dist/ .coverage cover/ yt-dlp.tar.gz completions/ yt_dlp/extractor/lazy_extractors.py *.spec CONTRIBUTING.md.tmp yt-dlp yt-dlp.exe yt_dlp.egg-info/ AUTHORS .mailmap
 clean-cache:
-	find . \( \
-		-type d -name .pytest_cache -o -type d -name __pycache__ -o -name "*.pyc" -o -name "*.class" \
-	\) -prune -exec rm -rf {} \;
+	find . -name "*.pyc" -o -name "*.class" -delete
 
 completion-bash: completions/bash/yt-dlp
 completion-fish: completions/fish/yt-dlp.fish
@@ -33,10 +25,10 @@ completion-zsh: completions/zsh/_yt-dlp
 lazy-extractors: yt_dlp/extractor/lazy_extractors.py
 
 PREFIX ?= /usr/local
-DESTDIR ?= .
 BINDIR ?= $(PREFIX)/bin
 MANDIR ?= $(PREFIX)/man
 SHAREDIR ?= $(PREFIX)/share
+# make_supportedsites.py doesnot work correctly in python2
 PYTHON ?= /usr/bin/env python3
 
 # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
@@ -45,66 +37,62 @@ SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then ech
 # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
 MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
 
-install: lazy-extractors yt-dlp yt-dlp.1 completions
-	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m755 yt-dlp $(DESTDIR)$(BINDIR)/yt-dlp
-	mkdir -p $(DESTDIR)$(MANDIR)/man1
-	install -m644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
-	mkdir -p $(DESTDIR)$(SHAREDIR)/bash-completion/completions
-	install -m644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
-	mkdir -p $(DESTDIR)$(SHAREDIR)/zsh/site-functions
-	install -m644 completions/zsh/_yt-dlp $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
-	mkdir -p $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d
-	install -m644 completions/fish/yt-dlp.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
-
-uninstall:
-	rm -f $(DESTDIR)$(BINDIR)/yt-dlp
-	rm -f $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
-	rm -f $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
-	rm -f $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
-	rm -f $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
+install: yt-dlp yt-dlp.1 completions
+	install -Dm755 yt-dlp $(DESTDIR)$(BINDIR)
+	install -Dm644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1
+	install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
+	install -Dm644 completions/zsh/_yt-dlp $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
+	install -Dm644 completions/fish/yt-dlp.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
 
 codetest:
 	flake8 .
 
 test:
-	$(PYTHON) -m pytest
+	#nosetests --with-coverage --cover-package=yt_dlp --cover-html --verbose --processes 4 test
+	nosetests --verbose test
 	$(MAKE) codetest
 
+# Keep this list in sync with devscripts/run_tests.sh
 offlinetest: codetest
-	$(PYTHON) -m pytest -k "not download"
+	$(PYTHON) -m nose --verbose test \
+		--exclude test_age_restriction.py \
+		--exclude test_download.py \
+		--exclude test_iqiyi_sdk_interpreter.py \
+		--exclude test_overwrites.py \
+		--exclude test_socks.py \
+		--exclude test_subtitles.py \
+		--exclude test_write_annotations.py \
+		--exclude test_youtube_lists.py \
+		--exclude test_youtube_signature.py \
+		--exclude test_post_hooks.py
 
-# XXX: This is hard to maintain
-CODE_FOLDERS = yt_dlp yt_dlp/downloader yt_dlp/extractor yt_dlp/postprocessor yt_dlp/compat \
-               yt_dlp/extractor/anvato_token_generator
 yt-dlp: yt_dlp/*.py yt_dlp/*/*.py
 	mkdir -p zip
-	for d in $(CODE_FOLDERS) ; do \
+	for d in yt_dlp yt_dlp/downloader yt_dlp/extractor yt_dlp/postprocessor ; do \
 	  mkdir -p zip/$$d ;\
 	  cp -pPR $$d/*.py zip/$$d/ ;\
 	done
-	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py zip/yt_dlp/*/*/*.py
+	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py
 	mv zip/yt_dlp/__main__.py zip/
-	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py yt_dlp/*/*/*.py __main__.py
+	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py
 	rm -rf zip
 	echo '#!$(PYTHON)' > yt-dlp
 	cat yt-dlp.zip >> yt-dlp
 	rm yt-dlp.zip
 	chmod a+x yt-dlp
 
-README.md: yt_dlp/*.py yt_dlp/*/*.py devscripts/make_readme.py
-	COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --ignore-config --help | $(PYTHON) devscripts/make_readme.py
+README.md: yt_dlp/*.py yt_dlp/*/*.py
+	COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --help | $(PYTHON) devscripts/make_readme.py
 
-CONTRIBUTING.md: README.md devscripts/make_contributing.py
+CONTRIBUTING.md: README.md
 	$(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
 
-issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml .github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml .github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml yt_dlp/version.py
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml .github/ISSUE_TEMPLATE/1_broken_site.yml
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml .github/ISSUE_TEMPLATE/2_site_support_request.yml
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml .github/ISSUE_TEMPLATE/3_site_feature_request.yml
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml .github/ISSUE_TEMPLATE/4_bug_report.yml
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml .github/ISSUE_TEMPLATE/5_feature_request.yml
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/6_question.yml .github/ISSUE_TEMPLATE/6_question.yml
+issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md yt_dlp/version.py
+	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
+	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE/2_site_support_request.md
+	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md
+	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE/4_bug_report.md
+	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md .github/ISSUE_TEMPLATE/5_feature_request.md
 
 supportedsites:
 	$(PYTHON) devscripts/make_supportedsites.py supportedsites.md
@@ -112,7 +100,7 @@ supportedsites:
 README.txt: README.md
 	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
-yt-dlp.1: README.md devscripts/prepare_manpage.py
+yt-dlp.1: README.md
 	$(PYTHON) devscripts/prepare_manpage.py yt-dlp.1.temp.md
 	pandoc -s -f $(MARKDOWN) -t man yt-dlp.1.temp.md -o yt-dlp.1
 	rm -f yt-dlp.1.temp.md
@@ -129,11 +117,11 @@ completions/fish/yt-dlp.fish: yt_dlp/*.py yt_dlp/*/*.py devscripts/fish-completi
 	mkdir -p completions/fish
 	$(PYTHON) devscripts/fish-completion.py
 
-_EXTRACTOR_FILES = $(shell find yt_dlp/extractor -name '*.py' -and -not -name 'lazy_extractors.py')
+_EXTRACTOR_FILES = $(shell find yt_dlp/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
 yt_dlp/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
 	$(PYTHON) devscripts/make_lazy_extractors.py $@
 
-yt-dlp.tar.gz: all
+yt-dlp.tar.gz: README.md yt-dlp.1 completions Changelog.md AUTHORS
 	@tar -czf $(DESTDIR)/yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \
 		--exclude '*.DS_Store' \
 		--exclude '*.kate-swp' \
@@ -141,14 +129,13 @@ yt-dlp.tar.gz: all
 		--exclude '*.pyo' \
 		--exclude '*~' \
 		--exclude '__pycache__' \
-		--exclude '.pytest_cache' \
 		--exclude '.git' \
+		--exclude 'docs/_build' \
 		-- \
-		README.md supportedsites.md Changelog.md LICENSE \
-		CONTRIBUTING.md Collaborators.md CONTRIBUTORS AUTHORS \
-		Makefile MANIFEST.in yt-dlp.1 README.txt completions \
-		setup.py setup.cfg yt-dlp yt_dlp requirements.txt \
-		devscripts test
+		devscripts test \
+		Changelog.md AUTHORS LICENSE README.md supportedsites.md \
+		Makefile MANIFEST.in yt-dlp.1 completions \
+		setup.py setup.cfg yt-dlp
 
 AUTHORS: .mailmap
 	git shortlog -s -n | cut -f2 | sort > AUTHORS

devscripts/__init__.py

@@ -1 +0,0 @@
-# Empty file needed to make devscripts.utils properly importable from outside

devscripts/bash-completion.py

@@ -1,12 +1,11 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+from __future__ import unicode_literals
 
-# Allow direct execution
 import os
+from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import yt_dlp
 
 BASH_COMPLETION_FILE = "completions/bash/yt-dlp"
@@ -27,5 +26,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = yt_dlp.parseOpts(ignore_config_files=True)[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)

devscripts/buildserver.py

@@ -0,0 +1,433 @@
+#!/usr/bin/python3
+
+import argparse
+import ctypes
+import functools
+import shutil
+import subprocess
+import sys
+import tempfile
+import threading
+import traceback
+import os.path
+
+sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))
+from yt_dlp.compat import (
+    compat_input,
+    compat_http_server,
+    compat_str,
+    compat_urlparse,
+)
+
+# These are not used outside of buildserver.py thus not in compat.py
+
+try:
+    import winreg as compat_winreg
+except ImportError:  # Python 2
+    import _winreg as compat_winreg
+
+try:
+    import socketserver as compat_socketserver
+except ImportError:  # Python 2
+    import SocketServer as compat_socketserver
+
+
+class BuildHTTPServer(compat_socketserver.ThreadingMixIn, compat_http_server.HTTPServer):
+    allow_reuse_address = True
+
+
+advapi32 = ctypes.windll.advapi32
+
+SC_MANAGER_ALL_ACCESS = 0xf003f
+SC_MANAGER_CREATE_SERVICE = 0x02
+SERVICE_WIN32_OWN_PROCESS = 0x10
+SERVICE_AUTO_START = 0x2
+SERVICE_ERROR_NORMAL = 0x1
+DELETE = 0x00010000
+SERVICE_STATUS_START_PENDING = 0x00000002
+SERVICE_STATUS_RUNNING = 0x00000004
+SERVICE_ACCEPT_STOP = 0x1
+
+SVCNAME = 'youtubedl_builder'
+
+LPTSTR = ctypes.c_wchar_p
+START_CALLBACK = ctypes.WINFUNCTYPE(None, ctypes.c_int, ctypes.POINTER(LPTSTR))
+
+
+class SERVICE_TABLE_ENTRY(ctypes.Structure):
+    _fields_ = [
+        ('lpServiceName', LPTSTR),
+        ('lpServiceProc', START_CALLBACK)
+    ]
+
+
+HandlerEx = ctypes.WINFUNCTYPE(
+    ctypes.c_int,     # return
+    ctypes.c_int,     # dwControl
+    ctypes.c_int,     # dwEventType
+    ctypes.c_void_p,  # lpEventData,
+    ctypes.c_void_p,  # lpContext,
+)
+
+
+def _ctypes_array(c_type, py_array):
+    ar = (c_type * len(py_array))()
+    ar[:] = py_array
+    return ar
+
+
+def win_OpenSCManager():
+    res = advapi32.OpenSCManagerW(None, None, SC_MANAGER_ALL_ACCESS)
+    if not res:
+        raise Exception('Opening service manager failed - '
+                        'are you running this as administrator?')
+    return res
+
+
+def win_install_service(service_name, cmdline):
+    manager = win_OpenSCManager()
+    try:
+        h = advapi32.CreateServiceW(
+            manager, service_name, None,
+            SC_MANAGER_CREATE_SERVICE, SERVICE_WIN32_OWN_PROCESS,
+            SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
+            cmdline, None, None, None, None, None)
+        if not h:
+            raise OSError('Service creation failed: %s' % ctypes.FormatError())
+
+        advapi32.CloseServiceHandle(h)
+    finally:
+        advapi32.CloseServiceHandle(manager)
+
+
+def win_uninstall_service(service_name):
+    manager = win_OpenSCManager()
+    try:
+        h = advapi32.OpenServiceW(manager, service_name, DELETE)
+        if not h:
+            raise OSError('Could not find service %s: %s' % (
+                service_name, ctypes.FormatError()))
+
+        try:
+            if not advapi32.DeleteService(h):
+                raise OSError('Deletion failed: %s' % ctypes.FormatError())
+        finally:
+            advapi32.CloseServiceHandle(h)
+    finally:
+        advapi32.CloseServiceHandle(manager)
+
+
+def win_service_report_event(service_name, msg, is_error=True):
+    with open('C:/sshkeys/log', 'a', encoding='utf-8') as f:
+        f.write(msg + '\n')
+
+    event_log = advapi32.RegisterEventSourceW(None, service_name)
+    if not event_log:
+        raise OSError('Could not report event: %s' % ctypes.FormatError())
+
+    try:
+        type_id = 0x0001 if is_error else 0x0004
+        event_id = 0xc0000000 if is_error else 0x40000000
+        lines = _ctypes_array(LPTSTR, [msg])
+
+        if not advapi32.ReportEventW(
+                event_log, type_id, 0, event_id, None, len(lines), 0,
+                lines, None):
+            raise OSError('Event reporting failed: %s' % ctypes.FormatError())
+    finally:
+        advapi32.DeregisterEventSource(event_log)
+
+
+def win_service_handler(stop_event, *args):
+    try:
+        raise ValueError('Handler called with args ' + repr(args))
+        TODO
+    except Exception as e:
+        tb = traceback.format_exc()
+        msg = str(e) + '\n' + tb
+        win_service_report_event(service_name, msg, is_error=True)
+        raise
+
+
+def win_service_set_status(handle, status_code):
+    svcStatus = SERVICE_STATUS()
+    svcStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS
+    svcStatus.dwCurrentState = status_code
+    svcStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP
+
+    svcStatus.dwServiceSpecificExitCode = 0
+
+    if not advapi32.SetServiceStatus(handle, ctypes.byref(svcStatus)):
+        raise OSError('SetServiceStatus failed: %r' % ctypes.FormatError())
+
+
+def win_service_main(service_name, real_main, argc, argv_raw):
+    try:
+        # args = [argv_raw[i].value for i in range(argc)]
+        stop_event = threading.Event()
+        handler = HandlerEx(functools.partial(stop_event, win_service_handler))
+        h = advapi32.RegisterServiceCtrlHandlerExW(service_name, handler, None)
+        if not h:
+            raise OSError('Handler registration failed: %s' %
+                          ctypes.FormatError())
+
+        TODO
+    except Exception as e:
+        tb = traceback.format_exc()
+        msg = str(e) + '\n' + tb
+        win_service_report_event(service_name, msg, is_error=True)
+        raise
+
+
+def win_service_start(service_name, real_main):
+    try:
+        cb = START_CALLBACK(
+            functools.partial(win_service_main, service_name, real_main))
+        dispatch_table = _ctypes_array(SERVICE_TABLE_ENTRY, [
+            SERVICE_TABLE_ENTRY(
+                service_name,
+                cb
+            ),
+            SERVICE_TABLE_ENTRY(None, ctypes.cast(None, START_CALLBACK))
+        ])
+
+        if not advapi32.StartServiceCtrlDispatcherW(dispatch_table):
+            raise OSError('ctypes start failed: %s' % ctypes.FormatError())
+    except Exception as e:
+        tb = traceback.format_exc()
+        msg = str(e) + '\n' + tb
+        win_service_report_event(service_name, msg, is_error=True)
+        raise
+
+
+def main(args=None):
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-i', '--install',
+                        action='store_const', dest='action', const='install',
+                        help='Launch at Windows startup')
+    parser.add_argument('-u', '--uninstall',
+                        action='store_const', dest='action', const='uninstall',
+                        help='Remove Windows service')
+    parser.add_argument('-s', '--service',
+                        action='store_const', dest='action', const='service',
+                        help='Run as a Windows service')
+    parser.add_argument('-b', '--bind', metavar='<host:port>',
+                        action='store', default='0.0.0.0:8142',
+                        help='Bind to host:port (default %default)')
+    options = parser.parse_args(args=args)
+
+    if options.action == 'install':
+        fn = os.path.abspath(__file__).replace('v:', '\\\\vboxsrv\\vbox')
+        cmdline = '%s %s -s -b %s' % (sys.executable, fn, options.bind)
+        win_install_service(SVCNAME, cmdline)
+        return
+
+    if options.action == 'uninstall':
+        win_uninstall_service(SVCNAME)
+        return
+
+    if options.action == 'service':
+        win_service_start(SVCNAME, main)
+        return
+
+    host, port_str = options.bind.split(':')
+    port = int(port_str)
+
+    print('Listening on %s:%d' % (host, port))
+    srv = BuildHTTPServer((host, port), BuildHTTPRequestHandler)
+    thr = threading.Thread(target=srv.serve_forever)
+    thr.start()
+    compat_input('Press ENTER to shut down')
+    srv.shutdown()
+    thr.join()
+
+
+def rmtree(path):
+    for name in os.listdir(path):
+        fname = os.path.join(path, name)
+        if os.path.isdir(fname):
+            rmtree(fname)
+        else:
+            os.chmod(fname, 0o666)
+            os.remove(fname)
+    os.rmdir(path)
+
+
+class BuildError(Exception):
+    def __init__(self, output, code=500):
+        self.output = output
+        self.code = code
+
+    def __str__(self):
+        return self.output
+
+
+class HTTPError(BuildError):
+    pass
+
+
+class PythonBuilder(object):
+    def __init__(self, **kwargs):
+        python_version = kwargs.pop('python', '3.4')
+        python_path = None
+        for node in ('Wow6432Node\\', ''):
+            try:
+                key = compat_winreg.OpenKey(
+                    compat_winreg.HKEY_LOCAL_MACHINE,
+                    r'SOFTWARE\%sPython\PythonCore\%s\InstallPath' % (node, python_version))
+                try:
+                    python_path, _ = compat_winreg.QueryValueEx(key, '')
+                finally:
+                    compat_winreg.CloseKey(key)
+                break
+            except Exception:
+                pass
+
+        if not python_path:
+            raise BuildError('No such Python version: %s' % python_version)
+
+        self.pythonPath = python_path
+
+        super(PythonBuilder, self).__init__(**kwargs)
+
+
+class GITInfoBuilder(object):
+    def __init__(self, **kwargs):
+        try:
+            self.user, self.repoName = kwargs['path'][:2]
+            self.rev = kwargs.pop('rev')
+        except ValueError:
+            raise BuildError('Invalid path')
+        except KeyError as e:
+            raise BuildError('Missing mandatory parameter "%s"' % e.args[0])
+
+        path = os.path.join(os.environ['APPDATA'], 'Build archive', self.repoName, self.user)
+        if not os.path.exists(path):
+            os.makedirs(path)
+        self.basePath = tempfile.mkdtemp(dir=path)
+        self.buildPath = os.path.join(self.basePath, 'build')
+
+        super(GITInfoBuilder, self).__init__(**kwargs)
+
+
+class GITBuilder(GITInfoBuilder):
+    def build(self):
+        try:
+            subprocess.check_output(['git', 'clone', 'git://github.com/%s/%s.git' % (self.user, self.repoName), self.buildPath])
+            subprocess.check_output(['git', 'checkout', self.rev], cwd=self.buildPath)
+        except subprocess.CalledProcessError as e:
+            raise BuildError(e.output)
+
+        super(GITBuilder, self).build()
+
+
+class YoutubeDLBuilder(object):
+    authorizedUsers = ['fraca7', 'phihag', 'rg3', 'FiloSottile', 'ytdl-org']
+
+    def __init__(self, **kwargs):
+        if self.repoName != 'yt-dlp':
+            raise BuildError('Invalid repository "%s"' % self.repoName)
+        if self.user not in self.authorizedUsers:
+            raise HTTPError('Unauthorized user "%s"' % self.user, 401)
+
+        super(YoutubeDLBuilder, self).__init__(**kwargs)
+
+    def build(self):
+        try:
+            proc = subprocess.Popen([os.path.join(self.pythonPath, 'python.exe'), 'setup.py', 'py2exe'], stdin=subprocess.PIPE, cwd=self.buildPath)
+            proc.wait()
+            #subprocess.check_output([os.path.join(self.pythonPath, 'python.exe'), 'setup.py', 'py2exe'],
+            #                        cwd=self.buildPath)
+        except subprocess.CalledProcessError as e:
+            raise BuildError(e.output)
+
+        super(YoutubeDLBuilder, self).build()
+
+
+class DownloadBuilder(object):
+    def __init__(self, **kwargs):
+        self.handler = kwargs.pop('handler')
+        self.srcPath = os.path.join(self.buildPath, *tuple(kwargs['path'][2:]))
+        self.srcPath = os.path.abspath(os.path.normpath(self.srcPath))
+        if not self.srcPath.startswith(self.buildPath):
+            raise HTTPError(self.srcPath, 401)
+
+        super(DownloadBuilder, self).__init__(**kwargs)
+
+    def build(self):
+        if not os.path.exists(self.srcPath):
+            raise HTTPError('No such file', 404)
+        if os.path.isdir(self.srcPath):
+            raise HTTPError('Is a directory: %s' % self.srcPath, 401)
+
+        self.handler.send_response(200)
+        self.handler.send_header('Content-Type', 'application/octet-stream')
+        self.handler.send_header('Content-Disposition', 'attachment; filename=%s' % os.path.split(self.srcPath)[-1])
+        self.handler.send_header('Content-Length', str(os.stat(self.srcPath).st_size))
+        self.handler.end_headers()
+
+        with open(self.srcPath, 'rb') as src:
+            shutil.copyfileobj(src, self.handler.wfile)
+
+        super(DownloadBuilder, self).build()
+
+
+class CleanupTempDir(object):
+    def build(self):
+        try:
+            rmtree(self.basePath)
+        except Exception as e:
+            print('WARNING deleting "%s": %s' % (self.basePath, e))
+
+        super(CleanupTempDir, self).build()
+
+
+class Null(object):
+    def __init__(self, **kwargs):
+        pass
+
+    def start(self):
+        pass
+
+    def close(self):
+        pass
+
+    def build(self):
+        pass
+
+
+class Builder(PythonBuilder, GITBuilder, YoutubeDLBuilder, DownloadBuilder, CleanupTempDir, Null):
+    pass
+
+
+class BuildHTTPRequestHandler(compat_http_server.BaseHTTPRequestHandler):
+    actionDict = {'build': Builder, 'download': Builder}  # They're the same, no more caching.
+
+    def do_GET(self):
+        path = compat_urlparse.urlparse(self.path)
+        paramDict = dict([(key, value[0]) for key, value in compat_urlparse.parse_qs(path.query).items()])
+        action, _, path = path.path.strip('/').partition('/')
+        if path:
+            path = path.split('/')
+            if action in self.actionDict:
+                try:
+                    builder = self.actionDict[action](path=path, handler=self, **paramDict)
+                    builder.start()
+                    try:
+                        builder.build()
+                    finally:
+                        builder.close()
+                except BuildError as e:
+                    self.send_response(e.code)
+                    msg = compat_str(e).encode('UTF-8')
+                    self.send_header('Content-Type', 'text/plain; charset=UTF-8')
+                    self.send_header('Content-Length', len(msg))
+                    self.end_headers()
+                    self.wfile.write(msg)
+            else:
+                self.send_response(500, 'Unknown build method "%s"' % action)
+        else:
+            self.send_response(500, 'Malformed URL')
+
+if __name__ == '__main__':
+    main()

devscripts/check-porn.py

@@ -1,4 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+from __future__ import unicode_literals
+
 """
 This script employs a VERY basic heuristic ('porn' in webpage.lower()) to check
 if we are not 'age_limit' tagging some porn site
@@ -10,14 +12,11 @@
 # Allow direct execution
 import os
 import sys
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-
-import urllib.parse
-import urllib.request
-
 from test.helper import gettestcases
+from yt_dlp.utils import compat_urllib_parse_urlparse
+from yt_dlp.utils import compat_urllib_request
 
 if len(sys.argv) > 1:
     METHOD = 'LIST'
@@ -28,9 +27,9 @@
 for test in gettestcases():
     if METHOD == 'EURISTIC':
         try:
-            webpage = urllib.request.urlopen(test['url'], timeout=10).read()
+            webpage = compat_urllib_request.urlopen(test['url'], timeout=10).read()
         except Exception:
-            print('\nFail: {}'.format(test['name']))
+            print('\nFail: {0}'.format(test['name']))
             continue
 
         webpage = webpage.decode('utf8', 'replace')
@@ -38,9 +37,9 @@
         RESULT = 'porn' in webpage.lower()
 
     elif METHOD == 'LIST':
-        domain = urllib.parse.urlparse(test['url']).netloc
+        domain = compat_urllib_parse_urlparse(test['url']).netloc
         if not domain:
-            print('\nFail: {}'.format(test['name']))
+            print('\nFail: {0}'.format(test['name']))
             continue
         domain = '.'.join(domain.split('.')[-2:])
 
@@ -48,11 +47,11 @@
 
     if RESULT and ('info_dict' not in test or 'age_limit' not in test['info_dict']
                    or test['info_dict']['age_limit'] != 18):
-        print('\nPotential missing age_limit check: {}'.format(test['name']))
+        print('\nPotential missing age_limit check: {0}'.format(test['name']))
 
     elif not RESULT and ('info_dict' in test and 'age_limit' in test['info_dict']
                          and test['info_dict']['age_limit'] == 18):
-        print('\nPotential false negative: {}'.format(test['name']))
+        print('\nPotential false negative: {0}'.format(test['name']))
 
     else:
         sys.stdout.write('.')

devscripts/create-github-release.py

@@ -0,0 +1,112 @@
+# Unused
+
+#!/usr/bin/env python
+from __future__ import unicode_literals
+
+import io
+import json
+import mimetypes
+import netrc
+import optparse
+import os
+import re
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from yt_dlp.compat import (
+    compat_basestring,
+    compat_getpass,
+    compat_print,
+    compat_urllib_request,
+)
+from yt_dlp.utils import (
+    make_HTTPS_handler,
+    sanitized_Request,
+)
+
+
+class GitHubReleaser(object):
+    _API_URL = 'https://api.github.com/repos/ytdl-org/youtube-dl/releases'
+    _UPLOADS_URL = 'https://uploads.github.com/repos/ytdl-org/youtube-dl/releases/%s/assets?name=%s'
+    _NETRC_MACHINE = 'github.com'
+
+    def __init__(self, debuglevel=0):
+        self._init_github_account()
+        https_handler = make_HTTPS_handler({}, debuglevel=debuglevel)
+        self._opener = compat_urllib_request.build_opener(https_handler)
+
+    def _init_github_account(self):
+        try:
+            info = netrc.netrc().authenticators(self._NETRC_MACHINE)
+            if info is not None:
+                self._token = info[2]
+                compat_print('Using GitHub credentials found in .netrc...')
+                return
+            else:
+                compat_print('No GitHub credentials found in .netrc')
+        except (IOError, netrc.NetrcParseError):
+            compat_print('Unable to parse .netrc')
+        self._token = compat_getpass(
+            'Type your GitHub PAT (personal access token) and press [Return]: ')
+
+    def _call(self, req):
+        if isinstance(req, compat_basestring):
+            req = sanitized_Request(req)
+        req.add_header('Authorization', 'token %s' % self._token)
+        response = self._opener.open(req).read().decode('utf-8')
+        return json.loads(response)
+
+    def list_releases(self):
+        return self._call(self._API_URL)
+
+    def create_release(self, tag_name, name=None, body='', draft=False, prerelease=False):
+        data = {
+            'tag_name': tag_name,
+            'target_commitish': 'master',
+            'name': name,
+            'body': body,
+            'draft': draft,
+            'prerelease': prerelease,
+        }
+        req = sanitized_Request(self._API_URL, json.dumps(data).encode('utf-8'))
+        return self._call(req)
+
+    def create_asset(self, release_id, asset):
+        asset_name = os.path.basename(asset)
+        url = self._UPLOADS_URL % (release_id, asset_name)
+        # Our files are small enough to be loaded directly into memory.
+        data = open(asset, 'rb').read()
+        req = sanitized_Request(url, data)
+        mime_type, _ = mimetypes.guess_type(asset_name)
+        req.add_header('Content-Type', mime_type or 'application/octet-stream')
+        return self._call(req)
+
+
+def main():
+    parser = optparse.OptionParser(usage='%prog CHANGELOG VERSION BUILDPATH')
+    options, args = parser.parse_args()
+    if len(args) != 3:
+        parser.error('Expected a version and a build directory')
+
+    changelog_file, version, build_path = args
+
+    with io.open(changelog_file, encoding='utf-8') as inf:
+        changelog = inf.read()
+
+    mobj = re.search(r'(?s)version %s\n{2}(.+?)\n{3}' % version, changelog)
+    body = mobj.group(1) if mobj else ''
+
+    releaser = GitHubReleaser()
+
+    new_release = releaser.create_release(
+        version, name='yt-dlp %s' % version, body=body)
+    release_id = new_release['id']
+
+    for asset in os.listdir(build_path):
+        compat_print('Uploading %s...' % asset)
+        releaser.create_asset(release_id, os.path.join(build_path, asset))
+
+
+if __name__ == '__main__':
+    main()

devscripts/fish-completion.py

@@ -1,14 +1,12 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
+#!/usr/bin/env python
+from __future__ import unicode_literals
 
 import optparse
+import os
+from os.path import dirname as dirn
+import sys
 
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import yt_dlp
 from yt_dlp.utils import shell_quote
 
@@ -48,5 +46,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = yt_dlp.parseOpts(ignore_config_files=True)[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)

devscripts/generate_aes_testdata.py

@@ -1,17 +1,14 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
+from __future__ import unicode_literals
 
 import codecs
 import subprocess
 
-from yt_dlp.aes import aes_encrypt, key_expansion
+import os
+import sys
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
 from yt_dlp.utils import intlist_to_bytes
+from yt_dlp.aes import aes_encrypt, key_expansion
 
 secret_msg = b'Secret message goes here'
 

devscripts/gh-pages/add-version.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import json
+import sys
+import hashlib
+import os.path
+
+
+if len(sys.argv) <= 1:
+    print('Specify the version number as parameter')
+    sys.exit()
+version = sys.argv[1]
+
+with open('update/LATEST_VERSION', 'w') as f:
+    f.write(version)
+
+versions_info = json.load(open('update/versions.json'))
+if 'signature' in versions_info:
+    del versions_info['signature']
+
+new_version = {}
+
+filenames = {
+    'bin': 'yt-dlp',
+    'exe': 'yt-dlp.exe',
+    'tar': 'yt-dlp-%s.tar.gz' % version}
+build_dir = os.path.join('..', '..', 'build', version)
+for key, filename in filenames.items():
+    url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename)
+    fn = os.path.join(build_dir, filename)
+    with open(fn, 'rb') as f:
+        data = f.read()
+    if not data:
+        raise ValueError('File %s is empty!' % fn)
+    sha256sum = hashlib.sha256(data).hexdigest()
+    new_version[key] = (url, sha256sum)
+
+versions_info['versions'][version] = new_version
+versions_info['latest'] = version
+
+with open('update/versions.json', 'w') as jsonf:
+    json.dump(versions_info, jsonf, indent=4, sort_keys=True)

devscripts/gh-pages/generate-download.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import json
+
+versions_info = json.load(open('update/versions.json'))
+version = versions_info['latest']
+version_dict = versions_info['versions'][version]
+
+# Read template page
+with open('download.html.in', 'r', encoding='utf-8') as tmplf:
+    template = tmplf.read()
+
+template = template.replace('@PROGRAM_VERSION@', version)
+template = template.replace('@PROGRAM_URL@', version_dict['bin'][0])
+template = template.replace('@PROGRAM_SHA256SUM@', version_dict['bin'][1])
+template = template.replace('@EXE_URL@', version_dict['exe'][0])
+template = template.replace('@EXE_SHA256SUM@', version_dict['exe'][1])
+template = template.replace('@TAR_URL@', version_dict['tar'][0])
+template = template.replace('@TAR_SHA256SUM@', version_dict['tar'][1])
+with open('download.html', 'w', encoding='utf-8') as dlf:
+    dlf.write(template)

devscripts/gh-pages/sign-versions.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals, with_statement
+
+import rsa
+import json
+from binascii import hexlify
+
+try:
+    input = raw_input
+except NameError:
+    pass
+
+versions_info = json.load(open('update/versions.json'))
+if 'signature' in versions_info:
+    del versions_info['signature']
+
+print('Enter the PKCS1 private key, followed by a blank line:')
+privkey = b''
+while True:
+    try:
+        line = input()
+    except EOFError:
+        break
+    if line == '':
+        break
+    privkey += line.encode('ascii') + b'\n'
+privkey = rsa.PrivateKey.load_pkcs1(privkey)
+
+signature = hexlify(rsa.pkcs1.sign(json.dumps(versions_info, sort_keys=True).encode('utf-8'), privkey, 'SHA-256')).decode()
+print('signature: ' + signature)
+
+versions_info['signature'] = signature
+with open('update/versions.json', 'w') as versionsf:
+    json.dump(versions_info, versionsf, indent=4, sort_keys=True)

devscripts/gh-pages/update-copyright.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+from __future__ import with_statement, unicode_literals
+
+import datetime
+import glob
+import io  # For Python 2 compatibility
+import os
+import re
+
+year = str(datetime.datetime.now().year)
+for fn in glob.glob('*.html*'):
+    with io.open(fn, encoding='utf-8') as f:
+        content = f.read()
+    newc = re.sub(r'(?P<copyright>Copyright © 2011-)(?P<year>[0-9]{4})', 'Copyright © 2011-' + year, content)
+    if content != newc:
+        tmpFn = fn + '.part'
+        with io.open(tmpFn, 'wt', encoding='utf-8') as outf:
+            outf.write(newc)
+        os.rename(tmpFn, fn)

devscripts/gh-pages/update-feed.py

@@ -0,0 +1,76 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import datetime
+import io
+import json
+import textwrap
+
+
+atom_template = textwrap.dedent("""\
+    <?xml version="1.0" encoding="utf-8"?>
+    <feed xmlns="http://www.w3.org/2005/Atom">
+        <link rel="self" href="http://ytdl-org.github.io/youtube-dl/update/releases.atom" />
+        <title>yt-dlp releases</title>
+        <id>https://yt-dl.org/feed/yt-dlp-updates-feed</id>
+        <updated>@TIMESTAMP@</updated>
+        @ENTRIES@
+    </feed>""")
+
+entry_template = textwrap.dedent("""
+    <entry>
+        <id>https://yt-dl.org/feed/yt-dlp-updates-feed/yt-dlp-@VERSION@</id>
+        <title>New version @VERSION@</title>
+        <link href="http://ytdl-org.github.io/yt-dlp" />
+        <content type="xhtml">
+            <div xmlns="http://www.w3.org/1999/xhtml">
+                Downloads available at <a href="https://yt-dl.org/downloads/@VERSION@/">https://yt-dl.org/downloads/@VERSION@/</a>
+            </div>
+        </content>
+        <author>
+            <name>The yt-dlp maintainers</name>
+        </author>
+        <updated>@TIMESTAMP@</updated>
+    </entry>
+    """)
+
+now = datetime.datetime.now()
+now_iso = now.isoformat() + 'Z'
+
+atom_template = atom_template.replace('@TIMESTAMP@', now_iso)
+
+versions_info = json.load(open('update/versions.json'))
+versions = list(versions_info['versions'].keys())
+versions.sort()
+
+entries = []
+for v in versions:
+    fields = v.split('.')
+    year, month, day = map(int, fields[:3])
+    faked = 0
+    patchlevel = 0
+    while True:
+        try:
+            datetime.date(year, month, day)
+        except ValueError:
+            day -= 1
+            faked += 1
+            assert day > 0
+            continue
+        break
+    if len(fields) >= 4:
+        try:
+            patchlevel = int(fields[3])
+        except ValueError:
+            patchlevel = 1
+    timestamp = '%04d-%02d-%02dT00:%02d:%02dZ' % (year, month, day, faked, patchlevel)
+
+    entry = entry_template.replace('@TIMESTAMP@', timestamp)
+    entry = entry.replace('@VERSION@', v)
+    entries.append(entry)
+
+entries_str = textwrap.indent(''.join(entries), '\t')
+atom_template = atom_template.replace('@ENTRIES@', entries_str)
+
+with io.open('update/releases.atom', 'w', encoding='utf-8') as atom_file:
+    atom_file.write(atom_template)

devscripts/gh-pages/update-sites.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import sys
+import os
+import textwrap
+
+# We must be able to import yt_dlp
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+
+import yt_dlp
+
+
+def main():
+    with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf:
+        template = tmplf.read()
+
+    ie_htmls = []
+    for ie in yt_dlp.list_extractors(age_limit=None):
+        ie_html = '<b>{}</b>'.format(ie.IE_NAME)
+        ie_desc = getattr(ie, 'IE_DESC', None)
+        if ie_desc is False:
+            continue
+        elif ie_desc is not None:
+            ie_html += ': {}'.format(ie.IE_DESC)
+        if not ie.working():
+            ie_html += ' (Currently broken)'
+        ie_htmls.append('<li>{}</li>'.format(ie_html))
+
+    template = template.replace('@SITES@', textwrap.indent('\n'.join(ie_htmls), '\t'))
+
+    with open('supportedsites.html', 'w', encoding='utf-8') as sitesf:
+        sitesf.write(template)
+
+
+if __name__ == '__main__':
+    main()

devscripts/lazy_load_template.py

@@ -1,35 +1,19 @@
-import importlib
-import random
+# coding: utf-8
+from __future__ import unicode_literals
+
 import re
 
-from ..utils import (
-    age_restricted,
-    bug_reports_message,
-    classproperty,
-    write_string,
-)
 
-# These bloat the lazy_extractors, so allow them to passthrough silently
-ALLOWED_CLASSMETHODS = {'get_testcases', 'extract_from_webpage'}
+class LazyLoadExtractor(object):
+    _module = None
 
-
-class LazyLoadMetaClass(type):
-    def __getattr__(cls, name):
-        if '_real_class' not in cls.__dict__ and name not in ALLOWED_CLASSMETHODS:
-            write_string(
-                'WARNING: Falling back to normal extractor since lazy extractor '
-                f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n')
-        return getattr(cls.real_class, name)
-
-
-class LazyLoadExtractor(metaclass=LazyLoadMetaClass):
-    @classproperty
-    def real_class(cls):
-        if '_real_class' not in cls.__dict__:
-            cls._real_class = getattr(importlib.import_module(cls._module), cls.__name__)
-        return cls._real_class
+    @classmethod
+    def ie_key(cls):
+        return cls.__name__[:-2]
 
     def __new__(cls, *args, **kwargs):
-        instance = cls.real_class.__new__(cls.real_class)
+        mod = __import__(cls._module, fromlist=(cls.__name__,))
+        real_cls = getattr(mod, cls.__name__)
+        instance = real_cls.__new__(real_cls)
         instance.__init__(*args, **kwargs)
         return instance

devscripts/make_contributing.py

@@ -1,32 +1,33 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+from __future__ import unicode_literals
 
+# import io
 import optparse
-import re
+# import re
 
 
 def main():
-    return  # This is unused in yt-dlp
-
     parser = optparse.OptionParser(usage='%prog INFILE OUTFILE')
     options, args = parser.parse_args()
     if len(args) != 2:
         parser.error('Expected an input and an output filename')
 
-    infile, outfile = args
 
-    with open(infile, encoding='utf-8') as inf:
+"""     infile, outfile = args
+
+    with io.open(infile, encoding='utf-8') as inf:
         readme = inf.read()
 
-    bug_text = re.search(
-        r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
-    dev_text = re.search(
-        r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING yt-dlp', readme).group(1)
+    bug_text = re.search( """
+# r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
+# dev_text = re.search(
+# r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING yt-dlp',
+"""         readme).group(1)
 
     out = bug_text + dev_text
 
-    with open(outfile, 'w', encoding='utf-8') as outf:
-        outf.write(out)
-
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out) """
 
 if __name__ == '__main__':
     main()

devscripts/make_issue_template.py

@@ -1,76 +1,29 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+from __future__ import unicode_literals
 
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import re
-
-from devscripts.utils import (
-    get_filename_args,
-    read_file,
-    read_version,
-    write_file,
-)
-
-VERBOSE_TMPL = '''
-  - type: checkboxes
-    id: verbose
-    attributes:
-      label: Provide verbose output that clearly demonstrates the problem
-      options:
-        - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-          required: true
-        - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
-          required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'test:youtube']
-        [debug] Portable config "yt-dlp.conf": ['-i']
-        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version %(version)s [9d339c4] (win32_exe)
-        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
-        [debug] Checking exe version: ffmpeg -bsfs
-        [debug] Checking exe version: ffprobe -bsfs
-        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
-        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
-        [debug] Proxy map: {}
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: %(version)s, Current version: %(version)s
-        yt-dlp is up to date (%(version)s)
-        <more lines>
-      render: shell
-    validations:
-      required: true
-'''.strip()
-
-NO_SKIP = '''
-  - type: checkboxes
-    attributes:
-      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-      description: Fill all fields even if you think it is irrelevant for the issue
-      options:
-        - label: I understand that I will be **blocked** if I remove or skip any mandatory\\* field
-          required: true
-'''.strip()
+import io
+import optparse
 
 
 def main():
-    fields = {'version': read_version(), 'no_skip': NO_SKIP}
-    fields['verbose'] = VERBOSE_TMPL % fields
-    fields['verbose_optional'] = re.sub(r'(\n\s+validations:)?\n\s+required: true', '', fields['verbose'])
+    parser = optparse.OptionParser(usage='%prog INFILE OUTFILE')
+    options, args = parser.parse_args()
+    if len(args) != 2:
+        parser.error('Expected an input and an output filename')
 
-    infile, outfile = get_filename_args(has_infile=True)
-    write_file(outfile, read_file(infile) % fields)
+    infile, outfile = args
 
+    with io.open(infile, encoding='utf-8') as inf:
+        issue_template_tmpl = inf.read()
+
+    # Get the version from yt_dlp/version.py without importing the package
+    exec(compile(open('yt_dlp/version.py').read(),
+                 'yt_dlp/version.py', 'exec'))
+
+    out = issue_template_tmpl % {'version': locals()['__version__']}
+
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 if __name__ == '__main__':
     main()

devscripts/make_lazy_extractors.py

@@ -1,117 +1,100 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
+from __future__ import unicode_literals, print_function
 
 from inspect import getsource
+import io
+import os
+from os.path import dirname as dirn
+import sys
 
-from devscripts.utils import get_filename_args, read_file, write_file
+print('WARNING: Lazy loading extractors is an experimental feature that may not always work', file=sys.stderr)
 
-NO_ATTR = object()
-STATIC_CLASS_PROPERTIES = ['IE_NAME', 'IE_DESC', 'SEARCH_KEY', '_VALID_URL', '_WORKING', '_NETRC_MACHINE', 'age_limit']
-CLASS_METHODS = [
-    'ie_key', 'working', 'description', 'suitable', '_match_valid_url', '_match_id', 'get_temp_id', 'is_suitable'
-]
-IE_TEMPLATE = '''
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
+
+lazy_extractors_filename = sys.argv[1]
+if os.path.exists(lazy_extractors_filename):
+    os.remove(lazy_extractors_filename)
+
+from yt_dlp.extractor import _ALL_CLASSES
+from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
+
+with open('devscripts/lazy_load_template.py', 'rt') as f:
+    module_template = f.read()
+
+module_contents = [
+    module_template + '\n' + getsource(InfoExtractor.suitable) + '\n',
+    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
+
+ie_template = '''
 class {name}({bases}):
-    _module = {module!r}
+    _VALID_URL = {valid_url!r}
+    _module = '{module}'
+'''
+
+make_valid_template = '''
+    @classmethod
+    def _make_valid_url(cls):
+        return {valid_url!r}
 '''
-MODULE_TEMPLATE = read_file('devscripts/lazy_load_template.py')
 
 
-def main():
-    lazy_extractors_filename = get_filename_args(default_outfile='yt_dlp/extractor/lazy_extractors.py')
-    if os.path.exists(lazy_extractors_filename):
-        os.remove(lazy_extractors_filename)
-
-    _ALL_CLASSES = get_all_ies()  # Must be before import
-
-    from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
-
-    DummyInfoExtractor = type('InfoExtractor', (InfoExtractor,), {'IE_NAME': NO_ATTR})
-    module_src = '\n'.join((
-        MODULE_TEMPLATE,
-        '    _module = None',
-        *extra_ie_code(DummyInfoExtractor),
-        '\nclass LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n',
-        *build_ies(_ALL_CLASSES, (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
-    ))
-
-    write_file(lazy_extractors_filename, f'{module_src}\n')
+def get_base_name(base):
+    if base is InfoExtractor:
+        return 'LazyLoadExtractor'
+    elif base is SearchInfoExtractor:
+        return 'LazyLoadSearchExtractor'
+    else:
+        return base.__name__
 
 
-def get_all_ies():
-    PLUGINS_DIRNAME = 'ytdlp_plugins'
-    BLOCKED_DIRNAME = f'{PLUGINS_DIRNAME}_blocked'
-    if os.path.exists(PLUGINS_DIRNAME):
-        os.rename(PLUGINS_DIRNAME, BLOCKED_DIRNAME)
-    try:
-        from yt_dlp.extractor.extractors import _ALL_CLASSES
-    finally:
-        if os.path.exists(BLOCKED_DIRNAME):
-            os.rename(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
-    return _ALL_CLASSES
+def build_lazy_ie(ie, name):
+    valid_url = getattr(ie, '_VALID_URL', None)
+    s = ie_template.format(
+        name=name,
+        bases=', '.join(map(get_base_name, ie.__bases__)),
+        valid_url=valid_url,
+        module=ie.__module__)
+    if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
+        s += '\n' + getsource(ie.suitable)
+    if hasattr(ie, '_make_valid_url'):
+        # search extractors
+        s += make_valid_template.format(valid_url=ie._make_valid_url())
+    return s
 
 
-def extra_ie_code(ie, base=None):
-    for var in STATIC_CLASS_PROPERTIES:
-        val = getattr(ie, var)
-        if val != (getattr(base, var) if base else NO_ATTR):
-            yield f'    {var} = {val!r}'
-    yield ''
+# find the correct sorting and add the required base classes so that subclasses
+# can be correctly created
+classes = _ALL_CLASSES[:-1]
+ordered_cls = []
+while classes:
+    for c in classes[:]:
+        bases = set(c.__bases__) - set((object, InfoExtractor, SearchInfoExtractor))
+        stop = False
+        for b in bases:
+            if b not in classes and b not in ordered_cls:
+                if b.__name__ == 'GenericIE':
+                    exit()
+                classes.insert(0, b)
+                stop = True
+        if stop:
+            break
+        if all(b in ordered_cls for b in bases):
+            ordered_cls.append(c)
+            classes.remove(c)
+            break
+ordered_cls.append(_ALL_CLASSES[-1])
 
-    for name in CLASS_METHODS:
-        f = getattr(ie, name)
-        if not base or f.__func__ != getattr(base, name).__func__:
-            yield getsource(f)
+names = []
+for ie in ordered_cls:
+    name = ie.__name__
+    src = build_lazy_ie(ie, name)
+    module_contents.append(src)
+    if ie in _ALL_CLASSES:
+        names.append(name)
 
+module_contents.append(
+    '_ALL_CLASSES = [{0}]'.format(', '.join(names)))
 
-def build_ies(ies, bases, attr_base):
-    names = []
-    for ie in sort_ies(ies, bases):
-        yield build_lazy_ie(ie, ie.__name__, attr_base)
-        if ie in ies:
-            names.append(ie.__name__)
+module_src = '\n'.join(module_contents) + '\n'
 
-    yield f'\n_ALL_CLASSES = [{", ".join(names)}]'
-
-
-def sort_ies(ies, ignored_bases):
-    """find the correct sorting and add the required base classes so that subclasses can be correctly created"""
-    classes, returned_classes = ies[:-1], set()
-    assert ies[-1].__name__ == 'GenericIE', 'Last IE must be GenericIE'
-    while classes:
-        for c in classes[:]:
-            bases = set(c.__bases__) - {object, *ignored_bases}
-            restart = False
-            for b in sorted(bases, key=lambda x: x.__name__):
-                if b not in classes and b not in returned_classes:
-                    assert b.__name__ != 'GenericIE', 'Cannot inherit from GenericIE'
-                    classes.insert(0, b)
-                    restart = True
-            if restart:
-                break
-            if bases <= returned_classes:
-                yield c
-                returned_classes.add(c)
-                classes.remove(c)
-                break
-    yield ies[-1]
-
-
-def build_lazy_ie(ie, name, attr_base):
-    bases = ', '.join({
-        'InfoExtractor': 'LazyLoadExtractor',
-        'SearchInfoExtractor': 'LazyLoadSearchExtractor',
-    }.get(base.__name__, base.__name__) for base in ie.__bases__)
-
-    s = IE_TEMPLATE.format(name=name, module=ie.__module__, bases=bases)
-    return s + '\n'.join(extra_ie_code(ie, attr_base))
-
-
-if __name__ == '__main__':
-    main()
+with io.open(lazy_extractors_filename, 'wt', encoding='utf-8') as f:
+    f.write(module_src)

devscripts/make_readme.py

@@ -1,83 +1,26 @@
-#!/usr/bin/env python3
+from __future__ import unicode_literals
 
-"""
-yt-dlp --help | make_readme.py
-This must be run in a console of correct width
-"""
-
-# Allow direct execution
-import os
+import io
 import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import functools
 import re
 
-from devscripts.utils import read_file, write_file
-
 README_FILE = 'README.md'
+helptext = sys.stdin.read()
 
-OPTIONS_START = 'General Options:'
-OPTIONS_END = 'CONFIGURATION'
-EPILOG_START = 'See full documentation'
-ALLOWED_OVERSHOOT = 2
+if isinstance(helptext, bytes):
+    helptext = helptext.decode('utf-8')
 
-DISABLE_PATCH = object()
+with io.open(README_FILE, encoding='utf-8') as f:
+    oldreadme = f.read()
 
+header = oldreadme[:oldreadme.index('## General Options:')]
+footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
 
-def take_section(text, start=None, end=None, *, shift=0):
-    return text[
-        text.index(start) + shift if start else None:
-        text.index(end) + shift if end else None
-    ]
+options = helptext[helptext.index('  General Options:'):]
+options = re.sub(r'(?m)^  (\w.+)$', r'## \1', options)
+options = options + '\n'
 
-
-def apply_patch(text, patch):
-    return text if patch[0] is DISABLE_PATCH else re.sub(*patch, text)
-
-
-options = take_section(sys.stdin.read(), f'\n  {OPTIONS_START}', f'\n{EPILOG_START}', shift=1)
-
-max_width = max(map(len, options.split('\n')))
-switch_col_width = len(re.search(r'(?m)^\s{5,}', options).group())
-delim = f'\n{" " * switch_col_width}'
-
-PATCHES = (
-    (   # Standardize update message
-        r'(?m)^(    -U, --update\s+).+(\n    \s.+)*$',
-        r'\1Update this program to the latest version',
-    ),
-    (  # Headings
-        r'(?m)^  (\w.+\n)(    (?=\w))?',
-        r'## \1'
-    ),
-    (  # Do not split URLs
-        rf'({delim[:-1]})? (?P<label>\[\S+\] )?(?P<url>https?({delim})?:({delim})?/({delim})?/(({delim})?\S+)+)\s',
-        lambda mobj: ''.join((delim, mobj.group('label') or '', re.sub(r'\s+', '', mobj.group('url')), '\n'))
-    ),
-    (  # Do not split "words"
-        rf'(?m)({delim}\S+)+$',
-        lambda mobj: ''.join((delim, mobj.group(0).replace(delim, '')))
-    ),
-    (  # Allow overshooting last line
-        rf'(?m)^(?P<prev>.+)${delim}(?P<current>.+)$(?!{delim})',
-        lambda mobj: (mobj.group().replace(delim, ' ')
-                      if len(mobj.group()) - len(delim) + 1 <= max_width + ALLOWED_OVERSHOOT
-                      else mobj.group())
-    ),
-    (  # Avoid newline when a space is available b/w switch and description
-        DISABLE_PATCH,  # This creates issues with prepare_manpage
-        r'(?m)^(\s{4}-.{%d})(%s)' % (switch_col_width - 6, delim),
-        r'\1 '
-    ),
-)
-
-readme = read_file(README_FILE)
-
-write_file(README_FILE, ''.join((
-    take_section(readme, end=f'## {OPTIONS_START}'),
-    functools.reduce(apply_patch, PATCHES, options),
-    take_section(readme, f'# {OPTIONS_END}'),
-)))
+with io.open(README_FILE, 'w', encoding='utf-8') as f:
+    f.write(header)
+    f.write(options)
+    f.write(footer)

devscripts/make_supportedsites.py

@@ -1,19 +1,45 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+from __future__ import unicode_literals
 
-# Allow direct execution
+import io
+import optparse
 import os
 import sys
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-
-from devscripts.utils import get_filename_args, write_file
-from yt_dlp.extractor import list_extractor_classes
+# Import yt_dlp
+ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
+sys.path.insert(0, ROOT_DIR)
+import yt_dlp
 
 
 def main():
-    out = '\n'.join(ie.description() for ie in list_extractor_classes() if ie.IE_DESC is not False)
-    write_file(get_filename_args(), f'# Supported sites\n{out}\n')
+    parser = optparse.OptionParser(usage='%prog OUTFILE.md')
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error('Expected an output filename')
+
+    outfile, = args
+
+    def gen_ies_md(ies):
+        for ie in ies:
+            ie_md = '**{0}**'.format(ie.IE_NAME)
+            ie_desc = getattr(ie, 'IE_DESC', None)
+            if ie_desc is False:
+                continue
+            if ie_desc is not None:
+                ie_md += ': {0}'.format(ie.IE_DESC)
+            if not ie.working():
+                ie_md += ' (Currently broken)'
+            yield ie_md
+
+    ies = sorted(yt_dlp.gen_extractors(), key=lambda i: i.IE_NAME.lower())
+    out = '# Supported sites\n' + ''.join(
+        ' - ' + md + '\n'
+        for md in gen_ies_md(ies))
+
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 
 if __name__ == '__main__':

devscripts/posix-locale.sh

@@ -0,0 +1,6 @@
+
+# source this file in your shell to get a POSIX locale (which will break many programs, but that's kind of the point)
+
+export LC_ALL=POSIX
+export LANG=POSIX
+export LANGUAGE=POSIX

devscripts/prepare_manpage.py

@@ -1,22 +1,10 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
+from __future__ import unicode_literals
 
+import io
+import optparse
 import os.path
 import re
 
-from devscripts.utils import (
-    compose_functions,
-    get_filename_args,
-    read_file,
-    write_file,
-)
-
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
 
@@ -24,73 +12,67 @@
 
 # NAME
 
-yt\-dlp \- A youtube-dl fork with additional features and patches
+youtube\-dl \- download videos from youtube.com or other video platforms
 
 # SYNOPSIS
 
 **yt-dlp** \[OPTIONS\] URL [URL...]
 
-# DESCRIPTION
-
 '''
 
 
-def filter_excluded_sections(readme):
-    EXCLUDED_SECTION_BEGIN_STRING = re.escape('<!-- MANPAGE: BEGIN EXCLUDED SECTION -->')
-    EXCLUDED_SECTION_END_STRING = re.escape('<!-- MANPAGE: END EXCLUDED SECTION -->')
-    return re.sub(
-        rf'(?s){EXCLUDED_SECTION_BEGIN_STRING}.+?{EXCLUDED_SECTION_END_STRING}\n',
-        '', readme)
+def main():
+    parser = optparse.OptionParser(usage='%prog OUTFILE.md')
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error('Expected an output filename')
 
+    outfile, = args
 
-def move_sections(readme):
-    MOVE_TAG_TEMPLATE = '<!-- MANPAGE: MOVE "%s" SECTION HERE -->'
-    sections = re.findall(r'(?m)^%s$' % (
-        re.escape(MOVE_TAG_TEMPLATE).replace(r'\%', '%') % '(.+)'), readme)
+    with io.open(README_FILE, encoding='utf-8') as f:
+        readme = f.read()
 
-    for section_name in sections:
-        move_tag = MOVE_TAG_TEMPLATE % section_name
-        if readme.count(move_tag) > 1:
-            raise Exception(f'There is more than one occurrence of "{move_tag}". This is unexpected')
+    readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme)
+    readme = re.sub(r'\s+yt-dlp \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
+    readme = PREFIX + readme
 
-        sections = re.findall(rf'(?sm)(^# {re.escape(section_name)}.+?)(?=^# )', readme)
-        if len(sections) < 1:
-            raise Exception(f'The section {section_name} does not exist')
-        elif len(sections) > 1:
-            raise Exception(f'There are multiple occurrences of section {section_name}, this is unhandled')
+    readme = filter_options(readme)
 
-        readme = readme.replace(sections[0], '', 1).replace(move_tag, sections[0], 1)
-    return readme
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(readme)
 
 
 def filter_options(readme):
-    section = re.search(r'(?sm)^# USAGE AND OPTIONS\n.+?(?=^# )', readme).group(0)
-    options = '# OPTIONS\n'
-    for line in section.split('\n')[1:]:
-        mobj = re.fullmatch(r'''(?x)
-                \s{4}(?P<opt>-(?:,\s|[^\s])+)
-                (?:\s(?P<meta>(?:[^\s]|\s(?!\s))+))?
-                (\s{2,}(?P<desc>.+))?
-            ''', line)
-        if not mobj:
-            options += f'{line.lstrip()}\n'
-            continue
-        option, metavar, description = mobj.group('opt', 'meta', 'desc')
+    ret = ''
+    in_options = False
+    for line in readme.split('\n'):
+        if line.startswith('# '):
+            if line[2:].startswith('OPTIONS'):
+                in_options = True
+            else:
+                in_options = False
 
-        # Pandoc's definition_lists. See http://pandoc.org/README.html
-        option = f'{option} *{metavar}*' if metavar else option
-        description = f'{description}\n' if description else ''
-        options += f'\n{option}\n:   {description}'
-        continue
+        if in_options:
+            if line.lstrip().startswith('-'):
+                split = re.split(r'\s{2,}', line.lstrip())
+                # Description string may start with `-` as well. If there is
+                # only one piece then it's a description bit not an option.
+                if len(split) > 1:
+                    option, description = split
+                    split_option = option.split(' ')
 
-    return readme.replace(section, options, 1)
+                    if not split_option[-1].startswith('-'):  # metavar
+                        option = ' '.join(split_option[:-1] + ['*%s*' % split_option[-1]])
 
+                    # Pandoc's definition_lists. See http://pandoc.org/README.html
+                    # for more information.
+                    ret += '\n%s\n:   %s\n' % (option, description)
+                    continue
+            ret += line.lstrip() + '\n'
+        else:
+            ret += line + '\n'
 
-TRANSFORM = compose_functions(filter_excluded_sections, move_sections, filter_options)
-
-
-def main():
-    write_file(get_filename_args(), PREFIX + TRANSFORM(read_file(README_FILE)))
+    return ret
 
 
 if __name__ == '__main__':

devscripts/release.sh

@@ -0,0 +1,142 @@
+# Unused
+#!/bin/bash
+
+# IMPORTANT: the following assumptions are made
+# * the GH repo is on the origin remote
+# * the gh-pages branch is named so locally
+# * the git config user.signingkey is properly set
+
+# You will need
+# pip install coverage nose rsa wheel
+
+# TODO
+# release notes
+# make hash on local files
+
+set -e
+
+skip_tests=true
+gpg_sign_commits=""
+buildserver='localhost:8142'
+
+while true
+do
+case "$1" in
+    --run-tests)
+        skip_tests=false
+        shift
+    ;;
+    --gpg-sign-commits|-S)
+        gpg_sign_commits="-S"
+        shift
+    ;;
+    --buildserver)
+        buildserver="$2"
+        shift 2
+    ;;
+    --*)
+        echo "ERROR: unknown option $1"
+        exit 1
+    ;;
+    *)
+        break
+    ;;
+esac
+done
+
+if [ -z "$1" ]; then echo "ERROR: specify version number like this: $0 1994.09.06"; exit 1; fi
+version="$1"
+major_version=$(echo "$version" | sed -n 's#^\([0-9]*\.[0-9]*\.[0-9]*\).*#\1#p')
+if test "$major_version" '!=' "$(date '+%Y.%m.%d')"; then
+    echo "$version does not start with today's date!"
+    exit 1
+fi
+
+if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi
+if [ ! -z "`git status --porcelain | grep -v CHANGELOG`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi
+useless_files=$(find yt_dlp -type f -not -name '*.py')
+if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in yt_dlp: $useless_files"; exit 1; fi
+if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi
+if ! type pandoc >/dev/null 2>/dev/null; then echo 'ERROR: pandoc is missing'; exit 1; fi
+if ! python3 -c 'import rsa' 2>/dev/null; then echo 'ERROR: python3-rsa is missing'; exit 1; fi
+if ! python3 -c 'import wheel' 2>/dev/null; then echo 'ERROR: wheel is missing'; exit 1; fi
+
+read -p "Is Changelog up to date? (y/n) " -n 1
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1; fi
+
+/bin/echo -e "\n### First of all, testing..."
+make clean
+if $skip_tests ; then
+    echo 'SKIPPING TESTS'
+else
+    nosetests --verbose --with-coverage --cover-package=yt_dlp --cover-html test --stop || exit 1
+fi
+
+/bin/echo -e "\n### Changing version in version.py..."
+sed -i "s/__version__ = '.*'/__version__ = '$version'/" yt_dlp/version.py
+
+/bin/echo -e "\n### Changing version in Changelog..."
+sed -i "s/<unreleased>/$version/" Changelog.md
+
+/bin/echo -e "\n### Committing documentation, templates and yt_dlp/version.py..."
+make README.md CONTRIBUTING.md issuetemplates supportedsites
+git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE/1_broken_site.md .github/ISSUE_TEMPLATE/2_site_support_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md .github/ISSUE_TEMPLATE/4_bug_report.md .github/ISSUE_TEMPLATE/5_feature_request.md .github/ISSUE_TEMPLATE/6_question.md docs/supportedsites.md yt_dlp/version.py Changelog.md
+git commit $gpg_sign_commits -m "release $version"
+
+/bin/echo -e "\n### Now tagging, signing and pushing..."
+git tag -s -m "Release $version" "$version"
+git show "$version"
+read -p "Is it good, can I push? (y/n) " -n 1
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1; fi
+echo
+MASTER=$(git rev-parse --abbrev-ref HEAD)
+git push origin $MASTER:master
+git push origin "$version"
+
+/bin/echo -e "\n### OK, now it is time to build the binaries..."
+REV=$(git rev-parse HEAD)
+make yt-dlp yt-dlp.tar.gz
+read -p "VM running? (y/n) " -n 1
+wget "http://$buildserver/build/ytdl-org/youtube-dl/yt-dlp.exe?rev=$REV" -O yt-dlp.exe
+mkdir -p "build/$version"
+mv yt-dlp yt-dlp.exe "build/$version"
+mv yt-dlp.tar.gz "build/$version/yt-dlp-$version.tar.gz"
+RELEASE_FILES="yt-dlp yt-dlp.exe yt-dlp-$version.tar.gz"
+(cd build/$version/ && md5sum $RELEASE_FILES > MD5SUMS)
+(cd build/$version/ && sha1sum $RELEASE_FILES > SHA1SUMS)
+(cd build/$version/ && sha256sum $RELEASE_FILES > SHA2-256SUMS)
+(cd build/$version/ && sha512sum $RELEASE_FILES > SHA2-512SUMS)
+
+/bin/echo -e "\n### Signing and uploading the new binaries to GitHub..."
+for f in $RELEASE_FILES; do gpg --passphrase-repeat 5 --detach-sig "build/$version/$f"; done
+
+ROOT=$(pwd)
+python devscripts/create-github-release.py Changelog.md $version "$ROOT/build/$version"
+
+ssh ytdl@yt-dl.org "sh html/update_latest.sh $version"
+
+/bin/echo -e "\n### Now switching to gh-pages..."
+git clone --branch gh-pages --single-branch . build/gh-pages
+(
+    set -e
+    ORIGIN_URL=$(git config --get remote.origin.url)
+    cd build/gh-pages
+    "$ROOT/devscripts/gh-pages/add-version.py" $version
+    "$ROOT/devscripts/gh-pages/update-feed.py"
+    "$ROOT/devscripts/gh-pages/sign-versions.py" < "$ROOT/updates_key.pem"
+    "$ROOT/devscripts/gh-pages/generate-download.py"
+    "$ROOT/devscripts/gh-pages/update-copyright.py"
+    "$ROOT/devscripts/gh-pages/update-sites.py"
+    git add *.html *.html.in update
+    git commit $gpg_sign_commits -m "release $version"
+    git push "$ROOT" gh-pages
+    git push "$ORIGIN_URL" gh-pages
+)
+rm -rf build
+
+make pypi-files
+echo "Uploading to PyPi ..."
+python setup.py sdist bdist_wheel upload
+make clean
+
+/bin/echo -e "\n### DONE!"

devscripts/run_tests.bat

@@ -1,17 +1,17 @@
-@setlocal
 @echo off
-cd /d %~dp0..
 
-if ["%~1"]==[""] (
-    set "test_set="test""
-) else if ["%~1"]==["core"] (
-    set "test_set="-m not download""
-) else if ["%~1"]==["download"] (
-    set "test_set="-m "download""
+rem Keep this list in sync with the `offlinetest` target in Makefile
+set DOWNLOAD_TESTS="age_restriction^|download^|iqiyi_sdk_interpreter^|socks^|subtitles^|write_annotations^|youtube_lists^|youtube_signature^|post_hooks"
+
+if "%YTDL_TEST_SET%" == "core" (
+    set test_set="-I test_("%DOWNLOAD_TESTS%")\.py"
+    set multiprocess_args=""
+) else if "%YTDL_TEST_SET%" == "download" (
+    set test_set="-I test_(?!"%DOWNLOAD_TESTS%").+\.py"
+    set multiprocess_args="--processes=4 --process-timeout=540"
 ) else (
-    echo.Invalid test type "%~1". Use "core" ^| "download"
+    echo YTDL_TEST_SET is not set or invalid
     exit /b 1
 )
 
-set PYTHONWARNINGS=error
-pytest %test_set%
+nosetests test --verbose %test_set:"=% %multiprocess_args:"=%

devscripts/run_tests.sh

@@ -1,14 +1,22 @@
-#!/usr/bin/env sh
+#!/bin/bash
 
-if [ -z $1 ]; then
-    test_set='test'
-elif [ $1 = 'core' ]; then
-    test_set="-m not download"
-elif [ $1 = 'download' ]; then
-    test_set="-m download"
-else
-    echo 'Invalid test type "'$1'". Use "core" | "download"'
-    exit 1
-fi
+# Keep this list in sync with the `offlinetest` target in Makefile
+DOWNLOAD_TESTS="age_restriction|download|iqiyi_sdk_interpreter|overwrites|socks|subtitles|write_annotations|youtube_lists|youtube_signature|post_hooks"
 
-python3 -bb -Werror -m pytest "$test_set"
+test_set=""
+multiprocess_args=""
+
+case "$YTDL_TEST_SET" in
+    core)
+        test_set="-I test_($DOWNLOAD_TESTS)\.py"
+    ;;
+    download)
+        test_set="-I test_(?!$DOWNLOAD_TESTS).+\.py"
+        multiprocess_args="--processes=4 --process-timeout=540"
+    ;;
+    *)
+        break
+    ;;
+esac
+
+nosetests test --verbose $test_set $multiprocess_args

devscripts/set-variant.py

@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import argparse
-import functools
-import re
-
-from devscripts.utils import compose_functions, read_file, write_file
-
-VERSION_FILE = 'yt_dlp/version.py'
-
-
-def parse_options():
-    parser = argparse.ArgumentParser(description='Set the build variant of the package')
-    parser.add_argument('variant', help='Name of the variant')
-    parser.add_argument('-M', '--update-message', default=None, help='Message to show in -U')
-    return parser.parse_args()
-
-
-def property_setter(name, value):
-    return functools.partial(re.sub, rf'(?m)^{name}\s*=\s*.+$', f'{name} = {value!r}')
-
-
-opts = parse_options()
-transform = compose_functions(
-    property_setter('VARIANT', opts.variant),
-    property_setter('UPDATE_HINT', opts.update_message)
-)
-
-write_file(VERSION_FILE, transform(read_file(VERSION_FILE)))

devscripts/show-downloads-statistics.py

@@ -0,0 +1,49 @@
+# Unused
+
+#!/usr/bin/env python
+from __future__ import unicode_literals
+
+import itertools
+import json
+import os
+import re
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from yt_dlp.compat import (
+    compat_print,
+    compat_urllib_request,
+)
+from yt_dlp.utils import format_bytes
+
+
+def format_size(bytes):
+    return '%s (%d bytes)' % (format_bytes(bytes), bytes)
+
+
+total_bytes = 0
+
+for page in itertools.count(1):
+    releases = json.loads(compat_urllib_request.urlopen(
+        'https://api.github.com/repos/ytdl-org/youtube-dl/releases?page=%s' % page
+    ).read().decode('utf-8'))
+
+    if not releases:
+        break
+
+    for release in releases:
+        compat_print(release['name'])
+        for asset in release['assets']:
+            asset_name = asset['name']
+            total_bytes += asset['download_count'] * asset['size']
+            if all(not re.match(p, asset_name) for p in (
+                    r'^yt-dlp$',
+                    r'^yt-dlp-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
+                    r'^yt-dlp\.exe$')):
+                continue
+            compat_print(
+                ' %s size: %s downloads: %d'
+                % (asset_name, format_size(asset['size']), asset['download_count']))
+
+compat_print('total downloads traffic: %s' % format_size(total_bytes))

devscripts/update-formulae.py

@@ -1,39 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Usage: python3 ./devscripts/update-formulae.py <path-to-formulae-rb> <version>
-version can be either 0-aligned (yt-dlp version) or normalized (PyPi version)
-"""
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import json
-import re
-import urllib.request
-
-from devscripts.utils import read_file, write_file
-
-filename, version = sys.argv[1:]
-
-normalized_version = '.'.join(str(int(x)) for x in version.split('.'))
-
-pypi_release = json.loads(urllib.request.urlopen(
-    'https://pypi.org/pypi/yt-dlp/%s/json' % normalized_version
-).read().decode())
-
-tarball_file = next(x for x in pypi_release['urls'] if x['filename'].endswith('.tar.gz'))
-
-sha256sum = tarball_file['digests']['sha256']
-url = tarball_file['url']
-
-formulae_text = read_file(filename)
-
-formulae_text = re.sub(r'sha256 "[0-9a-f]*?"', 'sha256 "%s"' % sha256sum, formulae_text, count=1)
-formulae_text = re.sub(r'url "[^"]*?"', 'url "%s"' % url, formulae_text, count=1)
-
-write_file(filename, formulae_text)

devscripts/update-version.py

@@ -1,54 +1,31 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import contextlib
-import subprocess
-import sys
+from __future__ import unicode_literals
 from datetime import datetime
+# import urllib.request
 
-from devscripts.utils import read_version, write_file
+# response = urllib.request.urlopen('https://blackjack4494.github.io/youtube-dlc/update/LATEST_VERSION')
+# old_version = response.read().decode('utf-8')
 
+exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
+old_version = locals()['__version__']
 
-def get_new_version(revision):
-    version = datetime.utcnow().strftime('%Y.%m.%d')
+old_version_list = old_version.split(".", 4)
 
-    if revision:
-        assert revision.isdigit(), 'Revision must be a number'
-    else:
-        old_version = read_version().split('.')
-        if version.split('.') == old_version[:3]:
-            revision = str(int((old_version + [0])[3]) + 1)
+old_ver = '.'.join(old_version_list[:3])
+old_rev = old_version_list[3] if len(old_version_list) > 3 else ''
 
-    return f'{version}.{revision}' if revision else version
+ver = datetime.utcnow().strftime("%Y.%m.%d")
+rev = str(int(old_rev or 0) + 1) if old_ver == ver else ''
 
+VERSION = '.'.join((ver, rev)) if rev else ver
+# VERSION_LIST = [(int(v) for v in ver.split(".") + [rev or 0])]
 
-def get_git_head():
-    with contextlib.suppress(Exception):
-        sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
-        return sp.communicate()[0].decode().strip() or None
+print('::set-output name=ytdlp_version::' + VERSION)
 
+file_version_py = open('yt_dlp/version.py', 'rt')
+data = file_version_py.read()
+data = data.replace(old_version, VERSION)
+file_version_py.close()
 
-VERSION = get_new_version((sys.argv + [''])[1])
-GIT_HEAD = get_git_head()
-
-VERSION_FILE = f'''\
-# Autogenerated by devscripts/update-version.py
-
-__version__ = {VERSION!r}
-
-RELEASE_GIT_HEAD = {GIT_HEAD!r}
-
-VARIANT = None
-
-UPDATE_HINT = None
-'''
-
-write_file('yt_dlp/version.py', VERSION_FILE)
-print(f'::set-output name=ytdlp_version::{VERSION}')
-print(f'\nVersion = {VERSION}, Git HEAD = {GIT_HEAD}')
+file_version_py = open('yt_dlp/version.py', 'wt')
+file_version_py.write(data)
+file_version_py.close()

devscripts/utils.py

@@ -1,35 +0,0 @@
-import argparse
-import functools
-
-
-def read_file(fname):
-    with open(fname, encoding='utf-8') as f:
-        return f.read()
-
-
-def write_file(fname, content):
-    with open(fname, 'w', encoding='utf-8') as f:
-        return f.write(content)
-
-
-# Get the version without importing the package
-def read_version(fname='yt_dlp/version.py'):
-    exec(compile(read_file(fname), fname, 'exec'))
-    return locals()['__version__']
-
-
-def get_filename_args(has_infile=False, default_outfile=None):
-    parser = argparse.ArgumentParser()
-    if has_infile:
-        parser.add_argument('infile', help='Input file')
-    kwargs = {'nargs': '?', 'default': default_outfile} if default_outfile else {}
-    parser.add_argument('outfile', **kwargs, help='Output file')
-
-    opts = parser.parse_args()
-    if has_infile:
-        return opts.infile, opts.outfile
-    return opts.outfile
-
-
-def compose_functions(*functions):
-    return lambda x: functools.reduce(lambda y, f: f(y), functions, x)

devscripts/wine-py2exe.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# Run with as parameter a setup.py that works in the current directory
+# e.g. no os.chdir()
+# It will run twice, the first time will crash
+
+set -e
+
+SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+
+if [ ! -d wine-py2exe ]; then
+
+    sudo apt-get install wine1.3 axel bsdiff
+
+    mkdir wine-py2exe
+    cd wine-py2exe
+    export WINEPREFIX=`pwd`
+
+    axel -a "http://www.python.org/ftp/python/2.7/python-2.7.msi"
+    axel -a "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"
+    #axel -a "http://winetricks.org/winetricks"
+
+    # http://appdb.winehq.org/objectManager.php?sClass=version&iId=21957
+    echo "Follow python setup on screen"
+    wine msiexec /i python-2.7.msi
+    
+    echo "Follow py2exe setup on screen"
+    wine py2exe-0.6.9.win32-py2.7.exe
+    
+    #echo "Follow Microsoft Visual C++ 2008 Redistributable Package setup on screen"
+    #bash winetricks vcrun2008
+
+    rm py2exe-0.6.9.win32-py2.7.exe
+    rm python-2.7.msi
+    #rm winetricks
+    
+    # http://bugs.winehq.org/show_bug.cgi?id=3591
+    
+    mv drive_c/Python27/Lib/site-packages/py2exe/run.exe drive_c/Python27/Lib/site-packages/py2exe/run.exe.backup
+    bspatch drive_c/Python27/Lib/site-packages/py2exe/run.exe.backup drive_c/Python27/Lib/site-packages/py2exe/run.exe "$SCRIPT_DIR/SizeOfImage.patch"
+    mv drive_c/Python27/Lib/site-packages/py2exe/run_w.exe drive_c/Python27/Lib/site-packages/py2exe/run_w.exe.backup
+    bspatch drive_c/Python27/Lib/site-packages/py2exe/run_w.exe.backup drive_c/Python27/Lib/site-packages/py2exe/run_w.exe "$SCRIPT_DIR/SizeOfImage_w.patch"
+
+    cd -
+    
+else
+
+    export WINEPREFIX="$( cd wine-py2exe && pwd )"
+
+fi
+
+wine "C:\\Python27\\python.exe" "$1" py2exe > "py2exe.log" 2>&1 || true
+echo '# Copying python27.dll' >> "py2exe.log"
+cp "$WINEPREFIX/drive_c/windows/system32/python27.dll" build/bdist.win32/winexe/bundle-2.7/
+wine "C:\\Python27\\python.exe" "$1" py2exe >> "py2exe.log" 2>&1
+

devscripts/zsh-completion.py

@@ -1,12 +1,11 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+from __future__ import unicode_literals
 
-# Allow direct execution
 import os
+from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import yt_dlp
 
 ZSH_COMPLETION_FILE = "completions/zsh/_yt-dlp"
@@ -46,5 +45,5 @@ def build_completion(opt_parser):
         f.write(template)
 
 
-parser = yt_dlp.parseOpts(ignore_config_files=True)[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)

docs/.gitignore

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

docs/Changelog.md

@@ -0,0 +1,5 @@
+---
+orphan: true
+---
+```{include} ../Changelog.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

@@ -1,153 +1,79 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+# coding: utf-8
 
-# Allow direct execution
-import os
+from __future__ import unicode_literals
 import sys
-
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
+# import os
 import platform
 
-from PyInstaller.__main__ import run as run_pyinstaller
+from PyInstaller.utils.win32.versioninfo import (
+    VarStruct, VarFileInfo, StringStruct, StringTable,
+    StringFileInfo, FixedFileInfo, VSVersionInfo, SetVersion,
+)
+import PyInstaller.__main__
 
-from devscripts.utils import read_version
+arch = sys.argv[1] if len(sys.argv) > 1 else platform.architecture()[0][:2]
+assert arch in ('32', '64')
+print('Building %sbit version' % arch)
+_x86 = '_x86' if arch == '32' else ''
 
-OS_NAME, MACHINE, ARCH = sys.platform, platform.machine(), platform.architecture()[0][:2]
-if MACHINE in ('x86_64', 'AMD64') or ('i' in MACHINE and '86' in MACHINE):
-    # NB: Windows x86 has MACHINE = AMD64 irrespective of bitness
-    MACHINE = 'x86' if ARCH == '32' else ''
+FILE_DESCRIPTION = 'Media Downloader%s' % (' (32 Bit)' if _x86 else '')
 
+# root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+# print('Changing working directory to %s' % root_dir)
+# os.chdir(root_dir)
 
-def main():
-    opts, version = parse_options(), read_version()
+exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
+VERSION = locals()['__version__']
 
-    onedir = '--onedir' in opts or '-D' in opts
-    if not onedir and '-F' not in opts and '--onefile' not in opts:
-        opts.append('--onefile')
+VERSION_LIST = VERSION.split('.')
+VERSION_LIST = list(map(int, VERSION_LIST)) + [0] * (4 - len(VERSION_LIST))
 
-    name, final_file = exe(onedir)
-    print(f'Building yt-dlp v{version} for {OS_NAME} {platform.machine()} with options {opts}')
-    print('Remember to update the version using  "devscripts/update-version.py"')
-    if not os.path.isfile('yt_dlp/extractor/lazy_extractors.py'):
-        print('WARNING: Building without lazy_extractors. Run  '
-              '"devscripts/make_lazy_extractors.py"  to build lazy extractors', file=sys.stderr)
-    print(f'Destination: {final_file}\n')
+print('Version: %s%s' % (VERSION, _x86))
+print('Remember to update the version using devscipts\\update-version.py')
 
-    opts = [
-        f'--name={name}',
-        '--icon=devscripts/logo.ico',
-        '--upx-exclude=vcruntime140.dll',
-        '--noconfirm',
-        *dependency_options(),
-        *opts,
-        'yt_dlp/__main__.py',
+VERSION_FILE = VSVersionInfo(
+    ffi=FixedFileInfo(
+        filevers=VERSION_LIST,
+        prodvers=VERSION_LIST,
+        mask=0x3F,
+        flags=0x0,
+        OS=0x4,
+        fileType=0x1,
+        subtype=0x0,
+        date=(0, 0),
+    ),
+    kids=[
+        StringFileInfo([
+            StringTable(
+                '040904B0', [
+                    StringStruct('Comments', 'yt-dlp%s Command Line Interface.' % _x86),
+                    StringStruct('CompanyName', 'https://github.com/yt-dlp'),
+                    StringStruct('FileDescription', FILE_DESCRIPTION),
+                    StringStruct('FileVersion', VERSION),
+                    StringStruct('InternalName', 'yt-dlp%s' % _x86),
+                    StringStruct(
+                        'LegalCopyright',
+                        'pukkandan.ytdlp@gmail.com | UNLICENSE',
+                    ),
+                    StringStruct('OriginalFilename', 'yt-dlp%s.exe' % _x86),
+                    StringStruct('ProductName', 'yt-dlp%s' % _x86),
+                    StringStruct('ProductVersion', '%s%s' % (VERSION, _x86)),
+                ])]),
+        VarFileInfo([VarStruct('Translation', [0, 1200])])
     ]
+)
 
-    print(f'Running PyInstaller with {opts}')
-    run_pyinstaller(opts)
-    set_version_info(final_file, version)
-
-
-def parse_options():
-    # Compatibility with older arguments
-    opts = sys.argv[1:]
-    if opts[0:1] in (['32'], ['64']):
-        if ARCH != opts[0]:
-            raise Exception(f'{opts[0]}bit executable cannot be built on a {ARCH}bit system')
-        opts = opts[1:]
-    return opts
-
-
-def exe(onedir):
-    """@returns (name, path)"""
-    name = '_'.join(filter(None, (
-        'yt-dlp',
-        {'win32': '', 'darwin': 'macos'}.get(OS_NAME, OS_NAME),
-        MACHINE
-    )))
-    return name, ''.join(filter(None, (
-        'dist/',
-        onedir and f'{name}/',
-        name,
-        OS_NAME == 'win32' and '.exe'
-    )))
-
-
-def version_to_list(version):
-    version_list = version.split('.')
-    return list(map(int, version_list)) + [0] * (4 - len(version_list))
-
-
-def dependency_options():
-    # Due to the current implementation, these are auto-detected, but explicitly add them just in case
-    dependencies = [pycryptodome_module(), 'mutagen', 'brotli', 'certifi', 'websockets']
-    excluded_modules = ['test', 'ytdlp_plugins', 'youtube_dl', 'youtube_dlc']
-
-    yield from (f'--hidden-import={module}' for module in dependencies)
-    yield '--collect-submodules=websockets'
-    yield from (f'--exclude-module={module}' for module in excluded_modules)
-
-
-def pycryptodome_module():
-    try:
-        import Cryptodome  # noqa: F401
-    except ImportError:
-        try:
-            import Crypto  # noqa: F401
-            print('WARNING: Using Crypto since Cryptodome is not available. '
-                  'Install with: pip install pycryptodomex', file=sys.stderr)
-            return 'Crypto'
-        except ImportError:
-            pass
-    return 'Cryptodome'
-
-
-def set_version_info(exe, version):
-    if OS_NAME == 'win32':
-        windows_set_version(exe, version)
-
-
-def windows_set_version(exe, version):
-    from PyInstaller.utils.win32.versioninfo import (
-        FixedFileInfo,
-        SetVersion,
-        StringFileInfo,
-        StringStruct,
-        StringTable,
-        VarFileInfo,
-        VarStruct,
-        VSVersionInfo,
-    )
-
-    version_list = version_to_list(version)
-    suffix = MACHINE and f'_{MACHINE}'
-    SetVersion(exe, VSVersionInfo(
-        ffi=FixedFileInfo(
-            filevers=version_list,
-            prodvers=version_list,
-            mask=0x3F,
-            flags=0x0,
-            OS=0x4,
-            fileType=0x1,
-            subtype=0x0,
-            date=(0, 0),
-        ),
-        kids=[
-            StringFileInfo([StringTable('040904B0', [
-                StringStruct('Comments', 'yt-dlp%s Command Line Interface' % suffix),
-                StringStruct('CompanyName', 'https://github.com/yt-dlp'),
-                StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),
-                StringStruct('FileVersion', version),
-                StringStruct('InternalName', f'yt-dlp{suffix}'),
-                StringStruct('LegalCopyright', 'pukkandan.ytdlp@gmail.com | UNLICENSE'),
-                StringStruct('OriginalFilename', f'yt-dlp{suffix}.exe'),
-                StringStruct('ProductName', f'yt-dlp{suffix}'),
-                StringStruct(
-                    'ProductVersion', f'{version}{suffix} on Python {platform.python_version()}'),
-            ])]), VarFileInfo([VarStruct('Translation', [0, 1200])])
-        ]
-    ))
-
-
-if __name__ == '__main__':
-    main()
+PyInstaller.__main__.run([
+    '--name=yt-dlp%s' % _x86,
+    '--onefile',
+    '--icon=devscripts/cloud.ico',
+    '--exclude-module=youtube_dl',
+    '--exclude-module=test',
+    '--exclude-module=ytdlp_plugins',
+    '--hidden-import=mutagen',
+    '--hidden-import=Crypto',
+    '--upx-exclude=vcruntime140.dll',
+    'yt_dlp/__main__.py',
+])
+SetVersion('dist/yt-dlp%s.exe' % _x86, VERSION_FILE)

requirements.txt

@@ -1,6 +1,2 @@
 mutagen
-pycryptodomex
-websockets
-brotli; platform_python_implementation=='CPython'
-brotlicffi; platform_python_implementation!='CPython'
-certifi
+pycryptodome

setup.cfg

@@ -1,41 +1,6 @@
 [wheel]
-universal = true
-
+universal = True
 
 [flake8]
-exclude = build,venv,.tox,.git,.pytest_cache
-ignore = E402,E501,E731,E741,W503
-max_line_length = 120
-per_file_ignores =
-    devscripts/lazy_load_template.py: F401
-
-
-[tool:pytest]
-addopts = -ra -v --strict-markers
-markers =
-    download
-
-
-[tox:tox]
-skipsdist = true
-envlist = py{36,37,38,39,310},pypy{36,37,38,39}
-skip_missing_interpreters = true
-
-[testenv]  # tox
-deps =
-   pytest
-commands = pytest {posargs:"-m not download"}
-passenv = HOME  # For test_compat_expanduser
-setenv =
-    # PYTHONWARNINGS = error  # Catches PIP's warnings too
-
-
-[isort]
-py_version = 37
-multi_line_output = VERTICAL_HANGING_INDENT
-line_length = 80
-reverse_relative = true
-ensure_newline_before_comments = true
-include_trailing_comma = true
-known_first_party =
-    test
+exclude = yt_dlp/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv,devscripts/create-github-release.py,devscripts/release.sh,devscripts/show-downloads-statistics.py
+ignore = E402,E501,E731,E741,W503

setup.py

@@ -1,76 +1,31 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+# coding: utf-8
 
+from setuptools import setup, Command, find_packages
 import os.path
-import subprocess
-import sys
 import warnings
+import sys
+from distutils.spawn import spawn
 
-try:
-    from setuptools import Command, find_packages, setup
-    setuptools_available = True
-except ImportError:
-    from distutils.core import Command, setup
-    setuptools_available = False
 
-from devscripts.utils import read_file, read_version
+# Get the version from yt_dlp/version.py without importing the package
+exec(compile(open('yt_dlp/version.py').read(),
+             'yt_dlp/version.py', 'exec'))
 
-VERSION = read_version()
 
-DESCRIPTION = 'A youtube-dl fork with additional features and patches'
+DESCRIPTION = 'Command-line program to download videos from YouTube.com and many other other video platforms.'
 
 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',
-    read_file('README.md')))
+    '**PS**: Many links in this document will not work since this is a copy of the README.md from Github',
+    open("README.md", "r", encoding="utf-8").read()))
 
-REQUIREMENTS = read_file('requirements.txt').splitlines()
+REQUIREMENTS = ['mutagen', 'pycryptodome']
 
 
-def packages():
-    if setuptools_available:
-        return find_packages(exclude=('youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins'))
-
-    return [
-        'yt_dlp', 'yt_dlp.extractor', 'yt_dlp.downloader', 'yt_dlp.postprocessor', 'yt_dlp.compat',
-        'yt_dlp.extractor.anvato_token_generator',
-    ]
-
-
-def py2exe_params():
-    import py2exe  # noqa: F401
-
-    warnings.warn(
-        'py2exe builds do not support pycryptodomex and needs VC++14 to run. '
-        'The recommended way is to use "pyinst.py" to build using pyinstaller')
-
-    return {
-        'console': [{
-            'script': './yt_dlp/__main__.py',
-            'dest_base': 'yt-dlp',
-            'version': VERSION,
-            'description': DESCRIPTION,
-            'comments': LONG_DESCRIPTION.split('\n')[0],
-            'product_name': 'yt-dlp',
-            'product_version': VERSION,
-            'icon_resources': [(1, 'devscripts/logo.ico')],
-        }],
-        'options': {
-            'py2exe': {
-                'bundle_files': 0,
-                'compressed': 1,
-                'optimize': 2,
-                'dist_dir': './dist',
-                'excludes': ['Crypto', 'Cryptodome'],  # py2exe cannot import Crypto
-                'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
-                # Modules that are only imported dynamically must be added here
-                'includes': ['yt_dlp.compat._legacy'],
-            }
-        },
-        'zipfile': None
-    }
-
-
-def build_params():
+if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
+    print("inv")
+else:
     files_spec = [
         ('share/bash-completion/completions', ['completions/bash/yt-dlp']),
         ('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
@@ -78,23 +33,21 @@ def build_params():
         ('share/doc/yt_dlp', ['README.txt']),
         ('share/man/man1', ['yt-dlp.1'])
     ]
+    root = os.path.dirname(os.path.abspath(__file__))
     data_files = []
     for dirname, files in files_spec:
         resfiles = []
         for fn in files:
             if not os.path.exists(fn):
-                warnings.warn(f'Skipping file {fn} since it is not present. Try running " make pypi-files " first')
+                warnings.warn('Skipping file %s since it is not present. Try running `make pypi-files` first.' % fn)
             else:
                 resfiles.append(fn)
         data_files.append((dirname, resfiles))
 
-    params = {'data_files': data_files}
-
-    if setuptools_available:
-        params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']}
-    else:
-        params['scripts'] = ['yt-dlp']
-    return params
+    params = {
+        'data_files': data_files,
+    }
+    params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']}
 
 
 class build_lazy_extractors(Command):
@@ -108,47 +61,57 @@ def finalize_options(self):
         pass
 
     def run(self):
-        if self.dry_run:
-            print('Skipping build of lazy extractors in dry run mode')
-            return
-        subprocess.run([sys.executable, 'devscripts/make_lazy_extractors.py'])
+        spawn(
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'],
+            dry_run=self.dry_run,
+        )
 
 
-params = py2exe_params() if sys.argv[1:2] == ['py2exe'] else build_params()
+packages = find_packages(exclude=("youtube_dl", "test", "ytdlp_plugins"))
+
 setup(
-    name='yt-dlp',
-    version=VERSION,
-    maintainer='pukkandan',
-    maintainer_email='pukkandan.ytdlp@gmail.com',
+    name="yt-dlp",
+    version=__version__,
+    maintainer="pukkandan",
+    maintainer_email="pukkandan.ytdlp@gmail.com",
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    long_description_content_type='text/markdown',
-    url='https://github.com/yt-dlp/yt-dlp',
-    packages=packages(),
+    long_description_content_type="text/markdown",
+    url="https://github.com/yt-dlp/yt-dlp",
+    packages=packages,
     install_requires=REQUIREMENTS,
-    python_requires='>=3.7',
     project_urls={
-        'Documentation': 'https://github.com/yt-dlp/yt-dlp#readme',
+        'Documentation': 'https://yt-dlp.readthedocs.io',
         'Source': 'https://github.com/yt-dlp/yt-dlp',
         'Tracker': 'https://github.com/yt-dlp/yt-dlp/issues',
-        'Funding': 'https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators',
+        #'Funding': 'https://donate.pypi.org',
     },
     classifiers=[
-        'Topic :: Multimedia :: Video',
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: Implementation',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
-        'License :: Public Domain',
-        'Operating System :: OS Independent',
+        "Topic :: Multimedia :: Video",
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: IronPython",
+        "Programming Language :: Python :: Implementation :: Jython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "License :: Public Domain",
+        "Operating System :: OS Independent",
     ],
+    python_requires='>=2.6',
+
     cmdclass={'build_lazy_extractors': build_lazy_extractors},
     **params
 )

test/helper.py

@@ -1,34 +1,36 @@
+from __future__ import unicode_literals
+
 import errno
+import io
 import hashlib
 import json
 import os.path
 import re
+import types
 import ssl
 import sys
-import types
 
 import yt_dlp.extractor
 from yt_dlp import YoutubeDL
-from yt_dlp.compat import compat_os_name
-from yt_dlp.utils import preferredencoding, write_string
-
-if 'pytest' in sys.modules:
-    import pytest
-    is_download_test = pytest.mark.download
-else:
-    def is_download_test(testClass):
-        return testClass
+from yt_dlp.compat import (
+    compat_os_name,
+    compat_str,
+)
+from yt_dlp.utils import (
+    preferredencoding,
+    write_string,
+)
 
 
 def get_params(override=None):
     PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                                   'parameters.json')
+                                   "parameters.json")
     LOCAL_PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                                         'local_parameters.json')
-    with open(PARAMETERS_FILE, encoding='utf-8') as pf:
+                                         "local_parameters.json")
+    with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
         parameters = json.load(pf)
     if os.path.exists(LOCAL_PARAMETERS_FILE):
-        with open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf:
+        with io.open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf:
             parameters.update(json.load(pf))
     if override:
         parameters.update(override)
@@ -44,7 +46,7 @@ def try_rm(filename):
             raise
 
 
-def report_warning(message, *args, **kwargs):
+def report_warning(message):
     '''
     Print the message to stderr, it will be prefixed with 'WARNING:'
     If stderr is a tty file the 'WARNING:' will be colored
@@ -53,8 +55,8 @@ def report_warning(message, *args, **kwargs):
         _msg_header = '\033[0;33mWARNING:\033[0m'
     else:
         _msg_header = 'WARNING:'
-    output = f'{_msg_header} {message}\n'
-    if 'b' in getattr(sys.stderr, 'mode', ''):
+    output = '%s %s\n' % (_msg_header, message)
+    if 'b' in getattr(sys.stderr, 'mode', '') or sys.version_info[0] < 3:
         output = output.encode(preferredencoding())
     sys.stderr.write(output)
 
@@ -64,13 +66,13 @@ def __init__(self, override=None):
         # Different instances of the downloader can't share the same dictionary
         # some test set the "sublang" parameter, which would break the md5 checks.
         params = get_params(override=override)
-        super().__init__(params, auto_init=False)
+        super(FakeYDL, self).__init__(params, auto_init=False)
         self.result = []
 
-    def to_screen(self, s, *args, **kwargs):
+    def to_screen(self, s, skip_eol=None):
         print(s)
 
-    def trouble(self, s, *args, **kwargs):
+    def trouble(self, s, tb=None):
         raise Exception(s)
 
     def download(self, x):
@@ -80,59 +82,56 @@ def expect_warning(self, regex):
         # Silence an expected warning matching a regex
         old_report_warning = self.report_warning
 
-        def report_warning(self, message, *args, **kwargs):
+        def report_warning(self, message):
             if re.match(regex, message):
                 return
-            old_report_warning(message, *args, **kwargs)
+            old_report_warning(message)
         self.report_warning = types.MethodType(report_warning, self)
 
 
 def gettestcases(include_onlymatching=False):
     for ie in yt_dlp.extractor.gen_extractors():
-        yield from ie.get_testcases(include_onlymatching)
-
-
-def getwebpagetestcases():
-    for ie in yt_dlp.extractor.gen_extractors():
-        for tc in ie.get_webpage_testcases():
-            tc.setdefault('add_ie', []).append('Generic')
+        for tc in ie.get_testcases(include_onlymatching):
             yield tc
 
 
-md5 = lambda s: hashlib.md5(s.encode()).hexdigest()
+md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
 
 
 def expect_value(self, got, expected, field):
-    if isinstance(expected, str) and expected.startswith('re:'):
+    if isinstance(expected, compat_str) and expected.startswith('re:'):
         match_str = expected[len('re:'):]
         match_rex = re.compile(match_str)
 
         self.assertTrue(
-            isinstance(got, str),
-            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+            isinstance(got, compat_str),
+            'Expected a %s object, but got %s for field %s' % (
+                compat_str.__name__, type(got).__name__, field))
         self.assertTrue(
             match_rex.match(got),
-            f'field {field} (value: {got!r}) should match {match_str!r}')
-    elif isinstance(expected, str) and expected.startswith('startswith:'):
+            'field %s (value: %r) should match %r' % (field, got, match_str))
+    elif isinstance(expected, compat_str) and expected.startswith('startswith:'):
         start_str = expected[len('startswith:'):]
         self.assertTrue(
-            isinstance(got, str),
-            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+            isinstance(got, compat_str),
+            'Expected a %s object, but got %s for field %s' % (
+                compat_str.__name__, type(got).__name__, field))
         self.assertTrue(
             got.startswith(start_str),
-            f'field {field} (value: {got!r}) should start with {start_str!r}')
-    elif isinstance(expected, str) and expected.startswith('contains:'):
+            'field %s (value: %r) should start with %r' % (field, got, start_str))
+    elif isinstance(expected, compat_str) and expected.startswith('contains:'):
         contains_str = expected[len('contains:'):]
         self.assertTrue(
-            isinstance(got, str),
-            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+            isinstance(got, compat_str),
+            'Expected a %s object, but got %s for field %s' % (
+                compat_str.__name__, type(got).__name__, field))
         self.assertTrue(
             contains_str in got,
-            f'field {field} (value: {got!r}) should contain {contains_str!r}')
+            'field %s (value: %r) should contain %r' % (field, got, contains_str))
     elif isinstance(expected, type):
         self.assertTrue(
             isinstance(got, expected),
-            f'Expected type {expected!r} for field {field}, but got value {got!r} of type {type(got)!r}')
+            'Expected type %r for field %s, but got value %r of type %r' % (expected, field, got, type(got)))
     elif isinstance(expected, dict) and isinstance(got, dict):
         expect_dict(self, got, expected)
     elif isinstance(expected, list) and isinstance(got, list):
@@ -149,15 +148,16 @@ def expect_value(self, got, expected, field):
                     index, field, type_expected, type_got))
             expect_value(self, item_got, item_expected, field)
     else:
-        if isinstance(expected, str) and expected.startswith('md5:'):
+        if isinstance(expected, compat_str) and expected.startswith('md5:'):
             self.assertTrue(
-                isinstance(got, str),
-                f'Expected field {field} to be a unicode object, but got value {got!r} of type {type(got)!r}')
+                isinstance(got, compat_str),
+                'Expected field %s to be a unicode object, but got value %r of type %r' % (field, got, type(got)))
             got = 'md5:' + md5(got)
-        elif isinstance(expected, str) and re.match(r'^(?:min|max)?count:\d+', expected):
+        elif isinstance(expected, compat_str) and re.match(r'^(?:min|max)?count:\d+', expected):
             self.assertTrue(
                 isinstance(got, (list, dict)),
-                f'Expected field {field} to be a list or a dict, but it is of type {type(got).__name__}')
+                'Expected field %s to be a list or a dict, but it is of type %s' % (
+                    field, type(got).__name__))
             op, _, expected_num = expected.partition(':')
             expected_num = int(expected_num)
             if op == 'mincount':
@@ -177,7 +177,7 @@ def expect_value(self, got, expected, field):
             return
         self.assertEqual(
             expected, got,
-            f'Invalid value for field {field}, expected {expected!r}, got {got!r}')
+            'Invalid value for field %s, expected %r, got %r' % (field, expected, got))
 
 
 def expect_dict(self, got_dict, expected_dict):
@@ -186,79 +186,37 @@ def expect_dict(self, got_dict, expected_dict):
         expect_value(self, got, expected, info_field)
 
 
-def sanitize_got_info_dict(got_dict):
-    IGNORED_FIELDS = (
-        *YoutubeDL._format_fields,
-
-        # Lists
-        'formats', 'thumbnails', 'subtitles', 'automatic_captions', 'comments', 'entries',
-
-        # Auto-generated
-        'autonumber', 'playlist', 'format_index', 'video_ext', 'audio_ext', 'duration_string', 'epoch',
-        'fulltitle', 'extractor', 'extractor_key', 'filepath', 'infojson_filename', 'original_url', 'n_entries',
-
-        # Only live_status needs to be checked
-        'is_live', 'was_live',
-    )
-
-    IGNORED_PREFIXES = ('', 'playlist', 'requested', 'webpage')
-
-    def sanitize(key, value):
-        if isinstance(value, str) and len(value) > 100 and key != 'thumbnail':
-            return f'md5:{md5(value)}'
-        elif isinstance(value, list) and len(value) > 10:
-            return f'count:{len(value)}'
-        elif key.endswith('_count') and isinstance(value, int):
-            return int
-        return value
-
-    test_info_dict = {
-        key: sanitize(key, value) for key, value in got_dict.items()
-        if value is not None and key not in IGNORED_FIELDS and not any(
-            key.startswith(f'{prefix}_') for prefix in IGNORED_PREFIXES)
-    }
-
-    # display_id may be generated from id
-    if test_info_dict.get('display_id') == test_info_dict.get('id'):
-        test_info_dict.pop('display_id')
-
-    return test_info_dict
-
-
 def expect_info_dict(self, got_dict, expected_dict):
     expect_dict(self, got_dict, expected_dict)
     # Check for the presence of mandatory fields
     if got_dict.get('_type') not in ('playlist', 'multi_video'):
-        mandatory_fields = ['id', 'title']
-        if expected_dict.get('ext'):
-            mandatory_fields.extend(('url', 'ext'))
-        for key in mandatory_fields:
+        for key in ('id', 'url', 'title', 'ext'):
             self.assertTrue(got_dict.get(key), 'Missing mandatory field %s' % key)
     # Check for mandatory fields that are automatically set by YoutubeDL
     for key in ['webpage_url', 'extractor', 'extractor_key']:
         self.assertTrue(got_dict.get(key), 'Missing field: %s' % key)
 
-    test_info_dict = sanitize_got_info_dict(got_dict)
-
+    # Are checkable fields missing from the test case definition?
+    test_info_dict = dict((key, value if not isinstance(value, compat_str) or len(value) < 250 else 'md5:' + md5(value))
+                          for key, value in got_dict.items()
+                          if value and key in ('id', 'title', 'description', 'uploader', 'upload_date', 'timestamp', 'uploader_id', 'location', 'age_limit'))
     missing_keys = set(test_info_dict.keys()) - set(expected_dict.keys())
     if missing_keys:
         def _repr(v):
-            if isinstance(v, str):
+            if isinstance(v, compat_str):
                 return "'%s'" % v.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n')
-            elif isinstance(v, type):
-                return v.__name__
             else:
                 return repr(v)
         info_dict_str = ''
         if len(missing_keys) != len(expected_dict):
             info_dict_str += ''.join(
-                f'    {_repr(k)}: {_repr(v)},\n'
+                '    %s: %s,\n' % (_repr(k), _repr(v))
                 for k, v in test_info_dict.items() if k not in missing_keys)
 
             if info_dict_str:
                 info_dict_str += '\n'
         info_dict_str += ''.join(
-            f'    {_repr(k)}: {_repr(test_info_dict[k])},\n'
+            '    %s: %s,\n' % (_repr(k), _repr(test_info_dict[k]))
             for k in missing_keys)
         write_string(
             '\n\'info_dict\': {\n' + info_dict_str + '},\n', out=sys.stderr)
@@ -287,30 +245,30 @@ def assertRegexpMatches(self, text, regexp, msg=None):
 def assertGreaterEqual(self, got, expected, msg=None):
     if not (got >= expected):
         if msg is None:
-            msg = f'{got!r} not greater than or equal to {expected!r}'
+            msg = '%r not greater than or equal to %r' % (got, expected)
         self.assertTrue(got >= expected, msg)
 
 
 def assertLessEqual(self, got, expected, msg=None):
     if not (got <= expected):
         if msg is None:
-            msg = f'{got!r} not less than or equal to {expected!r}'
+            msg = '%r not less than or equal to %r' % (got, expected)
         self.assertTrue(got <= expected, msg)
 
 
 def assertEqual(self, got, expected, msg=None):
     if not (got == expected):
         if msg is None:
-            msg = f'{got!r} not equal to {expected!r}'
+            msg = '%r not equal to %r' % (got, expected)
         self.assertTrue(got == expected, msg)
 
 
 def expect_warnings(ydl, warnings_re):
     real_warning = ydl.report_warning
 
-    def _report_warning(w, *args, **kwargs):
+    def _report_warning(w):
         if not any(re.search(w_re, w) for w_re in warnings_re):
-            real_warning(w, *args, **kwargs)
+            real_warning(w)
 
     ydl.report_warning = _report_warning
 

test/parameters.json

@@ -1,41 +1,41 @@
 {
-    "check_formats": false,
-    "consoletitle": false,
-    "continuedl": true,
-    "forcedescription": false,
-    "forcefilename": false,
-    "forceformat": false,
-    "forcethumbnail": false,
-    "forcetitle": false,
-    "forceurl": false,
+    "consoletitle": false, 
+    "continuedl": true, 
+    "forcedescription": false, 
+    "forcefilename": false, 
+    "forceformat": false, 
+    "forcethumbnail": false, 
+    "forcetitle": false, 
+    "forceurl": false, 
     "force_write_download_archive": false,
-    "format": "b/bv",
-    "ignoreerrors": false,
-    "listformats": null,
-    "logtostderr": false,
-    "matchtitle": null,
-    "max_downloads": null,
-    "overwrites": null,
-    "nopart": false,
-    "noprogress": false,
-    "outtmpl": "%(id)s.%(ext)s",
-    "password": null,
-    "playliststart": 1,
-    "prefer_free_formats": false,
-    "quiet": false,
-    "ratelimit": null,
-    "rejecttitle": null,
-    "retries": 10,
-    "simulate": false,
-    "subtitleslang": null,
+    "format": "best",
+    "ignoreerrors": false, 
+    "listformats": null, 
+    "logtostderr": false, 
+    "matchtitle": null, 
+    "max_downloads": null, 
+    "overwrites": null, 
+    "nopart": false, 
+    "noprogress": false, 
+    "outtmpl": "%(id)s.%(ext)s", 
+    "password": null, 
+    "playlistend": -1, 
+    "playliststart": 1, 
+    "prefer_free_formats": false, 
+    "quiet": false, 
+    "ratelimit": null, 
+    "rejecttitle": null, 
+    "retries": 10, 
+    "simulate": false, 
+    "subtitleslang": null, 
     "subtitlesformat": "best",
-    "test": true,
-    "updatetime": true,
-    "usenetrc": false,
-    "username": null,
-    "verbose": true,
-    "writedescription": false,
-    "writeinfojson": true,
+    "test": true, 
+    "updatetime": true, 
+    "usenetrc": false, 
+    "username": null, 
+    "verbose": true, 
+    "writedescription": false, 
+    "writeinfojson": true, 
     "writeannotations": false,
     "writelink": false,
     "writeurllink": false,
@@ -44,5 +44,6 @@
     "writesubtitles": false,
     "allsubtitles": false,
     "listsubtitles": false,
+    "socket_timeout": 20,
     "fixup": "never"
 }

test/swftests/.gitignore

@@ -0,0 +1 @@
+*.swf

test/swftests/ArrayAccess.as

@@ -0,0 +1,19 @@
+// input: [["a", "b", "c", "d"]]
+// output: ["c", "b", "a", "d"]
+
+package {
+public class ArrayAccess {
+    public static function main(ar:Array):Array {
+    	var aa:ArrayAccess = new ArrayAccess();
+    	return aa.f(ar, 2);
+    }
+
+    private function f(ar:Array, num:Number):Array{
+        var x:String = ar[0];
+        var y:String = ar[num % ar.length];
+        ar[0] = y;
+        ar[num] = x;
+        return ar;
+    }
+}
+}

test/swftests/ClassCall.as

@@ -0,0 +1,17 @@
+// input: []
+// output: 121
+
+package {
+public class ClassCall {
+    public static function main():int{
+    	var f:OtherClass = new OtherClass();
+        return f.func(100,20);
+    }
+}
+}
+
+class OtherClass {
+	public function func(x: int, y: int):int {
+		return x+y+1;
+	}
+}

test/swftests/ClassConstruction.as

@@ -0,0 +1,15 @@
+// input: []
+// output: 0
+
+package {
+public class ClassConstruction {
+    public static function main():int{
+    	var f:Foo = new Foo();
+        return 0;
+    }
+}
+}
+
+class Foo {
+
+}

test/swftests/ConstArrayAccess.as

@@ -0,0 +1,18 @@
+// input: []
+// output: 4
+
+package {
+public class ConstArrayAccess {
+	private static const x:int = 2;
+	private static const ar:Array = ["42", "3411"];
+
+    public static function main():int{
+        var c:ConstArrayAccess = new ConstArrayAccess();
+        return c.f();
+    }
+
+    public function f(): int {
+    	return ar[1].length;
+    }
+}
+}

test/swftests/ConstantInt.as

@@ -0,0 +1,12 @@
+// input: []
+// output: 2
+
+package {
+public class ConstantInt {
+	private static const x:int = 2;
+
+    public static function main():int{
+        return x;
+    }
+}
+}

test/swftests/DictCall.as

@@ -0,0 +1,10 @@
+// input: [{"x": 1, "y": 2}]
+// output: 3
+
+package {
+public class DictCall {
+    public static function main(d:Object):int{
+        return d.x + d.y;
+    }
+}
+}

test/swftests/EqualsOperator.as

@@ -0,0 +1,10 @@
+// input: []
+// output: false
+
+package {
+public class EqualsOperator {
+    public static function main():Boolean{
+        return 1 == 2;
+    }
+}
+}

test/swftests/LocalVars.as

@@ -0,0 +1,13 @@
+// input: [1, 2]
+// output: 3
+
+package {
+public class LocalVars {
+    public static function main(a:int, b:int):int{
+        var c:int = a + b + b;
+        var d:int = c - b;
+        var e:int = d;
+        return e;
+    }
+}
+}