Fix wrong user config (Closes #32)

:ci skip dl

.gitattributes

@@ -1,4 +0,0 @@
-* text=auto
-
-Makefile* text whitespace=-tab-in-indent
-*.sh text eol=lf

.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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.01.24. If it's not, see https://github.com/pukkandan/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/pukkandan/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/pukkandan/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.01.24**
+- [ ] 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 youtube-dlc that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -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.01.24
+ [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,63 +0,0 @@
-name: Broken site
-description: Report broken or misfunctioning site
-labels: [triage, site-bug]
-body:
-  - 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.03.08.1**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
-          required: true
-        - label: I've checked that all provided URLs are alive and playable in a browser
-          required: true
-        - 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 region the site is accessible from"
-      placeholder: "India"
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Provide an explanation of your issue in an arbitrary form.
-        Provide any additional information, any suggested solutions, and as much context and examples as possible
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        Provide the complete verbose output of yt-dlp **that clearly demonstrates the problem**.
-        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2022.03.08.1 (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (2022.03.08.1)
-        <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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.01.24. If it's not, see https://github.com/pukkandan/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/pukkandan/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/pukkandan/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.01.24**
+- [ ] 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,74 +0,0 @@
-name: Site support request
-description: Request support for a new site
-labels: [triage, site-request]
-body:
-  - 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.03.08.1**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
-          required: true
-        - label: I've checked that all provided URLs are alive and playable in a browser
-          required: true
-        - 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 region 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: Description
-      description: |
-        Provide any additional information
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        Provide the complete verbose output **using one of the example URLs provided above**.
-        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2022.03.08.1 (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (2022.03.08.1)
-        <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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.01.24. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar site feature requests: https://github.com/pukkandan/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.01.24**
+- [ ] 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,72 +0,0 @@
-name: Site feature request
-description: Request a new functionality for a supported site
-labels: [triage, site-enhancement]
-body:
-  - 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 site feature request
-          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.03.08.1**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
-          required: true
-        - label: I've checked that all provided URLs are alive and playable in a browser
-          required: true
-        - 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 region 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: Description
-      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 [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
-        Provide any additional information, any suggested solutions, and as much context and examples as possible
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        Provide the complete verbose output of yt-dlp that demonstrates the need for the enhancement.
-        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2022.03.08.1 (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (2022.03.08.1)
-        <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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.01.24. If it's not, see https://github.com/pukkandan/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/pukkandan/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+- Read bugs section in FAQ: https://github.com/pukkandan/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.01.24**
+- [ ] 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 youtube-dlc that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -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.01.24
+ [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,57 +0,0 @@
-name: Bug report
-description: Report a bug unrelated to any particular site or extractor
-labels: [triage, bug]
-body:
-  - 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.03.08.1**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
-          required: true
-        - label: I've checked that all provided URLs are alive and playable in a browser
-          required: true
-        - 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: Description
-      description: |
-        Provide an explanation of your issue in an arbitrary form.
-        Please make sure the description is worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
-        Provide any additional information, any suggested solutions, and as much context and examples as possible
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        Provide the complete verbose output of yt-dlp **that clearly demonstrates the problem**.
-        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2022.03.08.1 (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (2022.03.08.1)
-        <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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.01.24. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar feature requests: https://github.com/pukkandan/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.01.24**
+- [ ] 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,32 +0,0 @@
-name: Feature request
-description: Request a new functionality unrelated to any particular site or extractor
-labels: [triage, enhancement]
-body:
-  - 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 feature request
-          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.03.08.1**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
-          required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues including closed ones. DO NOT post duplicates
-          required: true
-        - 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: Description
-      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 [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
-        Provide any additional information, any suggested solutions, and as much context and examples as possible
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true

.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 youtube-dlc:
+- Look through the README (https://github.com/pukkandan/yt-dlp) and FAQ (https://github.com/pukkandan/yt-dlp) for similar questions
+- Search the bugtracker for similar questions: https://github.com/blackjack4494/yt-dlc
+- 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/blackjack4494/yt-dlc.
+-->
+
+WRITE QUESTION HERE

.github/ISSUE_TEMPLATE/6_question.yml

@@ -1,53 +0,0 @@
-name: Ask question
-description: Ask yt-dlp related question
-labels: [question]
-body:
-  - 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/feature request
-          required: true
-        - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
-          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 searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions including closed ones
-          required: true
-  - type: textarea
-    id: question
-    attributes:
-      label: Question
-      description: |
-        Ask your question in an arbitrary form.
-        Please make sure it's worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
-        Provide any additional information and as much context and examples as possible.
-        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
-        If you are in doubt if this is the right template, use another template!
-      placeholder: WRITE QUESTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        If your question involes a yt-dlp command, provide the complete verbose output of that command.
-        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2021.12.01 (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (2021.12.01)
-        <more lines>
-      render: shell

.github/ISSUE_TEMPLATE/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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/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/pukkandan/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/pukkandan/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 youtube-dlc that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -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,63 +0,0 @@
-name: Broken site
-description: Report broken or misfunctioning site
-labels: [triage, site-bug]
-body:
-  - 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))
-          required: true
-        - label: I've checked that all provided URLs are alive and playable in a browser
-          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 region the site is accessible from"
-      placeholder: "India"
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Provide an explanation of your issue in an arbitrary form.
-        Provide any additional information, any suggested solutions, and as much context and examples as possible
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        Provide the complete verbose output of yt-dlp **that clearly demonstrates the problem**.
-        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version %(version)s (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (%(version)s)
-        <more lines>
-      render: shell
-    validations:
-      required: true

.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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/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/pukkandan/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/pukkandan/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,74 +0,0 @@
-name: Site support request
-description: Request support for a new site
-labels: [triage, site-request]
-body:
-  - 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))
-          required: true
-        - label: I've checked that all provided URLs are alive and playable in a browser
-          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 region 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: Description
-      description: |
-        Provide any additional information
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        Provide the complete verbose output **using one of the example URLs provided above**.
-        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version %(version)s (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (%(version)s)
-        <more lines>
-      render: shell
-    validations:
-      required: true

.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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar site feature requests: https://github.com/pukkandan/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,72 +0,0 @@
-name: Site feature request
-description: Request a new functionality for a supported site
-labels: [triage, site-enhancement]
-body:
-  - 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 site feature request
-          required: true
-        - label: I've verified that I'm running yt-dlp version **%(version)s**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
-          required: true
-        - label: I've checked that all provided URLs are alive and playable in a browser
-          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 region 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: Description
-      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 [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
-        Provide any additional information, any suggested solutions, and as much context and examples as possible
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        Provide the complete verbose output of yt-dlp that demonstrates the need for the enhancement.
-        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version %(version)s (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (%(version)s)
-        <more lines>
-      render: shell
-    validations:
-      required: true

.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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/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/pukkandan/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+- Read bugs section in FAQ: https://github.com/pukkandan/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 youtube-dlc that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -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,57 +0,0 @@
-name: Bug report
-description: Report a bug unrelated to any particular site or extractor
-labels: [triage, bug]
-body:
-  - 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))
-          required: true
-        - label: I've checked that all provided URLs are alive and playable in a browser
-          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: Description
-      description: |
-        Provide an explanation of your issue in an arbitrary form.
-        Please make sure the description is worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
-        Provide any additional information, any suggested solutions, and as much context and examples as possible
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        Provide the complete verbose output of yt-dlp **that clearly demonstrates the problem**.
-        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version %(version)s (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (%(version)s)
-        <more lines>
-      render: shell
-    validations:
-      required: true

.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 youtube-dlc:
+- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar feature requests: https://github.com/pukkandan/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,32 +0,0 @@
-name: Feature request
-description: Request a new functionality unrelated to any particular site or extractor
-labels: [triage, enhancement]
-body:
-  - 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 feature request
-          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))
-          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: Description
-      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 [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
-        Provide any additional information, any suggested solutions, and as much context and examples as possible
-      placeholder: WRITE DESCRIPTION HERE
-    validations:
-      required: true

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -1,53 +0,0 @@
-name: Ask question
-description: Ask yt-dlp related question
-labels: [question]
-body:
-  - 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/feature request
-          required: true
-        - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
-          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 searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions including closed ones
-          required: true
-  - type: textarea
-    id: question
-    attributes:
-      label: Question
-      description: |
-        Ask your question in an arbitrary form.
-        Please make sure it's worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
-        Provide any additional information and as much context and examples as possible.
-        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
-        If you are in doubt if this is the right template, use another template!
-      placeholder: WRITE QUESTION HERE
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Verbose log
-      description: |
-        If your question involes a yt-dlp command, provide the complete verbose output of that command.
-        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
-        It should look similar to this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
-        [debug] Portable config file: yt-dlp.conf
-        [debug] Portable config: ['-i']
-        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
-        [debug] yt-dlp version 2021.12.01 (exe)
-        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
-        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
-        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
-        [debug] Proxy map: {}
-        yt-dlp is up to date (2021.12.01)
-        <more lines>
-      render: shell

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,11 +7,11 @@ ## Please follow the guide below
 ---
 
 ### 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
+- [ ] [Searched](https://github.com/pukkandan/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)
 
-### 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)
 

.github/workflows/build.yml

@@ -1,84 +1,64 @@
 name: Build
-on: workflow_dispatch
+
+on:
+  push:
+    branches:
+      - release
 
 jobs:
   build_unix:
+
     runs-on: ubuntu-latest
+
     outputs:
-      version_suffix: ${{ steps.version_suffix.outputs.version_suffix }}
+      ytdlc_version: ${{ steps.bump_version.outputs.ytdlc_version }}
-      ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
       upload_url: ${{ steps.create_release.outputs.upload_url }}
-      sha256_bin: ${{ steps.sha256_bin.outputs.sha256_bin }}
+      sha2_unix: ${{ steps.sha2_file.outputs.sha2_unix }}
-      sha512_bin: ${{ steps.sha512_bin.outputs.sha512_bin }}
-      sha256_tar: ${{ steps.sha256_tar.outputs.sha256_tar }}
-      sha512_tar: ${{ steps.sha512_tar.outputs.sha512_tar }}
 
     steps:
     - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
     - 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: 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")
     - name: Bump version
       id: bump_version
-      run: |
+      run: python scripts/update-version-workflow.py
-        python devscripts/update-version.py ${{ steps.version_suffix.outputs.version_suffix }}
+    - name: Check the output from My action
-        make issuetemplates
+      run: echo "${{ steps.bump_version.outputs.ytdlc_version }}"
-    - 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"
-        git push origin --force ${{ github.event.ref }}:release
-        echo ::set-output name=head_sha::$(git rev-parse HEAD)
-    - name: Update master
-      id: push_master
-      env:
-        PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
-      if: "env.PUSH_VERSION_COMMIT != ''"
-      run: git push origin ${{ github.event.ref }}
-    - name: Get Changelog
-      id: get_changelog
-      run: |
-        changelog=$(cat Changelog.md | grep -oPz '(?s)(?<=### ${{ steps.bump_version.outputs.ytdlp_version }}\n{2}).+?(?=\n{2,3}###)') || true
-        echo "changelog<<EOF" >> $GITHUB_ENV
-        echo "$changelog" >> $GITHUB_ENV
-        echo "EOF" >> $GITHUB_ENV
-
-    - name: Build lazy extractors
-      id: lazy_extractors
-      run: python devscripts/make_lazy_extractors.py
     - name: Run Make
-      run: make all tar
+      run: make
-    - name: Get SHA2-256SUMS for yt-dlp
+    - name: Create Release
-      id: sha256_bin
+      id: create_release
-      run: echo "::set-output name=sha256_bin::$(sha256sum yt-dlp | awk '{print $1}')"
+      uses: actions/create-release@v1
-    - name: Get SHA2-256SUMS for yt-dlp.tar.gz
-      id: sha256_tar
-      run: echo "::set-output name=sha256_tar::$(sha256sum yt-dlp.tar.gz | awk '{print $1}')"
-    - name: Get SHA2-512SUMS for yt-dlp
-      id: sha512_bin
-      run: echo "::set-output name=sha512_bin::$(sha512sum yt-dlp | awk '{print $1}')"
-    - name: Get SHA2-512SUMS for yt-dlp.tar.gz
-      id: sha512_tar
-      run: echo "::set-output name=sha512_tar::$(sha512sum yt-dlp.tar.gz | awk '{print $1}')"
-
-    - name: Install dependencies for pypi
       env:
-        PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      if: "env.PYPI_TOKEN != ''"
+      with:
+        tag_name: ${{ steps.bump_version.outputs.ytdlc_version }}
+        release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlc_version }}
+        body: |
+          Changelog:
+          PLACEHOLDER
+        draft: false
+        prerelease: false
+    - name: Upload youtube-dlc Unix binary
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./youtube-dlc
+        asset_name: youtube-dlc
+        asset_content_type: application/octet-stream
+    - name: Get SHA2-256SUMS for youtube-dlc
+      id: sha2_file
+      env:
+        SHA2: ${{ hashFiles('youtube-dlc') }}
+      run: echo "::set-output name=sha2_unix::$SHA2"
+    - name: Install dependencies for pypi
       run: |
         python -m pip install --upgrade pip
         pip install setuptools wheel twine
@@ -86,292 +66,91 @@ jobs:
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-      if: "env.TWINE_PASSWORD != ''"
       run: |
         rm -rf dist/*
         python setup.py sdist bdist_wheel
         twine upload dist/*
 
-    - name: Install SSH private key
-      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/
-        python3 devscripts/update-formulae.py taps/Formula/yt-dlp.rb "${{ steps.bump_version.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: ${{ steps.bump_version.outputs.ytdlp_version }}'
-        git -C taps/ push
-
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ steps.bump_version.outputs.ytdlp_version }}
-        release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlp_version }}
-        commitish: ${{ steps.push_release.outputs.head_sha }}
-        body: |
-          #### [A description of the various files]((https://github.com/yt-dlp/yt-dlp#release-files)) are in the README
-
-          ---
-
-          ### Changelog:
-          ${{ env.changelog }}
-        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:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./yt-dlp
-        asset_name: yt-dlp
-        asset_content_type: application/octet-stream
-    - name: Upload Source tar
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./yt-dlp.tar.gz
-        asset_name: yt-dlp.tar.gz
-        asset_content_type: application/gzip
-
-  build_macos:
-    runs-on: macos-11
-    needs: build_unix
-    outputs:
-      sha256_macos: ${{ steps.sha256_macos.outputs.sha256_macos }}
-      sha512_macos: ${{ steps.sha512_macos.outputs.sha512_macos }}
-      sha256_macos_zip: ${{ steps.sha256_macos_zip.outputs.sha256_macos_zip }}
-      sha512_macos_zip: ${{ steps.sha512_macos_zip.outputs.sha512_macos_zip }}
-
-    steps:
-    - uses: actions/checkout@v2
-    # 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==4.10 -r requirements.txt
-    - name: Bump version
-      id: bump_version
-      run: /usr/bin/python3 devscripts/update-version.py
-    - name: Build lazy extractors
-      id: lazy_extractors
-      run: /usr/bin/python3 devscripts/make_lazy_extractors.py
-    - name: Run PyInstaller Script
-      run: /usr/bin/python3 pyinst.py --target-architecture universal2 --onefile
-    - name: Upload yt-dlp MacOS binary
-      id: upload-release-macos
-      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_macos
-        asset_name: yt-dlp_macos
-        asset_content_type: application/octet-stream
-    - name: Get SHA2-256SUMS for yt-dlp_macos
-      id: sha256_macos
-      run: echo "::set-output name=sha256_macos::$(sha256sum dist/yt-dlp_macos | awk '{print $1}')"
-    - name: Get SHA2-512SUMS for yt-dlp_macos
-      id: sha512_macos
-      run: echo "::set-output name=sha512_macos::$(sha512sum dist/yt-dlp_macos | awk '{print $1}')"
-
-    - name: Run PyInstaller Script with --onedir
-      run: |
-        /usr/bin/python3 pyinst.py --target-architecture universal2 --onedir
-        zip ./dist/yt-dlp_macos.zip ./dist/yt-dlp_macos
-    - name: Upload yt-dlp MacOS onedir
-      id: upload-release-macos-zip
-      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_macos.zip
-        asset_name: yt-dlp_macos.zip
-        asset_content_type: application/zip
-    - name: Get SHA2-256SUMS for yt-dlp_macos.zip
-      id: sha256_macos_zip
-      run: echo "::set-output name=sha256_macos_zip::$(sha256sum dist/yt-dlp_macos.zip | awk '{print $1}')"
-    - name: Get SHA2-512SUMS for yt-dlp_macos.zip
-      id: sha512_macos_zip
-      run: echo "::set-output name=sha512_macos_zip::$(sha512sum dist/yt-dlp_macos.zip | awk '{print $1}')"
-
   build_windows:
+
     runs-on: windows-latest
+
     needs: build_unix
-    outputs:
-      sha256_win: ${{ steps.sha256_win.outputs.sha256_win }}
-      sha512_win: ${{ steps.sha512_win.outputs.sha512_win }}
-      sha256_py2exe: ${{ steps.sha256_py2exe.outputs.sha256_py2exe }}
-      sha512_py2exe: ${{ steps.sha512_py2exe.outputs.sha512_py2exe }}
-      sha256_win_zip: ${{ steps.sha256_win_zip.outputs.sha256_win_zip }}
-      sha512_win_zip: ${{ steps.sha512_win_zip.outputs.sha512_win_zip }}
 
     steps:
     - uses: actions/checkout@v2
-    # 3.8 is used for Win7 support
+    - name: Set up Python
-    - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:
           python-version: '3.8'
     - name: Install Requirements
-      # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
+      run: pip install pyinstaller
-      run: |
-          python -m pip install --upgrade pip setuptools wheel py2exe
-          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-4.10-py3-none-any.whl" -r requirements.txt
     - name: Bump version
-      id: bump_version
+      run: python scripts/update-version-workflow.py
-      env:
-        version_suffix: ${{ needs.build_unix.outputs.version_suffix }}
-      run: python devscripts/update-version.py ${{ env.version_suffix }}
-    - name: Build lazy extractors
-      id: lazy_extractors
-      run: python devscripts/make_lazy_extractors.py
     - name: Run PyInstaller Script
       run: python pyinst.py
-    - name: Upload yt-dlp.exe Windows binary
+    - name: Upload youtube-dlc.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_path: ./dist/youtube-dlc.exe
-        asset_name: yt-dlp.exe
+        asset_name: youtube-dlc.exe
         asset_content_type: application/vnd.microsoft.portable-executable
-    - name: Get SHA2-256SUMS for yt-dlp.exe
+    - name: Get SHA2-256SUMS for youtube-dlc.exe
-      id: sha256_win
+      id: sha2_file_win
-      run: echo "::set-output name=sha256_win::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"
-    - name: Get SHA2-512SUMS for yt-dlp.exe
-      id: sha512_win
-      run: echo "::set-output name=sha512_win::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA512).Hash.ToLower())"
-
-    - name: Run PyInstaller Script with --onedir
-      run: |
-        python pyinst.py --onedir
-        Compress-Archive -LiteralPath ./dist/yt-dlp -DestinationPath ./dist/yt-dlp_win.zip
-    - name: Upload yt-dlp Windows onedir
-      id: upload-release-windows-zip
-      uses: actions/upload-release-asset@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SHA2_win: ${{ hashFiles('dist/youtube-dlc.exe') }}
-      with:
+      run: echo "::set-output name=sha2_windows::$SHA2_win"
-        upload_url: ${{ needs.build_unix.outputs.upload_url }}
-        asset_path: ./dist/yt-dlp_win.zip
-        asset_name: yt-dlp_win.zip
-        asset_content_type: application/zip
-    - name: Get SHA2-256SUMS for yt-dlp_win.zip
-      id: sha256_win_zip
-      run: echo "::set-output name=sha256_win_zip::$((Get-FileHash dist\yt-dlp_win.zip -Algorithm SHA256).Hash.ToLower())"
-    - name: Get SHA2-512SUMS for yt-dlp_win.zip
-      id: sha512_win_zip
-      run: echo "::set-output name=sha512_win_zip::$((Get-FileHash dist\yt-dlp_win.zip -Algorithm SHA512).Hash.ToLower())"
-
-    - name: Run py2exe Script
-      run: python setup.py py2exe
-    - name: Upload yt-dlp_min.exe Windows binary
-      id: upload-release-windows-py2exe
-      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_min.exe
-        asset_content_type: application/vnd.microsoft.portable-executable
-    - name: Get SHA2-256SUMS for yt-dlp_min.exe
-      id: sha256_py2exe
-      run: echo "::set-output name=sha256_py2exe::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"
-    - name: Get SHA2-512SUMS for yt-dlp_min.exe
-      id: sha512_py2exe
-      run: echo "::set-output name=sha512_py2exe::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA512).Hash.ToLower())"
 
   build_windows32:
-    runs-on: windows-latest
-    needs: build_unix
 
-    outputs:
+    runs-on: windows-latest
-      sha256_win32: ${{ steps.sha256_win32.outputs.sha256_win32 }}
+
-      sha512_win32: ${{ steps.sha512_win32.outputs.sha512_win32 }}
+    needs: [build_unix, build_windows]
 
     steps:
     - uses: actions/checkout@v2
-    # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
+    - name: Set up Python 3.4.4 32-Bit
-    - name: Set up Python 3.7 32-Bit
       uses: actions/setup-python@v2
       with:
-          python-version: '3.7'
+          python-version: '3.4.4'
           architecture: 'x86'
-    - name: Install Requirements
+    - name: Install Requirements for 32 Bit
-      run: |
+      run: pip install pyinstaller==3.5
-          python -m pip install --upgrade pip setuptools wheel
-          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-4.10-py3-none-any.whl" -r requirements.txt
     - name: Bump version
-      id: bump_version
+      run: python scripts/update-version-workflow.py
-      env:
-        version_suffix: ${{ needs.build_unix.outputs.version_suffix }}
-      run: python devscripts/update-version.py ${{ env.version_suffix }}
-    - name: Build lazy extractors
-      id: lazy_extractors
-      run: python devscripts/make_lazy_extractors.py
     - name: Run PyInstaller Script for 32 Bit
-      run: python pyinst.py
+      run: python pyinst32.py
-    - name: Upload Executable yt-dlp_x86.exe
+    - name: Upload Executable youtube-dlc_x86.exe
       id: upload-release-windows32
       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_x86.exe
+        asset_path: ./dist/youtube-dlc_x86.exe
-        asset_name: yt-dlp_x86.exe
+        asset_name: youtube-dlc_x86.exe
         asset_content_type: application/vnd.microsoft.portable-executable
-    - name: Get SHA2-256SUMS for yt-dlp_x86.exe
+    - name: Get SHA2-256SUMS for youtube-dlc_x86.exe
-      id: sha256_win32
+      id: sha2_file_win32
-      run: echo "::set-output name=sha256_win32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())"
+      env:
-    - name: Get SHA2-512SUMS for yt-dlp_x86.exe
+        SHA2_win32: ${{ hashFiles('dist/youtube-dlc_x86.exe') }}
-      id: sha512_win32
+      run: echo "::set-output name=sha2_windows32::$SHA2_win32"
-      run: echo "::set-output name=sha512_win32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA512).Hash.ToLower())"
-
-  finish:
-    runs-on: ubuntu-latest
-    needs: [build_unix, build_windows, build_windows32, build_macos]
-
-    steps:
     - name: Make SHA2-256SUMS file
       env:
-        SHA256_BIN: ${{ needs.build_unix.outputs.sha256_bin }}
+        SHA2_WINDOWS: ${{ needs.build_windows.outputs.sha2_windows }}
-        SHA256_TAR: ${{ needs.build_unix.outputs.sha256_tar }}
+        SHA2_WINDOWS32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }}
-        SHA256_WIN: ${{ needs.build_windows.outputs.sha256_win }}
+        SHA2_UNIX: ${{ needs.build_unix.outputs.sha2_unix }}
-        SHA256_PY2EXE: ${{ needs.build_windows.outputs.sha256_py2exe }}
+        YTDLC_VERSION: ${{ needs.build_unix.outputs.ytdlc_version }}
-        SHA256_WIN_ZIP: ${{ needs.build_windows.outputs.sha256_win_zip }}
-        SHA256_WIN32: ${{ needs.build_windows32.outputs.sha256_win32 }}
-        SHA256_MACOS: ${{ needs.build_macos.outputs.sha256_macos }}
-        SHA256_MACOS_ZIP: ${{ needs.build_macos.outputs.sha256_macos_zip }}
       run: |
-        echo "${{ env.SHA256_BIN }}  yt-dlp" >> SHA2-256SUMS
+        echo "version:${env:YTDLC_VERSION}" >> SHA2-256SUMS
-        echo "${{ env.SHA256_TAR }}  yt-dlp.tar.gz" >> SHA2-256SUMS
+        echo "youtube-dlc.exe:${env:SHA2_WINDOWS}" >> SHA2-256SUMS
-        echo "${{ env.SHA256_WIN }}  yt-dlp.exe" >> SHA2-256SUMS
+        echo "youtube-dlc_x86.exe:${env:SHA2_WINDOWS32}" >> SHA2-256SUMS
-        echo "${{ env.SHA256_PY2EXE }}  yt-dlp_min.exe" >> SHA2-256SUMS
+        echo "youtube-dlc:${env:SHA2_UNIX}" >> SHA2-256SUMS
-        echo "${{ env.SHA256_WIN32 }}  yt-dlp_x86.exe" >> SHA2-256SUMS
+
-        echo "${{ env.SHA256_WIN_ZIP }}  yt-dlp_win.zip" >> SHA2-256SUMS
-        echo "${{ env.SHA256_MACOS }}  yt-dlp_macos" >> SHA2-256SUMS
-        echo "${{ env.SHA256_MACOS_ZIP }}  yt-dlp_macos.zip" >> SHA2-256SUMS
     - name: Upload 256SUMS file
       id: upload-sums
       uses: actions/upload-release-asset@v1
@@ -382,32 +161,19 @@ jobs:
         asset_path: ./SHA2-256SUMS
         asset_name: SHA2-256SUMS
         asset_content_type: text/plain
-    - name: Make SHA2-512SUMS file
+
-      env:
+  update_version_badge:
-        SHA512_BIN: ${{ needs.build_unix.outputs.sha512_bin }}
+
-        SHA512_TAR: ${{ needs.build_unix.outputs.sha512_tar }}
+    runs-on: ubuntu-latest
-        SHA512_WIN: ${{ needs.build_windows.outputs.sha512_win }}
+
-        SHA512_PY2EXE: ${{ needs.build_windows.outputs.sha512_py2exe }}
+    needs: build_unix
-        SHA512_WIN_ZIP: ${{ needs.build_windows.outputs.sha512_win_zip }}
+
-        SHA512_WIN32: ${{ needs.build_windows32.outputs.sha512_win32 }}
+    steps:
-        SHA512_MACOS: ${{ needs.build_macos.outputs.sha512_macos }}
+    - name: Create Version Badge
-        SHA512_MACOS_ZIP: ${{ needs.build_macos.outputs.sha512_macos_zip }}
+      uses: schneegans/dynamic-badges-action@v1.0.0
-      run: |
-        echo "${{ env.SHA512_BIN }}  yt-dlp" >> SHA2-512SUMS
-        echo "${{ env.SHA512_TAR }}  yt-dlp.tar.gz" >> SHA2-512SUMS
-        echo "${{ env.SHA512_WIN }}  yt-dlp.exe" >> SHA2-512SUMS
-        echo "${{ env.SHA512_WIN_ZIP }}  yt-dlp_win.zip" >> SHA2-512SUMS
-        echo "${{ env.SHA512_PY2EXE }}  yt-dlp_min.exe" >> SHA2-512SUMS
-        echo "${{ env.SHA512_WIN32 }}  yt-dlp_x86.exe" >> SHA2-512SUMS
-        echo "${{ env.SHA512_MACOS }}  yt-dlp_macos" >> SHA2-512SUMS
-        echo "${{ env.SHA512_MACOS_ZIP }}  yt-dlp_macos.zip" >> SHA2-512SUMS
-    - name: Upload 512SUMS file
-      id: upload-512sums
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: ${{ needs.build_unix.outputs.upload_url }}
+        auth: ${{ secrets.GIST_TOKEN }}
-        asset_path: ./SHA2-512SUMS
+        gistID: c69cb23c3c5b3316248e52022790aa57
-        asset_name: SHA2-512SUMS
+        filename: version.json
-        asset_content_type: text/plain
+        label: Version
+        message: ${{ needs.build_unix.outputs.ytdlc_version }}

.github/workflows/core.yml

@@ -3,29 +3,52 @@ on: [push, pull_request]
 jobs:
   tests:
     name: Core Tests
-    if: "!contains(github.event.head_commit.message, 'ci skip')"
+    if: "!contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os: [ubuntu-18.04]
-        # py3.9 is in quick-test
+        # TODO: python 2.6
-        python-version: [3.7, 3.8, 3.10-dev, pypy-3.6, pypy-3.7]
+        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 the tests must be in windows
+        # python 3.2 is only available on windows via setup-python
         - os: windows-latest
-          python-version: 3.6
+          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@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install pytest
+    - name: Set up Java 8
-      run: pip install pytest
+      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
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
-      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} core
+      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

@@ -3,26 +3,51 @@ on: [push, pull_request]
 jobs:
   tests:
     name: Download Tests
-    if: "contains(github.event.head_commit.message, 'ci run dl')"
+    if: "!contains(github.event.head_commit.message, 'ci skip dl') && !contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-18.04]
-        python-version: [3.7, 3.8, 3.9, 3.10-dev, pypy-3.6, pypy-3.7]
+        # 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:
+        # python 3.2 is only available on windows via setup-python
         - os: windows-latest
-          python-version: 3.6
+          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@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install pytest
+    - name: Set up Java 8
-      run: pip install pytest
+      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
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
-      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} download
+      env:
+        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}

.github/workflows/quick-test.yml

@@ -2,7 +2,7 @@ name: Quick Test
 on: [push, pull_request]
 jobs:
   tests:
-    name: Core Test
+    name: Core Tests
     if: "!contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ubuntu-latest
     steps:
@@ -11,10 +11,12 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.9
-    - name: Install test requirements
+    - name: Install nose
-      run: pip install pytest pycryptodomex
+      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')"
@@ -27,7 +29,5 @@ jobs:
         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 .

.gitignore

@@ -1,116 +1,76 @@
-# 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
-*.flac
-*.flv
-*.jpeg
-*.jpg
-*.m4a
-*.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
+*.class
+*~
+*.DS_Store
 wine-py2exe/
 py2exe.log
+*.kate-swp
 build/
 dist/
 zip/
-tmp/
-venv/
-completions/
-
-# Misc
-*~
-*.DS_Store
-*.kate-swp
 MANIFEST
-test/local_parameters.json
+README.txt
+youtube-dl.1
+youtube-dlc.1
+youtube-dl.bash-completion
+youtube-dlc.bash-completion
+youtube-dl.fish
+youtube-dlc.fish
+youtube_dl/extractor/lazy_extractors.py
+youtube_dlc/extractor/lazy_extractors.py
+youtube-dl
+youtube-dlc
+youtube-dl.exe
+youtube-dlc.exe
+youtube-dl.tar.gz
+youtube-dlc.tar.gz
+youtube-dlc.spec
 .coverage
 cover/
-secrets/
 updates_key.pem
 *.egg-info
-.tox
+*.srt
-*.class
+*.ttml
-
+*.sbv
-# Generated
+*.vtt
-AUTHORS
+*.flv
-README.txt
+*.mp4
-.mailmap
+*.m4a
-*.1
+*.m4v
-*.bash-completion
+*.mp3
-*.fish
+*.3gp
-*.tar.gz
+*.wav
-*.zsh
+*.ape
+*.mkv
+*.swf
+*.part
+*.ytdl
+*.conf
+*.swp
 *.spec
-test/testdata/sigs/player-*.js
-
-# Binary
-/youtube-dl
-/youtube-dlc
-/yt-dlp
-yt-dlp.zip
 *.exe
+test/local_parameters.json
+.tox
+youtube-dl.zsh
+youtube-dlc.zsh
 
-# Text Editor / IDE
+# IntelliJ related files
 .idea
 *.iml
-.vscode
-*.sublime-*
-*.code-workspace
 
-# Lazy extractors
+tmp/
-*/extractor/lazy_extractors.py
+venv/
+
+# VS Code related files
+.vscode
+
+# SublimeText files
+*.sublime-workspace
+
+# Cookies
+cookies
+cookies.txt
 
 # Plugins
 ytdlp_plugins/extractor/*

.readthedocs.yml

@@ -1,22 +0,0 @@
-# .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

.travis.yml.disabled

@@ -0,0 +1,38 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "pypy"
+  - "pypy3"
+dist: trusty
+env:
+  - YTDL_TEST_SET=core
+jobs:
+  include:
+    - python: 3.7
+      dist: xenial
+      env: YTDL_TEST_SET=core
+    - python: 3.8
+      dist: xenial
+      env: YTDL_TEST_SET=core
+    - python: 3.8-dev
+      dist: xenial
+      env: YTDL_TEST_SET=core
+    - env: JYTHON=true; YTDL_TEST_SET=core
+    - name: flake8
+      python: 3.8
+      dist: xenial
+      install: pip install flake8
+      script: flake8 .
+  fast_finish: true
+  allow_failures:
+    - env: YTDL_TEST_SET=download
+    - env: JYTHON=true; YTDL_TEST_SET=core
+before_install:
+  - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi
+script: ./devscripts/run_tests.sh

CONTRIBUTING.md

@@ -1,63 +1,26 @@
-# CONTRIBUTING TO YT-DLP
+**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:
-
-- [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:
 ```
-$ yt-dlp -vU <your command line>
+$ youtube-dl -v <your command line>
-[debug] Command-line config: ['-v', 'demo.com']
+[debug] System config: []
-[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, pref UTF-8
+[debug] User config: []
-[debug] yt-dlp version 2021.09.25 (zip)
+[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=BaW_jenozKcj']
-[debug] Python version 3.8.10 (CPython 64bit) - Linux-5.4.0-74-generic-x86_64-with-glibc2.29
+[debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
-[debug] exe versions: ffmpeg 4.2.4, ffprobe 4.2.4
+[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 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.
-
-The templates provided for the Issues, should be completed and **not removed**, this helps aide the resolution of the issue.
 
 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.
+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.
-
-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.
 
 ###  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.
+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.
-
-###  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.
 
 ###  Is there enough context in your bug report?
 
@@ -101,90 +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?
+###  Is your question about youtube-dl?
-
-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). 
-
-
 
+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.
+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**.
-
-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**.
 
 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. [Fork this repository](https://github.com/ytdl-org/youtube-dl/fork)
-1. Check out the source code with:
+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': {
@@ -198,7 +133,7 @@ ## Adding support for a new site
                 # * A regular expression; start the string with re:
                 # * Any Python type (for example int or float)
             }
-        }]
+        }
 
         def _real_extract(self, url):
             video_id = self._match_id(url)
@@ -212,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).
+5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
-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`
+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.
-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.
+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.
-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.
+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):
-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):
 
-        $ 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.6 and above. Backward compatibility is not required for even older versions of Python.
+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+.
-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:
+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 youtube_dl/extractor/extractors.py
-        $ git add yt_dlp/extractor/yourextractor.py
+        $ git add youtube_dl/extractor/yourextractor.py
-        $ git commit -m '[yourextractor] Add extractor'
+        $ 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:
+## youtube-dl coding conventions
-```json
-{
-    "username": "your user name",
-    "password": "your password"
-}
-```
-
-## yt-dlp 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.
+[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.
-
-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` - Eg: 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.
 
 #### Example
 
@@ -278,10 +199,8 @@ #### Example
 
 ```python
 {
+    ...
     "summary": "some fancy summary text",
-    "user": {
-        "name": "uploader name"
-    },
     ...
 }
 ```
@@ -300,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 the utility functions `try_get` or `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 = try_get(meta, lambda x: x['user']['name'])  # correct
-```
-or
-```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
-```
-
-
 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
@@ -344,35 +239,10 @@ #### 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` using `try_get` and now want to iterate over them
-
-```python
-thumbnail_data = try_get(...)
-thumbnails = [{
-    'url': item['url']
-} for item in thumbnail_data or []]  # correct
-```
-
-and not like:
-
-```python
-thumbnail_data = try_get(...)
-thumbnails = [{
-    'url': item['url']
-} for item in thumbnail_data]  # incorrect
-```
-
-In the later 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 `for item in thumbnail_data 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. Since `title` is a mandatory meta field you should end up with something like:
@@ -391,7 +261,6 @@ #### Example
 
 This code will try to extract from `meta` first and if it fails it will try extracting `og:title` from a `webpage`.
 
-
 ### Regular expressions
 
 #### Don't capture groups you don't use
@@ -413,6 +282,7 @@ ##### 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.
@@ -428,14 +298,14 @@ ##### 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')
 ```
 
 Or even better:
 
 ```python
-title = self._search_regex(  # correct
+title = self._search_regex(
     r'<span[^>]+class=(["\'])title\1[^>]*>(?P<title>[^<]+)',
     webpage, 'title', group='title')
 ```
@@ -445,32 +315,17 @@ ##### Example
 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 irrelevent for the data we need, and so the regex must not depend on it
-
-
 ### 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 unecessarily 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
@@ -484,47 +339,6 @@ ##### 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.
@@ -545,7 +359,6 @@ # ...some lines of code...
 title = self._html_search_regex(TITLE_RE, webpage, 'title')
 ```
 
-
 ### Collapse fallbacks
 
 Multiple fallback values can quickly become unwieldy. Collapse multiple fallback values into a single expression via a list of patterns.
@@ -571,105 +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, 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 = try_get(
-    info,
     lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
     list)
 ```
-Correct:
-
-```python
-url = try_get(info,
-              lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
-              list)
-```
 
 Incorrect:
 
 ```python
-url = try_get(
-    info,
     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 `try_get`, `dict_get` and `traverse_obj` 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.
 
 #### More examples
 
 ##### Safely extract optional description from parsed JSON
 ```python
-description = traverse_obj(response, ('result', 'video', 'summary'), expected_type=str)
+description = try_get(response, lambda x: x['result']['video'][0]['summary'], compat_str)
 ```
 
 ##### Safely extract more optional metadata
 ```python
-video = traverse_obj(response, ('result', 'video', 0), default={}, expected_type=dict)
+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,4 @@
 pukkandan (owner)
-shirt-dev (collaborator)
-coletdjnz/colethedj (collaborator)
-Ashish0804 (collaborator)
-nao20010128nao/Lesmiscore (collaborator)
 h-h-h-h
 pauldubois98
 nixxo
@@ -20,197 +16,4 @@ samiksome
 alxnull
 FelixFrog
 Zocker1999NET
-kurumigi
+nao20010128nao
-bbepis
-animelover1984/horahoradev
-Pccode66
-RobinD42
-hseg
-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

Collaborators.md

@@ -1,50 +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 downloading YoutubeWebArchive videos
-
-
-
-## [Ashish0804](https://github.com/Ashish0804)
-
-[![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 mildom, PixivSketch, skeb, radiko, voicy, mirrativ, openrec, whowatch, damtomo, 17.live, mixch etc

MANIFEST.in

@@ -1,9 +1,9 @@
-include AUTHORS
-include Changelog.md
-include LICENSE
 include README.md
-include completions/*/*
+include LICENSE
-include supportedsites.md
+include AUTHORS
-include yt-dlp.1
+include ChangeLog
-recursive-include devscripts *
+include youtube-dlc.bash-completion
+include youtube-dlc.fish
+include youtube-dlc.1
+recursive-include docs Makefile conf.py *.rst
 recursive-include test *

Makefile

@@ -1,39 +1,18 @@
-all: lazy-extractors yt-dlp doc pypi-files
+all: youtube-dlc doc man
-clean: clean-test clean-dist
-clean-all: clean clean-cache
-completions: completion-bash completion-fish completion-zsh
 doc: README.md CONTRIBUTING.md issuetemplates supportedsites
-ot: offlinetest
+man: README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
-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 devscripts/* test/*
 
-.PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites
+clean:
-
+	rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.spec CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
-clean-test:
+	find . -name "*.pyc" -delete
-	rm -rf test/testdata/sigs/player-*.js tmp/ *.annotations.xml *.aria2 *.description *.dump *.frag \
+	find . -name "*.class" -delete
-	*.frag.aria2 *.frag.urls *.info.json *.live_chat.json *.meta *.part* *.tmp *.temp *.unknown_video *.ytdl \
-	*.3gp *.ape *.ass *.avi *.desktop *.flac *.flv *.jpeg *.jpg *.m4a *.m4v *.mhtml *.mkv *.mov *.mp3 \
-	*.mp4 *.ogg *.opus *.png *.sbv *.srt *.swf *.swp *.ttml *.url *.vtt *.wav *.webloc *.webm *.webp
-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
-clean-cache:
-	find . \( -name "*.pyc" -o -name "*.class" \) -delete
-
-completion-bash: completions/bash/yt-dlp
-completion-fish: completions/fish/yt-dlp.fish
-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
@@ -42,81 +21,110 @@ 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
+install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
-	install -Dm755 yt-dlp $(DESTDIR)$(BINDIR)/yt-dlp
+	install -d $(DESTDIR)$(BINDIR)
-	install -Dm644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
+	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
-	install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
+	install -d $(DESTDIR)$(MANDIR)/man1
-	install -Dm644 completions/zsh/_yt-dlp $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
+	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
-	install -Dm644 completions/fish/yt-dlp.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
+	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
+	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc
+	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
+	install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc
+	install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
+	install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish
 
 codetest:
 	flake8 .
 
 test:
-	$(PYTHON) -m pytest
+	#nosetests --with-coverage --cover-package=youtube_dlc --cover-html --verbose --processes 4 test
+	nosetests --verbose test
 	$(MAKE) codetest
 
-offlinetest: codetest
+ot: offlinetest
-	$(PYTHON) -m pytest -k "not download"
 
-yt-dlp: yt_dlp/*.py yt_dlp/*/*.py
+# Keep this list in sync with devscripts/run_tests.sh
+offlinetest: codetest
+	$(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
+
+tar: youtube-dlc.tar.gz
+
+.PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
+
+pypi-files: youtube-dlc.bash-completion README.txt youtube-dlc.1 youtube-dlc.fish
+
+youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py
 	mkdir -p zip
-	for d in yt_dlp yt_dlp/downloader yt_dlp/extractor yt_dlp/postprocessor ; do \
+	for d in youtube_dlc youtube_dlc/downloader youtube_dlc/extractor youtube_dlc/postprocessor ; do \
 	  mkdir -p zip/$$d ;\
 	  cp -pPR $$d/*.py zip/$$d/ ;\
 	done
-	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py
+	touch -t 200001010101 zip/youtube_dlc/*.py zip/youtube_dlc/*/*.py
-	mv zip/yt_dlp/__main__.py zip/
+	mv zip/youtube_dlc/__main__.py zip/
-	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py
+	cd zip ; zip -q ../youtube-dlc youtube_dlc/*.py youtube_dlc/*/*.py __main__.py
 	rm -rf zip
-	echo '#!$(PYTHON)' > yt-dlp
+	echo '#!$(PYTHON)' > youtube-dlc
-	cat yt-dlp.zip >> yt-dlp
+	cat youtube-dlc.zip >> youtube-dlc
-	rm yt-dlp.zip
+	rm youtube-dlc.zip
-	chmod a+x yt-dlp
+	chmod a+x youtube-dlc
 
-README.md: yt_dlp/*.py yt_dlp/*/*.py
+README.md: youtube_dlc/*.py youtube_dlc/*/*.py
-	COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --help | $(PYTHON) devscripts/make_readme.py
+	COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help | $(PYTHON) devscripts/make_readme.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
+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 youtube_dlc/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/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.yml .github/ISSUE_TEMPLATE/2_site_support_request.yml
+	$(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.yml .github/ISSUE_TEMPLATE/3_site_feature_request.yml
+	$(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.yml .github/ISSUE_TEMPLATE/4_bug_report.yml
+	$(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.yml .github/ISSUE_TEMPLATE/5_feature_request.yml
+	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md .github/ISSUE_TEMPLATE/5_feature_request.md
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/6_question.yml .github/ISSUE_TEMPLATE/6_question.yml
 
 supportedsites:
-	$(PYTHON) devscripts/make_supportedsites.py supportedsites.md
+	$(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
 
 README.txt: README.md
 	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
-yt-dlp.1: README.md
+youtube-dlc.1: README.md
-	$(PYTHON) devscripts/prepare_manpage.py yt-dlp.1.temp.md
+	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
-	pandoc -s -f $(MARKDOWN) -t man yt-dlp.1.temp.md -o yt-dlp.1
+	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
-	rm -f yt-dlp.1.temp.md
+	rm -f youtube-dlc.1.temp.md
 
-completions/bash/yt-dlp: yt_dlp/*.py yt_dlp/*/*.py devscripts/bash-completion.in
+youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in
-	mkdir -p completions/bash
 	$(PYTHON) devscripts/bash-completion.py
 
-completions/zsh/_yt-dlp: yt_dlp/*.py yt_dlp/*/*.py devscripts/zsh-completion.in
+bash-completion: youtube-dlc.bash-completion
-	mkdir -p completions/zsh
+
+youtube-dlc.zsh: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/zsh-completion.in
 	$(PYTHON) devscripts/zsh-completion.py
 
-completions/fish/yt-dlp.fish: yt_dlp/*.py yt_dlp/*/*.py devscripts/fish-completion.in
+zsh-completion: youtube-dlc.zsh
-	mkdir -p completions/fish
+
+youtube-dlc.fish: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/fish-completion.in
 	$(PYTHON) devscripts/fish-completion.py
 
-_EXTRACTOR_FILES = $(shell find yt_dlp/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
+fish-completion: youtube-dlc.fish
-yt_dlp/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
+
+lazy-extractors: youtube_dlc/extractor/lazy_extractors.py
+
+_EXTRACTOR_FILES = $(shell find youtube_dlc/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
+youtube_dlc/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
+youtube-dlc.tar.gz: youtube-dlc README.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish ChangeLog AUTHORS
-	@tar -czf $(DESTDIR)/yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \
+	@tar -czf youtube-dlc.tar.gz --transform "s|^|youtube-dlc/|" --owner 0 --group 0 \
 		--exclude '*.DS_Store' \
 		--exclude '*.kate-swp' \
 		--exclude '*.pyc' \
@@ -124,15 +132,10 @@ yt-dlp.tar.gz: all
 		--exclude '*~' \
 		--exclude '__pycache__' \
 		--exclude '.git' \
+		--exclude 'docs/_build' \
 		-- \
-		README.md supportedsites.md Changelog.md LICENSE \
+		bin devscripts test youtube_dlc docs \
-		CONTRIBUTING.md Collaborators.md CONTRIBUTORS AUTHORS \
+		ChangeLog AUTHORS LICENSE README.md README.txt \
-		Makefile MANIFEST.in yt-dlp.1 README.txt completions \
+		Makefile MANIFEST.in youtube-dlc.1 youtube-dlc.bash-completion \
-		setup.py setup.cfg yt-dlp yt_dlp requirements.txt \
+		youtube-dlc.zsh youtube-dlc.fish setup.py setup.cfg \
-		devscripts test tox.ini pytest.ini
+		youtube-dlc
-
-AUTHORS: .mailmap
-	git shortlog -s -n | cut -f2 | sort > AUTHORS
-
-.mailmap:
-	git shortlog -s -e -n | awk '!(out[$$NF]++) { $$1="";sub(/^[ \t]+/,""); print}' > .mailmap

devscripts/bash-completion.in

@@ -1,4 +1,4 @@
-__yt_dlp()
+__youtube_dlc()
 {
     local cur prev opts fileopts diropts keywords
     COMPREPLY=()
@@ -26,4 +26,4 @@ __yt_dlp()
     fi
 }
 
-complete -F __yt_dlp yt-dlp
+complete -F __youtube_dlc youtube-dlc

devscripts/bash-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import os
@@ -6,9 +6,9 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import yt_dlp
+import youtube_dlc
 
-BASH_COMPLETION_FILE = "completions/bash/yt-dlp"
+BASH_COMPLETION_FILE = "youtube-dlc.bash-completion"
 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
 
 
@@ -26,5 +26,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = yt_dlp.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)

devscripts/buildserver.py

@@ -1,5 +1,3 @@
-# UNUSED
-
 #!/usr/bin/python3
 
 import argparse
@@ -14,7 +12,7 @@
 import os.path
 
 sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))
-from yt_dlp.compat import (
+from youtube_dlc.compat import (
     compat_input,
     compat_http_server,
     compat_str,
@@ -327,7 +325,7 @@ class YoutubeDLBuilder(object):
     authorizedUsers = ['fraca7', 'phihag', 'rg3', 'FiloSottile', 'ytdl-org']
 
     def __init__(self, **kwargs):
-        if self.repoName != 'yt-dlp':
+        if self.repoName != 'youtube-dlc':
             raise BuildError('Invalid repository "%s"' % self.repoName)
         if self.user not in self.authorizedUsers:
             raise HTTPError('Unauthorized user "%s"' % self.user, 401)

devscripts/check-porn.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 """
@@ -15,8 +15,8 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import gettestcases
-from yt_dlp.utils import compat_urllib_parse_urlparse
+from youtube_dlc.utils import compat_urllib_parse_urlparse
-from yt_dlp.utils import compat_urllib_request
+from youtube_dlc.utils import compat_urllib_request
 
 if len(sys.argv) > 1:
     METHOD = 'LIST'

devscripts/create-github-release.py

@@ -1,6 +1,6 @@
 # Unused
 
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import io
@@ -14,13 +14,13 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from yt_dlp.compat import (
+from youtube_dlc.compat import (
     compat_basestring,
     compat_getpass,
     compat_print,
     compat_urllib_request,
 )
-from yt_dlp.utils import (
+from youtube_dlc.utils import (
     make_HTTPS_handler,
     sanitized_Request,
 )
@@ -100,7 +100,7 @@ def main():
     releaser = GitHubReleaser()
 
     new_release = releaser.create_release(
-        version, name='yt-dlp %s' % version, body=body)
+        version, name='youtube-dlc %s' % version, body=body)
     release_id = new_release['id']
 
     for asset in os.listdir(build_path):

devscripts/fish-completion.in

@@ -2,4 +2,4 @@
 {{commands}}
 
 
-complete --command yt-dlp --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
+complete --command youtube-dlc --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"

devscripts/fish-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import optparse
@@ -7,10 +7,10 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import yt_dlp
+import youtube_dlc
-from yt_dlp.utils import shell_quote
+from youtube_dlc.utils import shell_quote
 
-FISH_COMPLETION_FILE = 'completions/fish/yt-dlp.fish'
+FISH_COMPLETION_FILE = 'youtube-dlc.fish'
 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
 EXTRA_ARGS = {
@@ -31,7 +31,7 @@ def build_completion(opt_parser):
     for group in opt_parser.option_groups:
         for option in group.option_list:
             long_option = option.get_opt_string().strip('-')
-            complete_cmd = ['complete', '--command', 'yt-dlp', '--long-option', long_option]
+            complete_cmd = ['complete', '--command', 'youtube-dlc', '--long-option', long_option]
             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]
             if option.help != optparse.SUPPRESS_HELP:
@@ -46,5 +46,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = yt_dlp.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)

devscripts/generate_aes_testdata.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
 
 import codecs
@@ -8,8 +7,8 @@
 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 youtube_dlc.utils import intlist_to_bytes
-from yt_dlp.aes import aes_encrypt, key_expansion
+from youtube_dlc.aes import aes_encrypt, key_expansion
 
 secret_msg = b'Secret message goes here'
 

devscripts/gh-pages/add-version.py

@@ -22,9 +22,9 @@
 new_version = {}
 
 filenames = {
-    'bin': 'yt-dlp',
+    'bin': 'youtube-dlc',
-    'exe': 'yt-dlp.exe',
+    'exe': 'youtube-dlc.exe',
-    'tar': 'yt-dlp-%s.tar.gz' % version}
+    'tar': 'youtube-dlc-%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)

devscripts/gh-pages/update-copyright.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import with_statement, unicode_literals

devscripts/gh-pages/update-feed.py

@@ -11,24 +11,24 @@
     <?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>
+        <title>youtube-dlc releases</title>
-        <id>https://yt-dl.org/feed/yt-dlp-updates-feed</id>
+        <id>https://yt-dl.org/feed/youtube-dlc-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>
+        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed/youtube-dlc-@VERSION@</id>
         <title>New version @VERSION@</title>
-        <link href="http://ytdl-org.github.io/yt-dlp" />
+        <link href="http://ytdl-org.github.io/youtube-dlc" />
         <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>
+            <name>The youtube-dlc maintainers</name>
         </author>
         <updated>@TIMESTAMP@</updated>
     </entry>

devscripts/gh-pages/update-sites.py

@@ -5,10 +5,10 @@
 import os
 import textwrap
 
-# We must be able to import yt_dlp
+# We must be able to import youtube_dlc
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
-import yt_dlp
+import youtube_dlc
 
 
 def main():
@@ -16,7 +16,7 @@ def main():
         template = tmplf.read()
 
     ie_htmls = []
-    for ie in yt_dlp.list_extractors(age_limit=None):
+    for ie in youtube_dlc.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:

devscripts/lazy_load_template.py

@@ -1,31 +1,19 @@
 # coding: utf-8
+from __future__ import unicode_literals
+
 import re
 
-from ..utils import bug_reports_message, write_string
 
-
+class LazyLoadExtractor(object):
-class LazyLoadMetaClass(type):
-    def __getattr__(cls, name):
-        if '_real_class' not in cls.__dict__:
-            write_string(
-                f'WARNING: Falling back to normal extractor since lazy extractor '
-                f'{cls.__name__} does not have attribute {name}{bug_reports_message()}')
-        return getattr(cls._get_real_class(), name)
-
-
-class LazyLoadExtractor(metaclass=LazyLoadMetaClass):
     _module = None
-    _WORKING = True
 
     @classmethod
-    def _get_real_class(cls):
+    def ie_key(cls):
-        if '_real_class' not in cls.__dict__:
+        return cls.__name__[:-2]
-            mod = __import__(cls._module, fromlist=(cls.__name__,))
-            cls._real_class = getattr(mod, cls.__name__)
-        return cls._real_class
 
     def __new__(cls, *args, **kwargs):
-        real_cls = cls._get_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,34 +1,33 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
-import io
+# 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
+
+"""     infile, outfile = args
 
     with io.open(infile, encoding='utf-8') as inf:
         readme = inf.read()
 
-    bug_text = re.search(
+    bug_text = re.search( """
-        r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
+# r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
-    dev_text = re.search(
+# dev_text = re.search(
-        r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING yt-dlp', readme).group(1)
+# r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING youtube-dlc',
+"""         readme).group(1)
 
     out = bug_text + dev_text
 
     with io.open(outfile, 'w', encoding='utf-8') as outf:
-        outf.write(out)
+        outf.write(out) """
-
 
 if __name__ == '__main__':
     main()

devscripts/make_issue_template.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import io
@@ -16,9 +16,9 @@ def main():
     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
+    # Get the version from youtube_dlc/version.py without importing the package
-    exec(compile(open('yt_dlp/version.py').read(),
+    exec(compile(open('youtube_dlc/version.py').read(),
-                 'yt_dlp/version.py', 'exec'))
+                 'youtube_dlc/version.py', 'exec'))
 
     out = issue_template_tmpl % {'version': locals()['__version__']}
 

devscripts/make_lazy_extractors.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals, print_function
 
 from inspect import getsource
@@ -7,38 +6,36 @@
 from os.path import dirname as dirn
 import sys
 
+print('WARNING: Lazy loading extractors is an experimental feature that may not always work', file=sys.stderr)
+
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 
-lazy_extractors_filename = sys.argv[1] if len(sys.argv) > 1 else 'yt_dlp/extractor/lazy_extractors.py'
+lazy_extractors_filename = sys.argv[1]
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
 
-# Block plugins from loading
+from youtube_dlc.extractor import _ALL_CLASSES
-plugins_dirname = 'ytdlp_plugins'
+from youtube_dlc.extractor.common import InfoExtractor, SearchInfoExtractor
-plugins_blocked_dirname = 'ytdlp_plugins_blocked'
-if os.path.exists(plugins_dirname):
-    os.rename(plugins_dirname, plugins_blocked_dirname)
-
-from yt_dlp.extractor import _ALL_CLASSES
-from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
-
-if os.path.exists(plugins_blocked_dirname):
-    os.rename(plugins_blocked_dirname, plugins_dirname)
 
 with open('devscripts/lazy_load_template.py', 'rt') as f:
     module_template = f.read()
 
-CLASS_PROPERTIES = ['ie_key', 'working', '_match_valid_url', 'suitable', '_match_id', 'get_temp_id']
 module_contents = [
-    module_template,
+    module_template + '\n' + getsource(InfoExtractor.suitable) + '\n',
-    *[getsource(getattr(InfoExtractor, k)) for k in CLASS_PROPERTIES],
+    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
-    '\nclass LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
 
 ie_template = '''
 class {name}({bases}):
+    _VALID_URL = {valid_url!r}
     _module = '{module}'
 '''
 
+make_valid_template = '''
+    @classmethod
+    def _make_valid_url(cls):
+        return {valid_url!r}
+'''
+
 
 def get_base_name(base):
     if base is InfoExtractor:
@@ -50,19 +47,17 @@ def get_base_name(base):
 
 
 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__)
-    valid_url = getattr(ie, '_VALID_URL', None)
-    if not valid_url and hasattr(ie, '_make_valid_url'):
-        valid_url = ie._make_valid_url()
-    if valid_url:
-        s += f'    _VALID_URL = {valid_url!r}\n'
-    if not ie._WORKING:
-        s += '    _WORKING = False\n'
     if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
-        s += f'\n{getsource(ie.suitable)}'
+        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
 
 
@@ -97,7 +92,7 @@ def build_lazy_ie(ie, name):
         names.append(name)
 
 module_contents.append(
-    '\n_ALL_CLASSES = [{0}]'.format(', '.join(names)))
+    '_ALL_CLASSES = [{0}]'.format(', '.join(names)))
 
 module_src = '\n'.join(module_contents) + '\n'
 

devscripts/make_readme.py

@@ -1,8 +1,3 @@
-#!/usr/bin/env python3
-
-# yt-dlp --help | make_readme.py
-# This must be run in a console of correct width
-
 from __future__ import unicode_literals
 
 import io

devscripts/make_supportedsites.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import io
@@ -7,10 +7,10 @@
 import sys
 
 
-# Import yt_dlp
+# Import youtube_dlc
 ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.insert(0, ROOT_DIR)
-import yt_dlp
+import youtube_dlc
 
 
 def main():
@@ -29,14 +29,11 @@ def gen_ies_md(ies):
                 continue
             if ie_desc is not None:
                 ie_md += ': {0}'.format(ie.IE_DESC)
-            search_key = getattr(ie, 'SEARCH_KEY', None)
-            if search_key is not None:
-                ie_md += f'; "{ie.SEARCH_KEY}:" prefix'
             if not ie.working():
                 ie_md += ' (Currently broken)'
             yield ie_md
 
-    ies = sorted(yt_dlp.gen_extractors(), key=lambda i: i.IE_NAME.lower())
+    ies = sorted(youtube_dlc.gen_extractors(), key=lambda i: i.IE_NAME.lower())
     out = '# Supported sites\n' + ''.join(
         ' - ' + md + '\n'
         for md in gen_ies_md(ies))

devscripts/prepare_manpage.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
 
 import io
@@ -9,17 +8,15 @@
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
 
-PREFIX = r'''%yt-dlp(1)
+PREFIX = r'''%youtube-dlc(1)
 
 # 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...]
+**youtube-dlc** \[OPTIONS\] URL [URL...]
-
-# DESCRIPTION
 
 '''
 
@@ -35,63 +32,47 @@ def main():
     with io.open(README_FILE, encoding='utf-8') as f:
         readme = f.read()
 
-    readme = filter_excluded_sections(readme)
+    readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme)
-    readme = move_sections(readme)
+    readme = re.sub(r'\s+youtube-dlc \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
+    readme = PREFIX + readme
+
     readme = filter_options(readme)
 
     with io.open(outfile, 'w', encoding='utf-8') as outf:
-        outf.write(PREFIX + readme)
+        outf.write(readme)
-
-
-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 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)
-
-    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')
-
-        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 = readme.replace(sections[0], '', 1).replace(move_tag, sections[0], 1)
-    return readme
 
 
 def filter_options(readme):
-    section = re.search(r'(?sm)^# USAGE AND OPTIONS\n.+?(?=^# )', readme).group(0)
+    ret = ''
-    options = '# OPTIONS\n'
+    in_options = False
-    for line in section.split('\n')[1:]:
+    for line in readme.split('\n'):
-        mobj = re.fullmatch(r'''(?x)
+        if line.startswith('# '):
-                \s{4}(?P<opt>-(?:,\s|[^\s])+)
+            if line[2:].startswith('OPTIONS'):
-                (?:\s(?P<meta>(?:[^\s]|\s(?!\s))+))?
+                in_options = True
-                (\s{2,}(?P<desc>.+))?
+            else:
-            ''', line)
+                in_options = False
-        if not mobj:
-            options += f'{line.lstrip()}\n'
-            continue
-        option, metavar, description = mobj.group('opt', 'meta', 'desc')
 
-        # Pandoc's definition_lists. See http://pandoc.org/README.html
+        if in_options:
-        option = f'{option} *{metavar}*' if metavar else option
+            if line.lstrip().startswith('-'):
-        description = f'{description}\n' if description else ''
+                split = re.split(r'\s{2,}', line.lstrip())
-        options += f'\n{option}\n:   {description}'
+                # Description string may start with `-` as well. If there is
-        continue
+                # 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'
+
+    return ret
 
 
 if __name__ == '__main__':

devscripts/release.sh

@@ -1,5 +1,4 @@
 # Unused
-
 #!/bin/bash
 
 # IMPORTANT: the following assumptions are made
@@ -55,14 +54,14 @@ 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')
+useless_files=$(find youtube_dlc -type f -not -name '*.py')
-if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in yt_dlp: $useless_files"; exit 1; fi
+if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dlc: $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
+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..."
@@ -70,18 +69,18 @@ make clean
 if $skip_tests ; then
     echo 'SKIPPING TESTS'
 else
-    nosetests --verbose --with-coverage --cover-package=yt_dlp --cover-html test --stop || exit 1
+    nosetests --verbose --with-coverage --cover-package=youtube_dlc --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
+sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dlc/version.py
 
-/bin/echo -e "\n### Changing version in Changelog..."
+/bin/echo -e "\n### Changing version in ChangeLog..."
-sed -i "s/<unreleased>/$version/" Changelog.md
+sed -i "s/<unreleased>/$version/" ChangeLog
 
-/bin/echo -e "\n### Committing documentation, templates and yt_dlp/version.py..."
+/bin/echo -e "\n### Committing documentation, templates and youtube_dlc/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 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 youtube_dlc/version.py ChangeLog
 git commit $gpg_sign_commits -m "release $version"
 
 /bin/echo -e "\n### Now tagging, signing and pushing..."
@@ -96,13 +95,13 @@ 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
+make youtube-dlc youtube-dlc.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
+wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dlc.exe?rev=$REV" -O youtube-dlc.exe
 mkdir -p "build/$version"
-mv yt-dlp yt-dlp.exe "build/$version"
+mv youtube-dlc youtube-dlc.exe "build/$version"
-mv yt-dlp.tar.gz "build/$version/yt-dlp-$version.tar.gz"
+mv youtube-dlc.tar.gz "build/$version/youtube-dlc-$version.tar.gz"
-RELEASE_FILES="yt-dlp yt-dlp.exe yt-dlp-$version.tar.gz"
+RELEASE_FILES="youtube-dlc youtube-dlc.exe youtube-dlc-$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)
@@ -112,7 +111,7 @@ RELEASE_FILES="yt-dlp yt-dlp.exe yt-dlp-$version.tar.gz"
 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"
+python devscripts/create-github-release.py ChangeLog $version "$ROOT/build/$version"
 
 ssh ytdl@yt-dl.org "sh html/update_latest.sh $version"
 

devscripts/run_tests.bat

@@ -1,16 +1,17 @@
-@setlocal
 @echo off
-cd /d %~dp0..
 
-if ["%~1"]==[""] (
+rem Keep this list in sync with the `offlinetest` target in Makefile
-    set "test_set="test""
+set DOWNLOAD_TESTS="age_restriction^|download^|iqiyi_sdk_interpreter^|socks^|subtitles^|write_annotations^|youtube_lists^|youtube_signature^|post_hooks"
-) else if ["%~1"]==["core"] (
+
-    set "test_set="-m not download""
+if "%YTDL_TEST_SET%" == "core" (
-) else if ["%~1"]==["download"] (
+    set test_set="-I test_("%DOWNLOAD_TESTS%")\.py"
-    set "test_set="-m "download""
+    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
 )
 
-pytest %test_set%
+nosetests test --verbose %test_set:"=% %multiprocess_args:"=%

devscripts/run_tests.sh

@@ -1,14 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
-if [ -z $1 ]; then
+# Keep this list in sync with the `offlinetest` target in Makefile
-    test_set='test'
+DOWNLOAD_TESTS="age_restriction|download|iqiyi_sdk_interpreter|overwrites|socks|subtitles|write_annotations|youtube_lists|youtube_signature|post_hooks"
-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
 
-python3 -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/show-downloads-statistics.py

@@ -1,6 +1,6 @@
 # Unused
 
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import itertools
@@ -11,11 +11,11 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from yt_dlp.compat import (
+from youtube_dlc.compat import (
     compat_print,
     compat_urllib_request,
 )
-from yt_dlp.utils import format_bytes
+from youtube_dlc.utils import format_bytes
 
 
 def format_size(bytes):
@@ -38,9 +38,9 @@ def format_size(bytes):
             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'^youtube-dlc$',
-                    r'^yt-dlp-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
+                    r'^youtube-dlc-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
-                    r'^yt-dlp\.exe$')):
+                    r'^youtube-dlc\.exe$')):
                 continue
             compat_print(
                 ' %s size: %s downloads: %d'

devscripts/update-formulae.py

@@ -1,37 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import unicode_literals
-
-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_urllib_request
-
-
-# usage: python3 ./devscripts/update-formulae.py <path-to-formulae-rb> <version>
-# version can be either 0-aligned (yt-dlp version) or normalized (PyPl version)
-
-filename, version = sys.argv[1:]
-
-normalized_version = '.'.join(str(int(x)) for x in version.split('.'))
-
-pypi_release = json.loads(compat_urllib_request.urlopen(
-    'https://pypi.org/pypi/yt-dlp/%s/json' % normalized_version
-).read().decode('utf-8'))
-
-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']
-
-with open(filename, 'r') as r:
-    formulae_text = r.read()
-
-formulae_text = re.sub(r'sha256 "[0-9a-f]*?"', 'sha256 "%s"' % sha256sum, formulae_text)
-formulae_text = re.sub(r'url "[^"]*?"', 'url "%s"' % url, formulae_text)
-
-with open(filename, 'w') as w:
-    w.write(formulae_text)

devscripts/update-version.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-from datetime import datetime
-import sys
-import subprocess
-
-
-with open('yt_dlp/version.py', 'rt') as f:
-    exec(compile(f.read(), 'yt_dlp/version.py', 'exec'))
-old_version = locals()['__version__']
-
-old_version_list = old_version.split('.')
-
-old_ver = '.'.join(old_version_list[:3])
-old_rev = old_version_list[3] if len(old_version_list) > 3 else ''
-
-ver = datetime.utcnow().strftime("%Y.%m.%d")
-
-rev = (sys.argv[1:] or [''])[0]  # Use first argument, if present as revision number
-if not rev:
-    rev = str(int(old_rev or 0) + 1) if old_ver == ver else ''
-
-VERSION = '.'.join((ver, rev)) if rev else ver
-
-try:
-    sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
-    GIT_HEAD = sp.communicate()[0].decode().strip() or None
-except Exception:
-    GIT_HEAD = None
-
-VERSION_FILE = f'''\
-# Autogenerated by devscripts/update-version.py
-
-__version__ = {VERSION!r}
-
-RELEASE_GIT_HEAD = {GIT_HEAD!r}
-'''
-
-with open('yt_dlp/version.py', 'wt') as f:
-    f.write(VERSION_FILE)
-
-print('::set-output name=ytdlp_version::' + VERSION)
-print(f'\nVersion = {VERSION}, Git HEAD = {GIT_HEAD}')

devscripts/wine-py2exe.sh

@@ -1,5 +1,3 @@
-# UNUSED
-
 #!/bin/bash
 
 # Run with as parameter a setup.py that works in the current directory

devscripts/zsh-completion.in

@@ -1,6 +1,6 @@
-#compdef yt-dlp
+#compdef youtube-dlc
 
-__yt_dlp() {
+__youtube_dlc() {
     local curcontext="$curcontext" fileopts diropts cur prev
     typeset -A opt_args
     fileopts="{{fileopts}}"
@@ -27,4 +27,4 @@ __yt_dlp() {
     esac
 }
 
-__yt_dlp
+__youtube_dlc

devscripts/zsh-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import os
@@ -6,9 +6,9 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import yt_dlp
+import youtube_dlc
 
-ZSH_COMPLETION_FILE = "completions/zsh/_yt-dlp"
+ZSH_COMPLETION_FILE = "youtube-dlc.zsh"
 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
 
 
@@ -45,5 +45,5 @@ def build_completion(opt_parser):
         f.write(template)
 
 
-parser = yt_dlp.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)

docs/Changelog.md

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

docs/Collaborators.md

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

docs/Contributing.md

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

docs/LICENSE.md

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

docs/Makefile

@@ -85,17 +85,17 @@ 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 "# qcollectiongenerator $(BUILDDIR)/qthelp/youtube-dlc.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/yt-dlp.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dlc.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 "# mkdir -p $$HOME/.local/share/devhelp/youtube-dlc"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/yt-dlp"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dlc"
 	@echo "# devhelp"
 
 epub:

docs/README.md

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

docs/conf.py

@@ -1,12 +1,21 @@
 # coding: utf-8
 #
-# yt-dlp documentation build configuration file
+# youtube-dlc documentation build configuration file, created by
+# sphinx-quickstart on Fri Mar 14 21:05:43 2014.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
 
 import sys
 import os
-
+# Allows to import youtube_dlc
-# Allows to import yt-dlp
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-sys.path.insert(0, os.path.abspath('..'))
 
 # -- General configuration ------------------------------------------------
 
@@ -14,26 +23,28 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'myst_parser',
+    'sphinx.ext.autodoc',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
+# The suffix of source filenames.
+source_suffix = '.rst'
+
 # The master toctree document.
-master_doc = 'README'
+master_doc = 'index'
 
 # General information about the project.
-project = u'yt-dlp'
+project = u'youtube-dlc'
-author = u'yt-dlp'
+copyright = u'2014, Ricardo Garcia Gonzalez'
-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__
+from youtube_dlc.version import __version__
 version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version
@@ -51,18 +62,10 @@
 # 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']
+html_static_path = ['_static']
 
-# Enable heading anchors
+# Output file base name for HTML help builder.
-myst_heading_anchors = 4
+htmlhelp_basename = 'youtube-dlcdoc'
-
-# Suppress heading warnings
-suppress_warnings = [
-    'myst.header',
-]

docs/faq.md

@@ -0,0 +1,31 @@
+- Q: How to redirect to another extractor?  
+  - A:
+    - Most simple using only `url_result` 
+      ```
+      # get proper url first if needed.
+      return self.url_result(url)
+      ```
+    - Using `_request_webpage` and `to_screen` in addition
+      ```
+      urlh = self._request_webpage(
+          url, id, note='Downloading redirect page')
+      url = urlh.geturl()
+      self.to_screen('Following redirect: %s' % url)
+      return self.url_result(url)
+      ```
+    - Using `return` construction
+      ```
+      return {
+            '_type': 'url_transparent',
+            'url': url, 
+            'ie_key': ExampleIE.ie_key(),
+            'id': id,
+        }
+      # Alternative if extractor supports internal uri like kaltura
+      return {
+            '_type': 'url_transparent',
+            'url': 'kaltura:%s:%s' % (partner_id, kaltura_id), 
+            'ie_key': KalturaIE.ie_key(),
+            'id': id,
+        }
+      ```

docs/index.rst

@@ -0,0 +1,23 @@
+Welcome to youtube-dlc's documentation!
+======================================
+
+*youtube-dlc* is a command-line program to download videos from YouTube.com and more sites.
+It can also be used in Python code.
+
+Developer guide
+---------------
+
+This section contains information for using *youtube-dlc* from Python programs.
+
+.. toctree::
+    :maxdepth: 2
+
+    module_guide
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

docs/module_guide.rst

@@ -0,0 +1,67 @@
+Using the ``youtube_dlc`` module
+===============================
+
+When using the ``youtube_dlc`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
+
+.. code-block:: python
+
+    >>> from youtube_dlc import YoutubeDL
+    >>> ydl = YoutubeDL()
+    >>> ydl.add_default_info_extractors()
+
+Extracting video information
+----------------------------
+
+You use the :meth:`YoutubeDL.extract_info` method for getting the video information, which returns a dictionary:
+
+.. code-block:: python
+
+    >>> info = ydl.extract_info('http://www.youtube.com/watch?v=BaW_jenozKc', download=False)
+    [youtube] Setting language
+    [youtube] BaW_jenozKc: Downloading webpage
+    [youtube] BaW_jenozKc: Downloading video info webpage
+    [youtube] BaW_jenozKc: Extracting video information
+    >>> info['title']
+    'youtube-dlc test video "\'/\\ä↭𝕐'
+    >>> info['height'], info['width']
+    (720, 1280)
+
+If you want to download or play the video you can get its url:
+
+.. code-block:: python
+
+    >>> info['url']
+    'https://...'
+
+Extracting playlist information
+-------------------------------
+
+The playlist information is extracted in a similar way, but the dictionary is a bit different:
+
+.. code-block:: python
+
+    >>> playlist = ydl.extract_info('http://www.ted.com/playlists/13/open_source_open_world', download=False)
+    [TED] open_source_open_world: Downloading playlist webpage
+    ...
+    >>> playlist['title']
+    'Open-source, open world'
+
+
+
+You can access the videos in the playlist with the ``entries`` field:
+
+.. code-block:: python
+
+    >>> for video in playlist['entries']:
+    ...     print('Video #%d: %s' % (video['playlist_index'], video['title']))
+
+    Video #1: How Arduino is open-sourcing imagination
+    Video #2: The year open data went worldwide
+    Video #3: Massive-scale online collaboration
+    Video #4: The art of asking
+    Video #5: How cognitive surplus will change the world
+    Video #6: The birth of Wikipedia
+    Video #7: Coding a better government
+    Video #8: The era of open innovation
+    Video #9: The currency of the new economy is trust
+

docs/requirements.txt

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

docs/ytdlp_plugins.md

@@ -1,6 +0,0 @@
----
-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).

make_win.bat

@@ -0,0 +1 @@
+py -m PyInstaller youtube_dlc\__main__.py --onefile --name youtube-dlc --version-file win\ver.txt --icon win\icon\cloud.ico --upx-exclude=vcruntime140.dll --exclude-module ytdlp_plugins

pyinst.py

@@ -1,135 +1,92 @@
-#!/usr/bin/env python3
+from __future__ import unicode_literals
-# coding: utf-8
+from PyInstaller.utils.win32.versioninfo import (
-import os
+    VarStruct, VarFileInfo, StringStruct, StringTable,
-import platform
+    StringFileInfo, FixedFileInfo, VSVersionInfo, SetVersion,
-import sys
+)
-from PyInstaller.utils.hooks import collect_submodules
+import PyInstaller.__main__
 
+from datetime import datetime
 
-OS_NAME = platform.system()
+FILE_DESCRIPTION = 'Media Downloader'
-if OS_NAME == 'Windows':
-    from PyInstaller.utils.win32.versioninfo import (
-        VarStruct, VarFileInfo, StringStruct, StringTable,
-        StringFileInfo, FixedFileInfo, VSVersionInfo, SetVersion,
-    )
-elif OS_NAME == 'Darwin':
-    pass
-else:
-    raise Exception('{OS_NAME} is not supported')
 
-ARCH = platform.architecture()[0][:2]
+exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec'))
 
+_LATEST_VERSION = locals()['__version__']
 
-def main():
+_OLD_VERSION = _LATEST_VERSION.rsplit("-", 1)
-    opts = parse_options()
-    version = read_version()
 
-    suffix = '_macos' if OS_NAME == 'Darwin' else '_x86' if ARCH == '32' else ''
+if len(_OLD_VERSION) > 0:
-    final_file = 'dist/%syt-dlp%s%s' % (
+    old_ver = _OLD_VERSION[0]
-        'yt-dlp/' if '--onedir' in opts else '', suffix, '.exe' if OS_NAME == 'Windows' else '')
 
-    print(f'Building yt-dlp v{version} {ARCH}bit for {OS_NAME} with options {opts}')
+old_rev = ''
-    print('Remember to update the version using  "devscripts/update-version.py"')
+if len(_OLD_VERSION) > 1:
-    if not os.path.isfile('yt_dlp/extractor/lazy_extractors.py'):
+    old_rev = _OLD_VERSION[1]
-        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')
 
-    opts = [
+now = datetime.now()
-        f'--name=yt-dlp{suffix}',
+# ver = f'{datetime.today():%Y.%m.%d}'
-        '--icon=devscripts/logo.ico',
+ver = now.strftime("%Y.%m.%d")
-        '--upx-exclude=vcruntime140.dll',
+rev = ''
-        '--noconfirm',
-        *dependency_options(),
-        *opts,
-        'yt_dlp/__main__.py',
-    ]
-    print(f'Running PyInstaller with {opts}')
 
-    import PyInstaller.__main__
+if old_ver == ver:
+    if old_rev:
+        rev = int(old_rev) + 1
+    else:
+        rev = 1
 
-    PyInstaller.__main__.run(opts)
+_SEPARATOR = '-'
 
-    set_version_info(final_file, version)
+version = _SEPARATOR.join(filter(None, [ver, str(rev)]))
 
+print(version)
 
-def parse_options():
+version_list = ver.split(".")
-    # Compatability with older arguments
+_year, _month, _day = [int(value) for value in version_list]
-    opts = sys.argv[1:]
+_rev = 0
-    if opts[0:1] in (['32'], ['64']):
+if rev:
-        if ARCH != opts[0]:
+    _rev = rev
-            raise Exception(f'{opts[0]}bit executable cannot be built on a {ARCH}bit system')
+_ver_tuple = _year, _month, _day, _rev
-        opts = opts[1:]
-    return opts or ['--onefile']
 
-
+version_file = VSVersionInfo(
-def read_version():
+    ffi=FixedFileInfo(
-    exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
+        filevers=_ver_tuple,
-    return locals()['__version__']
+        prodvers=_ver_tuple,
-
+        mask=0x3F,
-
+        flags=0x0,
-def version_to_list(version):
+        OS=0x4,
-    version_list = version.split('.')
+        fileType=0x1,
-    return list(map(int, version_list)) + [0] * (4 - len(version_list))
+        subtype=0x0,
-
+        date=(0, 0),
-
+    ),
-def dependency_options():
+    kids=[
-    dependencies = [pycryptodome_module(), 'mutagen', 'brotli'] + collect_submodules('websockets')
+        StringFileInfo(
-    excluded_modules = ['test', 'ytdlp_plugins', 'youtube-dl', 'youtube-dlc']
+            [
-
+                StringTable(
-    yield from (f'--hidden-import={module}' for module in dependencies)
+                    "040904B0",
-    yield from (f'--exclude-module={module}' for module in excluded_modules)
+                    [
-
+                        StringStruct("Comments", "Youtube-dlc Command Line Interface."),
-
+                        StringStruct("CompanyName", "theidel@uni-bremen.de"),
-def pycryptodome_module():
+                        StringStruct("FileDescription", FILE_DESCRIPTION),
-    try:
+                        StringStruct("FileVersion", version),
-        import Cryptodome  # noqa: F401
+                        StringStruct("InternalName", "youtube-dlc"),
-    except ImportError:
+                        StringStruct(
-        try:
+                            "LegalCopyright",
-            import Crypto  # noqa: F401
+                            "theidel@uni-bremen.de | UNLICENSE",
-            print('WARNING: Using Crypto since Cryptodome is not available. '
+                        ),
-                  'Install with: pip install pycryptodomex', file=sys.stderr)
+                        StringStruct("OriginalFilename", "youtube-dlc.exe"),
-            return 'Crypto'
+                        StringStruct("ProductName", "Youtube-dlc"),
-        except ImportError:
+                        StringStruct("ProductVersion", version + " | git.io/JLh7K"),
-            pass
+                    ],
-    return 'Cryptodome'
+                )
-
+            ]
-
-def set_version_info(exe, version):
-    if OS_NAME == 'Windows':
-        windows_set_version(exe, version)
-
-
-def windows_set_version(exe, version):
-    version_list = version_to_list(version)
-    suffix = '_x86' if ARCH == '32' else ''
-    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=[
+        VarFileInfo([VarStruct("Translation", [0, 1200])])
-            StringFileInfo([StringTable('040904B0', [
+    ]
-                StringStruct('Comments', 'yt-dlp%s Command Line Interface.' % suffix),
+)
-                StringStruct('CompanyName', 'https://github.com/yt-dlp'),
-                StringStruct('FileDescription', 'yt-dlp%s' % (' (32 Bit)' if ARCH == '32' else '')),
-                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])])
-        ]
-    ))
 
-
+PyInstaller.__main__.run([
-if __name__ == '__main__':
+    '--name=youtube-dlc',
-    main()
+    '--onefile',
+    '--icon=win/icon/cloud.ico',
+    'youtube_dlc/__main__.py',
+])
+SetVersion('dist/youtube-dlc.exe', version_file)

pyinst32.py

@@ -0,0 +1,92 @@
+from __future__ import unicode_literals
+from PyInstaller.utils.win32.versioninfo import (
+    VarStruct, VarFileInfo, StringStruct, StringTable,
+    StringFileInfo, FixedFileInfo, VSVersionInfo, SetVersion,
+)
+import PyInstaller.__main__
+
+from datetime import datetime
+
+FILE_DESCRIPTION = 'Media Downloader 32 Bit Version'
+
+exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec'))
+
+_LATEST_VERSION = locals()['__version__']
+
+_OLD_VERSION = _LATEST_VERSION.rsplit("-", 1)
+
+if len(_OLD_VERSION) > 0:
+    old_ver = _OLD_VERSION[0]
+
+old_rev = ''
+if len(_OLD_VERSION) > 1:
+    old_rev = _OLD_VERSION[1]
+
+now = datetime.now()
+# ver = f'{datetime.today():%Y.%m.%d}'
+ver = now.strftime("%Y.%m.%d")
+rev = ''
+
+if old_ver == ver:
+    if old_rev:
+        rev = int(old_rev) + 1
+    else:
+        rev = 1
+
+_SEPARATOR = '-'
+
+version = _SEPARATOR.join(filter(None, [ver, str(rev)]))
+
+print(version)
+
+version_list = ver.split(".")
+_year, _month, _day = [int(value) for value in version_list]
+_rev = 0
+if rev:
+    _rev = rev
+_ver_tuple = _year, _month, _day, _rev
+
+version_file = VSVersionInfo(
+    ffi=FixedFileInfo(
+        filevers=_ver_tuple,
+        prodvers=_ver_tuple,
+        mask=0x3F,
+        flags=0x0,
+        OS=0x4,
+        fileType=0x1,
+        subtype=0x0,
+        date=(0, 0),
+    ),
+    kids=[
+        StringFileInfo(
+            [
+                StringTable(
+                    "040904B0",
+                    [
+                        StringStruct("Comments", "Youtube-dlc_x86 Command Line Interface."),
+                        StringStruct("CompanyName", "theidel@uni-bremen.de"),
+                        StringStruct("FileDescription", FILE_DESCRIPTION),
+                        StringStruct("FileVersion", version),
+                        StringStruct("InternalName", "youtube-dlc_x86"),
+                        StringStruct(
+                            "LegalCopyright",
+                            "theidel@uni-bremen.de | UNLICENSE",
+                        ),
+                        StringStruct("OriginalFilename", "youtube-dlc_x86.exe"),
+                        StringStruct("ProductName", "Youtube-dlc_x86"),
+                        StringStruct("ProductVersion", version + "_x86 | git.io/JUGsM"),
+                    ],
+                )
+            ]
+        ),
+        VarFileInfo([VarStruct("Translation", [0, 1200])])
+    ]
+)
+
+PyInstaller.__main__.run([
+    '--name=youtube-dlc_x86',
+    '--onefile',
+    '--icon=win/icon/cloud.ico',
+    'youtube_dlc/__main__.py',
+])
+SetVersion('dist/youtube-dlc_x86.exe', version_file)

pytest.ini

@@ -1,4 +0,0 @@
-[pytest]
-addopts = -ra -v --strict-markers
-markers =
-    download

requirements.txt

@@ -1,5 +0,0 @@
-mutagen
-pycryptodomex
-websockets
-brotli; platform_python_implementation=='CPython'
-brotlicffi; platform_python_implementation!='CPython'

scripts/update-version-workflow.py

@@ -0,0 +1,44 @@
+from __future__ import unicode_literals
+from datetime import datetime
+# import urllib.request
+
+# response = urllib.request.urlopen('https://blackjack4494.github.io/youtube-dlc/update/LATEST_VERSION')
+# _LATEST_VERSION = response.read().decode('utf-8')
+
+exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec'))
+
+_LATEST_VERSION = locals()['__version__']
+
+_OLD_VERSION = _LATEST_VERSION.rsplit("-", 1)
+
+if len(_OLD_VERSION) > 0:
+    old_ver = _OLD_VERSION[0]
+
+old_rev = ''
+if len(_OLD_VERSION) > 1:
+    old_rev = _OLD_VERSION[1]
+
+now = datetime.now()
+# ver = f'{datetime.today():%Y.%m.%d}'
+ver = now.strftime("%Y.%m.%d")
+rev = ''
+
+if old_ver == ver:
+    if old_rev:
+        rev = int(old_rev) + 1
+    else:
+        rev = 1
+
+_SEPARATOR = '-'
+
+version = _SEPARATOR.join(filter(None, [ver, str(rev)]))
+
+print('::set-output name=ytdlc_version::' + version)
+
+file_version_py = open('youtube_dlc/version.py', 'rt')
+data = file_version_py.read()
+data = data.replace(locals()['__version__'], version)
+file_version_py.close()
+file_version_py = open('youtube_dlc/version.py', 'wt')
+file_version_py.write(data)
+file_version_py.close()

scripts/update-version.py

@@ -0,0 +1,33 @@
+# Unused
+
+from __future__ import unicode_literals
+from datetime import datetime
+import urllib.request
+
+response = urllib.request.urlopen('https://blackjack4494.github.io/youtube-dlc/update/LATEST_VERSION')
+
+_LATEST_VERSION = response.read().decode('utf-8')
+
+_OLD_VERSION = _LATEST_VERSION.rsplit("-", 1)
+
+if len(_OLD_VERSION) > 0:
+    old_ver = _OLD_VERSION[0]
+
+old_rev = ''
+if len(_OLD_VERSION) > 1:
+    old_rev = _OLD_VERSION[1]
+
+now = datetime.now()
+# ver = f'{datetime.today():%Y.%m.%d}'
+ver = now.strftime("%Y.%m.%d")
+rev = ''
+
+if old_ver == ver:
+    if old_rev:
+        rev = int(old_rev) + 1
+    else:
+        rev = 1
+
+_SEPARATOR = '-'
+
+version = _SEPARATOR.join(filter(None, [ver, str(rev)]))

setup.cfg

@@ -2,5 +2,5 @@
 universal = True
 
 [flake8]
-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
+exclude = youtube_dlc/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,scripts/update-version.py
 ignore = E402,E501,E731,E741,W503

setup.py

@@ -1,66 +1,31 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
+
+from setuptools import setup, Command, find_packages
 import os.path
 import warnings
 import sys
-
-try:
-    from setuptools import setup, Command, find_packages
-    setuptools_available = True
-except ImportError:
-    from distutils.core import setup, Command
-    setuptools_available = False
 from distutils.spawn import spawn
 
-# Get the version from yt_dlp/version.py without importing the package
+# Get the version from youtube_dlc/version.py without importing the package
-exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
+exec(compile(open('youtube_dlc/version.py').read(),
+             'youtube_dlc/version.py', 'exec'))
 
-
+DESCRIPTION = 'Command-line program to download videos from YouTube.com and many other other video platforms.'
-DESCRIPTION = 'A youtube-dl fork with additional features and patches'
 
 LONG_DESCRIPTION = '\n\n'.join((
-    'Official repository: <https://github.com/yt-dlp/yt-dlp>',
+    'Official repository: <https://github.com/pukkandan/yt-dlp>',
-    '**PS**: Some links in this document will not work since this is a copy of the README.md from Github',
+    '**PS**: Many links in this document will not work since this is a copy of the README.md from Github',
-    open('README.md', encoding='utf-8').read()))
+    open("README.md", "r", encoding="utf-8").read()))
-
-REQUIREMENTS = open('requirements.txt', encoding='utf-8').read().splitlines()
-
-
-if sys.argv[1:2] == ['py2exe']:
-    import py2exe
-    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')
-    params = {
-        '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__,
-        }],
-        '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'],
-            }
-        },
-        'zipfile': None
-    }
 
+if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
+    print("inv")
 else:
     files_spec = [
-        ('share/bash-completion/completions', ['completions/bash/yt-dlp']),
+        ('etc/bash_completion.d', ['youtube-dlc.bash-completion']),
-        ('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
+        ('etc/fish/completions', ['youtube-dlc.fish']),
-        ('share/fish/vendor_completions.d', ['completions/fish/yt-dlp.fish']),
+        ('share/doc/youtube_dlc', ['README.txt']),
-        ('share/doc/yt_dlp', ['README.txt']),
+        ('share/man/man1', ['youtube-dlc.1'])
-        ('share/man/man1', ['yt-dlp.1'])
     ]
     root = os.path.dirname(os.path.abspath(__file__))
     data_files = []
@@ -68,7 +33,7 @@
         resfiles = []
         for fn in files:
             if not os.path.exists(fn):
-                warnings.warn('Skipping file %s since it is not present. Try running `make pypi-files` first' % fn)
+                warnings.warn('Skipping file %s since it is not present. Type  make  to build all automatically generated files.' % fn)
             else:
                 resfiles.append(fn)
         data_files.append((dirname, resfiles))
@@ -76,12 +41,10 @@
     params = {
         'data_files': data_files,
     }
-
+    #if setuptools_available:
-    if setuptools_available:
+    params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dlc:main']}
-        params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']}
+    #else:
-    else:
+    #    params['scripts'] = ['bin/youtube-dlc']
-        params['scripts'] = ['yt-dlp']
-
 
 class build_lazy_extractors(Command):
     description = 'Build the extractor lazy loading module'
@@ -94,49 +57,53 @@ def finalize_options(self):
         pass
 
     def run(self):
-        spawn([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'],
+        spawn(
-              dry_run=self.dry_run)
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dlc/extractor/lazy_extractors.py'],
-
+            dry_run=self.dry_run,
-
+        )
-if setuptools_available:
-    packages = find_packages(exclude=('youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins'))
-else:
-    packages = ['yt_dlp', 'yt_dlp.downloader', 'yt_dlp.extractor', 'yt_dlp.postprocessor']
-
 
 setup(
-    name='yt-dlp',
+    name="yt-dlp",
     version=__version__,
-    maintainer='pukkandan',
+    maintainer="pukkandan",
-    maintainer_email='pukkandan.ytdlp@gmail.com',
+    maintainer_email="pukkandan@gmail.com",
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
-    url='https://github.com/yt-dlp/yt-dlp',
+    url="https://github.com/pukkandan/yt-dlp",
-    packages=packages,
+    packages=find_packages(exclude=("youtube_dl","test",)),
-    install_requires=REQUIREMENTS,
     project_urls={
-        'Documentation': 'https://yt-dlp.readthedocs.io',
+        'Documentation': 'https://github.com/pukkandan/yt-dlp#yt-dlp',
-        'Source': 'https://github.com/yt-dlp/yt-dlp',
+        'Source': 'https://github.com/pukkandan/yt-dlp',
-        'Tracker': 'https://github.com/yt-dlp/yt-dlp/issues',
+        'Tracker': 'https://github.com/pukkandan/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',
+	    "Topic :: Multimedia :: Video",
-        'Development Status :: 5 - Production/Stable',
+        "Development Status :: 5 - Production/Stable",
-        'Environment :: Console',
+        "Environment :: Console",
-        'Programming Language :: Python',
+        "Programming Language :: Python",
-        'Programming Language :: Python :: 3.6',
+        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 3.7',
+        "Programming Language :: Python :: 2.6",
-        'Programming Language :: Python :: 3.8',
+        "Programming Language :: Python :: 2.7",
-        'Programming Language :: Python :: Implementation',
+        "Programming Language :: Python :: 3",
-        'Programming Language :: Python :: Implementation :: CPython',
+        "Programming Language :: Python :: 3.2",
-        'Programming Language :: Python :: Implementation :: PyPy',
+        "Programming Language :: Python :: 3.3",
-        'License :: Public Domain',
+        "Programming Language :: Python :: 3.4",
-        'Operating System :: OS Independent',
+        "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='>=3.6',
+    python_requires='>=2.6',
 	
-    cmdclass={'build_lazy_extractors': build_lazy_extractors},
+	cmdclass={'build_lazy_extractors': build_lazy_extractors},
     **params
 )

test/helper.py

@@ -10,31 +10,23 @@
 import ssl
 import sys
 
-import yt_dlp.extractor
+import youtube_dlc.extractor
-from yt_dlp import YoutubeDL
+from youtube_dlc import YoutubeDL
-from yt_dlp.compat import (
+from youtube_dlc.compat import (
     compat_os_name,
     compat_str,
 )
-from yt_dlp.utils import (
+from youtube_dlc.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
-
-
 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')
+                                         "local_parameters.json")
     with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
         parameters = json.load(pf)
     if os.path.exists(LOCAL_PARAMETERS_FILE):
@@ -98,7 +90,7 @@ def report_warning(self, message):
 
 
 def gettestcases(include_onlymatching=False):
-    for ie in yt_dlp.extractor.gen_extractors():
+    for ie in youtube_dlc.extractor.gen_extractors():
         for tc in ie.get_testcases(include_onlymatching):
             yield tc
 
@@ -194,75 +186,25 @@ def expect_dict(self, got_dict, expected_dict):
         expect_value(self, got, expected, info_field)
 
 
-def sanitize_got_info_dict(got_dict):
-    IGNORED_FIELDS = (
-        # Format keys
-        'url', 'manifest_url', 'format', 'format_id', 'format_note', 'width', 'height', 'resolution',
-        'dynamic_range', 'tbr', 'abr', 'acodec', 'asr', 'vbr', 'fps', 'vcodec', 'container', 'filesize',
-        'filesize_approx', 'player_url', 'protocol', 'fragment_base_url', 'fragments', 'preference',
-        'language', 'language_preference', 'quality', 'source_preference', 'http_headers',
-        'stretched_ratio', 'no_resume', 'has_drm', 'downloader_options',
-
-        # RTMP formats
-        'page_url', 'app', 'play_path', 'tc_url', 'flash_version', 'rtmp_live', 'rtmp_conn', 'rtmp_protocol', 'rtmp_real_time',
-
-        # Lists
-        'formats', 'thumbnails', 'subtitles', 'automatic_captions', 'comments', 'entries',
-
-        # 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']
+        for key in ('id', 'url', 'title', 'ext'):
-        if expected_dict.get('ext'):
-            mandatory_fields.extend(('url', 'ext'))
-        for key in mandatory_fields:
             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, compat_str):
                 return "'%s'" % v.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n')
-            elif isinstance(v, type):
-                return v.__name__
             else:
                 return repr(v)
         info_dict_str = ''

test/parameters.json

@@ -1,5 +1,4 @@
 {
-    "check_formats": false,
     "consoletitle": false, 
     "continuedl": true, 
     "forcedescription": false, 
@@ -9,7 +8,7 @@
     "forcetitle": false, 
     "forceurl": false, 
     "force_write_download_archive": false,
-    "format": "b/bv",
+    "format": "best",
     "ignoreerrors": false, 
     "listformats": null, 
     "logtostderr": false, 
@@ -20,6 +19,7 @@
     "noprogress": false, 
     "outtmpl": "%(id)s.%(ext)s", 
     "password": null, 
+    "playlistend": -1, 
     "playliststart": 1, 
     "prefer_free_formats": false, 
     "quiet": false, 
@@ -44,5 +44,6 @@
     "writesubtitles": false,
     "allsubtitles": false,
     "listsubtitles": false,
+    "socket_timeout": 20,
     "fixup": "never"
 }