release 2019.04.17

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,61 @@
+## Please follow the guide below
+
+- You will be asked some questions and requested to provide some information, please read them **carefully** and answer honestly
+- Put an `x` into all the boxes [ ] relevant to your *issue* (like this: `[x]`)
+- Use the *Preview* tab to see what your issue will actually look like
+
+---
+
+### Make sure you are using the *latest* version: run `youtube-dl --version` and ensure your version is *2019.04.17*. If it's not, read [this FAQ entry](https://github.com/ytdl-org/youtube-dl/blob/master/README.md#how-do-i-update-youtube-dl) and update. Issues with outdated version will be rejected.
+- [ ] I've **verified** and **I assure** that I'm running youtube-dl **2019.04.17**
+
+### Before submitting an *issue* make sure you have:
+- [ ] At least skimmed through the [README](https://github.com/ytdl-org/youtube-dl/blob/master/README.md), **most notably** the [FAQ](https://github.com/ytdl-org/youtube-dl#faq) and [BUGS](https://github.com/ytdl-org/youtube-dl#bugs) sections
+- [ ] [Searched](https://github.com/ytdl-org/youtube-dl/search?type=Issues) the bugtracker for similar issues including closed ones
+- [ ] Checked that provided video/audio/playlist URLs (if any) are alive and playable in a browser
+
+### What is the purpose of your *issue*?
+- [ ] Bug report (encountered problems with youtube-dl)
+- [ ] Site support request (request for adding support for a new site)
+- [ ] Feature request (request for a new functionality)
+- [ ] Question
+- [ ] Other
+
+---
+
+### The following sections concretize particular purposed issues, you can erase any section (the contents between triple ---) not applicable to your *issue*
+
+---
+
+### If the purpose of this *issue* is a *bug report*, *site support request* or you are not completely sure provide the full verbose output as follows:
+
+Add the `-v` flag to **your command line** you run youtube-dl with (`youtube-dl -v <your command line>`), copy the **whole** output and insert it here. It should look similar to one below (replace it with **your** log inserted between triple ```):
+
+```
+[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] youtube-dl version 2019.04.17
+[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: {}
+...
+<end of log>
+```
+
+---
+
+### If the purpose of this *issue* is a *site support request* please 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
+
+Note that **youtube-dl does not support sites dedicated to [copyright infringement](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free)**. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
+
+---
+
+### Description of your *issue*, suggested solution and other information
+
+Explanation of your *issue* in arbitrary form goes here. Please make sure the [description is worded well enough to be understood](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient). Provide 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.

.github/ISSUE_TEMPLATE/1_broken_site.md

@@ -1,63 +0,0 @@
----
-name: Broken site support
-about: Report broken or misfunctioning site
-title: ''
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update 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 http://yt-dl.org/escape.
-- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a broken site support
-- [ ] I've verified that I'm running youtube-dl version **2021.06.06**
-- [ ] 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-dl that clearly demonstrates the problem.
-Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -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] youtube-dl version 2021.06.06
- [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
-```
-
-
-## 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/2_site_support_request.md

@@ -1,54 +0,0 @@
----
-name: Site support request
-about: Request support for a new site
-title: ''
-labels: 'site-support-request'
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update 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://yt-dl.org/copyright-infringement. youtube-dl 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: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a new site support request
-- [ ] I've verified that I'm running youtube-dl version **2021.06.06**
-- [ ] 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/3_site_feature_request.md

@@ -1,37 +0,0 @@
----
-name: Site feature request
-about: Request a new functionality for a site
-title: ''
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
-- Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a site feature request
-- [ ] I've verified that I'm running youtube-dl version **2021.06.06**
-- [ ] 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/4_bug_report.md

@@ -1,65 +0,0 @@
----
-name: Bug report
-about: Report a bug unrelated to any particular site or extractor
-title: ''
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update 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 http://yt-dl.org/escape.
-- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Read bugs section in FAQ: http://yt-dl.org/reporting
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a broken site support issue
-- [ ] I've verified that I'm running youtube-dl version **2021.06.06**
-- [ ] 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-dl that clearly demonstrates the problem.
-Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -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] youtube-dl version 2021.06.06
- [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
-```
-
-
-## 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/5_feature_request.md

@@ -1,38 +0,0 @@
----
-name: Feature request
-about: Request a new functionality unrelated to any particular site or extractor
-title: ''
-labels: 'request'
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
-- Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a feature request
-- [ ] I've verified that I'm running youtube-dl version **2021.06.06**
-- [ ] 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/6_question.md

@@ -1,38 +0,0 @@
----
-name: Ask question
-about: Ask youtube-dl related question
-title: ''
-labels: 'question'
----
-
-<!--
-
-######################################################################
-  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-dl:
-- Look through the README (http://yt-dl.org/readme) and FAQ (http://yt-dl.org/faq) for similar questions
-- Search the bugtracker for similar questions: http://yt-dl.org/search-issues
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] 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/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient.
--->
-
-WRITE QUESTION HERE

.github/ISSUE_TEMPLATE_tmpl.md

@@ -0,0 +1,61 @@
+## Please follow the guide below
+
+- You will be asked some questions and requested to provide some information, please read them **carefully** and answer honestly
+- Put an `x` into all the boxes [ ] relevant to your *issue* (like this: `[x]`)
+- Use the *Preview* tab to see what your issue will actually look like
+
+---
+
+### Make sure you are using the *latest* version: run `youtube-dl --version` and ensure your version is *%(version)s*. If it's not, read [this FAQ entry](https://github.com/ytdl-org/youtube-dl/blob/master/README.md#how-do-i-update-youtube-dl) and update. Issues with outdated version will be rejected.
+- [ ] I've **verified** and **I assure** that I'm running youtube-dl **%(version)s**
+
+### Before submitting an *issue* make sure you have:
+- [ ] At least skimmed through the [README](https://github.com/ytdl-org/youtube-dl/blob/master/README.md), **most notably** the [FAQ](https://github.com/ytdl-org/youtube-dl#faq) and [BUGS](https://github.com/ytdl-org/youtube-dl#bugs) sections
+- [ ] [Searched](https://github.com/ytdl-org/youtube-dl/search?type=Issues) the bugtracker for similar issues including closed ones
+- [ ] Checked that provided video/audio/playlist URLs (if any) are alive and playable in a browser
+
+### What is the purpose of your *issue*?
+- [ ] Bug report (encountered problems with youtube-dl)
+- [ ] Site support request (request for adding support for a new site)
+- [ ] Feature request (request for a new functionality)
+- [ ] Question
+- [ ] Other
+
+---
+
+### The following sections concretize particular purposed issues, you can erase any section (the contents between triple ---) not applicable to your *issue*
+
+---
+
+### If the purpose of this *issue* is a *bug report*, *site support request* or you are not completely sure provide the full verbose output as follows:
+
+Add the `-v` flag to **your command line** you run youtube-dl with (`youtube-dl -v <your command line>`), copy the **whole** output and insert it here. It should look similar to one below (replace it with **your** log inserted between triple ```):
+
+```
+[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] youtube-dl 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: {}
+...
+<end of log>
+```
+
+---
+
+### If the purpose of this *issue* is a *site support request* please 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
+
+Note that **youtube-dl does not support sites dedicated to [copyright infringement](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free)**. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
+
+---
+
+### Description of your *issue*, suggested solution and other information
+
+Explanation of your *issue* in arbitrary form goes here. Please make sure the [description is worded well enough to be understood](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient). Provide 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.

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md

@@ -1,63 +0,0 @@
----
-name: Broken site support
-about: Report broken or misfunctioning site
-title: ''
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is %(version)s. If it's not, see https://yt-dl.org/update 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 http://yt-dl.org/escape.
-- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a broken site support
-- [ ] I've verified that I'm running youtube-dl 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-dl that clearly demonstrates the problem.
-Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -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] youtube-dl 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
-```
-
-
-## 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/2_site_support_request.md

@@ -1,54 +0,0 @@
----
-name: Site support request
-about: Request support for a new site
-title: ''
-labels: 'site-support-request'
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is %(version)s. If it's not, see https://yt-dl.org/update 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://yt-dl.org/copyright-infringement. youtube-dl 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: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a new site support request
-- [ ] I've verified that I'm running youtube-dl 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/3_site_feature_request.md

@@ -1,37 +0,0 @@
----
-name: Site feature request
-about: Request a new functionality for a site
-title: ''
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is %(version)s. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
-- Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a site feature request
-- [ ] I've verified that I'm running youtube-dl 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/4_bug_report.md

@@ -1,65 +0,0 @@
----
-name: Bug report
-about: Report a bug unrelated to any particular site or extractor
-title: ''
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is %(version)s. If it's not, see https://yt-dl.org/update 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 http://yt-dl.org/escape.
-- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Read bugs section in FAQ: http://yt-dl.org/reporting
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a broken site support issue
-- [ ] I've verified that I'm running youtube-dl 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-dl that clearly demonstrates the problem.
-Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -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] youtube-dl 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
-```
-
-
-## 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/5_feature_request.md

@@ -1,38 +0,0 @@
----
-name: Feature request
-about: Request a new functionality unrelated to any particular site or extractor
-title: ''
-labels: 'request'
----
-
-<!--
-
-######################################################################
-  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-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is %(version)s. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
-- Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
-- Finally, put x into all relevant boxes (like this [x])
--->
-
-- [ ] I'm reporting a feature request
-- [ ] I've verified that I'm running youtube-dl 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/PULL_REQUEST_TEMPLATE.md

@@ -7,10 +7,8 @@
 ---
 
 ### Before submitting a *pull request* make sure you have:
+- [ ] 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/ytdl-org/youtube-dl/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
-- [ ] Read [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site)
-- [ ] Read [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) and adjusted the code to meet them
-- [ ] Covered the code with tests (note that PRs without tests will be REJECTED)
 - [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)
 
 ### 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:

.github/workflows/ci.yml

@@ -1,81 +0,0 @@
-name: CI
-on: [push, pull_request]
-jobs:
-  tests:
-    name: Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ubuntu-18.04]
-        # TODO: python 2.6
-        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
-        python-impl: [cpython]
-        ytdl-test-set: [core, download]
-        run-tests-ext: [sh]
-        include:
-        # python 3.2 is only available on windows via setup-python
-        - os: windows-latest
-          python-version: 3.2
-          python-impl: cpython
-          ytdl-test-set: core
-          run-tests-ext: bat
-        - os: windows-latest
-          python-version: 3.2
-          python-impl: cpython
-          ytdl-test-set: download
-          run-tests-ext: bat
-        # jython
-        - os: ubuntu-18.04
-          python-impl: jython
-          ytdl-test-set: core
-          run-tests-ext: sh
-        - os: ubuntu-18.04
-          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: Set up Java 8
-      if: ${{ matrix.python-impl == 'jython' }}
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - name: Install Jython
-      if: ${{ matrix.python-impl == 'jython' }}
-      run: |
-        wget https://repo1.maven.org/maven2/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
-      if: ${{ matrix.python-impl != 'jython' }}
-      run: pip install nose
-    - name: Install nose (Jython)
-      if: ${{ matrix.python-impl == 'jython' }}
-      # Working around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
-      run: |
-        wget https://files.pythonhosted.org/packages/99/4f/13fb671119e65c4dce97c60e67d3fd9e6f7f809f2b307e2611f4701205cb/nose-1.3.7-py2-none-any.whl
-        pip install nose-1.3.7-py2-none-any.whl
-    - name: Run tests
-      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
-      env:
-        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
-      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}
-  flake8:
-    name: Linter
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.9
-    - name: Install flake8
-      run: pip install flake8
-    - name: Run flake8
-      run: flake8 .

.travis.yml

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

AUTHORS

@@ -246,4 +246,3 @@ Enes Solak
 Nathan Rossi
 Thomas van der Berg
 Luca Cherubin
-Adrian Heine

CONTRIBUTING.md

@@ -153,7 +153,7 @@ After you have ensured this site is distributing its content legally, you can fo
 5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
 6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
 7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
-8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
+8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](http://flake8.pycqa.org/en/latest/index.html#quickstart):
 
         $ flake8 youtube_dl/extractor/yourextractor.py
 
@@ -339,72 +339,6 @@ Incorrect:
 'PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4'
 ```
 
-### 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.
-
-#### Example
-
-Correct:
-
-```python
-title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title')
-```
-
-Incorrect:
-
-```python
-TITLE_RE = r'<title>([^<]+)</title>'
-# ...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.
-
-#### Example
-
-Good:
-
-```python
-description = self._html_search_meta(
-    ['og:description', 'description', 'twitter:description'],
-    webpage, 'description', default=None)
-```
-
-Unwieldy:
-
-```python
-description = (
-    self._og_search_description(webpage, default=None)
-    or self._html_search_meta('description', webpage, default=None)
-    or self._html_search_meta('twitter:description', webpage, default=None))
-```
-
-Methods supporting list of patterns are: `_search_regex`, `_html_search_regex`, `_og_search_property`, `_html_search_meta`.
-
-### Trailing parentheses
-
-Always move trailing parentheses after the last argument.
-
-#### Example
-
-Correct:
-
-```python
-    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
-    list)
-```
-
-Incorrect:
-
-```python
-    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
-    list,
-)
-```
-
 ### Use convenience conversion and parsing functions
 
 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.

Makefile

@@ -1,7 +1,7 @@
 all: youtube-dl README.md CONTRIBUTING.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish supportedsites
 
 clean:
-	rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish youtube_dl/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
+	rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish youtube_dl/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp ISSUE_TEMPLATE.md.tmp youtube-dl youtube-dl.exe
 	find . -name "*.pyc" -delete
 	find . -name "*.class" -delete
 
@@ -78,12 +78,8 @@ README.md: youtube_dl/*.py youtube_dl/*/*.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.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_dl/version.py
+.github/ISSUE_TEMPLATE.md: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl.md  youtube_dl/version.py
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
+	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl.md .github/ISSUE_TEMPLATE.md
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE/2_site_support_request.md
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE/4_bug_report.md
-	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md .github/ISSUE_TEMPLATE/5_feature_request.md
 
 supportedsites:
 	$(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md

README.md

@@ -1,5 +1,4 @@
-[![Build Status](https://github.com/ytdl-org/youtube-dl/workflows/CI/badge.svg)](https://github.com/ytdl-org/youtube-dl/actions?query=workflow%3ACI)
+[![Build Status](https://travis-ci.org/ytdl-org/youtube-dl.svg?branch=master)](https://travis-ci.org/ytdl-org/youtube-dl)
-
 
 youtube-dl - download videos from youtube.com or other video platforms
 
@@ -52,431 +51,394 @@ Alternatively, refer to the [developer instructions](#developer-instructions) fo
     youtube-dl [OPTIONS] URL [URL...]
 
 # OPTIONS
-    -h, --help                           Print this help text and exit
+    -h, --help                       Print this help text and exit
-    --version                            Print program version and exit
+    --version                        Print program version and exit
-    -U, --update                         Update this program to latest version.
+    -U, --update                     Update this program to latest version. Make
-                                         Make sure that you have sufficient
+                                     sure that you have sufficient permissions
-                                         permissions (run with sudo if needed)
+                                     (run with sudo if needed)
-    -i, --ignore-errors                  Continue on download errors, for
+    -i, --ignore-errors              Continue on download errors, for example to
-                                         example to skip unavailable videos in a
+                                     skip unavailable videos in a playlist
-                                         playlist
+    --abort-on-error                 Abort downloading of further videos (in the
-    --abort-on-error                     Abort downloading of further videos (in
+                                     playlist or the command line) if an error
-                                         the playlist or the command line) if an
+                                     occurs
-                                         error occurs
+    --dump-user-agent                Display the current browser identification
-    --dump-user-agent                    Display the current browser
+    --list-extractors                List all supported extractors
-                                         identification
+    --extractor-descriptions         Output descriptions of all supported
-    --list-extractors                    List all supported extractors
+                                     extractors
-    --extractor-descriptions             Output descriptions of all supported
+    --force-generic-extractor        Force extraction to use the generic
-                                         extractors
+                                     extractor
-    --force-generic-extractor            Force extraction to use the generic
+    --default-search PREFIX          Use this prefix for unqualified URLs. For
-                                         extractor
+                                     example "gvsearch2:" downloads two videos
-    --default-search PREFIX              Use this prefix for unqualified URLs.
+                                     from google videos for youtube-dl "large
-                                         For example "gvsearch2:" downloads two
+                                     apple". Use the value "auto" to let
-                                         videos from google videos for youtube-
+                                     youtube-dl guess ("auto_warning" to emit a
-                                         dl "large apple". Use the value "auto"
+                                     warning when guessing). "error" just throws
-                                         to let youtube-dl guess ("auto_warning"
+                                     an error. The default value "fixup_error"
-                                         to emit a warning when guessing).
+                                     repairs broken URLs, but emits an error if
-                                         "error" just throws an error. The
+                                     this is not possible instead of searching.
-                                         default value "fixup_error" repairs
+    --ignore-config                  Do not read configuration files. When given
-                                         broken URLs, but emits an error if this
+                                     in the global configuration file
-                                         is not possible instead of searching.
+                                     /etc/youtube-dl.conf: Do not read the user
-    --ignore-config                      Do not read configuration files. When
+                                     configuration in ~/.config/youtube-
-                                         given in the global configuration file
+                                     dl/config (%APPDATA%/youtube-dl/config.txt
-                                         /etc/youtube-dl.conf: Do not read the
+                                     on Windows)
-                                         user configuration in
+    --config-location PATH           Location of the configuration file; either
-                                         ~/.config/youtube-dl/config
+                                     the path to the config or its containing
-                                         (%APPDATA%/youtube-dl/config.txt on
+                                     directory.
-                                         Windows)
+    --flat-playlist                  Do not extract the videos of a playlist,
-    --config-location PATH               Location of the configuration file;
+                                     only list them.
-                                         either the path to the config or its
+    --mark-watched                   Mark videos watched (YouTube only)
-                                         containing directory.
+    --no-mark-watched                Do not mark videos watched (YouTube only)
-    --flat-playlist                      Do not extract the videos of a
+    --no-color                       Do not emit color codes in output
-                                         playlist, only list them.
-    --mark-watched                       Mark videos watched (YouTube only)
-    --no-mark-watched                    Do not mark videos watched (YouTube
-                                         only)
-    --no-color                           Do not emit color codes in output
 
 ## Network Options:
-    --proxy URL                          Use the specified HTTP/HTTPS/SOCKS
+    --proxy URL                      Use the specified HTTP/HTTPS/SOCKS proxy.
-                                         proxy. To enable SOCKS proxy, specify a
+                                     To enable SOCKS proxy, specify a proper
-                                         proper scheme. For example
+                                     scheme. For example
-                                         socks5://127.0.0.1:1080/. Pass in an
+                                     socks5://127.0.0.1:1080/. Pass in an empty
-                                         empty string (--proxy "") for direct
+                                     string (--proxy "") for direct connection
-                                         connection
+    --socket-timeout SECONDS         Time to wait before giving up, in seconds
-    --socket-timeout SECONDS             Time to wait before giving up, in
+    --source-address IP              Client-side IP address to bind to
-                                         seconds
+    -4, --force-ipv4                 Make all connections via IPv4
-    --source-address IP                  Client-side IP address to bind to
+    -6, --force-ipv6                 Make all connections via IPv6
-    -4, --force-ipv4                     Make all connections via IPv4
-    -6, --force-ipv6                     Make all connections via IPv6
 
 ## Geo Restriction:
-    --geo-verification-proxy URL         Use this proxy to verify the IP address
+    --geo-verification-proxy URL     Use this proxy to verify the IP address for
-                                         for some geo-restricted sites. The
+                                     some geo-restricted sites. The default
-                                         default proxy specified by --proxy (or
+                                     proxy specified by --proxy (or none, if the
-                                         none, if the option is not present) is
+                                     option is not present) is used for the
-                                         used for the actual downloading.
+                                     actual downloading.
-    --geo-bypass                         Bypass geographic restriction via
+    --geo-bypass                     Bypass geographic restriction via faking
-                                         faking X-Forwarded-For HTTP header
+                                     X-Forwarded-For HTTP header
-    --no-geo-bypass                      Do not bypass geographic restriction
+    --no-geo-bypass                  Do not bypass geographic restriction via
-                                         via faking X-Forwarded-For HTTP header
+                                     faking X-Forwarded-For HTTP header
-    --geo-bypass-country CODE            Force bypass geographic restriction
+    --geo-bypass-country CODE        Force bypass geographic restriction with
-                                         with explicitly provided two-letter ISO
+                                     explicitly provided two-letter ISO 3166-2
-                                         3166-2 country code
+                                     country code
-    --geo-bypass-ip-block IP_BLOCK       Force bypass geographic restriction
+    --geo-bypass-ip-block IP_BLOCK   Force bypass geographic restriction with
-                                         with explicitly provided IP block in
+                                     explicitly provided IP block in CIDR
-                                         CIDR notation
+                                     notation
 
 ## Video Selection:
-    --playlist-start NUMBER              Playlist video to start at (default is
+    --playlist-start NUMBER          Playlist video to start at (default is 1)
-                                         1)
+    --playlist-end NUMBER            Playlist video to end at (default is last)
-    --playlist-end NUMBER                Playlist video to end at (default is
+    --playlist-items ITEM_SPEC       Playlist video items to download. Specify
-                                         last)
+                                     indices of the videos in the playlist
-    --playlist-items ITEM_SPEC           Playlist video items to download.
+                                     separated by commas like: "--playlist-items
-                                         Specify indices of the videos in the
+                                     1,2,5,8" if you want to download videos
-                                         playlist separated by commas like: "--
+                                     indexed 1, 2, 5, 8 in the playlist. You can
-                                         playlist-items 1,2,5,8" if you want to
+                                     specify range: "--playlist-items
-                                         download videos indexed 1, 2, 5, 8 in
+                                     1-3,7,10-13", it will download the videos
-                                         the playlist. You can specify range: "
+                                     at index 1, 2, 3, 7, 10, 11, 12 and 13.
-                                         --playlist-items 1-3,7,10-13", it will
+    --match-title REGEX              Download only matching titles (regex or
-                                         download the videos at index 1, 2, 3,
+                                     caseless sub-string)
-                                         7, 10, 11, 12 and 13.
+    --reject-title REGEX             Skip download for matching titles (regex or
-    --match-title REGEX                  Download only matching titles (regex or
+                                     caseless sub-string)
-                                         caseless sub-string)
+    --max-downloads NUMBER           Abort after downloading NUMBER files
-    --reject-title REGEX                 Skip download for matching titles
+    --min-filesize SIZE              Do not download any videos smaller than
-                                         (regex or caseless sub-string)
+                                     SIZE (e.g. 50k or 44.6m)
-    --max-downloads NUMBER               Abort after downloading NUMBER files
+    --max-filesize SIZE              Do not download any videos larger than SIZE
-    --min-filesize SIZE                  Do not download any videos smaller than
+                                     (e.g. 50k or 44.6m)
-                                         SIZE (e.g. 50k or 44.6m)
+    --date DATE                      Download only videos uploaded in this date
-    --max-filesize SIZE                  Do not download any videos larger than
+    --datebefore DATE                Download only videos uploaded on or before
-                                         SIZE (e.g. 50k or 44.6m)
+                                     this date (i.e. inclusive)
-    --date DATE                          Download only videos uploaded in this
+    --dateafter DATE                 Download only videos uploaded on or after
-                                         date
+                                     this date (i.e. inclusive)
-    --datebefore DATE                    Download only videos uploaded on or
+    --min-views COUNT                Do not download any videos with less than
-                                         before this date (i.e. inclusive)
+                                     COUNT views
-    --dateafter DATE                     Download only videos uploaded on or
+    --max-views COUNT                Do not download any videos with more than
-                                         after this date (i.e. inclusive)
+                                     COUNT views
-    --min-views COUNT                    Do not download any videos with less
+    --match-filter FILTER            Generic video filter. Specify any key (see
-                                         than COUNT views
+                                     the "OUTPUT TEMPLATE" for a list of
-    --max-views COUNT                    Do not download any videos with more
+                                     available keys) to match if the key is
-                                         than COUNT views
+                                     present, !key to check if the key is not
-    --match-filter FILTER                Generic video filter. Specify any key
+                                     present, key > NUMBER (like "comment_count
-                                         (see the "OUTPUT TEMPLATE" for a list
+                                     > 12", also works with >=, <, <=, !=, =) to
-                                         of available keys) to match if the key
+                                     compare against a number, key = 'LITERAL'
-                                         is present, !key to check if the key is
+                                     (like "uploader = 'Mike Smith'", also works
-                                         not present, key > NUMBER (like
+                                     with !=) to match against a string literal
-                                         "comment_count > 12", also works with
+                                     and & to require multiple matches. Values
-                                         >=, <, <=, !=, =) to compare against a
+                                     which are not known are excluded unless you
-                                         number, key = 'LITERAL' (like "uploader
+                                     put a question mark (?) after the operator.
-                                         = 'Mike Smith'", also works with !=) to
+                                     For example, to only match videos that have
-                                         match against a string literal and & to
+                                     been liked more than 100 times and disliked
-                                         require multiple matches. Values which
+                                     less than 50 times (or the dislike
-                                         are not known are excluded unless you
+                                     functionality is not available at the given
-                                         put a question mark (?) after the
+                                     service), but who also have a description,
-                                         operator. For example, to only match
+                                     use --match-filter "like_count > 100 &
-                                         videos that have been liked more than
+                                     dislike_count <? 50 & description" .
-                                         100 times and disliked less than 50
+    --no-playlist                    Download only the video, if the URL refers
-                                         times (or the dislike functionality is
+                                     to a video and a playlist.
-                                         not available at the given service),
+    --yes-playlist                   Download the playlist, if the URL refers to
-                                         but who also have a description, use
+                                     a video and a playlist.
-                                         --match-filter "like_count > 100 &
+    --age-limit YEARS                Download only videos suitable for the given
-                                         dislike_count <? 50 & description" .
+                                     age
-    --no-playlist                        Download only the video, if the URL
+    --download-archive FILE          Download only videos not listed in the
-                                         refers to a video and a playlist.
+                                     archive file. Record the IDs of all
-    --yes-playlist                       Download the playlist, if the URL
+                                     downloaded videos in it.
-                                         refers to a video and a playlist.
+    --include-ads                    Download advertisements as well
-    --age-limit YEARS                    Download only videos suitable for the
+                                     (experimental)
-                                         given age
-    --download-archive FILE              Download only videos not listed in the
-                                         archive file. Record the IDs of all
-                                         downloaded videos in it.
-    --include-ads                        Download advertisements as well
-                                         (experimental)
 
 ## Download Options:
-    -r, --limit-rate RATE                Maximum download rate in bytes per
+    -r, --limit-rate RATE            Maximum download rate in bytes per second
-                                         second (e.g. 50K or 4.2M)
+                                     (e.g. 50K or 4.2M)
-    -R, --retries RETRIES                Number of retries (default is 10), or
+    -R, --retries RETRIES            Number of retries (default is 10), or
-                                         "infinite".
+                                     "infinite".
-    --fragment-retries RETRIES           Number of retries for a fragment
+    --fragment-retries RETRIES       Number of retries for a fragment (default
-                                         (default is 10), or "infinite" (DASH,
+                                     is 10), or "infinite" (DASH, hlsnative and
-                                         hlsnative and ISM)
+                                     ISM)
-    --skip-unavailable-fragments         Skip unavailable fragments (DASH,
+    --skip-unavailable-fragments     Skip unavailable fragments (DASH, hlsnative
-                                         hlsnative and ISM)
+                                     and ISM)
-    --abort-on-unavailable-fragment      Abort downloading when some fragment is
+    --abort-on-unavailable-fragment  Abort downloading when some fragment is not
-                                         not available
+                                     available
-    --keep-fragments                     Keep downloaded fragments on disk after
+    --keep-fragments                 Keep downloaded fragments on disk after
-                                         downloading is finished; fragments are
+                                     downloading is finished; fragments are
-                                         erased by default
+                                     erased by default
-    --buffer-size SIZE                   Size of download buffer (e.g. 1024 or
+    --buffer-size SIZE               Size of download buffer (e.g. 1024 or 16K)
-                                         16K) (default is 1024)
+                                     (default is 1024)
-    --no-resize-buffer                   Do not automatically adjust the buffer
+    --no-resize-buffer               Do not automatically adjust the buffer
-                                         size. By default, the buffer size is
+                                     size. By default, the buffer size is
-                                         automatically resized from an initial
+                                     automatically resized from an initial value
-                                         value of SIZE.
+                                     of SIZE.
-    --http-chunk-size SIZE               Size of a chunk for chunk-based HTTP
+    --http-chunk-size SIZE           Size of a chunk for chunk-based HTTP
-                                         downloading (e.g. 10485760 or 10M)
+                                     downloading (e.g. 10485760 or 10M) (default
-                                         (default is disabled). May be useful
+                                     is disabled). May be useful for bypassing
-                                         for bypassing bandwidth throttling
+                                     bandwidth throttling imposed by a webserver
-                                         imposed by a webserver (experimental)
+                                     (experimental)
-    --playlist-reverse                   Download playlist videos in reverse
+    --playlist-reverse               Download playlist videos in reverse order
-                                         order
+    --playlist-random                Download playlist videos in random order
-    --playlist-random                    Download playlist videos in random
+    --xattr-set-filesize             Set file xattribute ytdl.filesize with
-                                         order
+                                     expected file size
-    --xattr-set-filesize                 Set file xattribute ytdl.filesize with
+    --hls-prefer-native              Use the native HLS downloader instead of
-                                         expected file size
+                                     ffmpeg
-    --hls-prefer-native                  Use the native HLS downloader instead
+    --hls-prefer-ffmpeg              Use ffmpeg instead of the native HLS
-                                         of ffmpeg
+                                     downloader
-    --hls-prefer-ffmpeg                  Use ffmpeg instead of the native HLS
+    --hls-use-mpegts                 Use the mpegts container for HLS videos,
-                                         downloader
+                                     allowing to play the video while
-    --hls-use-mpegts                     Use the mpegts container for HLS
+                                     downloading (some players may not be able
-                                         videos, allowing to play the video
+                                     to play it)
-                                         while downloading (some players may not
+    --external-downloader COMMAND    Use the specified external downloader.
-                                         be able to play it)
+                                     Currently supports
-    --external-downloader COMMAND        Use the specified external downloader.
+                                     aria2c,avconv,axel,curl,ffmpeg,httpie,wget
-                                         Currently supports aria2c,avconv,axel,c
+    --external-downloader-args ARGS  Give these arguments to the external
-                                         url,ffmpeg,httpie,wget
+                                     downloader
-    --external-downloader-args ARGS      Give these arguments to the external
-                                         downloader
 
 ## Filesystem Options:
-    -a, --batch-file FILE                File containing URLs to download ('-'
+    -a, --batch-file FILE            File containing URLs to download ('-' for
-                                         for stdin), one URL per line. Lines
+                                     stdin), one URL per line. Lines starting
-                                         starting with '#', ';' or ']' are
+                                     with '#', ';' or ']' are considered as
-                                         considered as comments and ignored.
+                                     comments and ignored.
-    --id                                 Use only video ID in file name
+    --id                             Use only video ID in file name
-    -o, --output TEMPLATE                Output filename template, see the
+    -o, --output TEMPLATE            Output filename template, see the "OUTPUT
-                                         "OUTPUT TEMPLATE" for all the info
+                                     TEMPLATE" for all the info
-    --output-na-placeholder PLACEHOLDER  Placeholder value for unavailable meta
+    --autonumber-start NUMBER        Specify the start value for %(autonumber)s
-                                         fields in output filename template
+                                     (default is 1)
-                                         (default is "NA")
+    --restrict-filenames             Restrict filenames to only ASCII
-    --autonumber-start NUMBER            Specify the start value for
+                                     characters, and avoid "&" and spaces in
-                                         %(autonumber)s (default is 1)
+                                     filenames
-    --restrict-filenames                 Restrict filenames to only ASCII
+    -w, --no-overwrites              Do not overwrite files
-                                         characters, and avoid "&" and spaces in
+    -c, --continue                   Force resume of partially downloaded files.
-                                         filenames
+                                     By default, youtube-dl will resume
-    -w, --no-overwrites                  Do not overwrite files
+                                     downloads if possible.
-    -c, --continue                       Force resume of partially downloaded
+    --no-continue                    Do not resume partially downloaded files
-                                         files. By default, youtube-dl will
+                                     (restart from beginning)
-                                         resume downloads if possible.
+    --no-part                        Do not use .part files - write directly
-    --no-continue                        Do not resume partially downloaded
+                                     into output file
-                                         files (restart from beginning)
+    --no-mtime                       Do not use the Last-modified header to set
-    --no-part                            Do not use .part files - write directly
+                                     the file modification time
-                                         into output file
+    --write-description              Write video description to a .description
-    --no-mtime                           Do not use the Last-modified header to
+                                     file
-                                         set the file modification time
+    --write-info-json                Write video metadata to a .info.json file
-    --write-description                  Write video description to a
+    --write-annotations              Write video annotations to a
-                                         .description file
+                                     .annotations.xml file
-    --write-info-json                    Write video metadata to a .info.json
+    --load-info-json FILE            JSON file containing the video information
-                                         file
+                                     (created with the "--write-info-json"
-    --write-annotations                  Write video annotations to a
+                                     option)
-                                         .annotations.xml file
+    --cookies FILE                   File to read cookies from and dump cookie
-    --load-info-json FILE                JSON file containing the video
+                                     jar in
-                                         information (created with the "--write-
+    --cache-dir DIR                  Location in the filesystem where youtube-dl
-                                         info-json" option)
+                                     can store some downloaded information
-    --cookies FILE                       File to read cookies from and dump
+                                     permanently. By default
-                                         cookie jar in
+                                     $XDG_CACHE_HOME/youtube-dl or
-    --cache-dir DIR                      Location in the filesystem where
+                                     ~/.cache/youtube-dl . At the moment, only
-                                         youtube-dl can store some downloaded
+                                     YouTube player files (for videos with
-                                         information permanently. By default
+                                     obfuscated signatures) are cached, but that
-                                         $XDG_CACHE_HOME/youtube-dl or
+                                     may change.
-                                         ~/.cache/youtube-dl . At the moment,
+    --no-cache-dir                   Disable filesystem caching
-                                         only YouTube player files (for videos
+    --rm-cache-dir                   Delete all filesystem cache files
-                                         with obfuscated signatures) are cached,
-                                         but that may change.
-    --no-cache-dir                       Disable filesystem caching
-    --rm-cache-dir                       Delete all filesystem cache files
 
-## Thumbnail Options:
+## Thumbnail images:
-    --write-thumbnail                    Write thumbnail image to disk
+    --write-thumbnail                Write thumbnail image to disk
-    --write-all-thumbnails               Write all thumbnail image formats to
+    --write-all-thumbnails           Write all thumbnail image formats to disk
-                                         disk
+    --list-thumbnails                Simulate and list all available thumbnail
-    --list-thumbnails                    Simulate and list all available
+                                     formats
-                                         thumbnail formats
 
 ## Verbosity / Simulation Options:
-    -q, --quiet                          Activate quiet mode
+    -q, --quiet                      Activate quiet mode
-    --no-warnings                        Ignore warnings
+    --no-warnings                    Ignore warnings
-    -s, --simulate                       Do not download the video and do not
+    -s, --simulate                   Do not download the video and do not write
-                                         write anything to disk
+                                     anything to disk
-    --skip-download                      Do not download the video
+    --skip-download                  Do not download the video
-    -g, --get-url                        Simulate, quiet but print URL
+    -g, --get-url                    Simulate, quiet but print URL
-    -e, --get-title                      Simulate, quiet but print title
+    -e, --get-title                  Simulate, quiet but print title
-    --get-id                             Simulate, quiet but print id
+    --get-id                         Simulate, quiet but print id
-    --get-thumbnail                      Simulate, quiet but print thumbnail URL
+    --get-thumbnail                  Simulate, quiet but print thumbnail URL
-    --get-description                    Simulate, quiet but print video
+    --get-description                Simulate, quiet but print video description
-                                         description
+    --get-duration                   Simulate, quiet but print video length
-    --get-duration                       Simulate, quiet but print video length
+    --get-filename                   Simulate, quiet but print output filename
-    --get-filename                       Simulate, quiet but print output
+    --get-format                     Simulate, quiet but print output format
-                                         filename
+    -j, --dump-json                  Simulate, quiet but print JSON information.
-    --get-format                         Simulate, quiet but print output format
+                                     See the "OUTPUT TEMPLATE" for a description
-    -j, --dump-json                      Simulate, quiet but print JSON
+                                     of available keys.
-                                         information. See the "OUTPUT TEMPLATE"
+    -J, --dump-single-json           Simulate, quiet but print JSON information
-                                         for a description of available keys.
+                                     for each command-line argument. If the URL
-    -J, --dump-single-json               Simulate, quiet but print JSON
+                                     refers to a playlist, dump the whole
-                                         information for each command-line
+                                     playlist information in a single line.
-                                         argument. If the URL refers to a
+    --print-json                     Be quiet and print the video information as
-                                         playlist, dump the whole playlist
+                                     JSON (video is still being downloaded).
-                                         information in a single line.
+    --newline                        Output progress bar as new lines
-    --print-json                         Be quiet and print the video
+    --no-progress                    Do not print progress bar
-                                         information as JSON (video is still
+    --console-title                  Display progress in console titlebar
-                                         being downloaded).
+    -v, --verbose                    Print various debugging information
-    --newline                            Output progress bar as new lines
+    --dump-pages                     Print downloaded pages encoded using base64
-    --no-progress                        Do not print progress bar
+                                     to debug problems (very verbose)
-    --console-title                      Display progress in console titlebar
+    --write-pages                    Write downloaded intermediary pages to
-    -v, --verbose                        Print various debugging information
+                                     files in the current directory to debug
-    --dump-pages                         Print downloaded pages encoded using
+                                     problems
-                                         base64 to debug problems (very verbose)
+    --print-traffic                  Display sent and read HTTP traffic
-    --write-pages                        Write downloaded intermediary pages to
+    -C, --call-home                  Contact the youtube-dl server for debugging
-                                         files in the current directory to debug
+    --no-call-home                   Do NOT contact the youtube-dl server for
-                                         problems
+                                     debugging
-    --print-traffic                      Display sent and read HTTP traffic
-    -C, --call-home                      Contact the youtube-dl server for
-                                         debugging
-    --no-call-home                       Do NOT contact the youtube-dl server
-                                         for debugging
 
 ## Workarounds:
-    --encoding ENCODING                  Force the specified encoding
+    --encoding ENCODING              Force the specified encoding (experimental)
-                                         (experimental)
+    --no-check-certificate           Suppress HTTPS certificate validation
-    --no-check-certificate               Suppress HTTPS certificate validation
+    --prefer-insecure                Use an unencrypted connection to retrieve
-    --prefer-insecure                    Use an unencrypted connection to
+                                     information about the video. (Currently
-                                         retrieve information about the video.
+                                     supported only for YouTube)
-                                         (Currently supported only for YouTube)
+    --user-agent UA                  Specify a custom user agent
-    --user-agent UA                      Specify a custom user agent
+    --referer URL                    Specify a custom referer, use if the video
-    --referer URL                        Specify a custom referer, use if the
+                                     access is restricted to one domain
-                                         video access is restricted to one
+    --add-header FIELD:VALUE         Specify a custom HTTP header and its value,
-                                         domain
+                                     separated by a colon ':'. You can use this
-    --add-header FIELD:VALUE             Specify a custom HTTP header and its
+                                     option multiple times
-                                         value, separated by a colon ':'. You
+    --bidi-workaround                Work around terminals that lack
-                                         can use this option multiple times
+                                     bidirectional text support. Requires bidiv
-    --bidi-workaround                    Work around terminals that lack
+                                     or fribidi executable in PATH
-                                         bidirectional text support. Requires
+    --sleep-interval SECONDS         Number of seconds to sleep before each
-                                         bidiv or fribidi executable in PATH
+                                     download when used alone or a lower bound
-    --sleep-interval SECONDS             Number of seconds to sleep before each
+                                     of a range for randomized sleep before each
-                                         download when used alone or a lower
+                                     download (minimum possible number of
-                                         bound of a range for randomized sleep
+                                     seconds to sleep) when used along with
-                                         before each download (minimum possible
+                                     --max-sleep-interval.
-                                         number of seconds to sleep) when used
+    --max-sleep-interval SECONDS     Upper bound of a range for randomized sleep
-                                         along with --max-sleep-interval.
+                                     before each download (maximum possible
-    --max-sleep-interval SECONDS         Upper bound of a range for randomized
+                                     number of seconds to sleep). Must only be
-                                         sleep before each download (maximum
+                                     used along with --min-sleep-interval.
-                                         possible number of seconds to sleep).
-                                         Must only be used along with --min-
-                                         sleep-interval.
 
 ## Video Format Options:
-    -f, --format FORMAT                  Video format code, see the "FORMAT
+    -f, --format FORMAT              Video format code, see the "FORMAT
-                                         SELECTION" for all the info
+                                     SELECTION" for all the info
-    --all-formats                        Download all available video formats
+    --all-formats                    Download all available video formats
-    --prefer-free-formats                Prefer free video formats unless a
+    --prefer-free-formats            Prefer free video formats unless a specific
-                                         specific one is requested
+                                     one is requested
-    -F, --list-formats                   List all available formats of requested
+    -F, --list-formats               List all available formats of requested
-                                         videos
+                                     videos
-    --youtube-skip-dash-manifest         Do not download the DASH manifests and
+    --youtube-skip-dash-manifest     Do not download the DASH manifests and
-                                         related data on YouTube videos
+                                     related data on YouTube videos
-    --merge-output-format FORMAT         If a merge is required (e.g.
+    --merge-output-format FORMAT     If a merge is required (e.g.
-                                         bestvideo+bestaudio), output to given
+                                     bestvideo+bestaudio), output to given
-                                         container format. One of mkv, mp4, ogg,
+                                     container format. One of mkv, mp4, ogg,
-                                         webm, flv. Ignored if no merge is
+                                     webm, flv. Ignored if no merge is required
-                                         required
 
 ## Subtitle Options:
-    --write-sub                          Write subtitle file
+    --write-sub                      Write subtitle file
-    --write-auto-sub                     Write automatically generated subtitle
+    --write-auto-sub                 Write automatically generated subtitle file
-                                         file (YouTube only)
+                                     (YouTube only)
-    --all-subs                           Download all the available subtitles of
+    --all-subs                       Download all the available subtitles of the
-                                         the video
+                                     video
-    --list-subs                          List all available subtitles for the
+    --list-subs                      List all available subtitles for the video
-                                         video
+    --sub-format FORMAT              Subtitle format, accepts formats
-    --sub-format FORMAT                  Subtitle format, accepts formats
+                                     preference, for example: "srt" or
-                                         preference, for example: "srt" or
+                                     "ass/srt/best"
-                                         "ass/srt/best"
+    --sub-lang LANGS                 Languages of the subtitles to download
-    --sub-lang LANGS                     Languages of the subtitles to download
+                                     (optional) separated by commas, use --list-
-                                         (optional) separated by commas, use
+                                     subs for available language tags
-                                         --list-subs for available language tags
 
 ## Authentication Options:
-    -u, --username USERNAME              Login with this account ID
+    -u, --username USERNAME          Login with this account ID
-    -p, --password PASSWORD              Account password. If this option is
+    -p, --password PASSWORD          Account password. If this option is left
-                                         left out, youtube-dl will ask
+                                     out, youtube-dl will ask interactively.
-                                         interactively.
+    -2, --twofactor TWOFACTOR        Two-factor authentication code
-    -2, --twofactor TWOFACTOR            Two-factor authentication code
+    -n, --netrc                      Use .netrc authentication data
-    -n, --netrc                          Use .netrc authentication data
+    --video-password PASSWORD        Video password (vimeo, smotri, youku)
-    --video-password PASSWORD            Video password (vimeo, youku)
 
 ## Adobe Pass Options:
-    --ap-mso MSO                         Adobe Pass multiple-system operator (TV
+    --ap-mso MSO                     Adobe Pass multiple-system operator (TV
-                                         provider) identifier, use --ap-list-mso
+                                     provider) identifier, use --ap-list-mso for
-                                         for a list of available MSOs
+                                     a list of available MSOs
-    --ap-username USERNAME               Multiple-system operator account login
+    --ap-username USERNAME           Multiple-system operator account login
-    --ap-password PASSWORD               Multiple-system operator account
+    --ap-password PASSWORD           Multiple-system operator account password.
-                                         password. If this option is left out,
+                                     If this option is left out, youtube-dl will
-                                         youtube-dl will ask interactively.
+                                     ask interactively.
-    --ap-list-mso                        List all supported multiple-system
+    --ap-list-mso                    List all supported multiple-system
-                                         operators
+                                     operators
 
 ## Post-processing Options:
-    -x, --extract-audio                  Convert video files to audio-only files
+    -x, --extract-audio              Convert video files to audio-only files
-                                         (requires ffmpeg/avconv and
+                                     (requires ffmpeg or avconv and ffprobe or
-                                         ffprobe/avprobe)
+                                     avprobe)
-    --audio-format FORMAT                Specify audio format: "best", "aac",
+    --audio-format FORMAT            Specify audio format: "best", "aac",
-                                         "flac", "mp3", "m4a", "opus", "vorbis",
+                                     "flac", "mp3", "m4a", "opus", "vorbis", or
-                                         or "wav"; "best" by default; No effect
+                                     "wav"; "best" by default; No effect without
-                                         without -x
+                                     -x
-    --audio-quality QUALITY              Specify ffmpeg/avconv audio quality,
+    --audio-quality QUALITY          Specify ffmpeg/avconv audio quality, insert
-                                         insert a value between 0 (better) and 9
+                                     a value between 0 (better) and 9 (worse)
-                                         (worse) for VBR or a specific bitrate
+                                     for VBR or a specific bitrate like 128K
-                                         like 128K (default 5)
+                                     (default 5)
-    --recode-video FORMAT                Encode the video to another format if
+    --recode-video FORMAT            Encode the video to another format if
-                                         necessary (currently supported:
+                                     necessary (currently supported:
-                                         mp4|flv|ogg|webm|mkv|avi)
+                                     mp4|flv|ogg|webm|mkv|avi)
-    --postprocessor-args ARGS            Give these arguments to the
+    --postprocessor-args ARGS        Give these arguments to the postprocessor
-                                         postprocessor
+    -k, --keep-video                 Keep the video file on disk after the post-
-    -k, --keep-video                     Keep the video file on disk after the
+                                     processing; the video is erased by default
-                                         post-processing; the video is erased by
+    --no-post-overwrites             Do not overwrite post-processed files; the
-                                         default
+                                     post-processed files are overwritten by
-    --no-post-overwrites                 Do not overwrite post-processed files;
+                                     default
-                                         the post-processed files are
+    --embed-subs                     Embed subtitles in the video (only for mp4,
-                                         overwritten by default
+                                     webm and mkv videos)
-    --embed-subs                         Embed subtitles in the video (only for
+    --embed-thumbnail                Embed thumbnail in the audio as cover art
-                                         mp4, webm and mkv videos)
+    --add-metadata                   Write metadata to the video file
-    --embed-thumbnail                    Embed thumbnail in the audio as cover
+    --metadata-from-title FORMAT     Parse additional metadata like song title /
-                                         art
+                                     artist from the video title. The format
-    --add-metadata                       Write metadata to the video file
+                                     syntax is the same as --output. Regular
-    --metadata-from-title FORMAT         Parse additional metadata like song
+                                     expression with named capture groups may
-                                         title / artist from the video title.
+                                     also be used. The parsed parameters replace
-                                         The format syntax is the same as
+                                     existing values. Example: --metadata-from-
-                                         --output. Regular expression with named
+                                     title "%(artist)s - %(title)s" matches a
-                                         capture groups may also be used. The
+                                     title like "Coldplay - Paradise". Example
-                                         parsed parameters replace existing
+                                     (regex): --metadata-from-title
-                                         values. Example: --metadata-from-title
+                                     "(?P<artist>.+?) - (?P<title>.+)"
-                                         "%(artist)s - %(title)s" matches a
+    --xattrs                         Write metadata to the video file's xattrs
-                                         title like "Coldplay - Paradise".
+                                     (using dublin core and xdg standards)
-                                         Example (regex): --metadata-from-title
+    --fixup POLICY                   Automatically correct known faults of the
-                                         "(?P<artist>.+?) - (?P<title>.+)"
+                                     file. One of never (do nothing), warn (only
-    --xattrs                             Write metadata to the video file's
+                                     emit a warning), detect_or_warn (the
-                                         xattrs (using dublin core and xdg
+                                     default; fix file if we can, warn
-                                         standards)
+                                     otherwise)
-    --fixup POLICY                       Automatically correct known faults of
+    --prefer-avconv                  Prefer avconv over ffmpeg for running the
-                                         the file. One of never (do nothing),
+                                     postprocessors
-                                         warn (only emit a warning),
+    --prefer-ffmpeg                  Prefer ffmpeg over avconv for running the
-                                         detect_or_warn (the default; fix file
+                                     postprocessors (default)
-                                         if we can, warn otherwise)
+    --ffmpeg-location PATH           Location of the ffmpeg/avconv binary;
-    --prefer-avconv                      Prefer avconv over ffmpeg for running
+                                     either the path to the binary or its
-                                         the postprocessors
+                                     containing directory.
-    --prefer-ffmpeg                      Prefer ffmpeg over avconv for running
+    --exec CMD                       Execute a command on the file after
-                                         the postprocessors (default)
+                                     downloading, similar to find's -exec
-    --ffmpeg-location PATH               Location of the ffmpeg/avconv binary;
+                                     syntax. Example: --exec 'adb push {}
-                                         either the path to the binary or its
+                                     /sdcard/Music/ && rm {}'
-                                         containing directory.
+    --convert-subs FORMAT            Convert the subtitles to other format
-    --exec CMD                           Execute a command on the file after
+                                     (currently supported: srt|ass|vtt|lrc)
-                                         downloading and post-processing,
-                                         similar to find's -exec syntax.
-                                         Example: --exec 'adb push {}
-                                         /sdcard/Music/ && rm {}'
-    --convert-subs FORMAT                Convert the subtitles to other format
-                                         (currently supported: srt|ass|vtt|lrc)
 
 # CONFIGURATION
 
@@ -583,7 +545,7 @@ The basic usage is not to set any template arguments when downloading a single f
  - `extractor` (string): Name of the extractor
  - `extractor_key` (string): Key name of the extractor
  - `epoch` (numeric): Unix epoch when creating the file
- - `autonumber` (numeric): Number that will be increased with each download, starting at `--autonumber-start`
+ - `autonumber` (numeric): Five-digit number that will be increased with each download, starting at zero
  - `playlist` (string): Name or id of the playlist that contains the video
  - `playlist_index` (numeric): Index of the video in the playlist padded with leading zeros according to the total length of the playlist
  - `playlist_id` (string): Playlist identifier
@@ -620,7 +582,7 @@ Available for the media that is a track or a part of a music album:
  - `disc_number` (numeric): Number of the disc or other physical medium the track belongs to
  - `release_year` (numeric): Year (YYYY) when the album was released
 
-Each aforementioned sequence when referenced in an output template will be replaced by the actual value corresponding to the sequence name. Note that some of the sequences are not guaranteed to be present since they depend on the metadata obtained by a particular extractor. Such sequences will be replaced with placeholder value provided with `--output-na-placeholder` (`NA` by default).
+Each aforementioned sequence when referenced in an output template will be replaced by the actual value corresponding to the sequence name. Note that some of the sequences are not guaranteed to be present since they depend on the metadata obtained by a particular extractor. Such sequences will be replaced with `NA`.
 
 For example for `-o %(title)s-%(id)s.%(ext)s` and an mp4 video with title `youtube-dl test video` and id `BaW_jenozKcj`, this will result in a `youtube-dl test video-BaW_jenozKcj.mp4` file created in the current directory.
 
@@ -715,7 +677,6 @@ Also filtering work for comparisons `=` (equals), `^=` (starts with), `$=` (ends
  - `container`: Name of the container format
  - `protocol`: The protocol that will be used for the actual download, lower-case (`http`, `https`, `rtsp`, `rtmp`, `rtmpe`, `mms`, `f4m`, `ism`, `http_dash_segments`, `m3u8`, or `m3u8_native`)
  - `format_id`: A short description of the format
- - `language`: Language code
 
 Any string comparison may be prefixed with negation `!` in order to produce an opposite comparison, e.g. `!*=` (does not contain).
 
@@ -791,8 +752,8 @@ As a last resort, you can also uninstall the version installed by your package m
 Afterwards, simply follow [our manual installation instructions](https://ytdl-org.github.io/youtube-dl/download.html):
 
 ```
-sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl
+sudo wget https://yt-dl.org/latest/youtube-dl -O /usr/local/bin/youtube-dl
-sudo chmod a+rx /usr/local/bin/youtube-dl
+sudo chmod a+x /usr/local/bin/youtube-dl
 hash -r
 ```
 
@@ -874,9 +835,7 @@ In February 2015, the new YouTube player contained a character sequence in a str
 
 ### HTTP Error 429: Too Many Requests or 402: Payment Required
 
-These two error codes indicate that the service is blocking your IP address because of overuse. Usually this is a soft block meaning that you can gain access again after solving CAPTCHA. Just open a browser and solve a CAPTCHA the service suggests you and after that [pass cookies](#how-do-i-pass-cookies-to-youtube-dl) to youtube-dl. Note that if your machine has multiple external IPs then you should also pass exactly the same IP you've used for solving CAPTCHA with [`--source-address`](#network-options). Also you may need to pass a `User-Agent` HTTP header of your browser with [`--user-agent`](#workarounds).
+These two error codes indicate that the service is blocking your IP address because of overuse. Contact the service and ask them to unblock your IP address, or - if you have acquired a whitelisted IP address already - use the [`--proxy` or `--source-address` options](#network-options) to select another IP address.
-
-If this is not the case (no CAPTCHA suggested to solve by the service) then you can contact the service and ask them to unblock your IP address, or - if you have acquired a whitelisted IP address already - use the [`--proxy` or `--source-address` options](#network-options) to select another IP address.
 
 ### SyntaxError: Non-ASCII character
 
@@ -893,7 +852,7 @@ Since June 2012 ([#342](https://github.com/ytdl-org/youtube-dl/issues/342)) yout
 
 ### The exe throws an error due to missing `MSVCR100.dll`
 
-To run the exe you need to install first the [Microsoft Visual C++ 2010 Service Pack 1 Redistributable Package (x86)](https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe).
+To run the exe you need to install first the [Microsoft Visual C++ 2010 Redistributable Package (x86)](https://www.microsoft.com/en-US/download/details.aspx?id=5555).
 
 ### On Windows, how should I set up ffmpeg and youtube-dl? Where should I put the exe files?
 
@@ -918,7 +877,7 @@ Either prepend `https://www.youtube.com/watch?v=` or separate the ID from the op
 
 Use the `--cookies` option, for example `--cookies /path/to/cookies/file.txt`.
 
-In order to extract cookies from browser use any conforming browser extension for exporting cookies. For example, [Get cookies.txt](https://chrome.google.com/webstore/detail/get-cookiestxt/bgaddhkoddajcdgocldbbfleckgcbcid/) (for Chrome) or [cookies.txt](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt/) (for Firefox).
+In order to extract cookies from browser use any conforming browser extension for exporting cookies. For example, [cookies.txt](https://chrome.google.com/webstore/detail/cookiestxt/njabckikapfpffapmjgojcnbfjonfjfg) (for Chrome) or [cookies.txt](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt/) (for Firefox).
 
 Note that the cookies file must be in Mozilla/Netscape format and the first line of the cookies file must be either `# HTTP Cookie File` or `# Netscape HTTP Cookie File`. Make sure you have correct [newline format](https://en.wikipedia.org/wiki/Newline) in the cookies file and convert newlines if necessary to correspond with your OS, namely `CRLF` (`\r\n`) for Windows and `LF` (`\n`) for Unix and Unix-like systems (Linux, macOS, etc.). `HTTP Error 400: Bad Request` when using `--cookies` is a good sign of invalid newline format.
 
@@ -1071,7 +1030,7 @@ After you have ensured this site is distributing its content legally, you can fo
 5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
 6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
 7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
-8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
+8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](http://flake8.pycqa.org/en/latest/index.html#quickstart):
 
         $ flake8 youtube_dl/extractor/yourextractor.py
 
@@ -1257,72 +1216,6 @@ Incorrect:
 'PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4'
 ```
 
-### 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.
-
-#### Example
-
-Correct:
-
-```python
-title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title')
-```
-
-Incorrect:
-
-```python
-TITLE_RE = r'<title>([^<]+)</title>'
-# ...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.
-
-#### Example
-
-Good:
-
-```python
-description = self._html_search_meta(
-    ['og:description', 'description', 'twitter:description'],
-    webpage, 'description', default=None)
-```
-
-Unwieldy:
-
-```python
-description = (
-    self._og_search_description(webpage, default=None)
-    or self._html_search_meta('description', webpage, default=None)
-    or self._html_search_meta('twitter:description', webpage, default=None))
-```
-
-Methods supporting list of patterns are: `_search_regex`, `_html_search_regex`, `_og_search_property`, `_html_search_meta`.
-
-### Trailing parentheses
-
-Always move trailing parentheses after the last argument.
-
-#### Example
-
-Correct:
-
-```python
-    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
-    list)
-```
-
-Incorrect:
-
-```python
-    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
-    list,
-)
-```
-
 ### Use convenience conversion and parsing functions
 
 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.

devscripts/check-porn.py

@@ -45,12 +45,12 @@ for test in gettestcases():
 
         RESULT = ('.' + domain + '\n' in LIST or '\n' + domain + '\n' in LIST)
 
-    if RESULT and ('info_dict' not in test or 'age_limit' not in test['info_dict']
+    if RESULT and ('info_dict' not in test or 'age_limit' not in test['info_dict'] or
-                   or test['info_dict']['age_limit'] != 18):
+                   test['info_dict']['age_limit'] != 18):
         print('\nPotential missing age_limit check: {0}'.format(test['name']))
 
-    elif not RESULT and ('info_dict' in test and 'age_limit' in test['info_dict']
+    elif not RESULT and ('info_dict' in test and 'age_limit' in test['info_dict'] and
-                         and test['info_dict']['age_limit'] == 18):
+                         test['info_dict']['age_limit'] == 18):
         print('\nPotential false negative: {0}'.format(test['name']))
 
     else:

devscripts/create-github-release.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import base64
 import io
 import json
 import mimetypes
@@ -14,6 +15,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.compat import (
     compat_basestring,
+    compat_input,
     compat_getpass,
     compat_print,
     compat_urllib_request,
@@ -38,20 +40,28 @@ class GitHubReleaser(object):
         try:
             info = netrc.netrc().authenticators(self._NETRC_MACHINE)
             if info is not None:
-                self._token = info[2]
+                self._username = info[0]
+                self._password = info[2]
                 compat_print('Using GitHub credentials found in .netrc...')
                 return
             else:
                 compat_print('No GitHub credentials found in .netrc')
         except (IOError, netrc.NetrcParseError):
             compat_print('Unable to parse .netrc')
-        self._token = compat_getpass(
+        self._username = compat_input(
-            'Type your GitHub PAT (personal access token) and press [Return]: ')
+            'Type your GitHub username or email address and press [Return]: ')
+        self._password = compat_getpass(
+            'Type your GitHub password and press [Return]: ')
 
     def _call(self, req):
         if isinstance(req, compat_basestring):
             req = sanitized_Request(req)
-        req.add_header('Authorization', 'token %s' % self._token)
+        # Authorizing manually since GitHub does not response with 401 with
+        # WWW-Authenticate header set (see
+        # https://developer.github.com/v3/#basic-authentication)
+        b64 = base64.b64encode(
+            ('%s:%s' % (self._username, self._password)).encode('utf-8')).decode('ascii')
+        req.add_header('Authorization', 'Basic %s' % b64)
         response = self._opener.open(req).read().decode('utf-8')
         return json.loads(response)
 

devscripts/install_jython.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+wget http://central.maven.org/maven2/org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar
+java -jar jython-installer-2.7.1.jar -s -d "$HOME/jython"
+$HOME/jython/bin/jython -m pip install nose

devscripts/make_lazy_extractors.py

@@ -61,7 +61,7 @@ def build_lazy_ie(ie, name):
     return s
 
 
-# find the correct sorting and add the required base classes so that subclasses
+# find the correct sorting and add the required base classes so that sublcasses
 # can be correctly created
 classes = _ALL_CLASSES[:-1]
 ordered_cls = []

devscripts/release.sh

@@ -78,8 +78,8 @@ sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dl/version.py
 sed -i "s/<unreleased>/$version/" ChangeLog
 
 /bin/echo -e "\n### Committing documentation, templates and youtube_dl/version.py..."
-make README.md CONTRIBUTING.md issuetemplates supportedsites
+make README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE.md 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 youtube_dl/version.py ChangeLog
+git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE.md docs/supportedsites.md youtube_dl/version.py ChangeLog
 git commit $gpg_sign_commits -m "release $version"
 
 /bin/echo -e "\n### Now tagging, signing and pushing..."

devscripts/run_tests.bat

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

docs/supportedsites.md

@@ -1,9 +1,9 @@
 # Supported sites
  - **1tv**: Первый канал
+ - **1up.com**
  - **20min**
  - **220.ro**
  - **23video**
- - **247sports**
  - **24video**
  - **3qsdn**: 3Q SDN
  - **3sat**
@@ -26,48 +26,49 @@
  - **AcademicEarth:Course**
  - **acast**
  - **acast:channel**
+ - **AddAnime**
  - **ADN**: Anime Digital Network
  - **AdobeConnect**
- - **adobetv**
+ - **AdobeTV**
- - **adobetv:channel**
+ - **AdobeTVChannel**
- - **adobetv:embed**
+ - **AdobeTVShow**
- - **adobetv:show**
+ - **AdobeTVVideo**
- - **adobetv:video**
  - **AdultSwim**
  - **aenetworks**: A+E Networks: A&E, Lifetime, History.com, FYI Network and History Vault
- - **aenetworks:collection**
- - **aenetworks:show**
  - **afreecatv**: afreecatv.com
  - **AirMozilla**
  - **AliExpressLive**
  - **AlJazeera**
  - **Allocine**
  - **AlphaPorno**
- - **Amara**
  - **AMCNetworks**
  - **AmericasTestKitchen**
- - **AmericasTestKitchenSeason**
  - **anderetijden**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **AnimeOnDemand**
  - **Anvato**
- - **aol.com**: Yahoo screen and movies
+ - **aol.com**
  - **APA**
  - **Aparat**
  - **AppleConnect**
  - **AppleDaily**: 臺灣蘋果日報
- - **ApplePodcasts**
  - **appletrailers**
  - **appletrailers:section**
  - **archive.org**: archive.org videos
- - **ArcPublishing**
  - **ARD**
  - **ARD:mediathek**
  - **ARDBetaMediathek**
  - **Arkena**
- - **arte.sky.it**
+ - **arte.tv**
- - **ArteTV**
+ - **arte.tv:+7**
- - **ArteTVEmbed**
+ - **arte.tv:cinema**
- - **ArteTVPlaylist**
+ - **arte.tv:concert**
+ - **arte.tv:creative**
+ - **arte.tv:ddc**
+ - **arte.tv:embed**
+ - **arte.tv:future**
+ - **arte.tv:info**
+ - **arte.tv:magazine**
+ - **arte.tv:playlist**
  - **AsianCrush**
  - **AsianCrushPlaylist**
  - **AtresPlayer**
@@ -77,13 +78,15 @@
  - **AudioBoom**
  - **audiomack**
  - **audiomack:album**
+ - **auroravid**: AuroraVid
  - **AWAAN**
  - **awaan:live**
  - **awaan:season**
  - **awaan:video**
  - **AZMedien**: AZ Medien videos
  - **BaiduVideo**: 百度视频
- - **bandaichannel**
+ - **bambuser**
+ - **bambuser:channel**
  - **Bandcamp**
  - **Bandcamp:album**
  - **Bandcamp:weekly**
@@ -91,8 +94,7 @@
  - **bbc**: BBC
  - **bbc.co.uk**: BBC iPlayer
  - **bbc.co.uk:article**: BBC articles
- - **bbc.co.uk:iplayer:episodes**
+ - **bbc.co.uk:iplayer:playlist**
- - **bbc.co.uk:iplayer:group**
  - **bbc.co.uk:playlist**
  - **BBVTV**
  - **Beatport**
@@ -102,28 +104,19 @@
  - **BellMedia**
  - **Bet**
  - **bfi:player**
- - **bfmtv**
- - **bfmtv:article**
- - **bfmtv:live**
- - **BibelTV**
  - **Bigflix**
  - **Bild**: Bild.de
  - **BiliBili**
- - **BilibiliAudio**
- - **BilibiliAudioAlbum**
- - **BiliBiliPlayer**
  - **BioBioChileTV**
- - **Biography**
  - **BIQLE**
  - **BitChute**
  - **BitChuteChannel**
  - **BleacherReport**
  - **BleacherReportCMS**
+ - **blinkx**
  - **Bloomberg**
  - **BokeCC**
- - **BongaCams**
  - **BostonGlobe**
- - **Box**
  - **Bpb**: Bundeszentrale für politische Bildung
  - **BR**: Bayerischer Rundfunk
  - **BravoTV**
@@ -156,12 +149,9 @@
  - **CBS**
  - **CBSInteractive**
  - **CBSLocal**
- - **CBSLocalArticle**
  - **cbsnews**: CBS News
- - **cbsnews:embed**
  - **cbsnews:livevideo**: CBS News Live Videos
- - **cbssports**
+ - **CBSSports**
- - **cbssports:embed**
  - **CCMA**
  - **CCTV**: 央视网
  - **CDA**
@@ -173,9 +163,7 @@
  - **Chilloutzone**
  - **chirbit**
  - **chirbit:profile**
- - **cielotv.it**
  - **Cinchcast**
- - **Cinemax**
  - **CiscoLiveSearch**
  - **CiscoLiveSession**
  - **CJSW**
@@ -185,6 +173,7 @@
  - **Clipsyndicate**
  - **CloserToTruth**
  - **CloudflareStream**
+ - **cloudtime**: CloudTime
  - **Cloudy**
  - **Clubic**
  - **Clyp**
@@ -194,32 +183,35 @@
  - **CNN**
  - **CNNArticle**
  - **CNNBlogs**
+ - **ComCarCoff**
  - **ComedyCentral**
+ - **ComedyCentralFullEpisodes**
+ - **ComedyCentralShortname**
  - **ComedyCentralTV**
  - **CondeNast**: Condé Nast media group: Allure, Architectural Digest, Ars Technica, Bon Appétit, Brides, Condé Nast, Condé Nast Traveler, Details, Epicurious, GQ, Glamour, Golf Digest, SELF, Teen Vogue, The New Yorker, Vanity Fair, Vogue, W Magazine, WIRED
- - **CONtv**
  - **Corus**
  - **Coub**
  - **Cracked**
  - **Crackle**
+ - **Criterion**
  - **CrooksAndLiars**
  - **crunchyroll**
  - **crunchyroll:playlist**
+ - **CSNNE**
  - **CSpan**: C-SPAN
  - **CtsNews**: 華視新聞
- - **CTV**
  - **CTVNews**
- - **cu.ntv.co.jp**: Nippon Television Network
  - **Culturebox**
  - **CultureUnplugged**
  - **curiositystream**
  - **curiositystream:collection**
  - **CWTV**
- - **DagelijkseKost**: dagelijksekost.een.be
  - **DailyMail**
  - **dailymotion**
  - **dailymotion:playlist**
  - **dailymotion:user**
+ - **DaisukiMotto**
+ - **DaisukiMottoPlaylist**
  - **daum.net**
  - **daum.net:clip**
  - **daum.net:playlist**
@@ -237,15 +229,15 @@
  - **DiscoveryGo**
  - **DiscoveryGoPlaylist**
  - **DiscoveryNetworksDe**
- - **DiscoveryPlus**
  - **DiscoveryVR**
  - **Disney**
- - **dlive:stream**
- - **dlive:vod**
  - **Dotsub**
  - **DouyuShow**
  - **DouyuTV**: 斗鱼
  - **DPlay**
+ - **DPlayIt**
+ - **dramafever**
+ - **dramafever:series**
  - **DRBonanza**
  - **Dropbox**
  - **DrTuber**
@@ -280,6 +272,7 @@
  - **ESPNArticle**
  - **EsriVideo**
  - **Europa**
+ - **EveryonesMixtape**
  - **EWETV**
  - **ExpoTV**
  - **Expressen**
@@ -297,12 +290,12 @@
  - **FiveThirtyEight**
  - **FiveTV**
  - **Flickr**
+ - **Flipagram**
  - **Folketinget**: Folketinget (ft.dk; Danish parliament)
  - **FootyRoom**
  - **Formula1**
  - **FOX**
  - **FOX9**
- - **FOX9News**
  - **Foxgay**
  - **foxnews**: Fox News and Fox Business Video
  - **foxnews:article**
@@ -321,19 +314,22 @@
  - **FrontendMasters**
  - **FrontendMastersCourse**
  - **FrontendMastersLesson**
- - **FujiTVFODPlus7**
  - **Funimation**
- - **Funk**
+ - **FunkChannel**
+ - **FunkMix**
+ - **FunnyOrDie**
  - **Fusion**
  - **Fux**
+ - **FXNetworks**
  - **Gaia**
  - **GameInformer**
+ - **GameOne**
+ - **gameone:playlist**
  - **GameSpot**
  - **GameStar**
  - **Gaskrank**
  - **Gazeta**
  - **GDCVault**
- - **GediDigital**
  - **generic**: Generic downloader that works on some sites
  - **Gfycat**
  - **GiantBomb**
@@ -343,14 +339,14 @@
  - **Globo**
  - **GloboArticle**
  - **Go**
+ - **Go90**
  - **GodTube**
  - **Golem**
- - **google:podcasts**
- - **google:podcasts:feed**
  - **GoogleDrive**
  - **Goshgay**
  - **GPUTechConf**
  - **Groupon**
+ - **Hark**
  - **hbo**
  - **HearThisAt**
  - **Heise**
@@ -359,10 +355,8 @@
  - **HentaiStigma**
  - **hetklokhuis**
  - **hgtv.com:show**
- - **HGTVDe**
  - **HiDive**
  - **HistoricFilms**
- - **history:player**
  - **history:topic**: History.com Topic
  - **hitbox**
  - **hitbox:live**
@@ -381,11 +375,8 @@
  - **Hungama**
  - **HungamaSong**
  - **Hypem**
+ - **Iconosquare**
  - **ign.com**
- - **IGNArticle**
- - **IGNVideo**
- - **IHeartRadio**
- - **iheartradio:podcast**
  - **imdb**: Internet Movie Database trailers
  - **imdb:list**: Internet Movie Database lists
  - **Imgur**
@@ -416,21 +407,22 @@
  - **JeuxVideo**
  - **Joj**
  - **Jove**
+ - **jpopsuki.tv**
  - **JWPlatform**
  - **Kakao**
  - **Kaltura**
+ - **KanalPlay**: Kanal 5/9/11 Play
  - **Kankan**
  - **Karaoketv**
  - **KarriereVideos**
- - **Katsomo**
+ - **keek**
  - **KeezMovies**
  - **Ketnet**
- - **khanacademy**
+ - **KhanAcademy**
- - **khanacademy:unit**
  - **KickStarter**
- - **KinjaEmbed**
  - **KinoPoisk**
  - **KonserthusetPlay**
+ - **kontrtube**: KontrTube.ru - Труба зовёт
  - **KrasView**: Красвью
  - **Ku6**
  - **KUSI**
@@ -443,12 +435,11 @@
  - **la7.it**
  - **laola1tv**
  - **laola1tv:embed**
- - **lbry**
- - **lbry:channel**
  - **LCI**
  - **Lcp**
  - **LcpPlay**
  - **Le**: 乐视网
+ - **Learnr**
  - **Lecture2Go**
  - **Lecturio**
  - **LecturioCourse**
@@ -464,14 +455,11 @@
  - **limelight**
  - **limelight:channel**
  - **limelight:channel_list**
- - **LineLive**
- - **LineLiveChannel**
  - **LineTV**
  - **linkedin:learning**
  - **linkedin:learning:course**
  - **LinuxAcademy**
  - **LiTV**
- - **LiveJournal**
  - **LiveLeak**
  - **LiveLeakEmbed**
  - **livestream**
@@ -484,22 +472,21 @@
  - **lynda**: lynda.com videos
  - **lynda:course**: lynda.com online courses
  - **m6**
+ - **macgamestore**: MacGameStore trailers
  - **mailru**: Видео@Mail.Ru
  - **mailru:music**: Музыка@Mail.Ru
  - **mailru:music:search**: Музыка@Mail.Ru
+ - **MakerTV**
  - **MallTV**
  - **mangomolo:live**
  - **mangomolo:video**
  - **ManyVids**
- - **MaoriTV**
  - **Markiza**
  - **MarkizaPage**
  - **massengeschmack.tv**
  - **MatchTV**
  - **MDR**: MDR.DE and KiKA
- - **MedalTV**
  - **media.ccc.de**
- - **media.ccc.de:lists**
  - **Medialaan**
  - **Mediaset**
  - **Mediasite**
@@ -512,27 +499,25 @@
  - **META**
  - **metacafe**
  - **Metacritic**
- - **mewatch**
  - **Mgoon**
  - **MGTV**: 芒果TV
  - **MiaoPai**
- - **minds**
+ - **Minhateca**
- - **minds:channel**
- - **minds:group**
  - **MinistryGrid**
  - **Minoto**
  - **miomio.tv**
  - **MiTele**: mitele.es
  - **mixcloud**
  - **mixcloud:playlist**
+ - **mixcloud:stream**
  - **mixcloud:user**
+ - **Mixer:live**
+ - **Mixer:vod**
  - **MLB**
- - **MLBVideo**
  - **Mnet**
  - **MNetTV**
  - **MoeVideo**: LetitBit video services: moevideo.net, playreplay.net and videochart.net
  - **Mofosex**
- - **MofosexEmbed**
  - **Mojvideo**
  - **Morningstar**: morningstar.com
  - **Motherless**
@@ -546,11 +531,11 @@
  - **mtg**: MTG services
  - **mtv**
  - **mtv.de**
+ - **mtv81**
  - **mtv:video**
- - **mtvjapan**
  - **mtvservices:embedded**
- - **MTVUutisetArticle**
  - **MuenchenTV**: münchen.tv
+ - **MusicPlayOn**
  - **mva**: Microsoft Virtual Academy videos
  - **mva:course**: Microsoft Virtual Academy courses
  - **Mwave**
@@ -568,11 +553,6 @@
  - **NationalGeographicTV**
  - **Naver**
  - **NBA**
- - **nba:watch**
- - **nba:watch:collection**
- - **NBAChannel**
- - **NBAEmbed**
- - **NBAWatchEmbed**
  - **NBC**
  - **NBCNews**
  - **nbcolympics**
@@ -602,10 +582,9 @@
  - **NextTV**: 壹電視
  - **Nexx**
  - **NexxEmbed**
- - **nfl.com** (Currently broken)
+ - **nfb**: National Film Board of Canada
- - **nfl.com:article** (Currently broken)
+ - **nfl.com**
  - **NhkVod**
- - **NhkVodProgram**
  - **nhl.com**
  - **nick.com**
  - **nick.de**
@@ -619,6 +598,7 @@
  - **njoy:embed**
  - **NJPWWorld**: 新日本プロレスワールド
  - **NobelPrize**
+ - **Noco**
  - **NonkTube**
  - **Noovo**
  - **Normalboots**
@@ -628,6 +608,7 @@
  - **nowness**
  - **nowness:playlist**
  - **nowness:series**
+ - **nowvideo**: NowVideo
  - **Noz**
  - **npo**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **npo.nl:live**
@@ -636,7 +617,6 @@
  - **Npr**
  - **NRK**
  - **NRKPlaylist**
- - **NRKRadioPodkast**
  - **NRKSkole**: NRK Skole
  - **NRKTV**: NRK TV and NRK Radio
  - **NRKTVDirekte**: NRK TV Direkte and NRK Radio Direkte
@@ -644,12 +624,10 @@
  - **NRKTVEpisodes**
  - **NRKTVSeason**
  - **NRKTVSeries**
- - **NRLTV**
  - **ntv.ru**
  - **Nuvid**
  - **NYTimes**
  - **NYTimesArticle**
- - **NYTimesCooking**
  - **NZZ**
  - **ocw.mit.edu**
  - **OdaTV**
@@ -663,34 +641,24 @@
  - **OnionStudios**
  - **Ooyala**
  - **OoyalaExternal**
+ - **Openload**
  - **OraTV**
- - **orf:burgenland**: Radio Burgenland
  - **orf:fm4**: radio FM4
  - **orf:fm4:story**: fm4.orf.at stories
  - **orf:iptv**: iptv.ORF.at
- - **orf:kaernten**: Radio Kärnten
- - **orf:noe**: Radio Niederösterreich
- - **orf:oberoesterreich**: Radio Oberösterreich
  - **orf:oe1**: Radio Österreich 1
- - **orf:oe3**: Radio Österreich 3
- - **orf:salzburg**: Radio Salzburg
- - **orf:steiermark**: Radio Steiermark
- - **orf:tirol**: Radio Tirol
  - **orf:tvthek**: ORF TVthek
- - **orf:vorarlberg**: Radio Vorarlberg
- - **orf:wien**: Radio Wien
  - **OsnatelTV**
  - **OutsideTV**
  - **PacktPub**
  - **PacktPubCourse**
- - **PalcoMP3:artist**
+ - **PandaTV**: 熊猫TV
- - **PalcoMP3:song**
- - **PalcoMP3:video**
  - **pandora.tv**: 판도라TV
  - **ParamountNetwork**
  - **parliamentlive.tv**: UK parliament videos
  - **Patreon**
  - **pbs**: Public Broadcasting Service (PBS) and member stations: PBS: Public Broadcasting Service, APT - Alabama Public Television (WBIQ), GPB/Georgia Public Broadcasting (WGTV), Mississippi Public Broadcasting (WMPN), Nashville Public Television (WNPT), WFSU-TV (WFSU), WSRE (WSRE), WTCI (WTCI), WPBA/Channel 30 (WPBA), Alaska Public Media (KAKM), Arizona PBS (KAET), KNME-TV/Channel 5 (KNME), Vegas PBS (KLVX), AETN/ARKANSAS ETV NETWORK (KETS), KET (WKLE), WKNO/Channel 10 (WKNO), LPB/LOUISIANA PUBLIC BROADCASTING (WLPB), OETA (KETA), Ozarks Public Television (KOZK), WSIU Public Broadcasting (WSIU), KEET TV (KEET), KIXE/Channel 9 (KIXE), KPBS San Diego (KPBS), KQED (KQED), KVIE Public Television (KVIE), PBS SoCal/KOCE (KOCE), ValleyPBS (KVPT), CONNECTICUT PUBLIC TELEVISION (WEDH), KNPB Channel 5 (KNPB), SOPTV (KSYS), Rocky Mountain PBS (KRMA), KENW-TV3 (KENW), KUED Channel 7 (KUED), Wyoming PBS (KCWC), Colorado Public Television / KBDI 12 (KBDI), KBYU-TV (KBYU), Thirteen/WNET New York (WNET), WGBH/Channel 2 (WGBH), WGBY (WGBY), NJTV Public Media NJ (WNJT), WLIW21 (WLIW), mpt/Maryland Public Television (WMPB), WETA Television and Radio (WETA), WHYY (WHYY), PBS 39 (WLVT), WVPT - Your Source for PBS and More! (WVPT), Howard University Television (WHUT), WEDU PBS (WEDU), WGCU Public Media (WGCU), WPBT2 (WPBT), WUCF TV (WUCF), WUFT/Channel 5 (WUFT), WXEL/Channel 42 (WXEL), WLRN/Channel 17 (WLRN), WUSF Public Broadcasting (WUSF), ETV (WRLK), UNC-TV (WUNC), PBS Hawaii - Oceanic Cable Channel 10 (KHET), Idaho Public Television (KAID), KSPS (KSPS), OPB (KOPB), KWSU/Channel 10 & KTNW/Channel 31 (KWSU), WILL-TV (WILL), Network Knowledge - WSEC/Springfield (WSEC), WTTW11 (WTTW), Iowa Public Television/IPTV (KDIN), Nine Network (KETC), PBS39 Fort Wayne (WFWA), WFYI Indianapolis (WFYI), Milwaukee Public Television (WMVS), WNIN (WNIN), WNIT Public Television (WNIT), WPT (WPNE), WVUT/Channel 22 (WVUT), WEIU/Channel 51 (WEIU), WQPT-TV (WQPT), WYCC PBS Chicago (WYCC), WIPB-TV (WIPB), WTIU (WTIU), CET  (WCET), ThinkTVNetwork (WPTD), WBGU-TV (WBGU), WGVU TV (WGVU), NET1 (KUON), Pioneer Public Television (KWCM), SDPB Television (KUSD), TPT (KTCA), KSMQ (KSMQ), KPTS/Channel 8 (KPTS), KTWU/Channel 11 (KTWU), East Tennessee PBS (WSJK), WCTE-TV (WCTE), WLJT, Channel 11 (WLJT), WOSU TV (WOSU), WOUB/WOUC (WOUB), WVPB (WVPB), WKYU-PBS (WKYU), KERA 13 (KERA), MPBN (WCBB), Mountain Lake PBS (WCFE), NHPTV (WENH), Vermont PBS (WETK), witf (WITF), WQED Multimedia (WQED), WMHT Educational Telecommunications (WMHT), Q-TV (WDCQ), WTVS Detroit Public TV (WTVS), CMU Public Television (WCMU), WKAR-TV (WKAR), WNMU-TV Public TV 13 (WNMU), WDSE - WRPT (WDSE), WGTE TV (WGTE), Lakeland Public Television (KAWE), KMOS-TV - Channels 6.1, 6.2 and 6.3 (KMOS), MontanaPBS (KUSM), KRWG/Channel 22 (KRWG), KACV (KACV), KCOS/Channel 13 (KCOS), WCNY/Channel 24 (WCNY), WNED (WNED), WPBS (WPBS), WSKG Public TV (WSKG), WXXI (WXXI), WPSU (WPSU), WVIA Public Media Studios (WVIA), WTVI (WTVI), Western Reserve PBS (WNEO), WVIZ/PBS ideastream (WVIZ), KCTS 9 (KCTS), Basin PBS (KPBT), KUHT / Channel 8 (KUHT), KLRN (KLRN), KLRU (KLRU), WTJX Channel 12 (WTJX), WCVE PBS (WCVE), KBTC Public Television (KBTC)
+ - **pcmag**
  - **PearVideo**
  - **PeerTube**
  - **People**
@@ -704,39 +672,36 @@
  - **PicartoVod**
  - **Piksel**
  - **Pinkbike**
- - **Pinterest**
- - **PinterestCollection**
  - **Pladform**
  - **Platzi**
  - **PlatziCourse**
  - **play.fm**
- - **player.sky.it**
  - **PlayPlusTV**
- - **PlayStuff**
  - **PlaysTV**
  - **Playtvak**: Playtvak.cz, iDNES.cz and Lidovky.cz
  - **Playvid**
  - **Playwire**
  - **pluralsight**
  - **pluralsight:course**
+ - **plus.google**: Google Plus
  - **podomatic**
  - **Pokemon**
  - **PolskieRadio**
  - **PolskieRadioCategory**
- - **Popcorntimes**
  - **PopcornTV**
  - **PornCom**
  - **PornerBros**
+ - **PornFlip**
  - **PornHd**
  - **PornHub**: PornHub and Thumbzilla
- - **PornHubPagedVideoList**
+ - **PornHubPlaylist**
- - **PornHubUser**
+ - **PornHubUserVideos**
- - **PornHubUserVideosUpload**
  - **Pornotube**
  - **PornoVoisines**
  - **PornoXO**
  - **PornTube**
  - **PressTV**
+ - **PromptFile**
  - **prosiebensat1**: ProSiebenSat.1 Digital
  - **puhutv**
  - **puhutv:serie**
@@ -748,7 +713,6 @@
  - **qqmusic:singer**: QQ音乐 - 歌手
  - **qqmusic:toplist**: QQ音乐 - 排行榜
  - **QuantumTV**
- - **Qub**
  - **Quickline**
  - **QuicklineLive**
  - **R7**
@@ -767,10 +731,7 @@
  - **RayWenderlichCourse**
  - **RBMARadio**
  - **RDS**: RDS.ca
- - **RedBull**
- - **RedBullEmbed**
  - **RedBullTV**
- - **RedBullTVRrnContent**
  - **Reddit**
  - **RedditR**
  - **RedTube**
@@ -780,6 +741,8 @@
  - **Restudy**
  - **Reuters**
  - **ReverbNation**
+ - **revision**
+ - **revision3:embed**
  - **RICE**
  - **RMCDecouverte**
  - **RockstarGames**
@@ -802,8 +765,8 @@
  - **rtve.es:television**
  - **RTVNH**
  - **RTVS**
+ - **Rudo**
  - **RUHD**
- - **RumbleEmbed**
  - **rutube**: Rutube videos
  - **rutube:channel**: Rutube channels
  - **rutube:embed**: Rutube embedded videos
@@ -818,7 +781,6 @@
  - **safari:course**: safaribooksonline.com online courses
  - **SAKTV**
  - **SaltTV**
- - **SampleFocus**
  - **Sapo**: SAPO Vídeos
  - **savefrom.net**
  - **SBS**: sbs.com.au
@@ -826,13 +788,11 @@
  - **screen.yahoo:search**: Yahoo screen search
  - **Screencast**
  - **ScreencastOMatic**
- - **ScrippsNetworks**
  - **scrippsnetworks:watch**
- - **SCTE**
- - **SCTECourse**
  - **Seeker**
  - **SenateISVP**
  - **SendtoNews**
+ - **ServingSys**
  - **Servus**
  - **Sexu**
  - **SeznamZpravy**
@@ -841,21 +801,18 @@
  - **ShahidShow**
  - **Shared**: shared.sx
  - **ShowRoomLive**
- - **simplecast**
- - **simplecast:episode**
- - **simplecast:podcast**
  - **Sina**
- - **sky.it**
- - **sky:news**
- - **sky:sports**
- - **sky:sports:news**
- - **skyacademy.it**
  - **SkylineWebcams**
  - **skynewsarabia:article**
  - **skynewsarabia:video**
+ - **SkySports**
  - **Slideshare**
  - **SlidesLive**
  - **Slutload**
+ - **smotri**: Smotri.com
+ - **smotri:broadcast**: Smotri.com broadcasts
+ - **smotri:community**: Smotri.com community videos
+ - **smotri:user**: Smotri.com user videos
  - **Snotr**
  - **Sohu**
  - **SonyLIV**
@@ -865,7 +822,6 @@
  - **soundcloud:set**
  - **soundcloud:trackstation**
  - **soundcloud:user**
- - **SoundcloudEmbed**
  - **soundgasm**
  - **soundgasm:profile**
  - **southpark.cc.com**
@@ -877,16 +833,12 @@
  - **SpankBangPlaylist**
  - **Spankwire**
  - **Spiegel**
+ - **Spiegel:Article**: Articles on spiegel.de
+ - **Spiegeltv**
  - **sport.francetvinfo.fr**
  - **Sport5**
  - **SportBox**
  - **SportDeutschland**
- - **spotify**
- - **spotify:show**
- - **Spreaker**
- - **SpreakerPage**
- - **SpreakerShow**
- - **SpreakerShowPage**
  - **SpringboardPlatform**
  - **Sprout**
  - **sr:mediathek**: Saarländischer Rundfunk
@@ -895,19 +847,14 @@
  - **stanfordoc**: Stanford Open ClassRoom
  - **Steam**
  - **Stitcher**
- - **StitcherShow**
- - **StoryFire**
- - **StoryFireSeries**
- - **StoryFireUser**
  - **Streamable**
+ - **Streamango**
  - **streamcloud.eu**
  - **StreamCZ**
  - **StreetVoice**
  - **StretchInternet**
  - **stv:player**
  - **SunPorno**
- - **sverigesradio:episode**
- - **sverigesradio:publication**
  - **SVT**
  - **SVTPage**
  - **SVTPlay**: SVT Play and Öppet arkiv
@@ -919,6 +866,7 @@
  - **Tagesschau**
  - **tagesschau:player**
  - **Tass**
+ - **TastyTrade**
  - **TBS**
  - **TDSLifeway**
  - **Teachable**
@@ -940,15 +888,13 @@
  - **TeleQuebec**
  - **TeleQuebecEmission**
  - **TeleQuebecLive**
- - **TeleQuebecSquat**
- - **TeleQuebecVideo**
  - **TeleTask**
  - **Telewebion**
  - **TennisTV**
- - **TenPlay**
  - **TF1**
  - **TFO**
  - **TheIntercept**
+ - **theoperaplatform**
  - **ThePlatform**
  - **ThePlatformFeed**
  - **TheScene**
@@ -959,7 +905,7 @@
  - **ThisAV**
  - **ThisOldHouse**
  - **TikTok**
- - **TikTokUser** (Currently broken)
+ - **TikTokUser**
  - **tinypic**: tinypic.com videos
  - **TMZ**
  - **TMZArticle**
@@ -967,13 +913,12 @@
  - **TNAFlixNetworkEmbed**
  - **toggle**
  - **ToonGoggles**
+ - **Tosh**: Tosh.0
  - **tou.tv**
  - **Toypics**: Toypics video
  - **ToypicsUser**: Toypics user profile
  - **TrailerAddict** (Currently broken)
  - **Trilulilu**
- - **Trovo**
- - **TrovoVod**
  - **TruNews**
  - **TruTV**
  - **Tube8**
@@ -985,23 +930,18 @@
  - **tunein:topic**
  - **TunePk**
  - **Turbo**
+ - **Tutv**
  - **tv.dfb.de**
  - **TV2**
  - **tv2.hu**
  - **TV2Article**
- - **TV2DK**
- - **TV2DKBornholmPlay**
  - **TV4**: tv4.se and tv4play.se
  - **TV5MondePlus**: TV5MONDE+
- - **tv5unis**
- - **tv5unis:video**
- - **tv8.it**
  - **TVA**
  - **TVANouvelles**
  - **TVANouvellesArticle**
  - **TVC**
  - **TVCArticle**
- - **TVer**
  - **tvigle**: Интернет-телевидение Tvigle.ru
  - **tvland.com**
  - **TVN24**
@@ -1019,21 +959,22 @@
  - **TVPlayHome**
  - **Tweakers**
  - **TwitCasting**
+ - **twitch:chapter**
  - **twitch:clips**
+ - **twitch:profile**
  - **twitch:stream**
+ - **twitch:video**
+ - **twitch:videos:all**
+ - **twitch:videos:highlights**
+ - **twitch:videos:past-broadcasts**
+ - **twitch:videos:uploads**
  - **twitch:vod**
- - **TwitchCollection**
- - **TwitchVideos**
- - **TwitchVideosClips**
- - **TwitchVideosCollections**
  - **twitter**
  - **twitter:amplify**
- - **twitter:broadcast**
  - **twitter:card**
  - **udemy**
  - **udemy:course**
  - **UDNEmbed**: 聯合影音
- - **UFCArabia**
  - **UFCTV**
  - **UKTVPlay**
  - **umg:de**: Universal Music Deutschland
@@ -1054,6 +995,7 @@
  - **Vbox7**
  - **VeeHD**
  - **Veoh**
+ - **Vessel**
  - **Vesti**: Вести.Ru
  - **Vevo**
  - **VevoPlaylist**
@@ -1067,25 +1009,27 @@
  - **Vidbit**
  - **Viddler**
  - **Videa**
- - **video.arnes.si**: Arnes Video
  - **video.google:search**: Google Video search
- - **video.sky.it**
+ - **video.mit.edu**
- - **video.sky.it:live**
  - **VideoDetective**
  - **videofy.me**
  - **videomore**
  - **videomore:season**
  - **videomore:video**
+ - **VideoPremium**
  - **VideoPress**
+ - **videoweed**: VideoWeed
  - **Vidio**
  - **VidLii**
  - **vidme**
  - **vidme:user**
  - **vidme:user:likes**
+ - **Vidzi**
  - **vier**: vier.be and vijf.be
  - **vier:videos**
- - **viewlift**
+ - **ViewLift**
- - **viewlift:embed**
+ - **ViewLiftEmbed**
+ - **Viewster**
  - **Viidea**
  - **viki**
  - **viki:channel**
@@ -1111,7 +1055,7 @@
  - **vk:wallpost**
  - **vlive**
  - **vlive:channel**
- - **vlive:post**
+ - **vlive:playlist**
  - **Vodlocker**
  - **VODPl**
  - **VODPlatform**
@@ -1121,17 +1065,15 @@
  - **VoxMediaVolume**
  - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **Vrak**
- - **VRT**: VRT NWS, Flanders News, Flandern Info and Sporza
+ - **VRT**: deredactie.be, sporza.be, cobra.be and cobra.canvas.be
  - **VrtNU**: VrtNU.be
  - **vrv**
  - **vrv:series**
  - **VShare**
- - **VTM**
  - **VTXTV**
  - **vube**: Vube.com
  - **VuClip**
  - **VVVVID**
- - **VVVVIDShow**
  - **VyboryMos**
  - **Vzaar**
  - **Wakanim**
@@ -1153,19 +1095,21 @@
  - **Weibo**
  - **WeiboMobile**
  - **WeiqiTV**: WQTV
+ - **wholecloud**: WholeCloud
+ - **Wimp**
  - **Wistia**
- - **WistiaPlaylist**
  - **wnl**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **WorldStarHipHop**
+ - **wrzuta.pl**
+ - **wrzuta.pl:playlist**
  - **WSJ**: Wall Street Journal
  - **WSJArticle**
  - **WWE**
  - **XBef**
  - **XboxClips**
- - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, WolfStream, XVideoSharing
+ - **XFileShare**: XFileShare based sites: DaClips, FileHoot, GorillaVid, MovPod, PowerWatch, Rapidvideo.ws, TheVideoBee, Vidto, Streamin.To, XVIDSTAGE, Vid ABC, VidBom, vidlo, RapidVideo.TV, FastVideo.me
  - **XHamster**
  - **XHamsterEmbed**
- - **XHamsterUser**
  - **xiami:album**: 虾米音乐 - 专辑
  - **xiami:artist**: 虾米音乐 - 歌手
  - **xiami:collection**: 虾米音乐 - 精选集
@@ -1183,11 +1127,8 @@
  - **Yahoo**: Yahoo screen and movies
  - **yahoo:gyao**
  - **yahoo:gyao:player**
- - **yahoo:japannews**: Yahoo! Japan News
  - **YandexDisk**
  - **yandexmusic:album**: Яндекс.Музыка - Альбом
- - **yandexmusic:artist:albums**: Яндекс.Музыка - Артист - Альбомы
- - **yandexmusic:artist:tracks**: Яндекс.Музыка - Артист - Треки
  - **yandexmusic:playlist**: Яндекс.Музыка - Плейлист
  - **yandexmusic:track**: Яндекс.Музыка - Трек
  - **YandexVideo**
@@ -1205,24 +1146,25 @@
  - **YourPorn**
  - **YourUpload**
  - **youtube**: YouTube.com
+ - **youtube:channel**: YouTube.com channels
  - **youtube:favorites**: YouTube.com favourite videos, ":ytfav" for short (requires authentication)
  - **youtube:history**: Youtube watch history, ":ythistory" for short (requires authentication)
+ - **youtube:live**: YouTube.com live streams
  - **youtube:playlist**: YouTube.com playlists
+ - **youtube:playlists**: YouTube.com user/channel playlists
  - **youtube:recommended**: YouTube.com recommended videos, ":ytrec" for short (requires authentication)
  - **youtube:search**: YouTube.com searches
  - **youtube:search:date**: YouTube.com searches, newest videos first
+ - **youtube:search_url**: YouTube.com search URLs
+ - **youtube:show**: YouTube.com (multi-season) shows
  - **youtube:subscriptions**: YouTube.com subscriptions feed, "ytsubs" keyword (requires authentication)
- - **youtube:tab**: YouTube.com tab
+ - **youtube:user**: YouTube.com user videos (URL or "ytuser" keyword)
  - **youtube:watchlater**: Youtube watch later list, ":ytwatchlater" for short (requires authentication)
- - **YoutubeYtBe**
- - **YoutubeYtUser**
  - **Zapiks**
+ - **Zaq1**
  - **Zattoo**
  - **ZattooLive**
  - **ZDF**
  - **ZDFChannel**
- - **Zhihu**
  - **zingmp3**: mp3.zing.vn
- - **zingmp3:album**
- - **zoom**
  - **Zype**

setup.cfg

@@ -3,4 +3,4 @@ universal = True
 
 [flake8]
 exclude = youtube_dl/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv
-ignore = E402,E501,E731,E741,W503
+ignore = E402,E501,E731,E741

test/parameters.json

@@ -37,7 +37,7 @@
     "writeinfojson": true, 
     "writesubtitles": false,
     "allsubtitles": false,
-    "listsubtitles": false,
+    "listssubtitles": false,
     "socket_timeout": 20,
     "fixup": "never"
 }

test/test_InfoExtractor.py

@@ -98,55 +98,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertRaises(RegexNotFoundError, ie._html_search_meta, 'z', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._html_search_meta, ('z', 'x'), html, None, fatal=True)
 
-    def test_search_json_ld_realworld(self):
-        # https://github.com/ytdl-org/youtube-dl/issues/23306
-        expect_dict(
-            self,
-            self.ie._search_json_ld(r'''<script type="application/ld+json">
-{
-"@context": "http://schema.org/",
-"@type": "VideoObject",
-"name": "1 On 1 With Kleio",
-"url": "https://www.eporner.com/hd-porn/xN49A1cT3eB/1-On-1-With-Kleio/",
-"duration": "PT0H12M23S",
-"thumbnailUrl": ["https://static-eu-cdn.eporner.com/thumbs/static4/7/78/780/780814/9_360.jpg", "https://imggen.eporner.com/780814/1920/1080/9.jpg"],
-"contentUrl": "https://gvideo.eporner.com/xN49A1cT3eB/xN49A1cT3eB.mp4",
-"embedUrl": "https://www.eporner.com/embed/xN49A1cT3eB/1-On-1-With-Kleio/",
-"image": "https://static-eu-cdn.eporner.com/thumbs/static4/7/78/780/780814/9_360.jpg",
-"width": "1920",
-"height": "1080",
-"encodingFormat": "mp4",
-"bitrate": "6617kbps",
-"isFamilyFriendly": "False",
-"description": "Kleio Valentien",
-"uploadDate": "2015-12-05T21:24:35+01:00",
-"interactionStatistic": {
-"@type": "InteractionCounter",
-"interactionType": { "@type": "http://schema.org/WatchAction" },
-"userInteractionCount": 1120958
-}, "aggregateRating": {
-"@type": "AggregateRating",
-"ratingValue": "88",
-"ratingCount": "630",
-"bestRating": "100",
-"worstRating": "0"
-}, "actor": [{
-"@type": "Person",
-"name": "Kleio Valentien",
-"url": "https://www.eporner.com/pornstar/kleio-valentien/"
-}]}
-</script>''', None),
-            {
-                'title': '1 On 1 With Kleio',
-                'description': 'Kleio Valentien',
-                'url': 'https://gvideo.eporner.com/xN49A1cT3eB/xN49A1cT3eB.mp4',
-                'timestamp': 1449347075,
-                'duration': 743.0,
-                'view_count': 1120958,
-                'width': 1920,
-                'height': 1080,
-            })
-
     def test_download_json(self):
         uri = encode_data_uri(b'{"foo": "blah"}', 'application/json')
         self.assertEqual(self.ie._download_json(uri, None), {'foo': 'blah'})
@@ -157,18 +108,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertEqual(self.ie._download_json(uri, None, fatal=False), None)
 
     def test_parse_html5_media_entries(self):
-        # inline video tag
-        expect_dict(
-            self,
-            self.ie._parse_html5_media_entries(
-                'https://127.0.0.1/video.html',
-                r'<html><video src="/vid.mp4" /></html>', None)[0],
-            {
-                'formats': [{
-                    'url': 'https://127.0.0.1/vid.mp4',
-                }],
-            })
-
         # from https://www.r18.com/
         # with kpbs in label
         expect_dict(

test/test_YoutubeDL.py

@@ -464,7 +464,6 @@ class TestFormatSelection(unittest.TestCase):
         assert_syntax_error('+bestaudio')
         assert_syntax_error('bestvideo+')
         assert_syntax_error('/')
-        assert_syntax_error('bestvideo+bestvideo+bestaudio')
 
     def test_format_filtering(self):
         formats = [
@@ -633,20 +632,13 @@ class TestYoutubeDL(unittest.TestCase):
             'title2': '%PATH%',
         }
 
-        def fname(templ, na_placeholder='NA'):
+        def fname(templ):
-            params = {'outtmpl': templ}
+            ydl = YoutubeDL({'outtmpl': templ})
-            if na_placeholder != 'NA':
-                params['outtmpl_na_placeholder'] = na_placeholder
-            ydl = YoutubeDL(params)
             return ydl.prepare_filename(info)
         self.assertEqual(fname('%(id)s.%(ext)s'), '1234.mp4')
         self.assertEqual(fname('%(id)s-%(width)s.%(ext)s'), '1234-NA.mp4')
-        NA_TEST_OUTTMPL = '%(uploader_date)s-%(width)d-%(id)s.%(ext)s'
+        # Replace missing fields with 'NA'
-        # Replace missing fields with 'NA' by default
+        self.assertEqual(fname('%(uploader_date)s-%(id)s.%(ext)s'), 'NA-1234.mp4')
-        self.assertEqual(fname(NA_TEST_OUTTMPL), 'NA-NA-1234.mp4')
-        # Or by provided placeholder
-        self.assertEqual(fname(NA_TEST_OUTTMPL, na_placeholder='none'), 'none-none-1234.mp4')
-        self.assertEqual(fname(NA_TEST_OUTTMPL, na_placeholder=''), '--1234.mp4')
         self.assertEqual(fname('%(height)d.%(ext)s'), '1080.mp4')
         self.assertEqual(fname('%(height)6d.%(ext)s'), '  1080.mp4')
         self.assertEqual(fname('%(height)-6d.%(ext)s'), '1080  .mp4')
@@ -824,15 +816,11 @@ class TestYoutubeDL(unittest.TestCase):
             'webpage_url': 'http://example.com',
         }
 
-        def get_downloaded_info_dicts(params):
-            ydl = YDL(params)
-            # make a deep copy because the dictionary and nested entries
-            # can be modified
-            ydl.process_ie_result(copy.deepcopy(playlist))
-            return ydl.downloaded_info_dicts
-
         def get_ids(params):
-            return [int(v['id']) for v in get_downloaded_info_dicts(params)]
+            ydl = YDL(params)
+            # make a copy because the dictionary can be modified
+            ydl.process_ie_result(playlist.copy())
+            return [int(v['id']) for v in ydl.downloaded_info_dicts]
 
         result = get_ids({})
         self.assertEqual(result, [1, 2, 3, 4])
@@ -864,22 +852,6 @@ class TestYoutubeDL(unittest.TestCase):
         result = get_ids({'playlist_items': '2-4,3-4,3'})
         self.assertEqual(result, [2, 3, 4])
 
-        # Tests for https://github.com/ytdl-org/youtube-dl/issues/10591
-        # @{
-        result = get_downloaded_info_dicts({'playlist_items': '2-4,3-4,3'})
-        self.assertEqual(result[0]['playlist_index'], 2)
-        self.assertEqual(result[1]['playlist_index'], 3)
-
-        result = get_downloaded_info_dicts({'playlist_items': '2-4,3-4,3'})
-        self.assertEqual(result[0]['playlist_index'], 2)
-        self.assertEqual(result[1]['playlist_index'], 3)
-        self.assertEqual(result[2]['playlist_index'], 4)
-
-        result = get_downloaded_info_dicts({'playlist_items': '4,2'})
-        self.assertEqual(result[0]['playlist_index'], 4)
-        self.assertEqual(result[1]['playlist_index'], 2)
-        # @}
-
     def test_urlopen_no_file_protocol(self):
         # see https://github.com/ytdl-org/youtube-dl/issues/8227
         ydl = YDL()
@@ -927,76 +899,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertEqual(downloaded['extractor'], 'testex')
         self.assertEqual(downloaded['extractor_key'], 'TestEx')
 
-    # Test case for https://github.com/ytdl-org/youtube-dl/issues/27064
-    def test_ignoreerrors_for_playlist_with_url_transparent_iterable_entries(self):
-
-        class _YDL(YDL):
-            def __init__(self, *args, **kwargs):
-                super(_YDL, self).__init__(*args, **kwargs)
-
-            def trouble(self, s, tb=None):
-                pass
-
-        ydl = _YDL({
-            'format': 'extra',
-            'ignoreerrors': True,
-        })
-
-        class VideoIE(InfoExtractor):
-            _VALID_URL = r'video:(?P<id>\d+)'
-
-            def _real_extract(self, url):
-                video_id = self._match_id(url)
-                formats = [{
-                    'format_id': 'default',
-                    'url': 'url:',
-                }]
-                if video_id == '0':
-                    raise ExtractorError('foo')
-                if video_id == '2':
-                    formats.append({
-                        'format_id': 'extra',
-                        'url': TEST_URL,
-                    })
-                return {
-                    'id': video_id,
-                    'title': 'Video %s' % video_id,
-                    'formats': formats,
-                }
-
-        class PlaylistIE(InfoExtractor):
-            _VALID_URL = r'playlist:'
-
-            def _entries(self):
-                for n in range(3):
-                    video_id = compat_str(n)
-                    yield {
-                        '_type': 'url_transparent',
-                        'ie_key': VideoIE.ie_key(),
-                        'id': video_id,
-                        'url': 'video:%s' % video_id,
-                        'title': 'Video Transparent %s' % video_id,
-                    }
-
-            def _real_extract(self, url):
-                return self.playlist_result(self._entries())
-
-        ydl.add_info_extractor(VideoIE(ydl))
-        ydl.add_info_extractor(PlaylistIE(ydl))
-        info = ydl.extract_info('playlist:')
-        entries = info['entries']
-        self.assertEqual(len(entries), 3)
-        self.assertTrue(entries[0] is None)
-        self.assertTrue(entries[1] is None)
-        self.assertEqual(len(ydl.downloaded_info_dicts), 1)
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(entries[2], downloaded)
-        self.assertEqual(downloaded['url'], TEST_URL)
-        self.assertEqual(downloaded['title'], 'Video Transparent 2')
-        self.assertEqual(downloaded['id'], '2')
-        self.assertEqual(downloaded['extractor'], 'Video')
-        self.assertEqual(downloaded['extractor_key'], 'Video')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_YoutubeDLCookieJar.py

@@ -39,13 +39,6 @@ class TestYoutubeDLCookieJar(unittest.TestCase):
         assert_cookie_has_value('HTTPONLY_COOKIE')
         assert_cookie_has_value('JS_ACCESSIBLE_COOKIE')
 
-    def test_malformed_cookies(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/malformed_cookies.txt')
-        cookiejar.load(ignore_discard=True, ignore_expires=True)
-        # Cookies should be empty since all malformed cookie file entries
-        # will be ignored
-        self.assertFalse(cookiejar._cookies)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_aes.py

@@ -44,16 +44,16 @@ class TestAES(unittest.TestCase):
     def test_decrypt_text(self):
         password = intlist_to_bytes(self.key).decode('utf-8')
         encrypted = base64.b64encode(
-            intlist_to_bytes(self.iv[:8])
+            intlist_to_bytes(self.iv[:8]) +
-            + b'\x17\x15\x93\xab\x8d\x80V\xcdV\xe0\t\xcdo\xc2\xa5\xd8ksM\r\xe27N\xae'
+            b'\x17\x15\x93\xab\x8d\x80V\xcdV\xe0\t\xcdo\xc2\xa5\xd8ksM\r\xe27N\xae'
         ).decode('utf-8')
         decrypted = (aes_decrypt_text(encrypted, password, 16))
         self.assertEqual(decrypted, self.secret_msg)
 
         password = intlist_to_bytes(self.key).decode('utf-8')
         encrypted = base64.b64encode(
-            intlist_to_bytes(self.iv[:8])
+            intlist_to_bytes(self.iv[:8]) +
-            + b'\x0b\xe6\xa4\xd9z\x0e\xb8\xb9\xd0\xd4i_\x85\x1d\x99\x98_\xe5\x80\xe7.\xbf\xa5\x83'
+            b'\x0b\xe6\xa4\xd9z\x0e\xb8\xb9\xd0\xd4i_\x85\x1d\x99\x98_\xe5\x80\xe7.\xbf\xa5\x83'
         ).decode('utf-8')
         decrypted = (aes_decrypt_text(encrypted, password, 32))
         self.assertEqual(decrypted, self.secret_msg)

test/test_all_urls.py

@@ -31,17 +31,16 @@ class TestAllURLsMatching(unittest.TestCase):
 
     def test_youtube_playlist_matching(self):
         assertPlaylist = lambda url: self.assertMatch(url, ['youtube:playlist'])
-        assertTab = lambda url: self.assertMatch(url, ['youtube:tab'])
         assertPlaylist('ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
         assertPlaylist('UUBABnxM4Ar9ten8Mdjj1j0Q')  # 585
         assertPlaylist('PL63F0C78739B09958')
-        assertTab('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')
+        assertPlaylist('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')
-        assertTab('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
+        assertPlaylist('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
-        assertTab('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
+        assertPlaylist('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
-        assertTab('https://www.youtube.com/watch?v=AV6J6_AeFEQ&playnext=1&list=PL4023E734DA416012')  # 668
+        assertPlaylist('https://www.youtube.com/watch?v=AV6J6_AeFEQ&playnext=1&list=PL4023E734DA416012')  # 668
         self.assertFalse('youtube:playlist' in self.matching_ies('PLtS2H6bU1M'))
         # Top tracks
-        assertTab('https://www.youtube.com/playlist?list=MCUS.20142101')
+        assertPlaylist('https://www.youtube.com/playlist?list=MCUS.20142101')
 
     def test_youtube_matching(self):
         self.assertTrue(YoutubeIE.suitable('PLtS2H6bU1M'))
@@ -52,23 +51,35 @@ class TestAllURLsMatching(unittest.TestCase):
         self.assertMatch('http://www.cleanvideosearch.com/media/action/yt/watch?videoId=8v_4O44sfjM', ['youtube'])
 
     def test_youtube_channel_matching(self):
-        assertChannel = lambda url: self.assertMatch(url, ['youtube:tab'])
+        assertChannel = lambda url: self.assertMatch(url, ['youtube:channel'])
         assertChannel('https://www.youtube.com/channel/HCtnHdj3df7iM')
         assertChannel('https://www.youtube.com/channel/HCtnHdj3df7iM?feature=gb_ch_rec')
         assertChannel('https://www.youtube.com/channel/HCtnHdj3df7iM/videos')
 
     def test_youtube_user_matching(self):
-        self.assertMatch('http://www.youtube.com/NASAgovVideo/videos', ['youtube:tab'])
+        self.assertMatch('http://www.youtube.com/NASAgovVideo/videos', ['youtube:user'])
 
     def test_youtube_feeds(self):
-        self.assertMatch('https://www.youtube.com/feed/library', ['youtube:tab'])
+        self.assertMatch('https://www.youtube.com/feed/watch_later', ['youtube:watchlater'])
-        self.assertMatch('https://www.youtube.com/feed/history', ['youtube:tab'])
+        self.assertMatch('https://www.youtube.com/feed/subscriptions', ['youtube:subscriptions'])
-        self.assertMatch('https://www.youtube.com/feed/watch_later', ['youtube:tab'])
+        self.assertMatch('https://www.youtube.com/feed/recommended', ['youtube:recommended'])
-        self.assertMatch('https://www.youtube.com/feed/subscriptions', ['youtube:tab'])
+        self.assertMatch('https://www.youtube.com/my_favorites', ['youtube:favorites'])
 
-    # def test_youtube_search_matching(self):
+    def test_youtube_show_matching(self):
-    #     self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
+        self.assertMatch('http://www.youtube.com/show/airdisasters', ['youtube:show'])
-    #     self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+
+    def test_youtube_search_matching(self):
+        self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
+        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+
+    def test_youtube_extract(self):
+        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
+        assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
+        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
 
     def test_facebook_matching(self):
         self.assertTrue(FacebookIE.suitable('https://www.facebook.com/Shiniknoh#!/photo.php?v=10153317450565268'))
@@ -112,6 +123,12 @@ class TestAllURLsMatching(unittest.TestCase):
         self.assertMatch('http://video.pbs.org/viralplayer/2365173446/', ['pbs'])
         self.assertMatch('http://video.pbs.org/widget/partnerplayer/980042464/', ['pbs'])
 
+    def test_yahoo_https(self):
+        # https://github.com/ytdl-org/youtube-dl/issues/2701
+        self.assertMatch(
+            'https://screen.yahoo.com/smartwatches-latest-wearable-gadgets-163745379-cbs.html',
+            ['Yahoo'])
+
     def test_no_duplicated_ie_names(self):
         name_accu = collections.defaultdict(list)
         for ie in self.ies:

test/test_execution.py

@@ -39,16 +39,6 @@ class TestExecution(unittest.TestCase):
         _, stderr = p.communicate()
         self.assertFalse(stderr)
 
-    def test_lazy_extractors(self):
-        try:
-            subprocess.check_call([sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dl/extractor/lazy_extractors.py'], cwd=rootDir, stdout=_DEV_NULL)
-            subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=_DEV_NULL)
-        finally:
-            try:
-                os.remove('youtube_dl/extractor/lazy_extractors.py')
-            except (IOError, OSError):
-                pass
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_subtitles.py

@@ -26,6 +26,7 @@ from youtube_dl.extractor import (
     ThePlatformIE,
     ThePlatformFeedIE,
     RTVEALaCartaIE,
+    FunnyOrDieIE,
     DemocracynowIE,
 )
 
@@ -258,24 +259,16 @@ class TestNRKSubtitles(BaseTestSubtitles):
 
 
 class TestRaiPlaySubtitles(BaseTestSubtitles):
+    url = 'http://www.raiplay.it/video/2014/04/Report-del-07042014-cb27157f-9dd0-4aee-b788-b1f67643a391.html'
     IE = RaiPlayIE
 
-    def test_subtitles_key(self):
+    def test_allsubtitles(self):
-        self.url = 'http://www.raiplay.it/video/2014/04/Report-del-07042014-cb27157f-9dd0-4aee-b788-b1f67643a391.html'
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['it']))
         self.assertEqual(md5(subtitles['it']), 'b1d90a98755126b61e667567a1f6680a')
 
-    def test_subtitles_array_key(self):
-        self.url = 'https://www.raiplay.it/video/2020/12/Report---04-01-2021-2e90f1de-8eee-4de4-ac0e-78d21db5b600.html'
-        self.DL.params['writesubtitles'] = True
-        self.DL.params['allsubtitles'] = True
-        subtitles = self.getSubtitles()
-        self.assertEqual(set(subtitles.keys()), set(['it']))
-        self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
-
 
 class TestVikiSubtitles(BaseTestSubtitles):
     url = 'http://www.viki.com/videos/1060846v-punch-episode-18'
@@ -329,6 +322,18 @@ class TestRtveSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['es']), '69e70cae2d40574fb7316f31d6eb7fca')
 
 
+class TestFunnyOrDieSubtitles(BaseTestSubtitles):
+    url = 'http://www.funnyordie.com/videos/224829ff6d/judd-apatow-will-direct-your-vine'
+    IE = FunnyOrDieIE
+
+    def test_allsubtitles(self):
+        self.DL.params['writesubtitles'] = True
+        self.DL.params['allsubtitles'] = True
+        subtitles = self.getSubtitles()
+        self.assertEqual(set(subtitles.keys()), set(['en']))
+        self.assertEqual(md5(subtitles['en']), 'c5593c193eacd353596c11c2d4f9ecc4')
+
+
 class TestDemocracynowSubtitles(BaseTestSubtitles):
     url = 'http://www.democracynow.org/shows/2015/7/3'
     IE = DemocracynowIE

test/test_swfinterp.py

@@ -34,8 +34,8 @@ def _make_testfunc(testfile):
     def test_func(self):
         as_file = os.path.join(TEST_DIR, testfile)
         swf_file = os.path.join(TEST_DIR, test_id + '.swf')
-        if ((not os.path.exists(swf_file))
+        if ((not os.path.exists(swf_file)) or
-                or os.path.getmtime(swf_file) < os.path.getmtime(as_file)):
+                os.path.getmtime(swf_file) < os.path.getmtime(as_file)):
             # Recompile
             try:
                 subprocess.check_call([

test/test_utils.py

@@ -19,9 +19,7 @@ from youtube_dl.utils import (
     age_restricted,
     args_to_str,
     encode_base_n,
-    caesar,
     clean_html,
-    clean_podcast_url,
     date_from_str,
     DateRange,
     detect_exe_version,
@@ -71,13 +69,10 @@ from youtube_dl.utils import (
     remove_start,
     remove_end,
     remove_quotes,
-    rot47,
     shell_quote,
     smuggle_url,
     str_to_int,
     strip_jsonp,
-    strip_or_none,
-    subtitles_filename,
     timeconvert,
     unescapeHTML,
     unified_strdate,
@@ -188,7 +183,7 @@ class TestUtil(unittest.TestCase):
 
         self.assertEqual(sanitize_filename(
             'ÂÃÄÀÁÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖŐØŒÙÚÛÜŰÝÞßàáâãäåæçèéêëìíîïðñòóôõöőøœùúûüűýþÿ', restricted=True),
-            'AAAAAAAECEEEEIIIIDNOOOOOOOOEUUUUUYTHssaaaaaaaeceeeeiiiionooooooooeuuuuuythy')
+            'AAAAAAAECEEEEIIIIDNOOOOOOOOEUUUUUYPssaaaaaaaeceeeeiiiionooooooooeuuuuuypy')
 
     def test_sanitize_ids(self):
         self.assertEqual(sanitize_filename('_n_cd26wFpw', is_id=True), '_n_cd26wFpw')
@@ -265,11 +260,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(replace_extension('.abc', 'temp'), '.abc.temp')
         self.assertEqual(replace_extension('.abc.ext', 'temp'), '.abc.temp')
 
-    def test_subtitles_filename(self):
-        self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')
-        self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')
-        self.assertEqual(subtitles_filename('abc.unexpected_ext', 'en', 'vtt', 'ext'), 'abc.unexpected_ext.en.vtt')
-
     def test_remove_start(self):
         self.assertEqual(remove_start(None, 'A - '), None)
         self.assertEqual(remove_start('A - B', 'A - '), 'B')
@@ -343,8 +333,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unified_strdate('July 15th, 2013'), '20130715')
         self.assertEqual(unified_strdate('September 1st, 2013'), '20130901')
         self.assertEqual(unified_strdate('Sep 2nd, 2013'), '20130902')
-        self.assertEqual(unified_strdate('November 3rd, 2019'), '20191103')
-        self.assertEqual(unified_strdate('October 23rd, 2005'), '20051023')
 
     def test_unified_timestamps(self):
         self.assertEqual(unified_timestamp('December 21, 2010'), 1292889600)
@@ -500,12 +488,6 @@ class TestUtil(unittest.TestCase):
     def test_str_to_int(self):
         self.assertEqual(str_to_int('123,456'), 123456)
         self.assertEqual(str_to_int('123.456'), 123456)
-        self.assertEqual(str_to_int(523), 523)
-        # Python 3 has no long
-        if sys.version_info < (3, 0):
-            eval('self.assertEqual(str_to_int(123456L), 123456)')
-        self.assertEqual(str_to_int('noninteger'), None)
-        self.assertEqual(str_to_int([]), None)
 
     def test_url_basename(self):
         self.assertEqual(url_basename('http://foo.de/'), '')
@@ -555,11 +537,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(url_or_none('http$://foo.de'), None)
         self.assertEqual(url_or_none('http://foo.de'), 'http://foo.de')
         self.assertEqual(url_or_none('//foo.de'), '//foo.de')
-        self.assertEqual(url_or_none('s3://foo.de'), None)
-        self.assertEqual(url_or_none('rtmpte://foo.de'), 'rtmpte://foo.de')
-        self.assertEqual(url_or_none('mms://foo.de'), 'mms://foo.de')
-        self.assertEqual(url_or_none('rtspu://foo.de'), 'rtspu://foo.de')
-        self.assertEqual(url_or_none('ftps://foo.de'), 'ftps://foo.de')
 
     def test_parse_age_limit(self):
         self.assertEqual(parse_age_limit(None), None)
@@ -775,18 +752,6 @@ class TestUtil(unittest.TestCase):
         d = json.loads(stripped)
         self.assertEqual(d, {'status': 'success'})
 
-    def test_strip_or_none(self):
-        self.assertEqual(strip_or_none(' abc'), 'abc')
-        self.assertEqual(strip_or_none('abc '), 'abc')
-        self.assertEqual(strip_or_none(' abc '), 'abc')
-        self.assertEqual(strip_or_none('\tabc\t'), 'abc')
-        self.assertEqual(strip_or_none('\n\tabc\n\t'), 'abc')
-        self.assertEqual(strip_or_none('abc'), 'abc')
-        self.assertEqual(strip_or_none(''), '')
-        self.assertEqual(strip_or_none(None), None)
-        self.assertEqual(strip_or_none(42), None)
-        self.assertEqual(strip_or_none([]), None)
-
     def test_uppercase_escape(self):
         self.assertEqual(uppercase_escape('aä'), 'aä')
         self.assertEqual(uppercase_escape('\\U0001d550'), '𝕐')
@@ -809,8 +774,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(mimetype2ext('text/vtt'), 'vtt')
         self.assertEqual(mimetype2ext('text/vtt;charset=utf-8'), 'vtt')
         self.assertEqual(mimetype2ext('text/html; charset=utf-8'), 'html')
-        self.assertEqual(mimetype2ext('audio/x-wav'), 'wav')
-        self.assertEqual(mimetype2ext('audio/x-wav;codec=pcm'), 'wav')
 
     def test_month_by_name(self):
         self.assertEqual(month_by_name(None), None)
@@ -846,15 +809,6 @@ class TestUtil(unittest.TestCase):
             'vcodec': 'av01.0.05M.08',
             'acodec': 'none',
         })
-        self.assertEqual(parse_codecs('theora, vorbis'), {
-            'vcodec': 'theora',
-            'acodec': 'vorbis',
-        })
-        self.assertEqual(parse_codecs('unknownvcodec, unknownacodec'), {
-            'vcodec': 'unknownvcodec',
-            'acodec': 'unknownacodec',
-        })
-        self.assertEqual(parse_codecs('unknown'), {})
 
     def test_escape_rfc3986(self):
         reserved = "!*'();:@&=+$,/?#[]"
@@ -943,28 +897,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(d['x'], 1)
         self.assertEqual(d['y'], 'a')
 
-        # Just drop ! prefix for now though this results in a wrong value
-        on = js_to_json('''{
-            a: !0,
-            b: !1,
-            c: !!0,
-            d: !!42.42,
-            e: !!![],
-            f: !"abc",
-            g: !"",
-            !42: 42
-        }''')
-        self.assertEqual(json.loads(on), {
-            'a': 0,
-            'b': 1,
-            'c': 0,
-            'd': 42.42,
-            'e': [],
-            'f': "abc",
-            'g': "",
-            '42': 42
-        })
-
         on = js_to_json('["abc", "def",]')
         self.assertEqual(json.loads(on), ['abc', 'def'])
 
@@ -1022,12 +954,6 @@ class TestUtil(unittest.TestCase):
         on = js_to_json('{42:4.2e1}')
         self.assertEqual(json.loads(on), {'42': 42.0})
 
-        on = js_to_json('{ "0x40": "0x40" }')
-        self.assertEqual(json.loads(on), {'0x40': '0x40'})
-
-        on = js_to_json('{ "040": "040" }')
-        self.assertEqual(json.loads(on), {'040': '040'})
-
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
@@ -1413,20 +1339,6 @@ Line 1
         self.assertRaises(ValueError, encode_base_n, 0, 70)
         self.assertRaises(ValueError, encode_base_n, 0, 60, custom_table)
 
-    def test_caesar(self):
-        self.assertEqual(caesar('ace', 'abcdef', 2), 'cea')
-        self.assertEqual(caesar('cea', 'abcdef', -2), 'ace')
-        self.assertEqual(caesar('ace', 'abcdef', -2), 'eac')
-        self.assertEqual(caesar('eac', 'abcdef', 2), 'ace')
-        self.assertEqual(caesar('ace', 'abcdef', 0), 'ace')
-        self.assertEqual(caesar('xyz', 'abcdef', 2), 'xyz')
-        self.assertEqual(caesar('abc', 'acegik', 2), 'ebg')
-        self.assertEqual(caesar('ebg', 'acegik', -2), 'abc')
-
-    def test_rot47(self):
-        self.assertEqual(rot47('youtube-dl'), r'J@FEF36\5=')
-        self.assertEqual(rot47('YOUTUBE-DL'), r'*~&%&qt\s{')
-
     def test_urshift(self):
         self.assertEqual(urshift(3, 1), 1)
         self.assertEqual(urshift(-3, 1), 2147483646)
@@ -1471,10 +1383,6 @@ Line 1
         self.assertEqual(get_elements_by_attribute('class', 'foo', html), [])
         self.assertEqual(get_elements_by_attribute('class', 'no-such-foo', html), [])
 
-    def test_clean_podcast_url(self):
-        self.assertEqual(clean_podcast_url('https://www.podtrac.com/pts/redirect.mp3/chtbl.com/track/5899E/traffic.megaphone.fm/HSW7835899191.mp3'), 'https://traffic.megaphone.fm/HSW7835899191.mp3')
-        self.assertEqual(clean_podcast_url('https://play.podtrac.com/npr-344098539/edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3'), 'https://edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_youtube_chapters.py

@@ -0,0 +1,275 @@
+#!/usr/bin/env python
+# coding: utf-8
+from __future__ import unicode_literals
+
+# Allow direct execution
+import os
+import sys
+import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from test.helper import expect_value
+from youtube_dl.extractor import YoutubeIE
+
+
+class TestYoutubeChapters(unittest.TestCase):
+
+    _TEST_CASES = [
+        (
+            # https://www.youtube.com/watch?v=A22oy8dFjqc
+            # pattern: 00:00 - <title>
+            '''This is the absolute ULTIMATE experience of Queen's set at LIVE AID, this is the best video mixed to the absolutely superior stereo radio broadcast. This vastly superior audio mix takes a huge dump on all of the official mixes. Best viewed in 1080p. ENJOY! ***MAKE SURE TO READ THE DESCRIPTION***<br /><a href="#" onclick="yt.www.watch.player.seekTo(00*60+36);return false;">00:36</a> - Bohemian Rhapsody<br /><a href="#" onclick="yt.www.watch.player.seekTo(02*60+42);return false;">02:42</a> - Radio Ga Ga<br /><a href="#" onclick="yt.www.watch.player.seekTo(06*60+53);return false;">06:53</a> - Ay Oh!<br /><a href="#" onclick="yt.www.watch.player.seekTo(07*60+34);return false;">07:34</a> - Hammer To Fall<br /><a href="#" onclick="yt.www.watch.player.seekTo(12*60+08);return false;">12:08</a> - Crazy Little Thing Called Love<br /><a href="#" onclick="yt.www.watch.player.seekTo(16*60+03);return false;">16:03</a> - We Will Rock You<br /><a href="#" onclick="yt.www.watch.player.seekTo(17*60+18);return false;">17:18</a> - We Are The Champions<br /><a href="#" onclick="yt.www.watch.player.seekTo(21*60+12);return false;">21:12</a> - Is This The World We Created...?<br /><br />Short song analysis:<br /><br />- "Bohemian Rhapsody": Although it's a short medley version, it's one of the best performances of the ballad section, with Freddie nailing the Bb4s with the correct studio phrasing (for the first time ever!).<br /><br />- "Radio Ga Ga": Although it's missing one chorus, this is one of - if not the best - the best versions ever, Freddie nails all the Bb4s and sounds very clean! Spike Edney's Roland Jupiter 8 also really shines through on this mix, compared to the DVD releases!<br /><br />- "Audience Improv": A great improv, Freddie sounds strong and confident. You gotta love when he sustains that A4 for 4 seconds!<br /><br />- "Hammer To Fall": Despite missing a verse and a chorus, it's a strong version (possibly the best ever). Freddie sings the song amazingly, and even ad-libs a C#5 and a C5! Also notice how heavy Brian's guitar sounds compared to the thin DVD mixes - it roars!<br /><br />- "Crazy Little Thing Called Love": A great version, the crowd loves the song, the jam is great as well! Only downside to this is the slight feedback issues.<br /><br />- "We Will Rock You": Although cut down to the 1st verse and chorus, Freddie sounds strong. He nails the A4, and the solo from Dr. May is brilliant!<br /><br />- "We Are the Champions": Perhaps the high-light of the performance - Freddie is very daring on this version, he sustains the pre-chorus Bb4s, nails the 1st C5, belts great A4s, but most importantly: He nails the chorus Bb4s, in all 3 choruses! This is the only time he has ever done so! It has to be said though, the last one sounds a bit rough, but that's a side effect of belting high notes for the past 18 minutes, with nodules AND laryngitis!<br /><br />- "Is This The World We Created... ?": Freddie and Brian perform a beautiful version of this, and it is one of the best versions ever. It's both sad and hilarious that a couple of BBC engineers are talking over the song, one of them being completely oblivious of the fact that he is interrupting the performance, on live television... Which was being televised to almost 2 billion homes.<br /><br /><br />All rights go to their respective owners!<br />-----Copyright Disclaimer Under Section 107 of the Copyright Act 1976, allowance is made for fair use for purposes such as criticism, comment, news reporting, teaching, scholarship, and research. Fair use is a use permitted by copyright statute that might otherwise be infringing. Non-profit, educational or personal use tips the balance in favor of fair use''',
+            1477,
+            [{
+                'start_time': 36,
+                'end_time': 162,
+                'title': 'Bohemian Rhapsody',
+            }, {
+                'start_time': 162,
+                'end_time': 413,
+                'title': 'Radio Ga Ga',
+            }, {
+                'start_time': 413,
+                'end_time': 454,
+                'title': 'Ay Oh!',
+            }, {
+                'start_time': 454,
+                'end_time': 728,
+                'title': 'Hammer To Fall',
+            }, {
+                'start_time': 728,
+                'end_time': 963,
+                'title': 'Crazy Little Thing Called Love',
+            }, {
+                'start_time': 963,
+                'end_time': 1038,
+                'title': 'We Will Rock You',
+            }, {
+                'start_time': 1038,
+                'end_time': 1272,
+                'title': 'We Are The Champions',
+            }, {
+                'start_time': 1272,
+                'end_time': 1477,
+                'title': 'Is This The World We Created...?',
+            }]
+        ),
+        (
+            # https://www.youtube.com/watch?v=ekYlRhALiRQ
+            # pattern: <num>. <title> 0:00
+            '1.  Those Beaten Paths of Confusion <a href="#" onclick="yt.www.watch.player.seekTo(0*60+00);return false;">0:00</a><br />2.  Beyond the Shadows of Emptiness & Nothingness <a href="#" onclick="yt.www.watch.player.seekTo(11*60+47);return false;">11:47</a><br />3.  Poison Yourself...With Thought <a href="#" onclick="yt.www.watch.player.seekTo(26*60+30);return false;">26:30</a><br />4.  The Agents of Transformation <a href="#" onclick="yt.www.watch.player.seekTo(35*60+57);return false;">35:57</a><br />5.  Drowning in the Pain of Consciousness <a href="#" onclick="yt.www.watch.player.seekTo(44*60+32);return false;">44:32</a><br />6.  Deny the Disease of Life <a href="#" onclick="yt.www.watch.player.seekTo(53*60+07);return false;">53:07</a><br /><br />More info/Buy: http://crepusculonegro.storenvy.com/products/257645-cn-03-arizmenda-within-the-vacuum-of-infinity<br /><br />No copyright is intended. The rights to this video are assumed by the owner and its affiliates.',
+            4009,
+            [{
+                'start_time': 0,
+                'end_time': 707,
+                'title': '1. Those Beaten Paths of Confusion',
+            }, {
+                'start_time': 707,
+                'end_time': 1590,
+                'title': '2. Beyond the Shadows of Emptiness & Nothingness',
+            }, {
+                'start_time': 1590,
+                'end_time': 2157,
+                'title': '3. Poison Yourself...With Thought',
+            }, {
+                'start_time': 2157,
+                'end_time': 2672,
+                'title': '4. The Agents of Transformation',
+            }, {
+                'start_time': 2672,
+                'end_time': 3187,
+                'title': '5. Drowning in the Pain of Consciousness',
+            }, {
+                'start_time': 3187,
+                'end_time': 4009,
+                'title': '6. Deny the Disease of Life',
+            }]
+        ),
+        (
+            # https://www.youtube.com/watch?v=WjL4pSzog9w
+            # pattern: 00:00 <title>
+            '<a href="https://arizmenda.bandcamp.com/merch/despairs-depths-descended-cd" class="yt-uix-servicelink  " data-target-new-window="True" data-servicelink="CDAQ6TgYACITCNf1raqT2dMCFdRjGAod_o0CBSj4HQ" data-url="https://arizmenda.bandcamp.com/merch/despairs-depths-descended-cd" rel="nofollow noopener" target="_blank">https://arizmenda.bandcamp.com/merch/...</a><br /><br /><a href="#" onclick="yt.www.watch.player.seekTo(00*60+00);return false;">00:00</a> Christening Unborn Deformities <br /><a href="#" onclick="yt.www.watch.player.seekTo(07*60+08);return false;">07:08</a> Taste of Purity<br /><a href="#" onclick="yt.www.watch.player.seekTo(16*60+16);return false;">16:16</a> Sculpting Sins of a Universal Tongue<br /><a href="#" onclick="yt.www.watch.player.seekTo(24*60+45);return false;">24:45</a> Birth<br /><a href="#" onclick="yt.www.watch.player.seekTo(31*60+24);return false;">31:24</a> Neves<br /><a href="#" onclick="yt.www.watch.player.seekTo(37*60+55);return false;">37:55</a> Libations in Limbo',
+            2705,
+            [{
+                'start_time': 0,
+                'end_time': 428,
+                'title': 'Christening Unborn Deformities',
+            }, {
+                'start_time': 428,
+                'end_time': 976,
+                'title': 'Taste of Purity',
+            }, {
+                'start_time': 976,
+                'end_time': 1485,
+                'title': 'Sculpting Sins of a Universal Tongue',
+            }, {
+                'start_time': 1485,
+                'end_time': 1884,
+                'title': 'Birth',
+            }, {
+                'start_time': 1884,
+                'end_time': 2275,
+                'title': 'Neves',
+            }, {
+                'start_time': 2275,
+                'end_time': 2705,
+                'title': 'Libations in Limbo',
+            }]
+        ),
+        (
+            # https://www.youtube.com/watch?v=o3r1sn-t3is
+            # pattern: <title> 00:00 <note>
+            'Download this show in MP3: <a href="http://sh.st/njZKK" class="yt-uix-servicelink  " data-url="http://sh.st/njZKK" data-target-new-window="True" data-servicelink="CDAQ6TgYACITCK3j8_6o2dMCFVDCGAoduVAKKij4HQ" rel="nofollow noopener" target="_blank">http://sh.st/njZKK</a><br /><br />Setlist:<br />I-E-A-I-A-I-O <a href="#" onclick="yt.www.watch.player.seekTo(00*60+45);return false;">00:45</a><br />Suite-Pee <a href="#" onclick="yt.www.watch.player.seekTo(4*60+26);return false;">4:26</a>  (Incomplete)<br />Attack <a href="#" onclick="yt.www.watch.player.seekTo(5*60+31);return false;">5:31</a> (First live performance since 2011)<br />Prison Song <a href="#" onclick="yt.www.watch.player.seekTo(8*60+42);return false;">8:42</a><br />Know <a href="#" onclick="yt.www.watch.player.seekTo(12*60+32);return false;">12:32</a> (First live performance since 2011)<br />Aerials <a href="#" onclick="yt.www.watch.player.seekTo(15*60+32);return false;">15:32</a><br />Soldier Side - Intro <a href="#" onclick="yt.www.watch.player.seekTo(19*60+13);return false;">19:13</a><br />B.Y.O.B. <a href="#" onclick="yt.www.watch.player.seekTo(20*60+09);return false;">20:09</a><br />Soil <a href="#" onclick="yt.www.watch.player.seekTo(24*60+32);return false;">24:32</a><br />Darts <a href="#" onclick="yt.www.watch.player.seekTo(27*60+48);return false;">27:48</a><br />Radio/Video <a href="#" onclick="yt.www.watch.player.seekTo(30*60+38);return false;">30:38</a><br />Hypnotize <a href="#" onclick="yt.www.watch.player.seekTo(35*60+05);return false;">35:05</a><br />Temper <a href="#" onclick="yt.www.watch.player.seekTo(38*60+08);return false;">38:08</a> (First live performance since 1999)<br />CUBErt <a href="#" onclick="yt.www.watch.player.seekTo(41*60+00);return false;">41:00</a><br />Needles <a href="#" onclick="yt.www.watch.player.seekTo(42*60+57);return false;">42:57</a><br />Deer Dance <a href="#" onclick="yt.www.watch.player.seekTo(46*60+27);return false;">46:27</a><br />Bounce <a href="#" onclick="yt.www.watch.player.seekTo(49*60+38);return false;">49:38</a><br />Suggestions <a href="#" onclick="yt.www.watch.player.seekTo(51*60+25);return false;">51:25</a><br />Psycho <a href="#" onclick="yt.www.watch.player.seekTo(53*60+52);return false;">53:52</a><br />Chop Suey! <a href="#" onclick="yt.www.watch.player.seekTo(58*60+13);return false;">58:13</a><br />Lonely Day <a href="#" onclick="yt.www.watch.player.seekTo(1*3600+01*60+15);return false;">1:01:15</a><br />Question! <a href="#" onclick="yt.www.watch.player.seekTo(1*3600+04*60+14);return false;">1:04:14</a><br />Lost in Hollywood <a href="#" onclick="yt.www.watch.player.seekTo(1*3600+08*60+10);return false;">1:08:10</a><br />Vicinity of Obscenity  <a href="#" onclick="yt.www.watch.player.seekTo(1*3600+13*60+40);return false;">1:13:40</a>(First live performance since 2012)<br />Forest <a href="#" onclick="yt.www.watch.player.seekTo(1*3600+16*60+17);return false;">1:16:17</a><br />Cigaro <a href="#" onclick="yt.www.watch.player.seekTo(1*3600+20*60+02);return false;">1:20:02</a><br />Toxicity <a href="#" onclick="yt.www.watch.player.seekTo(1*3600+23*60+57);return false;">1:23:57</a>(with Chino Moreno)<br />Sugar <a href="#" onclick="yt.www.watch.player.seekTo(1*3600+27*60+53);return false;">1:27:53</a>',
+            5640,
+            [{
+                'start_time': 45,
+                'end_time': 266,
+                'title': 'I-E-A-I-A-I-O',
+            }, {
+                'start_time': 266,
+                'end_time': 331,
+                'title': 'Suite-Pee (Incomplete)',
+            }, {
+                'start_time': 331,
+                'end_time': 522,
+                'title': 'Attack (First live performance since 2011)',
+            }, {
+                'start_time': 522,
+                'end_time': 752,
+                'title': 'Prison Song',
+            }, {
+                'start_time': 752,
+                'end_time': 932,
+                'title': 'Know (First live performance since 2011)',
+            }, {
+                'start_time': 932,
+                'end_time': 1153,
+                'title': 'Aerials',
+            }, {
+                'start_time': 1153,
+                'end_time': 1209,
+                'title': 'Soldier Side - Intro',
+            }, {
+                'start_time': 1209,
+                'end_time': 1472,
+                'title': 'B.Y.O.B.',
+            }, {
+                'start_time': 1472,
+                'end_time': 1668,
+                'title': 'Soil',
+            }, {
+                'start_time': 1668,
+                'end_time': 1838,
+                'title': 'Darts',
+            }, {
+                'start_time': 1838,
+                'end_time': 2105,
+                'title': 'Radio/Video',
+            }, {
+                'start_time': 2105,
+                'end_time': 2288,
+                'title': 'Hypnotize',
+            }, {
+                'start_time': 2288,
+                'end_time': 2460,
+                'title': 'Temper (First live performance since 1999)',
+            }, {
+                'start_time': 2460,
+                'end_time': 2577,
+                'title': 'CUBErt',
+            }, {
+                'start_time': 2577,
+                'end_time': 2787,
+                'title': 'Needles',
+            }, {
+                'start_time': 2787,
+                'end_time': 2978,
+                'title': 'Deer Dance',
+            }, {
+                'start_time': 2978,
+                'end_time': 3085,
+                'title': 'Bounce',
+            }, {
+                'start_time': 3085,
+                'end_time': 3232,
+                'title': 'Suggestions',
+            }, {
+                'start_time': 3232,
+                'end_time': 3493,
+                'title': 'Psycho',
+            }, {
+                'start_time': 3493,
+                'end_time': 3675,
+                'title': 'Chop Suey!',
+            }, {
+                'start_time': 3675,
+                'end_time': 3854,
+                'title': 'Lonely Day',
+            }, {
+                'start_time': 3854,
+                'end_time': 4090,
+                'title': 'Question!',
+            }, {
+                'start_time': 4090,
+                'end_time': 4420,
+                'title': 'Lost in Hollywood',
+            }, {
+                'start_time': 4420,
+                'end_time': 4577,
+                'title': 'Vicinity of Obscenity (First live performance since 2012)',
+            }, {
+                'start_time': 4577,
+                'end_time': 4802,
+                'title': 'Forest',
+            }, {
+                'start_time': 4802,
+                'end_time': 5037,
+                'title': 'Cigaro',
+            }, {
+                'start_time': 5037,
+                'end_time': 5273,
+                'title': 'Toxicity (with Chino Moreno)',
+            }, {
+                'start_time': 5273,
+                'end_time': 5640,
+                'title': 'Sugar',
+            }]
+        ),
+        (
+            # https://www.youtube.com/watch?v=PkYLQbsqCE8
+            # pattern: <num> - <title> [<latinized title>] 0:00:00
+            '''Затемно (Zatemno) is an Obscure Black Metal Band from Russia.<br /><br />"Во прах (Vo prakh)'' Into The Ashes", Debut mini-album released may 6, 2016, by Death Knell Productions<br />Released on 6 panel digipak CD, limited to 100 copies only<br />And digital format on Bandcamp<br /><br />Tracklist<br /><br />1 - Во прах [Vo prakh] <a href="#" onclick="yt.www.watch.player.seekTo(0*3600+00*60+00);return false;">0:00:00</a><br />2 - Искупление [Iskupleniye] <a href="#" onclick="yt.www.watch.player.seekTo(0*3600+08*60+10);return false;">0:08:10</a><br />3 - Из серпов луны...[Iz serpov luny] <a href="#" onclick="yt.www.watch.player.seekTo(0*3600+14*60+30);return false;">0:14:30</a><br /><br />Links:<br /><a href="https://deathknellprod.bandcamp.com/album/--2" class="yt-uix-servicelink  " data-target-new-window="True" data-url="https://deathknellprod.bandcamp.com/album/--2" data-servicelink="CC8Q6TgYACITCNP234Kr2dMCFcNxGAodQqsIwSj4HQ" target="_blank" rel="nofollow noopener">https://deathknellprod.bandcamp.com/a...</a><br /><a href="https://www.facebook.com/DeathKnellProd/" class="yt-uix-servicelink  " data-target-new-window="True" data-url="https://www.facebook.com/DeathKnellProd/" data-servicelink="CC8Q6TgYACITCNP234Kr2dMCFcNxGAodQqsIwSj4HQ" target="_blank" rel="nofollow noopener">https://www.facebook.com/DeathKnellProd/</a><br /><br /><br />I don't have any right about this artifact, my only intention is to spread the music of the band, all rights are reserved to the Затемно (Zatemno) and his producers, Death Knell Productions.<br /><br />------------------------------------------------------------------<br /><br />Subscribe for more videos like this.<br />My link: <a href="https://web.facebook.com/AttackOfTheDragons" class="yt-uix-servicelink  " data-target-new-window="True" data-url="https://web.facebook.com/AttackOfTheDragons" data-servicelink="CC8Q6TgYACITCNP234Kr2dMCFcNxGAodQqsIwSj4HQ" target="_blank" rel="nofollow noopener">https://web.facebook.com/AttackOfTheD...</a>''',
+            1138,
+            [{
+                'start_time': 0,
+                'end_time': 490,
+                'title': '1 - Во прах [Vo prakh]',
+            }, {
+                'start_time': 490,
+                'end_time': 870,
+                'title': '2 - Искупление [Iskupleniye]',
+            }, {
+                'start_time': 870,
+                'end_time': 1138,
+                'title': '3 - Из серпов луны...[Iz serpov luny]',
+            }]
+        ),
+        (
+            # https://www.youtube.com/watch?v=xZW70zEasOk
+            # time point more than duration
+            '''● LCS Spring finals: Saturday and Sunday from <a href="#" onclick="yt.www.watch.player.seekTo(13*60+30);return false;">13:30</a> outside the venue! <br />● PAX East: Fri, Sat & Sun - more info in tomorrows video on the main channel!''',
+            283,
+            []
+        ),
+    ]
+
+    def test_youtube_chapters(self):
+        for description, duration, expected_chapters in self._TEST_CASES:
+            ie = YoutubeIE()
+            expect_value(
+                self, ie._extract_chapters(description, duration),
+                expected_chapters, None)
+
+
+if __name__ == '__main__':
+    unittest.main()

test/test_youtube_lists.py

@@ -12,7 +12,6 @@ from test.helper import FakeYDL
 
 from youtube_dl.extractor import (
     YoutubePlaylistIE,
-    YoutubeTabIE,
     YoutubeIE,
 )
 
@@ -58,22 +57,14 @@ class TestYoutubeLists(unittest.TestCase):
         entries = result['entries']
         self.assertEqual(len(entries), 100)
 
-    def test_youtube_flat_playlist_extraction(self):
+    def test_youtube_flat_playlist_titles(self):
         dl = FakeYDL()
         dl.params['extract_flat'] = True
-        ie = YoutubeTabIE(dl)
+        ie = YoutubePlaylistIE(dl)
-        result = ie.extract('https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc')
+        result = ie.extract('https://www.youtube.com/playlist?list=PL-KKIb8rvtMSrAO9YFbeM6UQrAqoFTUWv')
         self.assertIsPlaylist(result)
-        entries = list(result['entries'])
+        for entry in result['entries']:
-        self.assertTrue(len(entries) == 1)
+            self.assertTrue(entry.get('title'))
-        video = entries[0]
-        self.assertEqual(video['_type'], 'url_transparent')
-        self.assertEqual(video['ie_key'], 'Youtube')
-        self.assertEqual(video['id'], 'BaW_jenozKc')
-        self.assertEqual(video['url'], 'BaW_jenozKc')
-        self.assertEqual(video['title'], 'youtube-dl test video "\'/\\ä↭𝕐')
-        self.assertEqual(video['duration'], 10)
-        self.assertEqual(video['uploader'], 'Philipp Hagemeister')
 
 
 if __name__ == '__main__':

test/test_youtube_misc.py

@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import sys
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-from youtube_dl.extractor import YoutubeIE
-
-
-class TestYoutubeMisc(unittest.TestCase):
-    def test_youtube_extract(self):
-        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
-        assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
-        assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
-        assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
-        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
-        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
-        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_youtube_signature.py

@@ -19,74 +19,61 @@ from youtube_dl.compat import compat_str, compat_urlretrieve
 _TESTS = [
     (
         'https://s.ytimg.com/yts/jsbin/html5player-vflHOr_nV.js',
+        'js',
         86,
         '>=<;:/.-[+*)(\'&%$#"!ZYX0VUTSRQPONMLKJIHGFEDCBA\\yxwvutsrqponmlkjihgfedcba987654321',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-vfldJ8xgI.js',
+        'js',
         85,
         '3456789a0cdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS[UVWXYZ!"#$%&\'()*+,-./:;<=>?@',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-vfle-mVwz.js',
+        'js',
         90,
         ']\\[@?>=<;:/.-,+*)(\'&%$#"hZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjiagfedcb39876',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl0Cbn9e.js',
+        'js',
         84,
         'O1I3456789abcde0ghijklmnopqrstuvwxyzABCDEFGHfJKLMN2PQRSTUVW@YZ!"#$%&\'()*+,-./:;<=',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflXGBaUN.js',
+        'js',
         '2ACFC7A61CA478CD21425E5A57EBD73DDC78E22A.2094302436B2D377D14A3BBA23022D023B8BC25AA',
         'A52CB8B320D22032ABB3A41D773D2B6342034902.A22E87CDD37DBE75A5E52412DC874AC16A7CFCA2',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflBb0OQx.js',
+        'js',
         84,
         '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl9FYC6l.js',
+        'js',
         83,
         '123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflCGk6yw/html5player.js',
+        'js',
         '4646B5181C6C3020DF1D9C7FCFEA.AD80ABF70C39BD369CCCAE780AFBB98FA6B6CB42766249D9488C288',
         '82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js',
+        'js',
         '312AA52209E3623129A412D56A40F11CB0AF14AE.3EE09501CB14E3BCDC3B2AE808BF3F1D14E7FBF12',
         '112AA5220913623229A412D56A40F11CB0AF14AE.3EE0950FCB14EEBCDC3B2AE808BF331D14E7FBF3',
     )
 ]
 
 
-class TestPlayerInfo(unittest.TestCase):
-    def test_youtube_extract_player_info(self):
-        PLAYER_URLS = (
-            ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/en_US/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/fr_FR/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-de_DE.vflset/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-tablet-en_US.vflset/base.js', '64dddad9'),
-            # obsolete
-            ('https://www.youtube.com/yts/jsbin/player_ias-vfle4-e03/en_US/base.js', 'vfle4-e03'),
-            ('https://www.youtube.com/yts/jsbin/player_ias-vfl49f_g4/en_US/base.js', 'vfl49f_g4'),
-            ('https://www.youtube.com/yts/jsbin/player_ias-vflCPQUIL/en_US/base.js', 'vflCPQUIL'),
-            ('https://www.youtube.com/yts/jsbin/player-vflzQZbt7/en_US/base.js', 'vflzQZbt7'),
-            ('https://www.youtube.com/yts/jsbin/player-en_US-vflaxXRn1/base.js', 'vflaxXRn1'),
-            ('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflXGBaUN.js', 'vflXGBaUN'),
-            ('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js', 'vflKjOTVq'),
-        )
-        for player_url, expected_player_id in PLAYER_URLS:
-            player_id = YoutubeIE._extract_player_info(player_url)
-            self.assertEqual(player_id, expected_player_id)
-
-
 class TestSignature(unittest.TestCase):
     def setUp(self):
         TEST_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -95,13 +82,13 @@ class TestSignature(unittest.TestCase):
             os.mkdir(self.TESTDATA_DIR)
 
 
-def make_tfunc(url, sig_input, expected_sig):
+def make_tfunc(url, stype, sig_input, expected_sig):
     m = re.match(r'.*-([a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$', url)
     assert m, '%r should follow URL format' % url
     test_id = m.group(1)
 
     def test_func(self):
-        basename = 'player-%s.js' % test_id
+        basename = 'player-%s.%s' % (test_id, stype)
         fn = os.path.join(self.TESTDATA_DIR, basename)
 
         if not os.path.exists(fn):
@@ -109,16 +96,22 @@ def make_tfunc(url, sig_input, expected_sig):
 
         ydl = FakeYDL()
         ie = YoutubeIE(ydl)
-        with io.open(fn, encoding='utf-8') as testf:
+        if stype == 'js':
-            jscode = testf.read()
+            with io.open(fn, encoding='utf-8') as testf:
-        func = ie._parse_sig_js(jscode)
+                jscode = testf.read()
+            func = ie._parse_sig_js(jscode)
+        else:
+            assert stype == 'swf'
+            with open(fn, 'rb') as testf:
+                swfcode = testf.read()
+            func = ie._parse_sig_swf(swfcode)
         src_sig = (
             compat_str(string.printable[:sig_input])
             if isinstance(sig_input, int) else sig_input)
         got_sig = func(src_sig)
         self.assertEqual(got_sig, expected_sig)
 
-    test_func.__name__ = str('test_signature_js_' + test_id)
+    test_func.__name__ = str('test_signature_' + stype + '_' + test_id)
     setattr(TestSignature, test_func.__name__, test_func)
 
 

test/testdata/cookies/malformed_cookies.txt

@@ -1,9 +0,0 @@
-# Netscape HTTP Cookie File
-# http://curl.haxx.se/rfc/cookie_spec.html
-# This is a generated file!  Do not edit.
-
-# Cookie file entry with invalid number of fields - 6 instead of 7
-www.foobar.foobar	FALSE	/	FALSE	0	COOKIE
-
-# Cookie file entry with invalid expires at
-www.foobar.foobar	FALSE	/	FALSE	1.7976931348623157e+308	COOKIE	VALUE

youtube_dl/YoutubeDL.py

@@ -92,7 +92,6 @@ from .utils import (
     YoutubeDLCookieJar,
     YoutubeDLCookieProcessor,
     YoutubeDLHandler,
-    YoutubeDLRedirectHandler,
 )
 from .cache import Cache
 from .extractor import get_info_extractor, gen_extractor_classes, _LAZY_LOADER
@@ -163,7 +162,6 @@ class YoutubeDL(object):
     simulate:          Do not download the video files.
     format:            Video format code. See options.py for more information.
     outtmpl:           Template for output names.
-    outtmpl_na_placeholder: Placeholder for unavailable meta fields.
     restrictfilenames: Do not allow "&" and spaces in file names
     ignoreerrors:      Do not stop on download errors.
     force_generic_extractor: Force downloader to use the generic extractor
@@ -339,8 +337,6 @@ class YoutubeDL(object):
     _pps = []
     _download_retcode = None
     _num_downloads = None
-    _playlist_level = 0
-    _playlist_urls = set()
     _screen_file = None
 
     def __init__(self, params=None, auto_init=True):
@@ -404,9 +400,9 @@ class YoutubeDL(object):
                 else:
                     raise
 
-        if (sys.platform != 'win32'
+        if (sys.platform != 'win32' and
-                and sys.getfilesystemencoding() in ['ascii', 'ANSI_X3.4-1968']
+                sys.getfilesystemencoding() in ['ascii', 'ANSI_X3.4-1968'] and
-                and not params.get('restrictfilenames', False)):
+                not params.get('restrictfilenames', False)):
             # Unicode filesystem API will throw errors (#1474, #13027)
             self.report_warning(
                 'Assuming --restrict-filenames since file system encoding '
@@ -444,9 +440,9 @@ class YoutubeDL(object):
             if re.match(r'^-[0-9A-Za-z_-]{10}$', a)]
         if idxs:
             correct_argv = (
-                ['youtube-dl']
+                ['youtube-dl'] +
-                + [a for i, a in enumerate(argv) if i not in idxs]
+                [a for i, a in enumerate(argv) if i not in idxs] +
-                + ['--'] + [argv[i] for i in idxs]
+                ['--'] + [argv[i] for i in idxs]
             )
             self.report_warning(
                 'Long argument string detected. '
@@ -659,7 +655,7 @@ class YoutubeDL(object):
             template_dict = dict((k, v if isinstance(v, compat_numeric_types) else sanitize(k, v))
                                  for k, v in template_dict.items()
                                  if v is not None and not isinstance(v, (list, tuple, dict)))
-            template_dict = collections.defaultdict(lambda: self.params.get('outtmpl_na_placeholder', 'NA'), template_dict)
+            template_dict = collections.defaultdict(lambda: 'NA', template_dict)
 
             outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
 
@@ -679,8 +675,8 @@ class YoutubeDL(object):
 
             # Missing numeric fields used together with integer presentation types
             # in format specification will break the argument substitution since
-            # string NA placeholder is returned for missing fields. We will patch
+            # string 'NA' is returned for missing fields. We will patch output
-            # output template for missing fields to meet string presentation type.
+            # template for missing fields to meet string presentation type.
             for numeric_field in self._NUMERIC_FIELDS:
                 if numeric_field not in template_dict:
                     # As of [1] format syntax is:
@@ -773,20 +769,11 @@ class YoutubeDL(object):
 
     def extract_info(self, url, download=True, ie_key=None, extra_info={},
                      process=True, force_generic_extractor=False):
-        """
+        '''
-        Return a list with a dictionary for each video extracted.
+        Returns a list with a dictionary for each video we find.
-
+        If 'download', also downloads the videos.
-        Arguments:
+        extra_info is a dict containing the extra values to add to each result
-        url -- URL to extract
+        '''
-
-        Keyword arguments:
-        download -- whether to download videos during extraction
-        ie_key -- extractor key hint
-        extra_info -- dictionary containing the extra values to add to each result
-        process -- whether to resolve all unresolved references (URLs, playlist items),
-            must be True for download to work.
-        force_generic_extractor -- force using the generic extractor
-        """
 
         if not ie_key and force_generic_extractor:
             ie_key = 'Generic'
@@ -805,14 +792,21 @@ class YoutubeDL(object):
                 self.report_warning('The program functionality for this site has been marked as broken, '
                                     'and will probably not work.')
 
-            return self.__extract_info(url, ie, download, extra_info, process)
-        else:
-            self.report_error('no suitable InfoExtractor for URL %s' % url)
-
-    def __handle_extraction_exceptions(func):
-        def wrapper(self, *args, **kwargs):
             try:
-                return func(self, *args, **kwargs)
+                ie_result = ie.extract(url)
+                if ie_result is None:  # Finished already (backwards compatibility; listformats and friends should be moved here)
+                    break
+                if isinstance(ie_result, list):
+                    # Backwards compatibility: old IE result format
+                    ie_result = {
+                        '_type': 'compat_list',
+                        'entries': ie_result,
+                    }
+                self.add_default_extra_info(ie_result, ie, url)
+                if process:
+                    return self.process_ie_result(ie_result, download, extra_info)
+                else:
+                    return ie_result
             except GeoRestrictedError as e:
                 msg = e.msg
                 if e.countries:
@@ -820,33 +814,20 @@ class YoutubeDL(object):
                         map(ISO3166Utils.short2full, e.countries))
                 msg += '\nYou might want to use a VPN or a proxy server (with --proxy) to workaround.'
                 self.report_error(msg)
+                break
             except ExtractorError as e:  # An error we somewhat expected
                 self.report_error(compat_str(e), e.format_traceback())
+                break
             except MaxDownloadsReached:
                 raise
             except Exception as e:
                 if self.params.get('ignoreerrors', False):
                     self.report_error(error_to_compat_str(e), tb=encode_compat_str(traceback.format_exc()))
+                    break
                 else:
                     raise
-        return wrapper
-
-    @__handle_extraction_exceptions
-    def __extract_info(self, url, ie, download, extra_info, process):
-        ie_result = ie.extract(url)
-        if ie_result is None:  # Finished already (backwards compatibility; listformats and friends should be moved here)
-            return
-        if isinstance(ie_result, list):
-            # Backwards compatibility: old IE result format
-            ie_result = {
-                '_type': 'compat_list',
-                'entries': ie_result,
-            }
-        self.add_default_extra_info(ie_result, ie, url)
-        if process:
-            return self.process_ie_result(ie_result, download, extra_info)
         else:
-            return ie_result
+            self.report_error('no suitable InfoExtractor for URL %s' % url)
 
     def add_default_extra_info(self, ie_result, ie, url):
         self.add_extra_info(ie_result, {
@@ -869,11 +850,10 @@ class YoutubeDL(object):
         if result_type in ('url', 'url_transparent'):
             ie_result['url'] = sanitize_url(ie_result['url'])
             extract_flat = self.params.get('extract_flat', False)
-            if ((extract_flat == 'in_playlist' and 'playlist' in extra_info)
+            if ((extract_flat == 'in_playlist' and 'playlist' in extra_info) or
-                    or extract_flat is True):
+                    extract_flat is True):
-                self.__forced_printings(
+                if self.params.get('forcejson', False):
-                    ie_result, self.prepare_filename(ie_result),
+                    self.to_stdout(json.dumps(ie_result))
-                    incomplete=True)
                 return ie_result
 
         if result_type == 'video':
@@ -918,23 +898,116 @@ class YoutubeDL(object):
             return self.process_ie_result(
                 new_result, download=download, extra_info=extra_info)
         elif result_type in ('playlist', 'multi_video'):
-            # Protect from infinite recursion due to recursively nested playlists
+            # We process each entry in the playlist
-            # (see https://github.com/ytdl-org/youtube-dl/issues/27833)
+            playlist = ie_result.get('title') or ie_result.get('id')
-            webpage_url = ie_result['webpage_url']
+            self.to_screen('[download] Downloading playlist: %s' % playlist)
-            if webpage_url in self._playlist_urls:
-                self.to_screen(
-                    '[download] Skipping already downloaded playlist: %s'
-                    % ie_result.get('title') or ie_result.get('id'))
-                return
 
-            self._playlist_level += 1
+            playlist_results = []
-            self._playlist_urls.add(webpage_url)
+
-            try:
+            playliststart = self.params.get('playliststart', 1) - 1
-                return self.__process_playlist(ie_result, download)
+            playlistend = self.params.get('playlistend')
-            finally:
+            # For backwards compatibility, interpret -1 as whole list
-                self._playlist_level -= 1
+            if playlistend == -1:
-                if not self._playlist_level:
+                playlistend = None
-                    self._playlist_urls.clear()
+
+            playlistitems_str = self.params.get('playlist_items')
+            playlistitems = None
+            if playlistitems_str is not None:
+                def iter_playlistitems(format):
+                    for string_segment in format.split(','):
+                        if '-' in string_segment:
+                            start, end = string_segment.split('-')
+                            for item in range(int(start), int(end) + 1):
+                                yield int(item)
+                        else:
+                            yield int(string_segment)
+                playlistitems = orderedSet(iter_playlistitems(playlistitems_str))
+
+            ie_entries = ie_result['entries']
+
+            def make_playlistitems_entries(list_ie_entries):
+                num_entries = len(list_ie_entries)
+                return [
+                    list_ie_entries[i - 1] for i in playlistitems
+                    if -num_entries <= i - 1 < num_entries]
+
+            def report_download(num_entries):
+                self.to_screen(
+                    '[%s] playlist %s: Downloading %d videos' %
+                    (ie_result['extractor'], playlist, num_entries))
+
+            if isinstance(ie_entries, list):
+                n_all_entries = len(ie_entries)
+                if playlistitems:
+                    entries = make_playlistitems_entries(ie_entries)
+                else:
+                    entries = ie_entries[playliststart:playlistend]
+                n_entries = len(entries)
+                self.to_screen(
+                    '[%s] playlist %s: Collected %d video ids (downloading %d of them)' %
+                    (ie_result['extractor'], playlist, n_all_entries, n_entries))
+            elif isinstance(ie_entries, PagedList):
+                if playlistitems:
+                    entries = []
+                    for item in playlistitems:
+                        entries.extend(ie_entries.getslice(
+                            item - 1, item
+                        ))
+                else:
+                    entries = ie_entries.getslice(
+                        playliststart, playlistend)
+                n_entries = len(entries)
+                report_download(n_entries)
+            else:  # iterable
+                if playlistitems:
+                    entries = make_playlistitems_entries(list(itertools.islice(
+                        ie_entries, 0, max(playlistitems))))
+                else:
+                    entries = list(itertools.islice(
+                        ie_entries, playliststart, playlistend))
+                n_entries = len(entries)
+                report_download(n_entries)
+
+            if self.params.get('playlistreverse', False):
+                entries = entries[::-1]
+
+            if self.params.get('playlistrandom', False):
+                random.shuffle(entries)
+
+            x_forwarded_for = ie_result.get('__x_forwarded_for_ip')
+
+            for i, entry in enumerate(entries, 1):
+                self.to_screen('[download] Downloading video %s of %s' % (i, n_entries))
+                # This __x_forwarded_for_ip thing is a bit ugly but requires
+                # minimal changes
+                if x_forwarded_for:
+                    entry['__x_forwarded_for_ip'] = x_forwarded_for
+                extra = {
+                    'n_entries': n_entries,
+                    'playlist': playlist,
+                    'playlist_id': ie_result.get('id'),
+                    'playlist_title': ie_result.get('title'),
+                    'playlist_uploader': ie_result.get('uploader'),
+                    'playlist_uploader_id': ie_result.get('uploader_id'),
+                    'playlist_index': i + playliststart,
+                    'extractor': ie_result['extractor'],
+                    'webpage_url': ie_result['webpage_url'],
+                    'webpage_url_basename': url_basename(ie_result['webpage_url']),
+                    'extractor_key': ie_result['extractor_key'],
+                }
+
+                reason = self._match_entry(entry, incomplete=True)
+                if reason is not None:
+                    self.to_screen('[download] ' + reason)
+                    continue
+
+                entry_result = self.process_ie_result(entry,
+                                                      download=download,
+                                                      extra_info=extra)
+                playlist_results.append(entry_result)
+            ie_result['entries'] = playlist_results
+            self.to_screen('[download] Finished downloading playlist: %s' % playlist)
+            return ie_result
         elif result_type == 'compat_list':
             self.report_warning(
                 'Extractor %s returned a compat_list result. '
@@ -959,123 +1032,6 @@ class YoutubeDL(object):
         else:
             raise Exception('Invalid result type: %s' % result_type)
 
-    def __process_playlist(self, ie_result, download):
-        # We process each entry in the playlist
-        playlist = ie_result.get('title') or ie_result.get('id')
-
-        self.to_screen('[download] Downloading playlist: %s' % playlist)
-
-        playlist_results = []
-
-        playliststart = self.params.get('playliststart', 1) - 1
-        playlistend = self.params.get('playlistend')
-        # For backwards compatibility, interpret -1 as whole list
-        if playlistend == -1:
-            playlistend = None
-
-        playlistitems_str = self.params.get('playlist_items')
-        playlistitems = None
-        if playlistitems_str is not None:
-            def iter_playlistitems(format):
-                for string_segment in format.split(','):
-                    if '-' in string_segment:
-                        start, end = string_segment.split('-')
-                        for item in range(int(start), int(end) + 1):
-                            yield int(item)
-                    else:
-                        yield int(string_segment)
-            playlistitems = orderedSet(iter_playlistitems(playlistitems_str))
-
-        ie_entries = ie_result['entries']
-
-        def make_playlistitems_entries(list_ie_entries):
-            num_entries = len(list_ie_entries)
-            return [
-                list_ie_entries[i - 1] for i in playlistitems
-                if -num_entries <= i - 1 < num_entries]
-
-        def report_download(num_entries):
-            self.to_screen(
-                '[%s] playlist %s: Downloading %d videos' %
-                (ie_result['extractor'], playlist, num_entries))
-
-        if isinstance(ie_entries, list):
-            n_all_entries = len(ie_entries)
-            if playlistitems:
-                entries = make_playlistitems_entries(ie_entries)
-            else:
-                entries = ie_entries[playliststart:playlistend]
-            n_entries = len(entries)
-            self.to_screen(
-                '[%s] playlist %s: Collected %d video ids (downloading %d of them)' %
-                (ie_result['extractor'], playlist, n_all_entries, n_entries))
-        elif isinstance(ie_entries, PagedList):
-            if playlistitems:
-                entries = []
-                for item in playlistitems:
-                    entries.extend(ie_entries.getslice(
-                        item - 1, item
-                    ))
-            else:
-                entries = ie_entries.getslice(
-                    playliststart, playlistend)
-            n_entries = len(entries)
-            report_download(n_entries)
-        else:  # iterable
-            if playlistitems:
-                entries = make_playlistitems_entries(list(itertools.islice(
-                    ie_entries, 0, max(playlistitems))))
-            else:
-                entries = list(itertools.islice(
-                    ie_entries, playliststart, playlistend))
-            n_entries = len(entries)
-            report_download(n_entries)
-
-        if self.params.get('playlistreverse', False):
-            entries = entries[::-1]
-
-        if self.params.get('playlistrandom', False):
-            random.shuffle(entries)
-
-        x_forwarded_for = ie_result.get('__x_forwarded_for_ip')
-
-        for i, entry in enumerate(entries, 1):
-            self.to_screen('[download] Downloading video %s of %s' % (i, n_entries))
-            # This __x_forwarded_for_ip thing is a bit ugly but requires
-            # minimal changes
-            if x_forwarded_for:
-                entry['__x_forwarded_for_ip'] = x_forwarded_for
-            extra = {
-                'n_entries': n_entries,
-                'playlist': playlist,
-                'playlist_id': ie_result.get('id'),
-                'playlist_title': ie_result.get('title'),
-                'playlist_uploader': ie_result.get('uploader'),
-                'playlist_uploader_id': ie_result.get('uploader_id'),
-                'playlist_index': playlistitems[i - 1] if playlistitems else i + playliststart,
-                'extractor': ie_result['extractor'],
-                'webpage_url': ie_result['webpage_url'],
-                'webpage_url_basename': url_basename(ie_result['webpage_url']),
-                'extractor_key': ie_result['extractor_key'],
-            }
-
-            reason = self._match_entry(entry, incomplete=True)
-            if reason is not None:
-                self.to_screen('[download] ' + reason)
-                continue
-
-            entry_result = self.__process_iterable_entry(entry, download, extra)
-            # TODO: skip failed (empty) entries?
-            playlist_results.append(entry_result)
-        ie_result['entries'] = playlist_results
-        self.to_screen('[download] Finished downloading playlist: %s' % playlist)
-        return ie_result
-
-    @__handle_extraction_exceptions
-    def __process_iterable_entry(self, entry, download, extra_info):
-        return self.process_ie_result(
-            entry, download=download, extra_info=extra_info)
-
     def _build_format_filter(self, filter_spec):
         " Returns a function to filter the formats according to the filter_spec "
 
@@ -1115,7 +1071,7 @@ class YoutubeDL(object):
                 '*=': lambda attr, value: value in attr,
             }
             str_operator_rex = re.compile(r'''(?x)
-                \s*(?P<key>ext|acodec|vcodec|container|protocol|format_id|language)
+                \s*(?P<key>ext|acodec|vcodec|container|protocol|format_id)
                 \s*(?P<negation>!\s*)?(?P<op>%s)(?P<none_inclusive>\s*\?)?
                 \s*(?P<value>[a-zA-Z0-9._-]+)
                 \s*$
@@ -1258,8 +1214,6 @@ class YoutubeDL(object):
                         group = _parse_format_selection(tokens, inside_group=True)
                         current_selector = FormatSelector(GROUP, group, [])
                     elif string == '+':
-                        if inside_merge:
-                            raise syntax_error('Unexpected "+"', start)
                         video_selector = current_selector
                         audio_selector = _parse_format_selection(tokens, inside_merge=True)
                         if not video_selector or not audio_selector:
@@ -1520,18 +1474,14 @@ class YoutubeDL(object):
         if 'display_id' not in info_dict and 'id' in info_dict:
             info_dict['display_id'] = info_dict['id']
 
-        for ts_key, date_key in (
+        if info_dict.get('upload_date') is None and info_dict.get('timestamp') is not None:
-                ('timestamp', 'upload_date'),
+            # Working around out-of-range timestamp values (e.g. negative ones on Windows,
-                ('release_timestamp', 'release_date'),
+            # see http://bugs.python.org/issue1646728)
-        ):
+            try:
-            if info_dict.get(date_key) is None and info_dict.get(ts_key) is not None:
+                upload_date = datetime.datetime.utcfromtimestamp(info_dict['timestamp'])
-                # Working around out-of-range timestamp values (e.g. negative ones on Windows,
+                info_dict['upload_date'] = upload_date.strftime('%Y%m%d')
-                # see http://bugs.python.org/issue1646728)
+            except (ValueError, OverflowError, OSError):
-                try:
+                pass
-                    upload_date = datetime.datetime.utcfromtimestamp(info_dict[ts_key])
-                    info_dict[date_key] = upload_date.strftime('%Y%m%d')
-                except (ValueError, OverflowError, OSError):
-                    pass
 
         # Auto generate title fields corresponding to the *_number fields when missing
         # in order to always have clean titles. This is very common for TV series.
@@ -1648,7 +1598,7 @@ class YoutubeDL(object):
         if req_format is None:
             req_format = self._default_format_spec(info_dict, download=download)
             if self.params.get('verbose'):
-                self._write_string('[debug] Default format spec: %s\n' % req_format)
+                self.to_stdout('[debug] Default format spec: %s' % req_format)
 
         format_selector = self.build_format_selector(req_format)
 
@@ -1669,9 +1619,9 @@ class YoutubeDL(object):
         # https://github.com/ytdl-org/youtube-dl/issues/10083).
         incomplete_formats = (
             # All formats are video-only or
-            all(f.get('vcodec') != 'none' and f.get('acodec') == 'none' for f in formats)
+            all(f.get('vcodec') != 'none' and f.get('acodec') == 'none' for f in formats) or
             # all formats are audio-only
-            or all(f.get('vcodec') == 'none' and f.get('acodec') != 'none' for f in formats))
+            all(f.get('vcodec') == 'none' and f.get('acodec') != 'none' for f in formats))
 
         ctx = {
             'formats': formats,
@@ -1743,36 +1693,6 @@ class YoutubeDL(object):
             subs[lang] = f
         return subs
 
-    def __forced_printings(self, info_dict, filename, incomplete):
-        def print_mandatory(field):
-            if (self.params.get('force%s' % field, False)
-                    and (not incomplete or info_dict.get(field) is not None)):
-                self.to_stdout(info_dict[field])
-
-        def print_optional(field):
-            if (self.params.get('force%s' % field, False)
-                    and info_dict.get(field) is not None):
-                self.to_stdout(info_dict[field])
-
-        print_mandatory('title')
-        print_mandatory('id')
-        if self.params.get('forceurl', False) and not incomplete:
-            if info_dict.get('requested_formats') is not None:
-                for f in info_dict['requested_formats']:
-                    self.to_stdout(f['url'] + f.get('play_path', ''))
-            else:
-                # For RTMP URLs, also include the playpath
-                self.to_stdout(info_dict['url'] + info_dict.get('play_path', ''))
-        print_optional('thumbnail')
-        print_optional('description')
-        if self.params.get('forcefilename', False) and filename is not None:
-            self.to_stdout(filename)
-        if self.params.get('forceduration', False) and info_dict.get('duration') is not None:
-            self.to_stdout(formatSeconds(info_dict['duration']))
-        print_mandatory('format')
-        if self.params.get('forcejson', False):
-            self.to_stdout(json.dumps(info_dict))
-
     def process_info(self, info_dict):
         """Process a single resolved IE result."""
 
@@ -1783,8 +1703,9 @@ class YoutubeDL(object):
             if self._num_downloads >= int(max_downloads):
                 raise MaxDownloadsReached()
 
-        # TODO: backward compatibility, to be removed
         info_dict['fulltitle'] = info_dict['title']
+        if len(info_dict['title']) > 200:
+            info_dict['title'] = info_dict['title'][:197] + '...'
 
         if 'format' not in info_dict:
             info_dict['format'] = info_dict['ext']
@@ -1799,7 +1720,29 @@ class YoutubeDL(object):
         info_dict['_filename'] = filename = self.prepare_filename(info_dict)
 
         # Forced printings
-        self.__forced_printings(info_dict, filename, incomplete=False)
+        if self.params.get('forcetitle', False):
+            self.to_stdout(info_dict['fulltitle'])
+        if self.params.get('forceid', False):
+            self.to_stdout(info_dict['id'])
+        if self.params.get('forceurl', False):
+            if info_dict.get('requested_formats') is not None:
+                for f in info_dict['requested_formats']:
+                    self.to_stdout(f['url'] + f.get('play_path', ''))
+            else:
+                # For RTMP URLs, also include the playpath
+                self.to_stdout(info_dict['url'] + info_dict.get('play_path', ''))
+        if self.params.get('forcethumbnail', False) and info_dict.get('thumbnail') is not None:
+            self.to_stdout(info_dict['thumbnail'])
+        if self.params.get('forcedescription', False) and info_dict.get('description') is not None:
+            self.to_stdout(info_dict['description'])
+        if self.params.get('forcefilename', False) and filename is not None:
+            self.to_stdout(filename)
+        if self.params.get('forceduration', False) and info_dict.get('duration') is not None:
+            self.to_stdout(formatSeconds(info_dict['duration']))
+        if self.params.get('forceformat', False):
+            self.to_stdout(info_dict['format'])
+        if self.params.get('forcejson', False):
+            self.to_stdout(json.dumps(info_dict))
 
         # Do nothing else if in simulate mode
         if self.params.get('simulate', False):
@@ -1815,8 +1758,6 @@ class YoutubeDL(object):
                     os.makedirs(dn)
                 return True
             except (OSError, IOError) as err:
-                if isinstance(err, OSError) and err.errno == errno.EEXIST:
-                    return True
                 self.report_error('unable to create directory ' + error_to_compat_str(err))
                 return False
 
@@ -1842,8 +1783,6 @@ class YoutubeDL(object):
             annofn = replace_extension(filename, 'annotations.xml', info_dict.get('ext'))
             if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(annofn)):
                 self.to_screen('[info] Video annotations are already present')
-            elif not info_dict.get('annotations'):
-                self.report_warning('There are no annotations to write.')
             else:
                 try:
                     self.to_screen('[info] Writing video annotations to: ' + annofn)
@@ -1865,7 +1804,7 @@ class YoutubeDL(object):
             ie = self.get_info_extractor(info_dict['extractor_key'])
             for sub_lang, sub_info in subtitles.items():
                 sub_format = sub_info['ext']
-                sub_filename = subtitles_filename(filename, sub_lang, sub_format, info_dict.get('ext'))
+                sub_filename = subtitles_filename(filename, sub_lang, sub_format)
                 if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(sub_filename)):
                     self.to_screen('[info] Video subtitle %s.%s is already present' % (sub_lang, sub_format))
                 else:
@@ -1911,7 +1850,7 @@ class YoutubeDL(object):
                     for ph in self._progress_hooks:
                         fd.add_progress_hook(ph)
                     if self.params.get('verbose'):
-                        self.to_screen('[debug] Invoking downloader on %r' % info.get('url'))
+                        self.to_stdout('[debug] Invoking downloader on %r' % info.get('url'))
                     return fd.download(name, info)
 
                 if info_dict.get('requested_formats') is not None:
@@ -2008,8 +1947,8 @@ class YoutubeDL(object):
                     else:
                         assert fixup_policy in ('ignore', 'never')
 
-                if (info_dict.get('requested_formats') is None
+                if (info_dict.get('requested_formats') is None and
-                        and info_dict.get('container') == 'm4a_dash'):
+                        info_dict.get('container') == 'm4a_dash'):
                     if fixup_policy == 'warn':
                         self.report_warning(
                             '%s: writing DASH m4a. '
@@ -2028,9 +1967,9 @@ class YoutubeDL(object):
                     else:
                         assert fixup_policy in ('ignore', 'never')
 
-                if (info_dict.get('protocol') == 'm3u8_native'
+                if (info_dict.get('protocol') == 'm3u8_native' or
-                        or info_dict.get('protocol') == 'm3u8'
+                        info_dict.get('protocol') == 'm3u8' and
-                        and self.params.get('hls_prefer_native')):
+                        self.params.get('hls_prefer_native')):
                     if fixup_policy == 'warn':
                         self.report_warning('%s: malformed AAC bitstream detected.' % (
                             info_dict['id']))
@@ -2056,10 +1995,10 @@ class YoutubeDL(object):
     def download(self, url_list):
         """Download a given list of URLs."""
         outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
-        if (len(url_list) > 1
+        if (len(url_list) > 1 and
-                and outtmpl != '-'
+                outtmpl != '-' and
-                and '%' not in outtmpl
+                '%' not in outtmpl and
-                and self.params.get('max_downloads') != 1):
+                self.params.get('max_downloads') != 1):
             raise SameFileError(outtmpl)
 
         for url in url_list:
@@ -2204,8 +2143,8 @@ class YoutubeDL(object):
             if res:
                 res += ', '
             res += '%s container' % fdict['container']
-        if (fdict.get('vcodec') is not None
+        if (fdict.get('vcodec') is not None and
-                and fdict.get('vcodec') != 'none'):
+                fdict.get('vcodec') != 'none'):
             if res:
                 res += ', '
             res += fdict['vcodec']
@@ -2394,7 +2333,6 @@ class YoutubeDL(object):
         debuglevel = 1 if self.params.get('debug_printtraffic') else 0
         https_handler = make_HTTPS_handler(self.params, debuglevel=debuglevel)
         ydlh = YoutubeDLHandler(self.params, debuglevel=debuglevel)
-        redirect_handler = YoutubeDLRedirectHandler()
         data_handler = compat_urllib_request_DataHandler()
 
         # When passing our own FileHandler instance, build_opener won't add the
@@ -2408,7 +2346,7 @@ class YoutubeDL(object):
         file_handler.file_open = file_open
 
         opener = compat_urllib_request.build_opener(
-            proxy_handler, https_handler, cookie_processor, ydlh, redirect_handler, data_handler, file_handler)
+            proxy_handler, https_handler, cookie_processor, ydlh, data_handler, file_handler)
 
         # Delete the default user-agent header, which would otherwise apply in
         # cases where our custom HTTP handler doesn't come into play
@@ -2450,7 +2388,7 @@ class YoutubeDL(object):
             thumb_ext = determine_ext(t['url'], 'jpg')
             suffix = '_%s' % t['id'] if len(thumbnails) > 1 else ''
             thumb_display_id = '%s ' % t['id'] if len(thumbnails) > 1 else ''
-            t['filename'] = thumb_filename = replace_extension(filename + suffix, thumb_ext, info_dict.get('ext'))
+            t['filename'] = thumb_filename = os.path.splitext(filename)[0] + suffix + '.' + thumb_ext
 
             if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(thumb_filename)):
                 self.to_screen('[%s] %s: Thumbnail %sis already present' %

youtube_dl/__init__.py

@@ -94,7 +94,7 @@ def _real_main(argv=None):
             if opts.verbose:
                 write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
         except IOError:
-            sys.exit('ERROR: batch file %s could not be read' % opts.batchfile)
+            sys.exit('ERROR: batch file could not be read')
     all_urls = batch_urls + [url.strip() for url in args]  # batch_urls are already striped in read_batch_urls
     _enc = preferredencoding()
     all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls]
@@ -230,14 +230,14 @@ def _real_main(argv=None):
     if opts.allsubtitles and not opts.writeautomaticsub:
         opts.writesubtitles = True
 
-    outtmpl = ((opts.outtmpl is not None and opts.outtmpl)
+    outtmpl = ((opts.outtmpl is not None and opts.outtmpl) or
-               or (opts.format == '-1' and opts.usetitle and '%(title)s-%(id)s-%(format)s.%(ext)s')
+               (opts.format == '-1' and opts.usetitle and '%(title)s-%(id)s-%(format)s.%(ext)s') or
-               or (opts.format == '-1' and '%(id)s-%(format)s.%(ext)s')
+               (opts.format == '-1' and '%(id)s-%(format)s.%(ext)s') or
-               or (opts.usetitle and opts.autonumber and '%(autonumber)s-%(title)s-%(id)s.%(ext)s')
+               (opts.usetitle and opts.autonumber and '%(autonumber)s-%(title)s-%(id)s.%(ext)s') or
-               or (opts.usetitle and '%(title)s-%(id)s.%(ext)s')
+               (opts.usetitle and '%(title)s-%(id)s.%(ext)s') or
-               or (opts.useid and '%(id)s.%(ext)s')
+               (opts.useid and '%(id)s.%(ext)s') or
-               or (opts.autonumber and '%(autonumber)s-%(id)s.%(ext)s')
+               (opts.autonumber and '%(autonumber)s-%(id)s.%(ext)s') or
-               or DEFAULT_OUTTMPL)
+               DEFAULT_OUTTMPL)
     if not os.path.splitext(outtmpl)[1] and opts.extractaudio:
         parser.error('Cannot download a video and extract audio into the same'
                      ' file! Use "{0}.%(ext)s" instead of "{0}" as the output'
@@ -340,7 +340,6 @@ def _real_main(argv=None):
         'format': opts.format,
         'listformats': opts.listformats,
         'outtmpl': outtmpl,
-        'outtmpl_na_placeholder': opts.outtmpl_na_placeholder,
         'autonumber_size': opts.autonumber_size,
         'autonumber_start': opts.autonumber_start,
         'restrictfilenames': opts.restrictfilenames,

youtube_dl/compat.py

@@ -57,31 +57,11 @@ try:
 except ImportError:  # Python 2
     import cookielib as compat_cookiejar
 
-if sys.version_info[0] == 2:
-    class compat_cookiejar_Cookie(compat_cookiejar.Cookie):
-        def __init__(self, version, name, value, *args, **kwargs):
-            if isinstance(name, compat_str):
-                name = name.encode()
-            if isinstance(value, compat_str):
-                value = value.encode()
-            compat_cookiejar.Cookie.__init__(self, version, name, value, *args, **kwargs)
-else:
-    compat_cookiejar_Cookie = compat_cookiejar.Cookie
-
 try:
     import http.cookies as compat_cookies
 except ImportError:  # Python 2
     import Cookie as compat_cookies
 
-if sys.version_info[0] == 2:
-    class compat_cookies_SimpleCookie(compat_cookies.SimpleCookie):
-        def load(self, rawdata):
-            if isinstance(rawdata, compat_str):
-                rawdata = str(rawdata)
-            return super(compat_cookies_SimpleCookie, self).load(rawdata)
-else:
-    compat_cookies_SimpleCookie = compat_cookies.SimpleCookie
-
 try:
     import html.entities as compat_html_entities
 except ImportError:  # Python 2
@@ -2354,7 +2334,7 @@ except ImportError:  # Python <3.4
 
         # HTMLParseError has been deprecated in Python 3.3 and removed in
         # Python 3.5. Introducing dummy exception for Python >3.5 for compatible
-        # and uniform cross-version exception handling
+        # and uniform cross-version exceptiong handling
         class compat_HTMLParseError(Exception):
             pass
 
@@ -2669,9 +2649,9 @@ else:
 
 try:
     args = shlex.split('中文')
-    assert (isinstance(args, list)
+    assert (isinstance(args, list) and
-            and isinstance(args[0], compat_str)
+            isinstance(args[0], compat_str) and
-            and args[0] == '中文')
+            args[0] == '中文')
     compat_shlex_split = shlex.split
 except (AssertionError, UnicodeEncodeError):
     # Working around shlex issue with unicode strings on some python 2
@@ -2774,17 +2754,6 @@ else:
         compat_expanduser = os.path.expanduser
 
 
-if compat_os_name == 'nt' and sys.version_info < (3, 8):
-    # os.path.realpath on Windows does not follow symbolic links
-    # prior to Python 3.8 (see https://bugs.python.org/issue9949)
-    def compat_realpath(path):
-        while os.path.islink(path):
-            path = os.path.abspath(os.readlink(path))
-        return path
-else:
-    compat_realpath = os.path.realpath
-
-
 if sys.version_info < (3, 0):
     def compat_print(s):
         from .utils import preferredencoding
@@ -3007,9 +2976,7 @@ __all__ = [
     'compat_basestring',
     'compat_chr',
     'compat_cookiejar',
-    'compat_cookiejar_Cookie',
     'compat_cookies',
-    'compat_cookies_SimpleCookie',
     'compat_ctypes_WINFUNCTYPE',
     'compat_etree_Element',
     'compat_etree_fromstring',
@@ -3031,7 +2998,6 @@ __all__ = [
     'compat_os_name',
     'compat_parse_qs',
     'compat_print',
-    'compat_realpath',
     'compat_setenv',
     'compat_shlex_quote',
     'compat_shlex_split',

youtube_dl/downloader/common.py

@@ -176,9 +176,7 @@ class FileDownloader(object):
             return
         speed = float(byte_counter) / elapsed
         if speed > rate_limit:
-            sleep_time = float(byte_counter) / rate_limit - elapsed
+            time.sleep(max((byte_counter // rate_limit) - elapsed, 0))
-            if sleep_time > 0:
-                time.sleep(sleep_time)
 
     def temp_name(self, filename):
         """Returns a temporary filename for the given filename."""
@@ -332,15 +330,15 @@ class FileDownloader(object):
         """
 
         nooverwrites_and_exists = (
-            self.params.get('nooverwrites', False)
+            self.params.get('nooverwrites', False) and
-            and os.path.exists(encodeFilename(filename))
+            os.path.exists(encodeFilename(filename))
         )
 
         if not hasattr(filename, 'write'):
             continuedl_and_exists = (
-                self.params.get('continuedl', True)
+                self.params.get('continuedl', True) and
-                and os.path.isfile(encodeFilename(filename))
+                os.path.isfile(encodeFilename(filename)) and
-                and not self.params.get('nopart', False)
+                not self.params.get('nopart', False)
             )
 
             # Check file already present

youtube_dl/downloader/dash.py

@@ -53,7 +53,7 @@ class DashSegmentsFD(FragmentFD):
                 except compat_urllib_error.HTTPError as err:
                     # YouTube may often return 404 HTTP error for a fragment causing the
                     # whole download to fail. However if the same fragment is immediately
-                    # retried with the same request data this usually succeeds (1-2 attempts
+                    # retried with the same request data this usually succeeds (1-2 attemps
                     # is usually enough) thus allowing to download the whole file successfully.
                     # To be future-proof we will retry all fragments that fail with any
                     # HTTP error.

youtube_dl/downloader/external.py

@@ -194,7 +194,6 @@ class Aria2cFD(ExternalFD):
         cmd += self._option('--interface', 'source_address')
         cmd += self._option('--all-proxy', 'proxy')
         cmd += self._bool_option('--check-certificate', 'nocheckcertificate', 'false', 'true', '=')
-        cmd += self._bool_option('--remote-time', 'updatetime', 'true', 'false', '=')
         cmd += ['--', info_dict['url']]
         return cmd
 

youtube_dl/downloader/f4m.py

@@ -238,8 +238,8 @@ def write_metadata_tag(stream, metadata):
 
 
 def remove_encrypted_media(media):
-    return list(filter(lambda e: 'drmAdditionalHeaderId' not in e.attrib
+    return list(filter(lambda e: 'drmAdditionalHeaderId' not in e.attrib and
-                                 and 'drmAdditionalHeaderSetId' not in e.attrib,
+                                 'drmAdditionalHeaderSetId' not in e.attrib,
                        media))
 
 
@@ -267,8 +267,8 @@ class F4mFD(FragmentFD):
         media = doc.findall(_add_ns('media'))
         if not media:
             self.report_error('No media found')
-        for e in (doc.findall(_add_ns('drmAdditionalHeader'))
+        for e in (doc.findall(_add_ns('drmAdditionalHeader')) +
-                  + doc.findall(_add_ns('drmAdditionalHeaderSet'))):
+                  doc.findall(_add_ns('drmAdditionalHeaderSet'))):
             # If id attribute is missing it's valid for all media nodes
             # without drmAdditionalHeaderId or drmAdditionalHeaderSetId attribute
             if 'id' not in e.attrib:

youtube_dl/downloader/fragment.py

@@ -97,15 +97,12 @@ class FragmentFD(FileDownloader):
 
     def _download_fragment(self, ctx, frag_url, info_dict, headers=None):
         fragment_filename = '%s-Frag%d' % (ctx['tmpfilename'], ctx['fragment_index'])
-        fragment_info_dict = {
+        success = ctx['dl'].download(fragment_filename, {
             'url': frag_url,
             'http_headers': headers or info_dict.get('http_headers'),
-        }
+        })
-        success = ctx['dl'].download(fragment_filename, fragment_info_dict)
         if not success:
             return False, None
-        if fragment_info_dict.get('filetime'):
-            ctx['fragment_filetime'] = fragment_info_dict.get('filetime')
         down, frag_sanitized = sanitize_open(fragment_filename, 'rb')
         ctx['fragment_filename_sanitized'] = frag_sanitized
         frag_content = down.read()
@@ -193,13 +190,12 @@ class FragmentFD(FileDownloader):
         })
 
     def _start_frag_download(self, ctx):
-        resume_len = ctx['complete_frags_downloaded_bytes']
         total_frags = ctx['total_frags']
         # This dict stores the download progress, it's updated by the progress
         # hook
         state = {
             'status': 'downloading',
-            'downloaded_bytes': resume_len,
+            'downloaded_bytes': ctx['complete_frags_downloaded_bytes'],
             'fragment_index': ctx['fragment_index'],
             'fragment_count': total_frags,
             'filename': ctx['filename'],
@@ -223,8 +219,8 @@ class FragmentFD(FileDownloader):
             frag_total_bytes = s.get('total_bytes') or 0
             if not ctx['live']:
                 estimated_size = (
-                    (ctx['complete_frags_downloaded_bytes'] + frag_total_bytes)
+                    (ctx['complete_frags_downloaded_bytes'] + frag_total_bytes) /
-                    / (state['fragment_index'] + 1) * total_frags)
+                    (state['fragment_index'] + 1) * total_frags)
                 state['total_bytes_estimate'] = estimated_size
 
             if s['status'] == 'finished':
@@ -238,8 +234,8 @@ class FragmentFD(FileDownloader):
                 state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
                 if not ctx['live']:
                     state['eta'] = self.calc_eta(
-                        start, time_now, estimated_size - resume_len,
+                        start, time_now, estimated_size,
-                        state['downloaded_bytes'] - resume_len)
+                        state['downloaded_bytes'])
                 state['speed'] = s.get('speed') or ctx.get('speed')
                 ctx['speed'] = state['speed']
                 ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
@@ -261,13 +257,6 @@ class FragmentFD(FileDownloader):
             downloaded_bytes = ctx['complete_frags_downloaded_bytes']
         else:
             self.try_rename(ctx['tmpfilename'], ctx['filename'])
-            if self.params.get('updatetime', True):
-                filetime = ctx.get('fragment_filetime')
-                if filetime:
-                    try:
-                        os.utime(ctx['filename'], (time.time(), filetime))
-                    except Exception:
-                        pass
             downloaded_bytes = os.path.getsize(encodeFilename(ctx['filename']))
 
         self._hook_progress({

youtube_dl/downloader/hls.py

@@ -42,13 +42,11 @@ class HlsFD(FragmentFD):
             # no segments will definitely be appended to the end of the playlist.
             # r'#EXT-X-PLAYLIST-TYPE:EVENT',  # media segments may be appended to the end of
             #                                 # event media playlists [4]
-            r'#EXT-X-MAP:',  # media initialization [5]
 
             # 1. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.4
             # 2. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.2
             # 3. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3.2
             # 4. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3.5
-            # 5. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.5
         )
         check_results = [not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES]
         is_aes128_enc = '#EXT-X-KEY:METHOD=AES-128' in manifest
@@ -66,7 +64,7 @@ class HlsFD(FragmentFD):
         s = urlh.read().decode('utf-8', 'ignore')
 
         if not self.can_download(s, info_dict):
-            if info_dict.get('extra_param_to_segment_url') or info_dict.get('_decryption_key_url'):
+            if info_dict.get('extra_param_to_segment_url'):
                 self.report_error('pycrypto not found. Please install it.')
                 return False
             self.report_warning(
@@ -78,12 +76,12 @@ class HlsFD(FragmentFD):
             return fd.real_download(filename, info_dict)
 
         def is_ad_fragment_start(s):
-            return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s
+            return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s or
-                    or s.startswith('#UPLYNK-SEGMENT') and s.endswith(',ad'))
+                    s.startswith('#UPLYNK-SEGMENT') and s.endswith(',ad'))
 
         def is_ad_fragment_end(s):
-            return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=master' in s
+            return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=master' in s or
-                    or s.startswith('#UPLYNK-SEGMENT') and s.endswith(',segment'))
+                    s.startswith('#UPLYNK-SEGMENT') and s.endswith(',segment'))
 
         media_frags = 0
         ad_frags = 0
@@ -143,7 +141,7 @@ class HlsFD(FragmentFD):
                     count = 0
                     headers = info_dict.get('http_headers', {})
                     if byte_range:
-                        headers['Range'] = 'bytes=%d-%d' % (byte_range['start'], byte_range['end'] - 1)
+                        headers['Range'] = 'bytes=%d-%d' % (byte_range['start'], byte_range['end'])
                     while count <= fragment_retries:
                         try:
                             success, frag_content = self._download_fragment(
@@ -171,13 +169,9 @@ class HlsFD(FragmentFD):
                     if decrypt_info['METHOD'] == 'AES-128':
                         iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', media_sequence)
                         decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(
-                            self._prepare_url(info_dict, info_dict.get('_decryption_key_url') or decrypt_info['URI'])).read()
+                            self._prepare_url(info_dict, decrypt_info['URI'])).read()
-                        # Don't decrypt the content in tests since the data is explicitly truncated and it's not to a valid block
+                        frag_content = AES.new(
-                        # size (see https://github.com/ytdl-org/youtube-dl/pull/27660). Tests only care that the correct data downloaded,
+                            decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
-                        # not what it decrypts to.
-                        if not test:
-                            frag_content = AES.new(
-                                decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
                     self._append_fragment(ctx, frag_content)
                     # We only download the first fragment during the test
                     if test:

youtube_dl/downloader/http.py

@@ -46,8 +46,8 @@ class HttpFD(FileDownloader):
 
         is_test = self.params.get('test', False)
         chunk_size = self._TEST_FILE_SIZE if is_test else (
-            info_dict.get('downloader_options', {}).get('http_chunk_size')
+            info_dict.get('downloader_options', {}).get('http_chunk_size') or
-            or self.params.get('http_chunk_size') or 0)
+            self.params.get('http_chunk_size') or 0)
 
         ctx.open_mode = 'wb'
         ctx.resume_len = 0
@@ -106,14 +106,7 @@ class HttpFD(FileDownloader):
                 set_range(request, range_start, range_end)
             # Establish connection
             try:
-                try:
+                ctx.data = self.ydl.urlopen(request)
-                    ctx.data = self.ydl.urlopen(request)
-                except (compat_urllib_error.URLError, ) as err:
-                    # reason may not be available, e.g. for urllib2.HTTPError on python 2.6
-                    reason = getattr(err, 'reason', None)
-                    if isinstance(reason, socket.timeout):
-                        raise RetryDownload(err)
-                    raise err
                 # When trying to resume, Content-Range HTTP header of response has to be checked
                 # to match the value of requested Range HTTP header. This is due to a webservers
                 # that don't support resuming and serve a whole file with no Content-Range
@@ -130,11 +123,11 @@ class HttpFD(FileDownloader):
                                 content_len = int_or_none(content_range_m.group(3))
                                 accept_content_len = (
                                     # Non-chunked download
-                                    not ctx.chunk_size
+                                    not ctx.chunk_size or
                                     # Chunked download and requested piece or
                                     # its part is promised to be served
-                                    or content_range_end == range_end
+                                    content_range_end == range_end or
-                                    or content_len < range_end)
+                                    content_len < range_end)
                                 if accept_content_len:
                                     ctx.data_len = content_len
                                     return
@@ -159,8 +152,8 @@ class HttpFD(FileDownloader):
                             raise
                     else:
                         # Examine the reported length
-                        if (content_length is not None
+                        if (content_length is not None and
-                                and (ctx.resume_len - 100 < int(content_length) < ctx.resume_len + 100)):
+                                (ctx.resume_len - 100 < int(content_length) < ctx.resume_len + 100)):
                             # The file had already been fully downloaded.
                             # Explanation to the above condition: in issue #175 it was revealed that
                             # YouTube sometimes adds or removes a few bytes from the end of the file,
@@ -225,27 +218,24 @@ class HttpFD(FileDownloader):
 
             def retry(e):
                 to_stdout = ctx.tmpfilename == '-'
-                if ctx.stream is not None:
+                if not to_stdout:
-                    if not to_stdout:
+                    ctx.stream.close()
-                        ctx.stream.close()
+                ctx.stream = None
-                    ctx.stream = None
                 ctx.resume_len = byte_counter if to_stdout else os.path.getsize(encodeFilename(ctx.tmpfilename))
                 raise RetryDownload(e)
 
             while True:
                 try:
                     # Download and write
-                    data_block = ctx.data.read(block_size if data_len is None else min(block_size, data_len - byte_counter))
+                    data_block = ctx.data.read(block_size if not is_test else min(block_size, data_len - byte_counter))
                 # socket.timeout is a subclass of socket.error but may not have
                 # errno set
                 except socket.timeout as e:
                     retry(e)
                 except socket.error as e:
-                    # SSLError on python 2 (inherits socket.error) may have
+                    if e.errno not in (errno.ECONNRESET, errno.ETIMEDOUT):
-                    # no errno set but this error message
+                        raise
-                    if e.errno in (errno.ECONNRESET, errno.ETIMEDOUT) or getattr(e, 'message', None) == 'The read operation timed out':
+                    retry(e)
-                        retry(e)
-                    raise
 
                 byte_counter += len(data_block)
 
@@ -309,7 +299,7 @@ class HttpFD(FileDownloader):
                     'elapsed': now - ctx.start_time,
                 })
 
-                if data_len is not None and byte_counter == data_len:
+                if is_test and byte_counter == data_len:
                     break
 
             if not is_test and ctx.chunk_size and ctx.data_len is not None and byte_counter < ctx.data_len:

youtube_dl/downloader/ism.py

@@ -146,7 +146,7 @@ def write_piff_header(stream, params):
             sps, pps = codec_private_data.split(u32.pack(1))[1:]
             avcc_payload = u8.pack(1)  # configuration version
             avcc_payload += sps[1:4]  # avc profile indication + profile compatibility + avc level indication
-            avcc_payload += u8.pack(0xfc | (params.get('nal_unit_length_field', 4) - 1))  # complete representation (1) + reserved (11111) + length size minus one
+            avcc_payload += u8.pack(0xfc | (params.get('nal_unit_length_field', 4) - 1))  # complete represenation (1) + reserved (11111) + length size minus one
             avcc_payload += u8.pack(1)  # reserved (0) + number of sps (0000001)
             avcc_payload += u16.pack(len(sps))
             avcc_payload += sps

youtube_dl/extractor/abc.py

@@ -110,17 +110,17 @@ class ABCIViewIE(InfoExtractor):
 
     # ABC iview programs are normally available for 14 days only.
     _TESTS = [{
-        'url': 'https://iview.abc.net.au/show/gruen/series/11/video/LE1927H001S00',
+        'url': 'https://iview.abc.net.au/show/ben-and-hollys-little-kingdom/series/0/video/ZX9371A050S00',
-        'md5': '67715ce3c78426b11ba167d875ac6abf',
+        'md5': 'cde42d728b3b7c2b32b1b94b4a548afc',
         'info_dict': {
-            'id': 'LE1927H001S00',
+            'id': 'ZX9371A050S00',
             'ext': 'mp4',
-            'title': "Series 11 Ep 1",
+            'title': "Gaston's Birthday",
-            'series': "Gruen",
+            'series': "Ben And Holly's Little Kingdom",
-            'description': 'md5:52cc744ad35045baf6aded2ce7287f67',
+            'description': 'md5:f9de914d02f226968f598ac76f105bcf',
-            'upload_date': '20190925',
+            'upload_date': '20180604',
-            'uploader_id': 'abc1',
+            'uploader_id': 'abc4kids',
-            'timestamp': 1569445289,
+            'timestamp': 1528140219,
         },
         'params': {
             'skip_download': True,
@@ -148,7 +148,7 @@ class ABCIViewIE(InfoExtractor):
                 'hdnea': token,
             })
 
-        for sd in ('720', 'sd', 'sd-low'):
+        for sd in ('sd', 'sd-low'):
             sd_url = try_get(
                 stream, lambda x: x['streams']['hls'][sd], compat_str)
             if not sd_url:

youtube_dl/extractor/abcnews.py

@@ -1,28 +1,24 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import calendar
 import re
+import time
 
 from .amp import AMPIE
 from .common import InfoExtractor
-from ..utils import (
+from .youtube import YoutubeIE
-    parse_duration,
+from ..compat import compat_urlparse
-    parse_iso8601,
-    try_get,
-)
 
 
 class AbcNewsVideoIE(AMPIE):
     IE_NAME = 'abcnews:video'
     _VALID_URL = r'''(?x)
                     https?://
+                        abcnews\.go\.com/
                         (?:
-                            abcnews\.go\.com/
+                            [^/]+/video/(?P<display_id>[0-9a-z-]+)-|
-                            (?:
+                            video/embed\?.*?\bid=
-                                (?:[^/]+/)*video/(?P<display_id>[0-9a-z-]+)-|
-                                video/(?:embed|itemfeed)\?.*?\bid=
-                            )|
-                            fivethirtyeight\.abcnews\.go\.com/video/embed/\d+/
                         )
                         (?P<id>\d+)
                     '''
@@ -37,8 +33,6 @@ class AbcNewsVideoIE(AMPIE):
             'description': 'George Stephanopoulos goes one-on-one with Iranian Foreign Minister Dr. Javad Zarif.',
             'duration': 180,
             'thumbnail': r're:^https?://.*\.jpg$',
-            'timestamp': 1380454200,
-            'upload_date': '20130929',
         },
         'params': {
             # m3u8 download
@@ -50,12 +44,6 @@ class AbcNewsVideoIE(AMPIE):
     }, {
         'url': 'http://abcnews.go.com/2020/video/2020-husband-stands-teacher-jail-student-affairs-26119478',
         'only_matching': True,
-    }, {
-        'url': 'http://abcnews.go.com/video/itemfeed?id=46979033',
-        'only_matching': True,
-    }, {
-        'url': 'https://abcnews.go.com/GMA/News/video/history-christmas-story-67894761',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -76,23 +64,28 @@ class AbcNewsIE(InfoExtractor):
     _VALID_URL = r'https?://abcnews\.go\.com/(?:[^/]+/)+(?P<display_id>[0-9a-z-]+)/story\?id=(?P<id>\d+)'
 
     _TESTS = [{
-        # Youtube Embeds
+        'url': 'http://abcnews.go.com/Blotter/News/dramatic-video-rare-death-job-america/story?id=10498713#.UIhwosWHLjY',
-        'url': 'https://abcnews.go.com/Entertainment/peter-billingsley-child-actor-christmas-story-hollywood-power/story?id=51286501',
         'info_dict': {
-            'id': '51286501',
+            'id': '10505354',
-            'title': "Peter Billingsley: From child actor in 'A Christmas Story' to Hollywood power player",
+            'ext': 'flv',
-            'description': 'Billingsley went from a child actor to Hollywood power player.',
+            'display_id': 'dramatic-video-rare-death-job-america',
+            'title': 'Occupational Hazards',
+            'description': 'Nightline investigates the dangers that lurk at various jobs.',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'upload_date': '20100428',
+            'timestamp': 1272412800,
         },
-        'playlist_count': 5,
+        'add_ie': ['AbcNewsVideo'],
     }, {
         'url': 'http://abcnews.go.com/Entertainment/justin-timberlake-performs-stop-feeling-eurovision-2016/story?id=39125818',
         'info_dict': {
             'id': '38897857',
             'ext': 'mp4',
+            'display_id': 'justin-timberlake-performs-stop-feeling-eurovision-2016',
             'title': 'Justin Timberlake Drops Hints For Secret Single',
             'description': 'Lara Spencer reports the buzziest stories of the day in "GMA" Pop News.',
-            'upload_date': '20160505',
+            'upload_date': '20160515',
-            'timestamp': 1462442280,
+            'timestamp': 1463329500,
         },
         'params': {
             # m3u8 download
@@ -104,55 +97,49 @@ class AbcNewsIE(InfoExtractor):
     }, {
         'url': 'http://abcnews.go.com/Technology/exclusive-apple-ceo-tim-cook-iphone-cracking-software/story?id=37173343',
         'only_matching': True,
-    }, {
-        # inline.type == 'video'
-        'url': 'http://abcnews.go.com/Technology/exclusive-apple-ceo-tim-cook-iphone-cracking-software/story?id=37173343',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        story_id = self._match_id(url)
+        mobj = re.match(self._VALID_URL, url)
-        webpage = self._download_webpage(url, story_id)
+        display_id = mobj.group('display_id')
-        story = self._parse_json(self._search_regex(
+        video_id = mobj.group('id')
-            r"window\['__abcnews__'\]\s*=\s*({.+?});",
-            webpage, 'data'), story_id)['page']['content']['story']['everscroll'][0]
-        article_contents = story.get('articleContents') or {}
 
-        def entries():
+        webpage = self._download_webpage(url, video_id)
-            featured_video = story.get('featuredVideo') or {}
+        video_url = self._search_regex(
-            feed = try_get(featured_video, lambda x: x['video']['feed'])
+            r'window\.abcnvideo\.url\s*=\s*"([^"]+)"', webpage, 'video URL')
-            if feed:
+        full_video_url = compat_urlparse.urljoin(url, video_url)
-                yield {
-                    '_type': 'url',
-                    'id': featured_video.get('id'),
-                    'title': featured_video.get('name'),
-                    'url': feed,
-                    'thumbnail': featured_video.get('images'),
-                    'description': featured_video.get('description'),
-                    'timestamp': parse_iso8601(featured_video.get('uploadDate')),
-                    'duration': parse_duration(featured_video.get('duration')),
-                    'ie_key': AbcNewsVideoIE.ie_key(),
-                }
 
-            for inline in (article_contents.get('inlines') or []):
+        youtube_url = YoutubeIE._extract_url(webpage)
-                inline_type = inline.get('type')
-                if inline_type == 'iframe':
-                    iframe_url = try_get(inline, lambda x: x['attrs']['src'])
-                    if iframe_url:
-                        yield self.url_result(iframe_url)
-                elif inline_type == 'video':
-                    video_id = inline.get('id')
-                    if video_id:
-                        yield {
-                            '_type': 'url',
-                            'id': video_id,
-                            'url': 'http://abcnews.go.com/video/embed?id=' + video_id,
-                            'thumbnail': inline.get('imgSrc') or inline.get('imgDefault'),
-                            'description': inline.get('description'),
-                            'duration': parse_duration(inline.get('duration')),
-                            'ie_key': AbcNewsVideoIE.ie_key(),
-                        }
 
-        return self.playlist_result(
+        timestamp = None
-            entries(), story_id, article_contents.get('headline'),
+        date_str = self._html_search_regex(
-            article_contents.get('subHead'))
+            r'<span[^>]+class="timestamp">([^<]+)</span>',
+            webpage, 'timestamp', fatal=False)
+        if date_str:
+            tz_offset = 0
+            if date_str.endswith(' ET'):  # Eastern Time
+                tz_offset = -5
+                date_str = date_str[:-3]
+            date_formats = ['%b. %d, %Y', '%b %d, %Y, %I:%M %p']
+            for date_format in date_formats:
+                try:
+                    timestamp = calendar.timegm(time.strptime(date_str.strip(), date_format))
+                except ValueError:
+                    continue
+            if timestamp is not None:
+                timestamp -= tz_offset * 3600
+
+        entry = {
+            '_type': 'url_transparent',
+            'ie_key': AbcNewsVideoIE.ie_key(),
+            'url': full_video_url,
+            'id': video_id,
+            'display_id': display_id,
+            'timestamp': timestamp,
+        }
+
+        if youtube_url:
+            entries = [entry, self.url_result(youtube_url, ie=YoutubeIE.ie_key())]
+            return self.playlist_result(entries)
+
+        return entry

youtube_dl/extractor/abcotvs.py

@@ -4,30 +4,29 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    dict_get,
     int_or_none,
-    try_get,
+    parse_iso8601,
 )
 
 
 class ABCOTVSIE(InfoExtractor):
     IE_NAME = 'abcotvs'
     IE_DESC = 'ABC Owned Television Stations'
-    _VALID_URL = r'https?://(?P<site>abc(?:7(?:news|ny|chicago)?|11|13|30)|6abc)\.com(?:(?:/[^/]+)*/(?P<display_id>[^/]+))?/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:abc(?:7(?:news|ny|chicago)?|11|13|30)|6abc)\.com(?:/[^/]+/(?P<display_id>[^/]+))?/(?P<id>\d+)'
     _TESTS = [
         {
             'url': 'http://abc7news.com/entertainment/east-bay-museum-celebrates-vintage-synthesizers/472581/',
             'info_dict': {
-                'id': '472548',
+                'id': '472581',
                 'display_id': 'east-bay-museum-celebrates-vintage-synthesizers',
                 'ext': 'mp4',
-                'title': 'East Bay museum celebrates synthesized music',
+                'title': 'East Bay museum celebrates vintage synthesizers',
                 'description': 'md5:24ed2bd527096ec2a5c67b9d5a9005f3',
                 'thumbnail': r're:^https?://.*\.jpg$',
-                'timestamp': 1421118520,
+                'timestamp': 1421123075,
                 'upload_date': '20150113',
+                'uploader': 'Jonathan Bloom',
             },
             'params': {
                 # m3u8 download
@@ -38,63 +37,39 @@ class ABCOTVSIE(InfoExtractor):
             'url': 'http://abc7news.com/472581',
             'only_matching': True,
         },
-        {
-            'url': 'https://6abc.com/man-75-killed-after-being-struck-by-vehicle-in-chester/5725182/',
-            'only_matching': True,
-        },
     ]
-    _SITE_MAP = {
-        '6abc': 'wpvi',
-        'abc11': 'wtvd',
-        'abc13': 'ktrk',
-        'abc30': 'kfsn',
-        'abc7': 'kabc',
-        'abc7chicago': 'wls',
-        'abc7news': 'kgo',
-        'abc7ny': 'wabc',
-    }
 
     def _real_extract(self, url):
-        site, display_id, video_id = re.match(self._VALID_URL, url).groups()
+        mobj = re.match(self._VALID_URL, url)
-        display_id = display_id or video_id
+        video_id = mobj.group('id')
-        station = self._SITE_MAP[site]
+        display_id = mobj.group('display_id') or video_id
 
-        data = self._download_json(
+        webpage = self._download_webpage(url, display_id)
-            'https://api.abcotvs.com/v2/content', display_id, query={
-                'id': video_id,
-                'key': 'otv.web.%s.story' % station,
-                'station': station,
-            })['data']
-        video = try_get(data, lambda x: x['featuredMedia']['video'], dict) or data
-        video_id = compat_str(dict_get(video, ('id', 'publishedKey'), video_id))
-        title = video.get('title') or video['linkText']
 
-        formats = []
+        m3u8 = self._html_search_meta(
-        m3u8_url = video.get('m3u8')
+            'contentURL', webpage, 'm3u8 url', fatal=True).split('?')[0]
-        if m3u8_url:
+
-            formats = self._extract_m3u8_formats(
+        formats = self._extract_m3u8_formats(m3u8, display_id, 'mp4')
-                video['m3u8'].split('?')[0], display_id, 'mp4', m3u8_id='hls', fatal=False)
-        mp4_url = video.get('mp4')
-        if mp4_url:
-            formats.append({
-                'abr': 128,
-                'format_id': 'https',
-                'height': 360,
-                'url': mp4_url,
-                'width': 640,
-            })
         self._sort_formats(formats)
 
-        image = video.get('image') or {}
+        title = self._og_search_title(webpage).strip()
+        description = self._og_search_description(webpage).strip()
+        thumbnail = self._og_search_thumbnail(webpage)
+        timestamp = parse_iso8601(self._search_regex(
+            r'<div class="meta">\s*<time class="timeago" datetime="([^"]+)">',
+            webpage, 'upload date', fatal=False))
+        uploader = self._search_regex(
+            r'rel="author">([^<]+)</a>',
+            webpage, 'uploader', default=None)
 
         return {
             'id': video_id,
             'display_id': display_id,
             'title': title,
-            'description': dict_get(video, ('description', 'caption'), try_get(video, lambda x: x['meta']['description'])),
+            'description': description,
-            'thumbnail': dict_get(image, ('source', 'dynamicSource')),
+            'thumbnail': thumbnail,
-            'timestamp': int_or_none(video.get('date')),
+            'timestamp': timestamp,
-            'duration': int_or_none(video.get('length')),
+            'uploader': uploader,
             'formats': formats,
         }
 

youtube_dl/extractor/acast.py

@@ -2,48 +2,20 @@
 from __future__ import unicode_literals
 
 import re
+import functools
 
 from .common import InfoExtractor
+from ..compat import compat_str
 from ..utils import (
-    clean_html,
+    float_or_none,
-    clean_podcast_url,
     int_or_none,
-    parse_iso8601,
+    try_get,
+    unified_timestamp,
+    OnDemandPagedList,
 )
 
 
-class ACastBaseIE(InfoExtractor):
+class ACastIE(InfoExtractor):
-    def _extract_episode(self, episode, show_info):
-        title = episode['title']
-        info = {
-            'id': episode['id'],
-            'display_id': episode.get('episodeUrl'),
-            'url': clean_podcast_url(episode['url']),
-            'title': title,
-            'description': clean_html(episode.get('description') or episode.get('summary')),
-            'thumbnail': episode.get('image'),
-            'timestamp': parse_iso8601(episode.get('publishDate')),
-            'duration': int_or_none(episode.get('duration')),
-            'filesize': int_or_none(episode.get('contentLength')),
-            'season_number': int_or_none(episode.get('season')),
-            'episode': title,
-            'episode_number': int_or_none(episode.get('episode')),
-        }
-        info.update(show_info)
-        return info
-
-    def _extract_show_info(self, show):
-        return {
-            'creator': show.get('author'),
-            'series': show.get('title'),
-        }
-
-    def _call_api(self, path, video_id, query=None):
-        return self._download_json(
-            'https://feeder.acast.com/api/v1/shows/' + path, video_id, query=query)
-
-
-class ACastIE(ACastBaseIE):
     IE_NAME = 'acast'
     _VALID_URL = r'''(?x)
                     https?://
@@ -55,15 +27,15 @@ class ACastIE(ACastBaseIE):
                     '''
     _TESTS = [{
         'url': 'https://www.acast.com/sparpodcast/2.raggarmordet-rosterurdetforflutna',
-        'md5': 'f5598f3ad1e4776fed12ec1407153e4b',
+        'md5': 'a02393c74f3bdb1801c3ec2695577ce0',
         'info_dict': {
             'id': '2a92b283-1a75-4ad8-8396-499c641de0d9',
             'ext': 'mp3',
             'title': '2. Raggarmordet - Röster ur det förflutna',
-            'description': 'md5:a992ae67f4d98f1c0141598f7bebbf67',
+            'description': 'md5:4f81f6d8cf2e12ee21a321d8bca32db4',
             'timestamp': 1477346700,
             'upload_date': '20161024',
-            'duration': 2766,
+            'duration': 2766.602563,
             'creator': 'Anton Berg & Martin Johnson',
             'series': 'Spår',
             'episode': '2. Raggarmordet - Röster ur det förflutna',
@@ -72,23 +44,40 @@ class ACastIE(ACastBaseIE):
         'url': 'http://embed.acast.com/adambuxton/ep.12-adam-joeschristmaspodcast2015',
         'only_matching': True,
     }, {
-        'url': 'https://play.acast.com/s/rattegangspodden/s04e09styckmordetihelenelund-del2-2',
+        'url': 'https://play.acast.com/s/rattegangspodden/s04e09-styckmordet-i-helenelund-del-22',
-        'only_matching': True,
-    }, {
-        'url': 'https://play.acast.com/s/sparpodcast/2a92b283-1a75-4ad8-8396-499c641de0d9',
         'only_matching': True,
     }]
 
     def _real_extract(self, url):
         channel, display_id = re.match(self._VALID_URL, url).groups()
-        episode = self._call_api(
+        s = self._download_json(
-            '%s/episodes/%s' % (channel, display_id),
+            'https://play-api.acast.com/stitch/%s/%s' % (channel, display_id),
-            display_id, {'showInfo': 'true'})
+            display_id)['result']
-        return self._extract_episode(
+        media_url = s['url']
-            episode, self._extract_show_info(episode.get('show') or {}))
+        cast_data = self._download_json(
+            'https://play-api.acast.com/splash/%s/%s' % (channel, display_id),
+            display_id)['result']
+        e = cast_data['episode']
+        title = e['name']
+        return {
+            'id': compat_str(e['id']),
+            'display_id': display_id,
+            'url': media_url,
+            'title': title,
+            'description': e.get('description') or e.get('summary'),
+            'thumbnail': e.get('image'),
+            'timestamp': unified_timestamp(e.get('publishingDate')),
+            'duration': float_or_none(s.get('duration') or e.get('duration')),
+            'filesize': int_or_none(e.get('contentLength')),
+            'creator': try_get(cast_data, lambda x: x['show']['author'], compat_str),
+            'series': try_get(cast_data, lambda x: x['show']['name'], compat_str),
+            'season_number': int_or_none(e.get('seasonNumber')),
+            'episode': title,
+            'episode_number': int_or_none(e.get('episodeNumber')),
+        }
 
 
-class ACastChannelIE(ACastBaseIE):
+class ACastChannelIE(InfoExtractor):
     IE_NAME = 'acast:channel'
     _VALID_URL = r'''(?x)
                     https?://
@@ -103,24 +92,34 @@ class ACastChannelIE(ACastBaseIE):
         'info_dict': {
             'id': '4efc5294-5385-4847-98bd-519799ce5786',
             'title': 'Today in Focus',
-            'description': 'md5:c09ce28c91002ce4ffce71d6504abaae',
+            'description': 'md5:9ba5564de5ce897faeb12963f4537a64',
         },
-        'playlist_mincount': 200,
+        'playlist_mincount': 35,
     }, {
         'url': 'http://play.acast.com/s/ft-banking-weekly',
         'only_matching': True,
     }]
+    _API_BASE_URL = 'https://play.acast.com/api/'
+    _PAGE_SIZE = 10
 
     @classmethod
     def suitable(cls, url):
         return False if ACastIE.suitable(url) else super(ACastChannelIE, cls).suitable(url)
 
+    def _fetch_page(self, channel_slug, page):
+        casts = self._download_json(
+            self._API_BASE_URL + 'channels/%s/acasts?page=%s' % (channel_slug, page),
+            channel_slug, note='Download page %d of channel data' % page)
+        for cast in casts:
+            yield self.url_result(
+                'https://play.acast.com/s/%s/%s' % (channel_slug, cast['url']),
+                'ACast', cast['id'])
+
     def _real_extract(self, url):
-        show_slug = self._match_id(url)
+        channel_slug = self._match_id(url)
-        show = self._call_api(show_slug, show_slug)
+        channel_data = self._download_json(
-        show_info = self._extract_show_info(show)
+            self._API_BASE_URL + 'channels/%s' % channel_slug, channel_slug)
-        entries = []
+        entries = OnDemandPagedList(functools.partial(
-        for episode in (show.get('episodes') or []):
+            self._fetch_page, channel_slug), self._PAGE_SIZE)
-            entries.append(self._extract_episode(episode, show_info))
+        return self.playlist_result(entries, compat_str(
-        return self.playlist_result(
+            channel_data['id']), channel_data['name'], channel_data.get('description'))
-            entries, show.get('id'), show.get('title'), show.get('description'))

youtube_dl/extractor/addanime.py

@@ -0,0 +1,95 @@
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..compat import (
+    compat_HTTPError,
+    compat_str,
+    compat_urllib_parse_urlencode,
+    compat_urllib_parse_urlparse,
+)
+from ..utils import (
+    ExtractorError,
+    qualities,
+)
+
+
+class AddAnimeIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:\w+\.)?add-anime\.net/(?:watch_video\.php\?(?:.*?)v=|video/)(?P<id>[\w_]+)'
+    _TESTS = [{
+        'url': 'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
+        'md5': '72954ea10bc979ab5e2eb288b21425a0',
+        'info_dict': {
+            'id': '24MR3YO5SAS9',
+            'ext': 'mp4',
+            'description': 'One Piece 606',
+            'title': 'One Piece 606',
+        },
+        'skip': 'Video is gone',
+    }, {
+        'url': 'http://add-anime.net/video/MDUGWYKNGBD8/One-Piece-687',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        try:
+            webpage = self._download_webpage(url, video_id)
+        except ExtractorError as ee:
+            if not isinstance(ee.cause, compat_HTTPError) or \
+               ee.cause.code != 503:
+                raise
+
+            redir_webpage = ee.cause.read().decode('utf-8')
+            action = self._search_regex(
+                r'<form id="challenge-form" action="([^"]+)"',
+                redir_webpage, 'Redirect form')
+            vc = self._search_regex(
+                r'<input type="hidden" name="jschl_vc" value="([^"]+)"/>',
+                redir_webpage, 'redirect vc value')
+            av = re.search(
+                r'a\.value = ([0-9]+)[+]([0-9]+)[*]([0-9]+);',
+                redir_webpage)
+            if av is None:
+                raise ExtractorError('Cannot find redirect math task')
+            av_res = int(av.group(1)) + int(av.group(2)) * int(av.group(3))
+
+            parsed_url = compat_urllib_parse_urlparse(url)
+            av_val = av_res + len(parsed_url.netloc)
+            confirm_url = (
+                parsed_url.scheme + '://' + parsed_url.netloc +
+                action + '?' +
+                compat_urllib_parse_urlencode({
+                    'jschl_vc': vc, 'jschl_answer': compat_str(av_val)}))
+            self._download_webpage(
+                confirm_url, video_id,
+                note='Confirming after redirect')
+            webpage = self._download_webpage(url, video_id)
+
+        FORMATS = ('normal', 'hq')
+        quality = qualities(FORMATS)
+        formats = []
+        for format_id in FORMATS:
+            rex = r"var %s_video_file = '(.*?)';" % re.escape(format_id)
+            video_url = self._search_regex(rex, webpage, 'video file URLx',
+                                           fatal=False)
+            if not video_url:
+                continue
+            formats.append({
+                'format_id': format_id,
+                'url': video_url,
+                'quality': quality(format_id),
+            })
+        self._sort_formats(formats)
+        video_title = self._og_search_title(webpage)
+        video_description = self._og_search_description(webpage)
+
+        return {
+            '_type': 'video',
+            'id': video_id,
+            'formats': formats,
+            'title': video_title,
+            'description': video_description
+        }

youtube_dl/extractor/adn.py

@@ -10,7 +10,6 @@ import random
 from .common import InfoExtractor
 from ..aes import aes_cbc_decrypt
 from ..compat import (
-    compat_HTTPError,
     compat_b64decode,
     compat_ord,
 )
@@ -19,14 +18,11 @@ from ..utils import (
     bytes_to_long,
     ExtractorError,
     float_or_none,
-    int_or_none,
     intlist_to_bytes,
     long_to_bytes,
     pkcs1pad,
     strip_or_none,
-    try_get,
+    urljoin,
-    unified_strdate,
-    urlencode_postdata,
 )
 
 
@@ -35,30 +31,16 @@ class ADNIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?animedigitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
     _TEST = {
         'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
-        'md5': '0319c99885ff5547565cacb4f3f9348d',
+        'md5': 'e497370d847fd79d9d4c74be55575c7a',
         'info_dict': {
             'id': '7778',
             'ext': 'mp4',
-            'title': 'Blue Exorcist - Kyôto Saga - Episode 1',
+            'title': 'Blue Exorcist - Kyôto Saga - Épisode 1',
             'description': 'md5:2f7b5aa76edbc1a7a92cedcda8a528d5',
-            'series': 'Blue Exorcist - Kyôto Saga',
-            'duration': 1467,
-            'release_date': '20170106',
-            'comment_count': int,
-            'average_rating': float,
-            'season_number': 2,
-            'episode': 'Début des hostilités',
-            'episode_number': 1,
         }
     }
-
-    _NETRC_MACHINE = 'animedigitalnetwork'
     _BASE_URL = 'http://animedigitalnetwork.fr'
-    _API_BASE_URL = 'https://gw.api.animedigitalnetwork.fr/'
+    _RSA_KEY = (0xc35ae1e4356b65a73b551493da94b8cb443491c0aa092a357a5aee57ffc14dda85326f42d716e539a34542a0d3f363adf16c5ec222d713d5997194030ee2e4f0d1fb328c01a81cf6868c090d50de8e169c6b13d1675b9eeed1cbc51e1fffca9b38af07f37abd790924cd3bee59d0257cfda4fe5f3f0534877e21ce5821447d1b, 65537)
-    _PLAYER_BASE_URL = _API_BASE_URL + 'player/'
-    _HEADERS = {}
-    _LOGIN_ERR_MESSAGE = 'Unable to log in'
-    _RSA_KEY = (0x9B42B08905199A5CCE2026274399CA560ECB209EE9878A708B1C0812E1BB8CB5D1FB7441861147C1A1F2F3A0476DD63A9CAC20D3E983613346850AA6CB38F16DC7D720FD7D86FC6E5B3D5BBC72E14CD0BF9E869F2CEA2CCAD648F1DCE38F1FF916CEFB2D339B64AA0264372344BC775E265E8A852F88144AB0BD9AA06C1A4ABB, 65537)
     _POS_ALIGN_MAP = {
         'start': 1,
         'end': 3,
@@ -72,24 +54,25 @@ class ADNIE(InfoExtractor):
     def _ass_subtitles_timecode(seconds):
         return '%01d:%02d:%02d.%02d' % (seconds / 3600, (seconds % 3600) / 60, seconds % 60, (seconds % 1) * 100)
 
-    def _get_subtitles(self, sub_url, video_id):
+    def _get_subtitles(self, sub_path, video_id):
-        if not sub_url:
+        if not sub_path:
             return None
 
         enc_subtitles = self._download_webpage(
-            sub_url, video_id, 'Downloading subtitles location', fatal=False) or '{}'
+            urljoin(self._BASE_URL, sub_path),
+            video_id, 'Downloading subtitles location', fatal=False) or '{}'
         subtitle_location = (self._parse_json(enc_subtitles, video_id, fatal=False) or {}).get('location')
         if subtitle_location:
             enc_subtitles = self._download_webpage(
-                subtitle_location, video_id, 'Downloading subtitles data',
+                urljoin(self._BASE_URL, subtitle_location),
-                fatal=False, headers={'Origin': 'https://animedigitalnetwork.fr'})
+                video_id, 'Downloading subtitles data', fatal=False)
         if not enc_subtitles:
             return None
 
         # http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
         dec_subtitles = intlist_to_bytes(aes_cbc_decrypt(
             bytes_to_intlist(compat_b64decode(enc_subtitles[24:])),
-            bytes_to_intlist(binascii.unhexlify(self._K + 'ab9f52f5baae7c72')),
+            bytes_to_intlist(binascii.unhexlify(self._K + '4421de0a5f0814ba')),
             bytes_to_intlist(compat_b64decode(enc_subtitles[:24]))
         ))
         subtitles_json = self._parse_json(
@@ -133,100 +116,61 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             }])
         return subtitles
 
-    def _real_initialize(self):
-        username, password = self._get_login_info()
-        if not username:
-            return
-        try:
-            access_token = (self._download_json(
-                self._API_BASE_URL + 'authentication/login', None,
-                'Logging in', self._LOGIN_ERR_MESSAGE, fatal=False,
-                data=urlencode_postdata({
-                    'password': password,
-                    'rememberMe': False,
-                    'source': 'Web',
-                    'username': username,
-                })) or {}).get('accessToken')
-            if access_token:
-                self._HEADERS = {'authorization': 'Bearer ' + access_token}
-        except ExtractorError as e:
-            message = None
-            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
-                resp = self._parse_json(
-                    e.cause.read().decode(), None, fatal=False) or {}
-                message = resp.get('message') or resp.get('code')
-            self.report_warning(message or self._LOGIN_ERR_MESSAGE)
-
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_base_url = self._PLAYER_BASE_URL + 'video/%s/' % video_id
+        webpage = self._download_webpage(url, video_id)
-        player = self._download_json(
+        player_config = self._parse_json(self._search_regex(
-            video_base_url + 'configuration', video_id,
+            r'playerConfig\s*=\s*({.+});', webpage,
-            'Downloading player config JSON metadata',
+            'player config', default='{}'), video_id, fatal=False)
-            headers=self._HEADERS)['player']
+        if not player_config:
-        options = player['options']
+            config_url = urljoin(self._BASE_URL, self._search_regex(
+                r'(?:id="player"|class="[^"]*adn-player-container[^"]*")[^>]+data-url="([^"]+)"',
+                webpage, 'config url'))
+            player_config = self._download_json(
+                config_url, video_id,
+                'Downloading player config JSON metadata')['player']
 
-        user = options['user']
+        video_info = {}
-        if not user.get('hasAccess'):
+        video_info_str = self._search_regex(
-            self.raise_login_required()
+            r'videoInfo\s*=\s*({.+});', webpage,
+            'video info', fatal=False)
+        if video_info_str:
+            video_info = self._parse_json(
+                video_info_str, video_id, fatal=False) or {}
 
-        token = self._download_json(
+        options = player_config.get('options') or {}
-            user.get('refreshTokenUrl') or (self._PLAYER_BASE_URL + 'refresh/token'),
+        metas = options.get('metas') or {}
-            video_id, 'Downloading access token', headers={
+        links = player_config.get('links') or {}
-                'x-player-refresh-token': user['refreshToken']
+        sub_path = player_config.get('subtitles')
-            }, data=b'')['token']
+        error = None
-
+        if not links:
-        links_url = try_get(options, lambda x: x['video']['url']) or (video_base_url + 'link')
+            links_url = player_config.get('linksurl') or options['videoUrl']
-        self._K = ''.join([random.choice('0123456789abcdef') for _ in range(16)])
+            token = options['token']
-        message = bytes_to_intlist(json.dumps({
+            self._K = ''.join([random.choice('0123456789abcdef') for _ in range(16)])
-            'k': self._K,
+            message = bytes_to_intlist(json.dumps({
-            't': token,
+                'k': self._K,
-        }))
+                'e': 60,
-
+                't': token,
-        # Sometimes authentication fails for no good reason, retry with
+            }))
-        # a different random padding
-        links_data = None
-        for _ in range(3):
             padded_message = intlist_to_bytes(pkcs1pad(message, 128))
             n, e = self._RSA_KEY
             encrypted_message = long_to_bytes(pow(bytes_to_long(padded_message), e, n))
             authorization = base64.b64encode(encrypted_message).decode()
-
+            links_data = self._download_json(
-            try:
+                urljoin(self._BASE_URL, links_url), video_id,
-                links_data = self._download_json(
+                'Downloading links JSON metadata', headers={
-                    links_url, video_id, 'Downloading links JSON metadata', headers={
+                    'Authorization': 'Bearer ' + authorization,
-                        'X-Player-Token': authorization
+                })
-                    }, query={
+            links = links_data.get('links') or {}
-                        'freeWithAds': 'true',
+            metas = metas or links_data.get('meta') or {}
-                        'adaptive': 'false',
+            sub_path = sub_path or links_data.get('subtitles') or \
-                        'withMetadata': 'true',
+                'index.php?option=com_vodapi&task=subtitles.getJSON&format=json&id=' + video_id
-                        'source': 'Web'
+            sub_path += '&token=' + token
-                    })
+            error = links_data.get('error')
-                break
+        title = metas.get('title') or video_info['title']
-            except ExtractorError as e:
-                if not isinstance(e.cause, compat_HTTPError):
-                    raise e
-
-                if e.cause.code == 401:
-                    # This usually goes away with a different random pkcs1pad, so retry
-                    continue
-
-                error = self._parse_json(e.cause.read(), video_id)
-                message = error.get('message')
-                if e.cause.code == 403 and error.get('code') == 'player-bad-geolocation-country':
-                    self.raise_geo_restricted(msg=message)
-                raise ExtractorError(message)
-        else:
-            raise ExtractorError('Giving up retrying')
-
-        links = links_data.get('links') or {}
-        metas = links_data.get('metadata') or {}
-        sub_url = (links.get('subtitles') or {}).get('all')
-        video_info = links_data.get('video') or {}
-        title = metas['title']
 
         formats = []
-        for format_id, qualities in (links.get('streaming') or {}).items():
+        for format_id, qualities in links.items():
             if not isinstance(qualities, dict):
                 continue
             for quality, load_balancer_url in qualities.items():
@@ -244,26 +188,19 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
                     for f in m3u8_formats:
                         f['language'] = 'fr'
                 formats.extend(m3u8_formats)
+        if not error:
+            error = options.get('error')
+        if not formats and error:
+            raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
         self._sort_formats(formats)
 
-        video = (self._download_json(
-            self._API_BASE_URL + 'video/%s' % video_id, video_id,
-            'Downloading additional video metadata', fatal=False) or {}).get('video') or {}
-        show = video.get('show') or {}
-
         return {
             'id': video_id,
             'title': title,
-            'description': strip_or_none(metas.get('summary') or video.get('summary')),
+            'description': strip_or_none(metas.get('summary') or video_info.get('resume')),
-            'thumbnail': video_info.get('image') or player.get('image'),
+            'thumbnail': video_info.get('image'),
             'formats': formats,
-            'subtitles': self.extract_subtitles(sub_url, video_id),
+            'subtitles': self.extract_subtitles(sub_path, video_id),
-            'episode': metas.get('subtitle') or video.get('name'),
+            'episode': metas.get('subtitle') or video_info.get('videoTitle'),
-            'episode_number': int_or_none(video.get('shortNumber')),
+            'series': video_info.get('playlistTitle'),
-            'series': show.get('title'),
-            'season_number': int_or_none(video.get('season')),
-            'duration': int_or_none(video_info.get('duration') or video.get('duration')),
-            'release_date': unified_strdate(video.get('releaseDate')),
-            'average_rating': float_or_none(video.get('rating') or metas.get('rating')),
-            'comment_count': int_or_none(video.get('commentsCount')),
         }

youtube_dl/extractor/adobepass.py

@@ -25,11 +25,6 @@ MSO_INFO = {
         'username_field': 'username',
         'password_field': 'password',
     },
-    'ATT': {
-        'name': 'AT&T U-verse',
-        'username_field': 'userid',
-        'password_field': 'password',
-    },
     'ATTOTT': {
         'name': 'DIRECTV NOW',
         'username_field': 'email',

youtube_dl/extractor/adobetv.py

@@ -1,119 +1,25 @@
 from __future__ import unicode_literals
 
-import functools
 import re
 
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
-    float_or_none,
-    int_or_none,
-    ISO639Utils,
-    OnDemandPagedList,
     parse_duration,
-    str_or_none,
-    str_to_int,
     unified_strdate,
+    str_to_int,
+    int_or_none,
+    float_or_none,
+    ISO639Utils,
+    determine_ext,
 )
 
 
 class AdobeTVBaseIE(InfoExtractor):
-    def _call_api(self, path, video_id, query, note=None):
+    _API_BASE_URL = 'http://tv.adobe.com/api/v4/'
-        return self._download_json(
-            'http://tv.adobe.com/api/v4/' + path,
-            video_id, note, query=query)['data']
-
-    def _parse_subtitles(self, video_data, url_key):
-        subtitles = {}
-        for translation in video_data.get('translations', []):
-            vtt_path = translation.get(url_key)
-            if not vtt_path:
-                continue
-            lang = translation.get('language_w3c') or ISO639Utils.long2short(translation['language_medium'])
-            subtitles.setdefault(lang, []).append({
-                'ext': 'vtt',
-                'url': vtt_path,
-            })
-        return subtitles
-
-    def _parse_video_data(self, video_data):
-        video_id = compat_str(video_data['id'])
-        title = video_data['title']
-
-        s3_extracted = False
-        formats = []
-        for source in video_data.get('videos', []):
-            source_url = source.get('url')
-            if not source_url:
-                continue
-            f = {
-                'format_id': source.get('quality_level'),
-                'fps': int_or_none(source.get('frame_rate')),
-                'height': int_or_none(source.get('height')),
-                'tbr': int_or_none(source.get('video_data_rate')),
-                'width': int_or_none(source.get('width')),
-                'url': source_url,
-            }
-            original_filename = source.get('original_filename')
-            if original_filename:
-                if not (f.get('height') and f.get('width')):
-                    mobj = re.search(r'_(\d+)x(\d+)', original_filename)
-                    if mobj:
-                        f.update({
-                            'height': int(mobj.group(2)),
-                            'width': int(mobj.group(1)),
-                        })
-                if original_filename.startswith('s3://') and not s3_extracted:
-                    formats.append({
-                        'format_id': 'original',
-                        'preference': 1,
-                        'url': original_filename.replace('s3://', 'https://s3.amazonaws.com/'),
-                    })
-                    s3_extracted = True
-            formats.append(f)
-        self._sort_formats(formats)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': video_data.get('description'),
-            'thumbnail': video_data.get('thumbnail'),
-            'upload_date': unified_strdate(video_data.get('start_date')),
-            'duration': parse_duration(video_data.get('duration')),
-            'view_count': str_to_int(video_data.get('playcount')),
-            'formats': formats,
-            'subtitles': self._parse_subtitles(video_data, 'vtt'),
-        }
-
-
-class AdobeTVEmbedIE(AdobeTVBaseIE):
-    IE_NAME = 'adobetv:embed'
-    _VALID_URL = r'https?://tv\.adobe\.com/embed/\d+/(?P<id>\d+)'
-    _TEST = {
-        'url': 'https://tv.adobe.com/embed/22/4153',
-        'md5': 'c8c0461bf04d54574fc2b4d07ac6783a',
-        'info_dict': {
-            'id': '4153',
-            'ext': 'flv',
-            'title': 'Creating Graphics Optimized for BlackBerry',
-            'description': 'md5:eac6e8dced38bdaae51cd94447927459',
-            'thumbnail': r're:https?://.*\.jpg$',
-            'upload_date': '20091109',
-            'duration': 377,
-            'view_count': int,
-        },
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        video_data = self._call_api(
-            'episode/' + video_id, video_id, {'disclosure': 'standard'})[0]
-        return self._parse_video_data(video_data)
 
 
 class AdobeTVIE(AdobeTVBaseIE):
-    IE_NAME = 'adobetv'
     _VALID_URL = r'https?://tv\.adobe\.com/(?:(?P<language>fr|de|es|jp)/)?watch/(?P<show_urlname>[^/]+)/(?P<id>[^/]+)'
 
     _TEST = {
@@ -136,33 +42,45 @@ class AdobeTVIE(AdobeTVBaseIE):
         if not language:
             language = 'en'
 
-        video_data = self._call_api(
+        video_data = self._download_json(
-            'episode/get', urlname, {
+            self._API_BASE_URL + 'episode/get/?language=%s&show_urlname=%s&urlname=%s&disclosure=standard' % (language, show_urlname, urlname),
-                'disclosure': 'standard',
+            urlname)['data'][0]
-                'language': language,
+
-                'show_urlname': show_urlname,
+        formats = [{
-                'urlname': urlname,
+            'url': source['url'],
-            })[0]
+            'format_id': source.get('quality_level') or source['url'].split('-')[-1].split('.')[0] or None,
-        return self._parse_video_data(video_data)
+            'width': int_or_none(source.get('width')),
+            'height': int_or_none(source.get('height')),
+            'tbr': int_or_none(source.get('video_data_rate')),
+        } for source in video_data['videos']]
+        self._sort_formats(formats)
+
+        return {
+            'id': compat_str(video_data['id']),
+            'title': video_data['title'],
+            'description': video_data.get('description'),
+            'thumbnail': video_data.get('thumbnail'),
+            'upload_date': unified_strdate(video_data.get('start_date')),
+            'duration': parse_duration(video_data.get('duration')),
+            'view_count': str_to_int(video_data.get('playcount')),
+            'formats': formats,
+        }
 
 
 class AdobeTVPlaylistBaseIE(AdobeTVBaseIE):
-    _PAGE_SIZE = 25
+    def _parse_page_data(self, page_data):
+        return [self.url_result(self._get_element_url(element_data)) for element_data in page_data]
 
-    def _fetch_page(self, display_id, query, page):
+    def _extract_playlist_entries(self, url, display_id):
-        page += 1
+        page = self._download_json(url, display_id)
-        query['page'] = page
+        entries = self._parse_page_data(page['data'])
-        for element_data in self._call_api(
+        for page_num in range(2, page['paging']['pages'] + 1):
-                self._RESOURCE, display_id, query, 'Download Page %d' % page):
+            entries.extend(self._parse_page_data(
-            yield self._process_data(element_data)
+                self._download_json(url + '&page=%d' % page_num, display_id)['data']))
-
+        return entries
-    def _extract_playlist_entries(self, display_id, query):
-        return OnDemandPagedList(functools.partial(
-            self._fetch_page, display_id, query), self._PAGE_SIZE)
 
 
 class AdobeTVShowIE(AdobeTVPlaylistBaseIE):
-    IE_NAME = 'adobetv:show'
     _VALID_URL = r'https?://tv\.adobe\.com/(?:(?P<language>fr|de|es|jp)/)?show/(?P<id>[^/]+)'
 
     _TEST = {
@@ -174,31 +92,26 @@ class AdobeTVShowIE(AdobeTVPlaylistBaseIE):
         },
         'playlist_mincount': 136,
     }
-    _RESOURCE = 'episode'
+
-    _process_data = AdobeTVBaseIE._parse_video_data
+    def _get_element_url(self, element_data):
+        return element_data['urls'][0]
 
     def _real_extract(self, url):
         language, show_urlname = re.match(self._VALID_URL, url).groups()
         if not language:
             language = 'en'
-        query = {
+        query = 'language=%s&show_urlname=%s' % (language, show_urlname)
-            'disclosure': 'standard',
-            'language': language,
-            'show_urlname': show_urlname,
-        }
 
-        show_data = self._call_api(
+        show_data = self._download_json(self._API_BASE_URL + 'show/get/?%s' % query, show_urlname)['data'][0]
-            'show/get', show_urlname, query)[0]
 
         return self.playlist_result(
-            self._extract_playlist_entries(show_urlname, query),
+            self._extract_playlist_entries(self._API_BASE_URL + 'episode/?%s' % query, show_urlname),
-            str_or_none(show_data.get('id')),
+            compat_str(show_data['id']),
-            show_data.get('show_name'),
+            show_data['show_name'],
-            show_data.get('show_description'))
+            show_data['show_description'])
 
 
 class AdobeTVChannelIE(AdobeTVPlaylistBaseIE):
-    IE_NAME = 'adobetv:channel'
     _VALID_URL = r'https?://tv\.adobe\.com/(?:(?P<language>fr|de|es|jp)/)?channel/(?P<id>[^/]+)(?:/(?P<category_urlname>[^/]+))?'
 
     _TEST = {
@@ -208,30 +121,24 @@ class AdobeTVChannelIE(AdobeTVPlaylistBaseIE):
         },
         'playlist_mincount': 96,
     }
-    _RESOURCE = 'show'
 
-    def _process_data(self, show_data):
+    def _get_element_url(self, element_data):
-        return self.url_result(
+        return element_data['url']
-            show_data['url'], 'AdobeTVShow', str_or_none(show_data.get('id')))
 
     def _real_extract(self, url):
         language, channel_urlname, category_urlname = re.match(self._VALID_URL, url).groups()
         if not language:
             language = 'en'
-        query = {
+        query = 'language=%s&channel_urlname=%s' % (language, channel_urlname)
-            'channel_urlname': channel_urlname,
-            'language': language,
-        }
         if category_urlname:
-            query['category_urlname'] = category_urlname
+            query += '&category_urlname=%s' % category_urlname
 
         return self.playlist_result(
-            self._extract_playlist_entries(channel_urlname, query),
+            self._extract_playlist_entries(self._API_BASE_URL + 'show/?%s' % query, channel_urlname),
             channel_urlname)
 
 
-class AdobeTVVideoIE(AdobeTVBaseIE):
+class AdobeTVVideoIE(InfoExtractor):
-    IE_NAME = 'adobetv:video'
     _VALID_URL = r'https?://video\.tv\.adobe\.com/v/(?P<id>\d+)'
 
     _TEST = {
@@ -253,36 +160,38 @@ class AdobeTVVideoIE(AdobeTVBaseIE):
 
         video_data = self._parse_json(self._search_regex(
             r'var\s+bridge\s*=\s*([^;]+);', webpage, 'bridged data'), video_id)
-        title = video_data['title']
 
-        formats = []
+        formats = [{
-        sources = video_data.get('sources') or []
+            'format_id': '%s-%s' % (determine_ext(source['src']), source.get('height')),
-        for source in sources:
+            'url': source['src'],
-            source_src = source.get('src')
+            'width': int_or_none(source.get('width')),
-            if not source_src:
+            'height': int_or_none(source.get('height')),
-                continue
+            'tbr': int_or_none(source.get('bitrate')),
-            formats.append({
+        } for source in video_data['sources']]
-                'filesize': int_or_none(source.get('kilobytes') or None, invscale=1000),
-                'format_id': '-'.join(filter(None, [source.get('format'), source.get('label')])),
-                'height': int_or_none(source.get('height') or None),
-                'tbr': int_or_none(source.get('bitrate') or None),
-                'width': int_or_none(source.get('width') or None),
-                'url': source_src,
-            })
         self._sort_formats(formats)
 
         # For both metadata and downloaded files the duration varies among
         # formats. I just pick the max one
         duration = max(filter(None, [
             float_or_none(source.get('duration'), scale=1000)
-            for source in sources]))
+            for source in video_data['sources']]))
+
+        subtitles = {}
+        for translation in video_data.get('translations', []):
+            lang_id = translation.get('language_w3c') or ISO639Utils.long2short(translation['language_medium'])
+            if lang_id not in subtitles:
+                subtitles[lang_id] = []
+            subtitles[lang_id].append({
+                'url': translation['vttPath'],
+                'ext': 'vtt',
+            })
 
         return {
             'id': video_id,
             'formats': formats,
-            'title': title,
+            'title': video_data['title'],
             'description': video_data.get('description'),
-            'thumbnail': video_data.get('video', {}).get('poster'),
+            'thumbnail': video_data['video'].get('poster'),
             'duration': duration,
-            'subtitles': self._parse_subtitles(video_data, 'vttPath'),
+            'subtitles': subtitles,
         }

youtube_dl/extractor/aenetworks.py

@@ -5,32 +5,20 @@ import re
 
 from .theplatform import ThePlatformIE
 from ..utils import (
+    extract_attributes,
     ExtractorError,
-    GeoRestrictedError,
     int_or_none,
+    smuggle_url,
     update_url_query,
-    urlencode_postdata,
+)
+from ..compat import (
+    compat_urlparse,
 )
 
 
 class AENetworksBaseIE(ThePlatformIE):
-    _BASE_URL_REGEX = r'''(?x)https?://
-        (?:(?:www|play|watch)\.)?
-        (?P<domain>
-            (?:history(?:vault)?|aetv|mylifetime|lifetimemovieclub)\.com|
-            fyi\.tv
-        )/'''
     _THEPLATFORM_KEY = 'crazyjava'
     _THEPLATFORM_SECRET = 's3cr3t'
-    _DOMAIN_MAP = {
-        'history.com': ('HISTORY', 'history'),
-        'aetv.com': ('AETV', 'aetv'),
-        'mylifetime.com': ('LIFETIME', 'lifetime'),
-        'lifetimemovieclub.com': ('LIFETIMEMOVIECLUB', 'lmc'),
-        'fyi.tv': ('FYI', 'fyi'),
-        'historyvault.com': (None, 'historyvault'),
-        'biography.com': (None, 'biography'),
-    }
 
     def _extract_aen_smil(self, smil_url, video_id, auth=None):
         query = {'mbr': 'true'}
@@ -43,7 +31,7 @@ class AENetworksBaseIE(ThePlatformIE):
             'assetTypes': 'high_video_s3'
         }, {
             'assetTypes': 'high_video_s3',
-            'switch': 'hls_high_fastly',
+            'switch': 'hls_ingest_fastly'
         }]
         formats = []
         subtitles = {}
@@ -56,8 +44,6 @@ class AENetworksBaseIE(ThePlatformIE):
                 tp_formats, tp_subtitles = self._extract_theplatform_smil(
                     m_url, video_id, 'Downloading %s SMIL data' % (q.get('switch') or q['assetTypes']))
             except ExtractorError as e:
-                if isinstance(e, GeoRestrictedError):
-                    raise
                 last_e = e
                 continue
             formats.extend(tp_formats)
@@ -71,45 +57,24 @@ class AENetworksBaseIE(ThePlatformIE):
             'subtitles': subtitles,
         }
 
-    def _extract_aetn_info(self, domain, filter_key, filter_value, url):
-        requestor_id, brand = self._DOMAIN_MAP[domain]
-        result = self._download_json(
-            'https://feeds.video.aetnd.com/api/v2/%s/videos' % brand,
-            filter_value, query={'filter[%s]' % filter_key: filter_value})['results'][0]
-        title = result['title']
-        video_id = result['id']
-        media_url = result['publicUrl']
-        theplatform_metadata = self._download_theplatform_metadata(self._search_regex(
-            r'https?://link\.theplatform\.com/s/([^?]+)', media_url, 'theplatform_path'), video_id)
-        info = self._parse_theplatform_metadata(theplatform_metadata)
-        auth = None
-        if theplatform_metadata.get('AETN$isBehindWall'):
-            resource = self._get_mvpd_resource(
-                requestor_id, theplatform_metadata['title'],
-                theplatform_metadata.get('AETN$PPL_pplProgramId') or theplatform_metadata.get('AETN$PPL_pplProgramId_OLD'),
-                theplatform_metadata['ratings'][0]['rating'])
-            auth = self._extract_mvpd_auth(
-                url, video_id, requestor_id, resource)
-        info.update(self._extract_aen_smil(media_url, video_id, auth))
-        info.update({
-            'title': title,
-            'series': result.get('seriesName'),
-            'season_number': int_or_none(result.get('tvSeasonNumber')),
-            'episode_number': int_or_none(result.get('tvSeasonEpisodeNumber')),
-        })
-        return info
-
 
 class AENetworksIE(AENetworksBaseIE):
     IE_NAME = 'aenetworks'
     IE_DESC = 'A+E Networks: A&E, Lifetime, History.com, FYI Network and History Vault'
-    _VALID_URL = AENetworksBaseIE._BASE_URL_REGEX + r'''(?P<id>
+    _VALID_URL = r'''(?x)
-        shows/[^/]+/season-\d+/episode-\d+|
+                    https?://
-        (?:
+                        (?:www\.)?
-            (?:movie|special)s/[^/]+|
+                        (?P<domain>
-            (?:shows/[^/]+/)?videos
+                            (?:history(?:vault)?|aetv|mylifetime|lifetimemovieclub)\.com|
-        )/[^/?#&]+
+                            fyi\.tv
-    )'''
+                        )/
+                        (?:
+                            shows/(?P<show_path>[^/]+(?:/[^/]+){0,2})|
+                            movies/(?P<movie_display_id>[^/]+)(?:/full-movie)?|
+                            specials/(?P<special_display_id>[^/]+)/(?:full-special|preview-)|
+                            collections/[^/]+/(?P<collection_display_id>[^/]+)
+                        )
+                    '''
     _TESTS = [{
         'url': 'http://www.history.com/shows/mountain-men/season-1/episode-1',
         'info_dict': {
@@ -126,23 +91,22 @@ class AENetworksIE(AENetworksBaseIE):
             'skip_download': True,
         },
         'add_ie': ['ThePlatform'],
-        'skip': 'This video is only available for users of participating TV providers.',
+    }, {
+        'url': 'http://www.history.com/shows/ancient-aliens/season-1',
+        'info_dict': {
+            'id': '71889446852',
+        },
+        'playlist_mincount': 5,
+    }, {
+        'url': 'http://www.mylifetime.com/shows/atlanta-plastic',
+        'info_dict': {
+            'id': 'SERIES4317',
+            'title': 'Atlanta Plastic',
+        },
+        'playlist_mincount': 2,
     }, {
         'url': 'http://www.aetv.com/shows/duck-dynasty/season-9/episode-1',
-        'info_dict': {
+        'only_matching': True
-            'id': '600587331957',
-            'ext': 'mp4',
-            'title': 'Inlawful Entry',
-            'description': 'md5:57c12115a2b384d883fe64ca50529e08',
-            'timestamp': 1452634428,
-            'upload_date': '20160112',
-            'uploader': 'AENE-NEW',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'add_ie': ['ThePlatform'],
     }, {
         'url': 'http://www.fyi.tv/shows/tiny-house-nation/season-1/episode-8',
         'only_matching': True
@@ -153,125 +117,78 @@ class AENetworksIE(AENetworksBaseIE):
         'url': 'http://www.mylifetime.com/movies/center-stage-on-pointe/full-movie',
         'only_matching': True
     }, {
-        'url': 'https://watch.lifetimemovieclub.com/movies/10-year-reunion/full-movie',
+        'url': 'https://www.lifetimemovieclub.com/movies/a-killer-among-us',
         'only_matching': True
     }, {
         'url': 'http://www.history.com/specials/sniper-into-the-kill-zone/full-special',
         'only_matching': True
+    }, {
+        'url': 'https://www.historyvault.com/collections/america-the-story-of-us/westward',
+        'only_matching': True
     }, {
         'url': 'https://www.aetv.com/specials/hunting-jonbenets-killer-the-untold-story/preview-hunting-jonbenets-killer-the-untold-story',
         'only_matching': True
-    }, {
-        'url': 'http://www.history.com/videos/history-of-valentines-day',
-        'only_matching': True
-    }, {
-        'url': 'https://play.aetv.com/shows/duck-dynasty/videos/best-of-duck-dynasty-getting-quack-in-shape',
-        'only_matching': True
     }]
+    _DOMAIN_TO_REQUESTOR_ID = {
+        'history.com': 'HISTORY',
+        'aetv.com': 'AETV',
+        'mylifetime.com': 'LIFETIME',
+        'lifetimemovieclub.com': 'LIFETIMEMOVIECLUB',
+        'fyi.tv': 'FYI',
+    }
 
     def _real_extract(self, url):
-        domain, canonical = re.match(self._VALID_URL, url).groups()
+        domain, show_path, movie_display_id, special_display_id, collection_display_id = re.match(self._VALID_URL, url).groups()
-        return self._extract_aetn_info(domain, 'canonical', '/' + canonical, url)
+        display_id = show_path or movie_display_id or special_display_id or collection_display_id
+        webpage = self._download_webpage(url, display_id, headers=self.geo_verification_headers())
+        if show_path:
+            url_parts = show_path.split('/')
+            url_parts_len = len(url_parts)
+            if url_parts_len == 1:
+                entries = []
+                for season_url_path in re.findall(r'(?s)<li[^>]+data-href="(/shows/%s/season-\d+)"' % url_parts[0], webpage):
+                    entries.append(self.url_result(
+                        compat_urlparse.urljoin(url, season_url_path), 'AENetworks'))
+                if entries:
+                    return self.playlist_result(
+                        entries, self._html_search_meta('aetn:SeriesId', webpage),
+                        self._html_search_meta('aetn:SeriesTitle', webpage))
+                else:
+                    # single season
+                    url_parts_len = 2
+            if url_parts_len == 2:
+                entries = []
+                for episode_item in re.findall(r'(?s)<[^>]+class="[^"]*(?:episode|program)-item[^"]*"[^>]*>', webpage):
+                    episode_attributes = extract_attributes(episode_item)
+                    episode_url = compat_urlparse.urljoin(
+                        url, episode_attributes['data-canonical'])
+                    entries.append(self.url_result(
+                        episode_url, 'AENetworks',
+                        episode_attributes.get('data-videoid') or episode_attributes.get('data-video-id')))
+                return self.playlist_result(
+                    entries, self._html_search_meta('aetn:SeasonId', webpage))
 
-
+        video_id = self._html_search_meta('aetn:VideoID', webpage)
-class AENetworksListBaseIE(AENetworksBaseIE):
+        media_url = self._search_regex(
-    def _call_api(self, resource, slug, brand, fields):
+            [r"media_url\s*=\s*'(?P<url>[^']+)'",
-        return self._download_json(
+             r'data-media-url=(?P<url>(?:https?:)?//[^\s>]+)',
-            'https://yoga.appsvcs.aetnd.com/graphql',
+             r'data-media-url=(["\'])(?P<url>(?:(?!\1).)+?)\1'],
-            slug, query={'brand': brand}, data=urlencode_postdata({
+            webpage, 'video url', group='url')
-                'query': '''{
+        theplatform_metadata = self._download_theplatform_metadata(self._search_regex(
-  %s(slug: "%s") {
+            r'https?://link\.theplatform\.com/s/([^?]+)', media_url, 'theplatform_path'), video_id)
-    %s
+        info = self._parse_theplatform_metadata(theplatform_metadata)
-  }
+        auth = None
-}''' % (resource, slug, fields),
+        if theplatform_metadata.get('AETN$isBehindWall'):
-            }))['data'][resource]
+            requestor_id = self._DOMAIN_TO_REQUESTOR_ID[domain]
-
+            resource = self._get_mvpd_resource(
-    def _real_extract(self, url):
+                requestor_id, theplatform_metadata['title'],
-        domain, slug = re.match(self._VALID_URL, url).groups()
+                theplatform_metadata.get('AETN$PPL_pplProgramId') or theplatform_metadata.get('AETN$PPL_pplProgramId_OLD'),
-        _, brand = self._DOMAIN_MAP[domain]
+                theplatform_metadata['ratings'][0]['rating'])
-        playlist = self._call_api(self._RESOURCE, slug, brand, self._FIELDS)
+            auth = self._extract_mvpd_auth(
-        base_url = 'http://watch.%s' % domain
+                url, video_id, requestor_id, resource)
-
+        info.update(self._search_json_ld(webpage, video_id, fatal=False))
-        entries = []
+        info.update(self._extract_aen_smil(media_url, video_id, auth))
-        for item in (playlist.get(self._ITEMS_KEY) or []):
+        return info
-            doc = self._get_doc(item)
-            canonical = doc.get('canonical')
-            if not canonical:
-                continue
-            entries.append(self.url_result(
-                base_url + canonical, AENetworksIE.ie_key(), doc.get('id')))
-
-        description = None
-        if self._PLAYLIST_DESCRIPTION_KEY:
-            description = playlist.get(self._PLAYLIST_DESCRIPTION_KEY)
-
-        return self.playlist_result(
-            entries, playlist.get('id'),
-            playlist.get(self._PLAYLIST_TITLE_KEY), description)
-
-
-class AENetworksCollectionIE(AENetworksListBaseIE):
-    IE_NAME = 'aenetworks:collection'
-    _VALID_URL = AENetworksBaseIE._BASE_URL_REGEX + r'(?:[^/]+/)*(?:list|collections)/(?P<id>[^/?#&]+)/?(?:[?#&]|$)'
-    _TESTS = [{
-        'url': 'https://watch.historyvault.com/list/america-the-story-of-us',
-        'info_dict': {
-            'id': '282',
-            'title': 'America The Story of Us',
-        },
-        'playlist_mincount': 12,
-    }, {
-        'url': 'https://watch.historyvault.com/shows/america-the-story-of-us-2/season-1/list/america-the-story-of-us',
-        'only_matching': True
-    }, {
-        'url': 'https://www.historyvault.com/collections/mysteryquest',
-        'only_matching': True
-    }]
-    _RESOURCE = 'list'
-    _ITEMS_KEY = 'items'
-    _PLAYLIST_TITLE_KEY = 'display_title'
-    _PLAYLIST_DESCRIPTION_KEY = None
-    _FIELDS = '''id
-    display_title
-    items {
-      ... on ListVideoItem {
-        doc {
-          canonical
-          id
-        }
-      }
-    }'''
-
-    def _get_doc(self, item):
-        return item.get('doc') or {}
-
-
-class AENetworksShowIE(AENetworksListBaseIE):
-    IE_NAME = 'aenetworks:show'
-    _VALID_URL = AENetworksBaseIE._BASE_URL_REGEX + r'shows/(?P<id>[^/?#&]+)/?(?:[?#&]|$)'
-    _TESTS = [{
-        'url': 'http://www.history.com/shows/ancient-aliens',
-        'info_dict': {
-            'id': 'SERIES1574',
-            'title': 'Ancient Aliens',
-            'description': 'md5:3f6d74daf2672ff3ae29ed732e37ea7f',
-        },
-        'playlist_mincount': 150,
-    }]
-    _RESOURCE = 'series'
-    _ITEMS_KEY = 'episodes'
-    _PLAYLIST_TITLE_KEY = 'title'
-    _PLAYLIST_DESCRIPTION_KEY = 'description'
-    _FIELDS = '''description
-    id
-    title
-    episodes {
-      canonical
-      id
-    }'''
-
-    def _get_doc(self, item):
-        return item
 
 
 class HistoryTopicIE(AENetworksBaseIE):
@@ -287,7 +204,6 @@ class HistoryTopicIE(AENetworksBaseIE):
             'description': 'md5:7b57ea4829b391995b405fa60bd7b5f7',
             'timestamp': 1375819729,
             'upload_date': '20130806',
-            'uploader': 'AENE-NEW',
         },
         'params': {
             # m3u8 download
@@ -296,47 +212,36 @@ class HistoryTopicIE(AENetworksBaseIE):
         'add_ie': ['ThePlatform'],
     }]
 
-    def _real_extract(self, url):
+    def theplatform_url_result(self, theplatform_url, video_id, query):
-        display_id = self._match_id(url)
+        return {
-        return self.url_result(
+            '_type': 'url_transparent',
-            'http://www.history.com/videos/' + display_id,
+            'id': video_id,
-            AENetworksIE.ie_key())
+            'url': smuggle_url(
-
+                update_url_query(theplatform_url, query),
-
+                {
-class HistoryPlayerIE(AENetworksBaseIE):
+                    'sig': {
-    IE_NAME = 'history:player'
+                        'key': self._THEPLATFORM_KEY,
-    _VALID_URL = r'https?://(?:www\.)?(?P<domain>(?:history|biography)\.com)/player/(?P<id>\d+)'
+                        'secret': self._THEPLATFORM_SECRET,
-    _TESTS = []
+                    },
-
+                    'force_smil_url': True
-    def _real_extract(self, url):
+                }),
-        domain, video_id = re.match(self._VALID_URL, url).groups()
+            'ie_key': 'ThePlatform',
-        return self._extract_aetn_info(domain, 'id', video_id, url)
+        }
-
-
-class BiographyIE(AENetworksBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?biography\.com/video/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://www.biography.com/video/vincent-van-gogh-full-episode-2075049808',
-        'info_dict': {
-            'id': '30322987',
-            'ext': 'mp4',
-            'title': 'Vincent Van Gogh - Full Episode',
-            'description': 'A full biography about the most influential 20th century painter, Vincent Van Gogh.',
-            'timestamp': 1311970571,
-            'upload_date': '20110729',
-            'uploader': 'AENE-NEW',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'add_ie': ['ThePlatform'],
-    }]
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
-        player_url = self._search_regex(
+        video_id = self._search_regex(
-            r'<phoenix-iframe[^>]+src="(%s)' % HistoryPlayerIE._VALID_URL,
+            r'<phoenix-iframe[^>]+src="[^"]+\btpid=(\d+)', webpage, 'tpid')
-            webpage, 'player URL')
+        result = self._download_json(
-        return self.url_result(player_url, HistoryPlayerIE.ie_key())
+            'https://feeds.video.aetnd.com/api/v2/history/videos',
+            video_id, query={'filter[id]': video_id})['results'][0]
+        title = result['title']
+        info = self._extract_aen_smil(result['publicUrl'], video_id)
+        info.update({
+            'title': title,
+            'description': result.get('description'),
+            'duration': int_or_none(result.get('duration')),
+            'timestamp': int_or_none(result.get('added'), 1000),
+        })
+        return info

youtube_dl/extractor/afreecatv.py

@@ -275,7 +275,7 @@ class AfreecaTVIE(InfoExtractor):
         video_element = video_xml.findall(compat_xpath('./track/video'))[-1]
         if video_element is None or video_element.text is None:
             raise ExtractorError(
-                'Video %s does not exist' % video_id, expected=True)
+                'Video %s video does not exist' % video_id, expected=True)
 
         video_url = video_element.text.strip()
 

youtube_dl/extractor/aljazeera.py

@@ -1,16 +1,13 @@
 from __future__ import unicode_literals
 
-import json
-import re
-
 from .common import InfoExtractor
 
 
 class AlJazeeraIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?aljazeera\.com/(?P<type>program/[^/]+|(?:feature|video)s)/\d{4}/\d{1,2}/\d{1,2}/(?P<id>[^/?&#]+)'
+    _VALID_URL = r'https?://(?:www\.)?aljazeera\.com/(?:programmes|video)/.*?/(?P<id>[^/]+)\.html'
 
     _TESTS = [{
-        'url': 'https://www.aljazeera.com/program/episode/2014/9/19/deliverance',
+        'url': 'http://www.aljazeera.com/programmes/the-slum/2014/08/deliverance-201482883754237240.html',
         'info_dict': {
             'id': '3792260579001',
             'ext': 'mp4',
@@ -23,34 +20,14 @@ class AlJazeeraIE(InfoExtractor):
         'add_ie': ['BrightcoveNew'],
         'skip': 'Not accessible from Travis CI server',
     }, {
-        'url': 'https://www.aljazeera.com/videos/2017/5/11/sierra-leone-709-carat-diamond-to-be-auctioned-off',
+        'url': 'http://www.aljazeera.com/video/news/2017/05/sierra-leone-709-carat-diamond-auctioned-170511100111930.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.aljazeera.com/features/2017/8/21/transforming-pakistans-buses-into-art',
         'only_matching': True,
     }]
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
+    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/665003303001/default_default/index.html?videoId=%s'
 
     def _real_extract(self, url):
-        post_type, name = re.match(self._VALID_URL, url).groups()
+        program_name = self._match_id(url)
-        post_type = {
+        webpage = self._download_webpage(url, program_name)
-            'features': 'post',
+        brightcove_id = self._search_regex(
-            'program': 'episode',
+            r'RenderPagesVideo\(\'(.+?)\'', webpage, 'brightcove id')
-            'videos': 'video',
+        return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id)
-        }[post_type.split('/')[0]]
-        video = self._download_json(
-            'https://www.aljazeera.com/graphql', name, query={
-                'operationName': 'SingleArticleQuery',
-                'variables': json.dumps({
-                    'name': name,
-                    'postType': post_type,
-                }),
-            }, headers={
-                'wp-site': 'aje',
-            })['data']['article']['video']
-        video_id = video['id']
-        account_id = video.get('accountId') or '665003303001'
-        player_id = video.get('playerId') or 'BkeSH5BDb'
-        return self.url_result(
-            self.BRIGHTCOVE_URL_TEMPLATE % (account_id, player_id, video_id),
-            'BrightcoveNew', video_id)

youtube_dl/extractor/amara.py

@@ -1,103 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from .youtube import YoutubeIE
-from .vimeo import VimeoIE
-from ..utils import (
-    int_or_none,
-    parse_iso8601,
-    update_url_query,
-)
-
-
-class AmaraIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?amara\.org/(?:\w+/)?videos/(?P<id>\w+)'
-    _TESTS = [{
-        # Youtube
-        'url': 'https://amara.org/en/videos/jVx79ZKGK1ky/info/why-jury-trials-are-becoming-less-common/?tab=video',
-        'md5': 'ea10daf2b6154b8c1ecf9922aca5e8ae',
-        'info_dict': {
-            'id': 'h6ZuVdvYnfE',
-            'ext': 'mp4',
-            'title': 'Why jury trials are becoming less common',
-            'description': 'md5:a61811c319943960b6ab1c23e0cbc2c1',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'subtitles': dict,
-            'upload_date': '20160813',
-            'uploader': 'PBS NewsHour',
-            'uploader_id': 'PBSNewsHour',
-            'timestamp': 1549639570,
-        }
-    }, {
-        # Vimeo
-        'url': 'https://amara.org/en/videos/kYkK1VUTWW5I/info/vimeo-at-ces-2011',
-        'md5': '99392c75fa05d432a8f11df03612195e',
-        'info_dict': {
-            'id': '18622084',
-            'ext': 'mov',
-            'title': 'Vimeo at CES 2011!',
-            'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'subtitles': dict,
-            'timestamp': 1294763658,
-            'upload_date': '20110111',
-            'uploader': 'Sam Morrill',
-            'uploader_id': 'sammorrill'
-        }
-    }, {
-        # Direct Link
-        'url': 'https://amara.org/en/videos/s8KL7I3jLmh6/info/the-danger-of-a-single-story/',
-        'md5': 'd3970f08512738ee60c5807311ff5d3f',
-        'info_dict': {
-            'id': 's8KL7I3jLmh6',
-            'ext': 'mp4',
-            'title': 'The danger of a single story',
-            'description': 'md5:d769b31139c3b8bb5be9177f62ea3f23',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'subtitles': dict,
-            'upload_date': '20091007',
-            'timestamp': 1254942511,
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        meta = self._download_json(
-            'https://amara.org/api/videos/%s/' % video_id,
-            video_id, query={'format': 'json'})
-        title = meta['title']
-        video_url = meta['all_urls'][0]
-
-        subtitles = {}
-        for language in (meta.get('languages') or []):
-            subtitles_uri = language.get('subtitles_uri')
-            if not (subtitles_uri and language.get('published')):
-                continue
-            subtitle = subtitles.setdefault(language.get('code') or 'en', [])
-            for f in ('json', 'srt', 'vtt'):
-                subtitle.append({
-                    'ext': f,
-                    'url': update_url_query(subtitles_uri, {'format': f}),
-                })
-
-        info = {
-            'url': video_url,
-            'id': video_id,
-            'subtitles': subtitles,
-            'title': title,
-            'description': meta.get('description'),
-            'thumbnail': meta.get('thumbnail'),
-            'duration': int_or_none(meta.get('duration')),
-            'timestamp': parse_iso8601(meta.get('created')),
-        }
-
-        for ie in (YoutubeIE, VimeoIE):
-            if ie.suitable(video_url):
-                info.update({
-                    '_type': 'url_transparent',
-                    'ie_key': ie.ie_key(),
-                })
-                break
-
-        return info

youtube_dl/extractor/amcnetworks.py

@@ -1,8 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import re
-
 from .theplatform import ThePlatformIE
 from ..utils import (
     int_or_none,
@@ -13,22 +11,25 @@ from ..utils import (
 
 
 class AMCNetworksIE(ThePlatformIE):
-    _VALID_URL = r'https?://(?:www\.)?(?P<site>amc|bbcamerica|ifc|(?:we|sundance)tv)\.com/(?P<id>(?:movies|shows(?:/[^/]+)+)/[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?(?:amc|bbcamerica|ifc|(?:we|sundance)tv)\.com/(?:movies|shows(?:/[^/]+)+)/(?P<id>[^/?#]+)'
     _TESTS = [{
-        'url': 'https://www.bbcamerica.com/shows/the-graham-norton-show/videos/tina-feys-adorable-airline-themed-family-dinner--51631',
+        'url': 'http://www.ifc.com/shows/maron/season-04/episode-01/step-1',
+        'md5': '',
         'info_dict': {
-            'id': '4Lq1dzOnZGt0',
+            'id': 's3MX01Nl4vPH',
             'ext': 'mp4',
-            'title': "The Graham Norton Show - Season 28 - Tina Fey's Adorable Airline-Themed Family Dinner",
+            'title': 'Maron - Season 4 - Step 1',
-            'description': "It turns out child stewardesses are very generous with the wine! All-new episodes of 'The Graham Norton Show' premiere Fridays at 11/10c on BBC America.",
+            'description': 'In denial about his current situation, Marc is reluctantly convinced by his friends to enter rehab. Starring Marc Maron and Constance Zimmer.',
-            'upload_date': '20201120',
+            'age_limit': 17,
-            'timestamp': 1605904350,
+            'upload_date': '20160505',
+            'timestamp': 1462468831,
             'uploader': 'AMCN',
         },
         'params': {
             # m3u8 download
             'skip_download': True,
         },
+        'skip': 'Requires TV provider accounts',
     }, {
         'url': 'http://www.bbcamerica.com/shows/the-hunt/full-episodes/season-1/episode-01-the-hardest-challenge',
         'only_matching': True,
@@ -54,34 +55,32 @@ class AMCNetworksIE(ThePlatformIE):
         'url': 'https://www.sundancetv.com/shows/riviera/full-episodes/season-1/episode-01-episode-1',
         'only_matching': True,
     }]
-    _REQUESTOR_ID_MAP = {
-        'amc': 'AMC',
-        'bbcamerica': 'BBCA',
-        'ifc': 'IFC',
-        'sundancetv': 'SUNDANCE',
-        'wetv': 'WETV',
-    }
 
     def _real_extract(self, url):
-        site, display_id = re.match(self._VALID_URL, url).groups()
+        display_id = self._match_id(url)
-        requestor_id = self._REQUESTOR_ID_MAP[site]
+        webpage = self._download_webpage(url, display_id)
-        properties = self._download_json(
-            'https://content-delivery-gw.svc.ds.amcn.com/api/v2/content/amcn/%s/url/%s' % (requestor_id.lower(), display_id),
-            display_id)['data']['properties']
         query = {
             'mbr': 'true',
             'manifest': 'm3u',
         }
-        tp_path = 'M_UwQC/media/' + properties['videoPid']
+        media_url = self._search_regex(
-        media_url = 'https://link.theplatform.com/s/' + tp_path
+            r'window\.platformLinkURL\s*=\s*[\'"]([^\'"]+)',
-        theplatform_metadata = self._download_theplatform_metadata(tp_path, display_id)
+            webpage, 'media url')
+        theplatform_metadata = self._download_theplatform_metadata(self._search_regex(
+            r'link\.theplatform\.com/s/([^?]+)',
+            media_url, 'theplatform_path'), display_id)
         info = self._parse_theplatform_metadata(theplatform_metadata)
         video_id = theplatform_metadata['pid']
         title = theplatform_metadata['title']
         rating = try_get(
             theplatform_metadata, lambda x: x['ratings'][0]['rating'])
-        video_category = properties.get('videoCategory')
+        auth_required = self._search_regex(
-        if video_category and video_category.endswith('-Auth'):
+            r'window\.authRequired\s*=\s*(true|false);',
+            webpage, 'auth required')
+        if auth_required == 'true':
+            requestor_id = self._search_regex(
+                r'window\.requestor_id\s*=\s*[\'"]([^\'"]+)',
+                webpage, 'requestor id')
             resource = self._get_mvpd_resource(
                 requestor_id, title, video_id, rating)
             query['auth'] = self._extract_mvpd_auth(

youtube_dl/extractor/americastestkitchen.py

@@ -1,58 +1,34 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import json
-import re
-
 from .common import InfoExtractor
 from ..utils import (
     clean_html,
     int_or_none,
     try_get,
     unified_strdate,
-    unified_timestamp,
 )
 
 
 class AmericasTestKitchenIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:americastestkitchen|cooks(?:country|illustrated))\.com/(?P<resource_type>episode|videos)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?americastestkitchen\.com/(?:episode|videos)/(?P<id>\d+)'
     _TESTS = [{
-        'url': 'https://www.americastestkitchen.com/episode/582-weeknight-japanese-suppers',
+        'url': 'https://www.americastestkitchen.com/episode/548-summer-dinner-party',
         'md5': 'b861c3e365ac38ad319cfd509c30577f',
         'info_dict': {
-            'id': '5b400b9ee338f922cb06450c',
+            'id': '1_5g5zua6e',
-            'title': 'Japanese Suppers',
+            'title': 'Summer Dinner Party',
             'ext': 'mp4',
-            'description': 'md5:64e606bfee910627efc4b5f050de92b3',
+            'description': 'md5:858d986e73a4826979b6a5d9f8f6a1ec',
-            'thumbnail': r're:^https?://',
+            'thumbnail': r're:^https?://.*\.jpg',
-            'timestamp': 1523318400,
+            'timestamp': 1497285541,
-            'upload_date': '20180410',
+            'upload_date': '20170612',
-            'release_date': '20180410',
+            'uploader_id': 'roger.metcalf@americastestkitchen.com',
+            'release_date': '20170617',
             'series': "America's Test Kitchen",
-            'season_number': 18,
+            'season_number': 17,
-            'episode': 'Japanese Suppers',
+            'episode': 'Summer Dinner Party',
-            'episode_number': 15,
+            'episode_number': 24,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # Metadata parsing behaves differently for newer episodes (705) as opposed to older episodes (582 above)
-        'url': 'https://www.americastestkitchen.com/episode/705-simple-chicken-dinner',
-        'md5': '06451608c57651e985a498e69cec17e5',
-        'info_dict': {
-            'id': '5fbe8c61bda2010001c6763b',
-            'title': 'Simple Chicken Dinner',
-            'ext': 'mp4',
-            'description': 'md5:eb68737cc2fd4c26ca7db30139d109e7',
-            'thumbnail': r're:^https?://',
-            'timestamp': 1610755200,
-            'upload_date': '20210116',
-            'release_date': '20210116',
-            'series': "America's Test Kitchen",
-            'season_number': 21,
-            'episode': 'Simple Chicken Dinner',
-            'episode_number': 3,
         },
         'params': {
             'skip_download': True,
@@ -60,100 +36,57 @@ class AmericasTestKitchenIE(InfoExtractor):
     }, {
         'url': 'https://www.americastestkitchen.com/videos/3420-pan-seared-salmon',
         'only_matching': True,
-    }, {
-        'url': 'https://www.cookscountry.com/episode/564-when-only-chocolate-will-do',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cooksillustrated.com/videos/4478-beef-wellington',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        resource_type, video_id = re.match(self._VALID_URL, url).groups()
+        video_id = self._match_id(url)
-        is_episode = resource_type == 'episode'
-        if is_episode:
-            resource_type = 'episodes'
 
-        resource = self._download_json(
+        webpage = self._download_webpage(url, video_id)
-            'https://www.americastestkitchen.com/api/v6/%s/%s' % (resource_type, video_id), video_id)
+
-        video = resource['video'] if is_episode else resource
+        video_data = self._parse_json(
-        episode = resource if is_episode else resource.get('episode') or {}
+            self._search_regex(
+                r'window\.__INITIAL_STATE__\s*=\s*({.+?})\s*;\s*</script>',
+                webpage, 'initial context'),
+            video_id)
+
+        ep_data = try_get(
+            video_data,
+            (lambda x: x['episodeDetail']['content']['data'],
+             lambda x: x['videoDetail']['content']['data']), dict)
+        ep_meta = ep_data.get('full_video', {})
+
+        zype_id = ep_meta.get('zype_id')
+        if zype_id:
+            embed_url = 'https://player.zype.com/embed/%s.js?api_key=jZ9GUhRmxcPvX7M3SlfejB6Hle9jyHTdk2jVxG7wOHPLODgncEKVdPYBhuz9iWXQ' % zype_id
+            ie_key = 'Zype'
+        else:
+            partner_id = self._search_regex(
+                r'src=["\'](?:https?:)?//(?:[^/]+\.)kaltura\.com/(?:[^/]+/)*(?:p|partner_id)/(\d+)',
+                webpage, 'kaltura partner id')
+            external_id = ep_data.get('external_id') or ep_meta['external_id']
+            embed_url = 'kaltura:%s:%s' % (partner_id, external_id)
+            ie_key = 'Kaltura'
+
+        title = ep_data.get('title') or ep_meta.get('title')
+        description = clean_html(ep_meta.get('episode_description') or ep_data.get(
+            'description') or ep_meta.get('description'))
+        thumbnail = try_get(ep_meta, lambda x: x['photo']['image_url'])
+        release_date = unified_strdate(ep_data.get('aired_at'))
+
+        season_number = int_or_none(ep_meta.get('season_number'))
+        episode = ep_meta.get('title')
+        episode_number = int_or_none(ep_meta.get('episode_number'))
 
         return {
             '_type': 'url_transparent',
-            'url': 'https://player.zype.com/embed/%s.js?api_key=jZ9GUhRmxcPvX7M3SlfejB6Hle9jyHTdk2jVxG7wOHPLODgncEKVdPYBhuz9iWXQ' % video['zypeId'],
+            'url': embed_url,
-            'ie_key': 'Zype',
+            'ie_key': ie_key,
-            'description': clean_html(video.get('description')),
+            'title': title,
-            'timestamp': unified_timestamp(video.get('publishDate')),
+            'description': description,
-            'release_date': unified_strdate(video.get('publishDate')),
+            'thumbnail': thumbnail,
-            'episode_number': int_or_none(episode.get('number')),
+            'release_date': release_date,
-            'season_number': int_or_none(episode.get('season')),
+            'series': "America's Test Kitchen",
-            'series': try_get(episode, lambda x: x['show']['title']),
+            'season_number': season_number,
-            'episode': episode.get('title'),
+            'episode': episode,
+            'episode_number': episode_number,
         }
-
-
-class AmericasTestKitchenSeasonIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?P<show>americastestkitchen|cookscountry)\.com/episodes/browse/season_(?P<id>\d+)'
-    _TESTS = [{
-        # ATK Season
-        'url': 'https://www.americastestkitchen.com/episodes/browse/season_1',
-        'info_dict': {
-            'id': 'season_1',
-            'title': 'Season 1',
-        },
-        'playlist_count': 13,
-    }, {
-        # Cooks Country Season
-        'url': 'https://www.cookscountry.com/episodes/browse/season_12',
-        'info_dict': {
-            'id': 'season_12',
-            'title': 'Season 12',
-        },
-        'playlist_count': 13,
-    }]
-
-    def _real_extract(self, url):
-        show_name, season_number = re.match(self._VALID_URL, url).groups()
-        season_number = int(season_number)
-
-        slug = 'atk' if show_name == 'americastestkitchen' else 'cco'
-
-        season = 'Season %d' % season_number
-
-        season_search = self._download_json(
-            'https://y1fnzxui30-dsn.algolia.net/1/indexes/everest_search_%s_season_desc_production' % slug,
-            season, headers={
-                'Origin': 'https://www.%s.com' % show_name,
-                'X-Algolia-API-Key': '8d504d0099ed27c1b73708d22871d805',
-                'X-Algolia-Application-Id': 'Y1FNZXUI30',
-            }, query={
-                'facetFilters': json.dumps([
-                    'search_season_list:' + season,
-                    'search_document_klass:episode',
-                    'search_show_slug:' + slug,
-                ]),
-                'attributesToRetrieve': 'description,search_%s_episode_number,search_document_date,search_url,title' % slug,
-                'attributesToHighlight': '',
-                'hitsPerPage': 1000,
-            })
-
-        def entries():
-            for episode in (season_search.get('hits') or []):
-                search_url = episode.get('search_url')
-                if not search_url:
-                    continue
-                yield {
-                    '_type': 'url',
-                    'url': 'https://www.%s.com%s' % (show_name, search_url),
-                    'id': try_get(episode, lambda e: e['objectID'].split('_')[-1]),
-                    'title': episode.get('title'),
-                    'description': episode.get('description'),
-                    'timestamp': unified_timestamp(episode.get('search_document_date')),
-                    'season_number': season_number,
-                    'episode_number': int_or_none(episode.get('search_%s_episode_number' % slug)),
-                    'ie_key': AmericasTestKitchenIE.ie_key(),
-                }
-
-        return self.playlist_result(
-            entries(), 'season_%d' % season_number, season)

youtube_dl/extractor/amp.py

@@ -8,7 +8,6 @@ from ..utils import (
     int_or_none,
     mimetype2ext,
     parse_iso8601,
-    unified_timestamp,
     url_or_none,
 )
 
@@ -89,7 +88,7 @@ class AMPIE(InfoExtractor):
 
         self._sort_formats(formats)
 
-        timestamp = unified_timestamp(item.get('pubDate'), ' ') or parse_iso8601(item.get('dc-date'))
+        timestamp = parse_iso8601(item.get('pubDate'), ' ') or parse_iso8601(item.get('dc-date'))
 
         return {
             'id': video_id,

youtube_dl/extractor/animeondemand.py

@@ -116,6 +116,8 @@ class AnimeOnDemandIE(InfoExtractor):
             r'(?s)<div[^>]+itemprop="description"[^>]*>(.+?)</div>',
             webpage, 'anime description', default=None)
 
+        entries = []
+
         def extract_info(html, video_id, num=None):
             title, description = [None] * 2
             formats = []
@@ -231,7 +233,7 @@ class AnimeOnDemandIE(InfoExtractor):
                 self._sort_formats(info['formats'])
                 f = common_info.copy()
                 f.update(info)
-                yield f
+                entries.append(f)
 
             # Extract teaser/trailer only when full episode is not available
             if not info['formats']:
@@ -245,7 +247,7 @@ class AnimeOnDemandIE(InfoExtractor):
                         'title': m.group('title'),
                         'url': urljoin(url, m.group('href')),
                     })
-                    yield f
+                    entries.append(f)
 
         def extract_episodes(html):
             for num, episode_html in enumerate(re.findall(
@@ -273,8 +275,7 @@ class AnimeOnDemandIE(InfoExtractor):
                     'episode_number': episode_number,
                 }
 
-                for e in extract_entries(episode_html, video_id, common_info):
+                extract_entries(episode_html, video_id, common_info)
-                    yield e
 
         def extract_film(html, video_id):
             common_info = {
@@ -282,18 +283,11 @@ class AnimeOnDemandIE(InfoExtractor):
                 'title': anime_title,
                 'description': anime_description,
             }
-            for e in extract_entries(html, video_id, common_info):
+            extract_entries(html, video_id, common_info)
-                yield e
 
-        def entries():
+        extract_episodes(webpage)
-            has_episodes = False
-            for e in extract_episodes(webpage):
-                has_episodes = True
-                yield e
 
-            if not has_episodes:
+        if not entries:
-                for e in extract_film(webpage, anime_id):
+            extract_film(webpage, anime_id)
-                    yield e
 
-        return self.playlist_result(
+        return self.playlist_result(entries, anime_id, anime_title, anime_description)
-            entries(), anime_id, anime_title, anime_description)

youtube_dl/extractor/anvato.py

@@ -116,76 +116,7 @@ class AnvatoIE(InfoExtractor):
         'anvato_scripps_app_ios_prod_409c41960c60b308db43c3cc1da79cab9f1c3d93': 'WPxj5GraLTkYCyj3M7RozLqIycjrXOEcDGFMIJPn',
         'EZqvRyKBJLrgpClDPDF8I7Xpdp40Vx73': '4OxGd2dEakylntVKjKF0UK9PDPYB6A9W',
         'M2v78QkpleXm9hPp9jUXI63x5vA6BogR': 'ka6K32k7ZALmpINkjJUGUo0OE42Md1BQ',
-        'nbcu_nbcd_desktop_web_prod_93d8ead38ce2024f8f544b78306fbd15895ae5e6_secure': 'NNemUkySjxLyPTKvZRiGntBIjEyK8uqicjMakIaQ',
+        'nbcu_nbcd_desktop_web_prod_93d8ead38ce2024f8f544b78306fbd15895ae5e6_secure': 'NNemUkySjxLyPTKvZRiGntBIjEyK8uqicjMakIaQ'
-        'X8POa4zPPaKVZHqmWjuEzfP31b1QM9VN': 'Dn5vOY9ooDw7VSl9qztjZI5o0g08mA0z',
-        'M2v78QkBMpNJlSPp9diX5F2PBmBy6Bog': 'ka6K32kyo7nDZfNkjQCGWf1lpApXMd1B',
-        'bvJ0dQpav07l0hG5JgfVLF2dv1vARwpP': 'BzoQW24GrJZoJfmNodiJKSPeB9B8NOxj',
-        'lxQMLg2XZKuEZaWgsqubBxV9INZ6bryY': 'Vm2Mx6noKds9jB71h6urazwlTG3m9x8l',
-        '04EnjvXeoSmkbJ9ckPs7oY0mcxv7PlyN': 'aXERQP9LMfQVlEDsgGs6eEA1SWznAQ8P',
-        'mQbO2ge6BFRWVPYCYpU06YvNt80XLvAX': 'E2BV1NGmasN5v7eujECVPJgwflnLPm2A',
-        'g43oeBzJrCml7o6fa5fRL1ErCdeD8z4K': 'RX34mZ6zVH4Nr6whbxIGLv9WSbxEKo8V',
-        'VQrDJoP7mtdBzkxhXbSPwGB1coeElk4x': 'j2VejQx0VFKQepAF7dI0mJLKtOVJE18z',
-        'WxA5NzLRjCrmq0NUgaU5pdMDuZO7RJ4w': 'lyY5ADLKaIOLEgAsGQCveEMAcqnx3rY9',
-        'M4lpMXB71ie0PjMCjdFzVXq0SeRVqz49': 'n2zVkOqaLIv3GbLfBjcwW51LcveWOZ2e',
-        'dyDZGEqN8u8nkJZcJns0oxYmtP7KbGAn': 'VXOEqQW9BtEVLajfZQSLEqxgS5B7qn2D',
-        'E7QNjrVY5u5mGvgu67IoDgV1CjEND8QR': 'rz8AaDmdKIkLmPNhB5ILPJnjS5PnlL8d',
-        'a4zrqjoKlfzg0dwHEWtP31VqcLBpjm4g': 'LY9J16gwETdGWa3hjBu5o0RzuoQDjqXQ',
-        'dQP5BZroMsMVLO1hbmT5r2Enu86GjxA6': '7XR3oOdbPF6x3PRFLDCq9RkgsRjAo48V',
-        'M4lKNBO1NFe0PjMCj1tzVXq0SeRVqzA9': 'n2zoRqGLRUv3GbLfBmTwW51LcveWOZYe',
-        'nAZ7MZdpGCGg1pqFEbsoJOz2C60mv143': 'dYJgdqA9aT4yojETqGi7yNgoFADxqmXP',
-        '3y1MERYgOuE9NzbFgwhV6Wv2F0YKvbyz': '081xpZDQgC4VadLTavhWQxrku56DAgXV',
-        'bmQvmEXr5HWklBMCZOcpE2Z3HBYwqGyl': 'zxXPbVNyMiMAZldhr9FkOmA0fl4aKr2v',
-        'wA7oDNYldfr6050Hwxi52lPZiVlB86Ap': 'ZYK16aA7ni0d3l3c34uwpxD7CbReMm8Q',
-        'g43MbKMWmFml7o7sJoSRkXxZiXRvJ3QK': 'RX3oBJonvs4Nr6rUWBCGn3matRGqJPXV',
-        'mA9VdlqpLS0raGaSDvtoqNrBTzb8XY4q': '0XN4OjBD3fnW7r7IbmtJB4AyfOmlrE2r',
-        'mAajOwgkGt17oGoFmEuklMP9H0GnW54d': 'lXbBLPGyzikNGeGujAuAJGjZiwLRxyXR',
-        'vy8vjJ9kbUwrRqRu59Cj5dWZfzYErlAb': 'K8l7gpwaGcBpnAnCLNCmPZRdin3eaQX0',
-        'xQMWBpR8oHEZaWaSMGUb0avOHjLVYn4Y': 'm2MrN4vEaf9jB7BFy5Srb40jTrN67AYl',
-        'xyKEmVO3miRr6D6UVkt7oB8jtD6aJEAv': 'g2ddDebqDfqdgKgswyUKwGjbTWwzq923',
-        '7Qk0wa2D9FjKapacoJF27aLvUDKkLGA0': 'b2kgBEkephJaMkMTL7s1PLe4Ua6WyP2P',
-        '3QLg6nqmNTJ5VvVTo7f508LPidz1xwyY': 'g2L1GgpraipmAOAUqmIbBnPxHOmw4MYa',
-        '3y1B7zZjXTE9NZNSzZSVNPZaTNLjo6Qz': '081b5G6wzH4VagaURmcWbN5mT4JGEe2V',
-        'lAqnwvkw6SG6D8DSqmUg6DRLUp0w3G4x': 'O2pbP0xPDFNJjpjIEvcdryOJtpkVM4X5',
-        'awA7xd1N0Hr6050Hw2c52lPZiVlB864p': 'GZYKpn4aoT0d3l3c3PiwpxD7CbReMmXQ',
-        'jQVqPLl9YHL1WGWtR1HDgWBGT63qRNyV': '6X03ne6vrU4oWyWUN7tQVoajikxJR3Ye',
-        'GQRMR8mL7uZK797t7xH3eNzPIP5dOny1': 'm2vqPWGd4U31zWzSyasDRAoMT1PKRp8o',
-        'zydq9RdmRhXLkNkfNoTJlMzaF0lWekQB': '3X7LnvE7vH5nkEkSqLiey793Un7dLB8e',
-        'VQrDzwkB2IdBzjzu9MHPbEYkSB50gR4x': 'j2VebLzoKUKQeEesmVh0gM1eIp9jKz8z',
-        'mAa2wMamBs17oGoFmktklMP9H0GnW54d': 'lXbgP74xZTkNGeGujVUAJGjZiwLRxy8R',
-        '7yjB6ZLG6sW8R6RF2xcan1KGfJ5dNoyd': 'wXQkPorvPHZ45N5t4Jf6qwg5Tp4xvw29',
-        'a4zPpNeWGuzg0m0iX3tPeanGSkRKWXQg': 'LY9oa3QAyHdGW9Wu3Ri5JGeEik7l1N8Q',
-        'k2rneA2M38k25cXDwwSknTJlxPxQLZ6M': '61lyA2aEVDzklfdwmmh31saPxQx2VRjp',
-        'bK9Zk4OvPnvxduLgxvi8VUeojnjA02eV': 'o5jANYjbeMb4nfBaQvcLAt1jzLzYx6ze',
-        '5VD6EydM3R9orHmNMGInGCJwbxbQvGRw': 'w3zjmX7g4vnxzCxElvUEOiewkokXprkZ',
-        '70X35QbVYVYNPUmP9YfbzI06YqYQk2R1': 'vG4Aj2BMjMjoztB7zeFOnCVPJpJ8lMOa',
-        '26qYwQVG9p1Bks2GgBckjfDJOXOAMgG1': 'r4ev9X0mv5zqJc0yk5IBDcQOwZw8mnwQ',
-        'rvVKpA56MBXWlSxMw3cobT5pdkd4Dm7q': '1J7ZkY53pZ645c93owcLZuveE7E8B3rL',
-        'qN1zdy1zlYL23IWZGWtDvfV6WeWQWkJo': 'qN1zdy1zlYL23IWZGWtDvfV6WeWQWkJo',
-        'jdKqRGF16dKsBviMDae7IGDl7oTjEbVV': 'Q09l7vhlNxPFErIOK6BVCe7KnwUW5DVV',
-        '3QLkogW1OUJ5VvPsrDH56DY2u7lgZWyY': 'g2LRE1V9espmAOPhE4ubj4ZdUA57yDXa',
-        'wyJvWbXGBSdbkEzhv0CW8meou82aqRy8': 'M2wolPvyBIpQGkbT4juedD4ruzQGdK2y',
-        '7QkdZrzEkFjKap6IYDU2PB0oCNZORmA0': 'b2kN1l96qhJaMkPs9dt1lpjBfwqZoA8P',
-        'pvA05113MHG1w3JTYxc6DVlRCjErVz4O': 'gQXeAbblBUnDJ7vujbHvbRd1cxlz3AXO',
-        'mA9blJDZwT0raG1cvkuoeVjLC7ZWd54q': '0XN9jRPwMHnW7rvumgfJZOD9CJgVkWYr',
-        '5QwRN5qKJTvGKlDTmnf7xwNZcjRmvEy9': 'R2GP6LWBJU1QlnytwGt0B9pytWwAdDYy',
-        'eyn5rPPbkfw2KYxH32fG1q58CbLJzM40': 'p2gyqooZnS56JWeiDgfmOy1VugOQEBXn',
-        '3BABn3b5RfPJGDwilbHe7l82uBoR05Am': '7OYZG7KMVhbPdKJS3xcWEN3AuDlLNmXj',
-        'xA5zNGXD3HrmqMlF6OS5pdMDuZO7RJ4w': 'yY5DAm6r1IOLE3BCVMFveEMAcqnx3r29',
-        'g43PgW3JZfml7o6fDEURL1ErCdeD8zyK': 'RX3aQn1zrS4Nr6whDgCGLv9WSbxEKo2V',
-        'lAqp8WbGgiG6D8LTKJcg3O72CDdre1Qx': 'O2pnm6473HNJjpKuVosd3vVeh975yrX5',
-        'wyJbYEDxKSdbkJ6S6RhW8meou82aqRy8': 'M2wPm7EgRSpQGlAh70CedD4ruzQGdKYy',
-        'M4lgW28nLCe0PVdtaXszVXq0SeRVqzA9': 'n2zmJvg4jHv3G0ETNgiwW51LcveWOZ8e',
-        '5Qw3OVvp9FvGKlDTmOC7xwNZcjRmvEQ9': 'R2GzDdml9F1Qlnytw9s0B9pytWwAdD8y',
-        'vy8a98X7zCwrRqbHrLUjYzwDiK2b70Qb': 'K8lVwzyjZiBpnAaSGeUmnAgxuGOBxmY0',
-        'g4eGjJLLoiqRD3Pf9oT5O03LuNbLRDQp': '6XqD59zzpfN4EwQuaGt67qNpSyRBlnYy',
-        'g43OPp9boIml7o6fDOIRL1ErCdeD8z4K': 'RX33alNB4s4Nr6whDPUGLv9WSbxEKoXV',
-        'xA2ng9OkBcGKzDbTkKsJlx7dUK8R3dA5': 'z2aPnJvzBfObkwGC3vFaPxeBhxoMqZ8K',
-        'xyKEgBajZuRr6DEC0Kt7XpD1cnNW9gAv': 'g2ddlEBvRsqdgKaI4jUK9PrgfMexGZ23',
-        'BAogww51jIMa2JnH1BcYpXM5F658RNAL': 'rYWDmm0KptlkGv4FGJFMdZmjs9RDE6XR',
-        'BAokpg62VtMa2JnH1mHYpXM5F658RNAL': 'rYWryDnlNslkGv4FG4HMdZmjs9RDE62R',
-        'a4z1Px5e2hzg0m0iMMCPeanGSkRKWXAg': 'LY9eorNQGUdGW9WuKKf5JGeEik7l1NYQ',
-        'kAx69R58kF9nY5YcdecJdl2pFXP53WyX': 'gXyRxELpbfPvLeLSaRil0mp6UEzbZJ8L',
-        'BAoY13nwViMa2J2uo2cY6BlETgmdwryL': 'rYWwKzJmNFlkGvGtNoUM9bzwIJVzB1YR',
     }
 
     _MCP_TO_ACCESS_KEY_TABLE = {
@@ -258,17 +189,19 @@ class AnvatoIE(InfoExtractor):
 
         video_data_url += '&X-Anvato-Adst-Auth=' + base64.b64encode(auth_secret).decode('ascii')
         anvrid = md5_text(time.time() * 1000 * random.random())[:30]
-        api = {
+        payload = {
-            'anvrid': anvrid,
+            'api': {
-            'anvts': server_time,
+                'anvrid': anvrid,
+                'anvstk': md5_text('%s|%s|%d|%s' % (
+                    access_key, anvrid, server_time,
+                    self._ANVACK_TABLE.get(access_key, self._API_KEY))),
+                'anvts': server_time,
+            },
         }
-        api['anvstk'] = md5_text('%s|%s|%d|%s' % (
-            access_key, anvrid, server_time,
-            self._ANVACK_TABLE.get(access_key, self._API_KEY)))
 
         return self._download_json(
             video_data_url, video_id, transform_source=strip_jsonp,
-            data=json.dumps({'api': api}).encode('utf-8'))
+            data=json.dumps(payload).encode('utf-8'))
 
     def _get_anvato_videos(self, access_key, video_id):
         video_data = self._get_video_json(access_key, video_id)
@@ -326,7 +259,7 @@ class AnvatoIE(InfoExtractor):
             'description': video_data.get('def_description'),
             'tags': video_data.get('def_tags', '').split(','),
             'categories': video_data.get('categories'),
-            'thumbnail': video_data.get('src_image_url') or video_data.get('thumbnail'),
+            'thumbnail': video_data.get('thumbnail'),
             'timestamp': int_or_none(video_data.get(
                 'ts_published') or video_data.get('ts_added')),
             'uploader': video_data.get('mcp_id'),

youtube_dl/extractor/aol.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 import re
 
-from .yahoo import YahooIE
+from .common import InfoExtractor
 from ..compat import (
     compat_parse_qs,
     compat_urllib_parse_urlparse,
@@ -15,9 +15,9 @@ from ..utils import (
 )
 
 
-class AolIE(YahooIE):
+class AolIE(InfoExtractor):
     IE_NAME = 'aol.com'
-    _VALID_URL = r'(?:aol-video:|https?://(?:www\.)?aol\.(?:com|ca|co\.uk|de|jp)/video/(?:[^/]+/)*)(?P<id>\d{9}|[0-9a-f]{24}|[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12})'
+    _VALID_URL = r'(?:aol-video:|https?://(?:www\.)?aol\.(?:com|ca|co\.uk|de|jp)/video/(?:[^/]+/)*)(?P<id>[0-9a-f]+)'
 
     _TESTS = [{
         # video with 5min ID
@@ -76,16 +76,10 @@ class AolIE(YahooIE):
     }, {
         'url': 'https://www.aol.jp/video/playlist/5a28e936a1334d000137da0c/5a28f3151e642219fde19831/',
         'only_matching': True,
-    }, {
-        # Yahoo video
-        'url': 'https://www.aol.com/video/play/991e6700-ac02-11ea-99ff-357400036f61/24bbc846-3e30-3c46-915e-fe8ccd7fcc46/',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        if '-' in video_id:
-            return self._extract_yahoo_video(video_id, 'us')
 
         response = self._download_json(
             'https://feedapi.b2c.on.aol.com/v1.0/app/videos/aolon/%s/details' % video_id,

youtube_dl/extractor/apa.py

@@ -6,21 +6,25 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     determine_ext,
-    int_or_none,
+    js_to_json,
     url_or_none,
 )
 
 
 class APAIE(InfoExtractor):
-    _VALID_URL = r'(?P<base_url>https?://[^/]+\.apa\.at)/embed/(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'
+    _VALID_URL = r'https?://[^/]+\.apa\.at/embed/(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'
     _TESTS = [{
         'url': 'http://uvp.apa.at/embed/293f6d17-692a-44e3-9fd5-7b178f3a1029',
         'md5': '2b12292faeb0a7d930c778c7a5b4759b',
         'info_dict': {
-            'id': '293f6d17-692a-44e3-9fd5-7b178f3a1029',
+            'id': 'jjv85FdZ',
             'ext': 'mp4',
-            'title': '293f6d17-692a-44e3-9fd5-7b178f3a1029',
+            'title': '"Blau ist mysteriös": Die Blue Man Group im Interview',
+            'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
             'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 254,
+            'timestamp': 1519211149,
+            'upload_date': '20180221',
         },
     }, {
         'url': 'https://uvp-apapublisher.sf.apa.at/embed/2f94e9e6-d945-4db2-9548-f9a41ebf7b78',
@@ -42,11 +46,9 @@ class APAIE(InfoExtractor):
                 webpage)]
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
+        video_id = self._match_id(url)
-        video_id, base_url = mobj.group('id', 'base_url')
 
-        webpage = self._download_webpage(
+        webpage = self._download_webpage(url, video_id)
-            '%s/player/%s' % (base_url, video_id), video_id)
 
         jwplatform_id = self._search_regex(
             r'media[iI]d\s*:\s*["\'](?P<id>[a-zA-Z0-9]{8})', webpage,
@@ -57,18 +59,16 @@ class APAIE(InfoExtractor):
                 'jwplatform:' + jwplatform_id, ie='JWPlatform',
                 video_id=video_id)
 
-        def extract(field, name=None):
+        sources = self._parse_json(
-            return self._search_regex(
+            self._search_regex(
-                r'\b%s["\']\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1' % field,
+                r'sources\s*=\s*(\[.+?\])\s*;', webpage, 'sources'),
-                webpage, name or field, default=None, group='value')
+            video_id, transform_source=js_to_json)
-
-        title = extract('title') or video_id
-        description = extract('description')
-        thumbnail = extract('poster', 'thumbnail')
 
         formats = []
-        for format_id in ('hls', 'progressive'):
+        for source in sources:
-            source_url = url_or_none(extract(format_id))
+            if not isinstance(source, dict):
+                continue
+            source_url = url_or_none(source.get('file'))
             if not source_url:
                 continue
             ext = determine_ext(source_url)
@@ -77,19 +77,18 @@ class APAIE(InfoExtractor):
                     source_url, video_id, 'mp4', entry_protocol='m3u8_native',
                     m3u8_id='hls', fatal=False))
             else:
-                height = int_or_none(self._search_regex(
-                    r'(\d+)\.mp4', source_url, 'height', default=None))
                 formats.append({
                     'url': source_url,
-                    'format_id': format_id,
-                    'height': height,
                 })
         self._sort_formats(formats)
 
+        thumbnail = self._search_regex(
+            r'image\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
+            'thumbnail', fatal=False, group='url')
+
         return {
             'id': video_id,
-            'title': title,
+            'title': video_id,
-            'description': description,
             'thumbnail': thumbnail,
             'formats': formats,
         }

youtube_dl/extractor/aparat.py

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import (
-    get_element_by_id,
     int_or_none,
     merge_dicts,
     mimetype2ext,
@@ -40,15 +39,23 @@ class AparatIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id, fatal=False)
 
         if not webpage:
+            # Note: There is an easier-to-parse configuration at
+            # http://www.aparat.com/video/video/config/videohash/%video_id
+            # but the URL in there does not work
             webpage = self._download_webpage(
                 'http://www.aparat.com/video/video/embed/vt/frame/showvideo/yes/videohash/' + video_id,
                 video_id)
 
-        options = self._parse_json(self._search_regex(
+        options = self._parse_json(
-            r'options\s*=\s*({.+?})\s*;', webpage, 'options'), video_id)
+            self._search_regex(
+                r'options\s*=\s*JSON\.parse\(\s*(["\'])(?P<value>(?:(?!\1).)+)\1\s*\)',
+                webpage, 'options', group='value'),
+            video_id)
+
+        player = options['plugins']['sabaPlayerPlugin']
 
         formats = []
-        for sources in (options.get('multiSRC') or []):
+        for sources in player['multiSRC']:
             for item in sources:
                 if not isinstance(item, dict):
                     continue
@@ -78,12 +85,11 @@ class AparatIE(InfoExtractor):
         info = self._search_json_ld(webpage, video_id, default={})
 
         if not info.get('title'):
-            info['title'] = get_element_by_id('videoTitle', webpage) or \
+            info['title'] = player['title']
-                self._html_search_meta(['og:title', 'twitter:title', 'DC.Title', 'title'], webpage, fatal=True)
 
         return merge_dicts(info, {
             'id': video_id,
             'thumbnail': url_or_none(options.get('poster')),
-            'duration': int_or_none(options.get('duration')),
+            'duration': int_or_none(player.get('duration')),
             'formats': formats,
         })

youtube_dl/extractor/appleconnect.py

@@ -9,10 +9,10 @@ from ..utils import (
 
 
 class AppleConnectIE(InfoExtractor):
-    _VALID_URL = r'https?://itunes\.apple\.com/\w{0,2}/?post/(?:id)?sa\.(?P<id>[\w-]+)'
+    _VALID_URL = r'https?://itunes\.apple\.com/\w{0,2}/?post/idsa\.(?P<id>[\w-]+)'
-    _TESTS = [{
+    _TEST = {
         'url': 'https://itunes.apple.com/us/post/idsa.4ab17a39-2720-11e5-96c5-a5b38f6c42d3',
-        'md5': 'c1d41f72c8bcaf222e089434619316e4',
+        'md5': 'e7c38568a01ea45402570e6029206723',
         'info_dict': {
             'id': '4ab17a39-2720-11e5-96c5-a5b38f6c42d3',
             'ext': 'm4v',
@@ -22,10 +22,7 @@ class AppleConnectIE(InfoExtractor):
             'upload_date': '20150710',
             'timestamp': 1436545535,
         },
-    }, {
+    }
-        'url': 'https://itunes.apple.com/us/post/sa.0fe0229f-2457-11e5-9f40-1bb645f2d5d9',
-        'only_matching': True,
-    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -39,7 +36,7 @@ class AppleConnectIE(InfoExtractor):
 
         video_data = self._parse_json(video_json, video_id)
         timestamp = str_to_int(self._html_search_regex(r'data-timestamp="(\d+)"', webpage, 'timestamp'))
-        like_count = str_to_int(self._html_search_regex(r'(\d+) Loves', webpage, 'like count', default=None))
+        like_count = str_to_int(self._html_search_regex(r'(\d+) Loves', webpage, 'like count'))
 
         return {
             'id': video_id,

youtube_dl/extractor/applepodcasts.py

@@ -1,62 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_podcast_url,
-    int_or_none,
-    parse_iso8601,
-    try_get,
-)
-
-
-class ApplePodcastsIE(InfoExtractor):
-    _VALID_URL = r'https?://podcasts\.apple\.com/(?:[^/]+/)?podcast(?:/[^/]+){1,2}.*?\bi=(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://podcasts.apple.com/us/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
-        'md5': 'df02e6acb11c10e844946a39e7222b08',
-        'info_dict': {
-            'id': '1000482637777',
-            'ext': 'mp3',
-            'title': '207 - Whitney Webb Returns',
-            'description': 'md5:13a73bade02d2e43737751e3987e1399',
-            'upload_date': '20200705',
-            'timestamp': 1593921600,
-            'duration': 6425,
-            'series': 'The Tim Dillon Show',
-        }
-    }, {
-        'url': 'https://podcasts.apple.com/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
-        'only_matching': True,
-    }, {
-        'url': 'https://podcasts.apple.com/podcast/207-whitney-webb-returns?i=1000482637777',
-        'only_matching': True,
-    }, {
-        'url': 'https://podcasts.apple.com/podcast/id1135137367?i=1000482637777',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        episode_id = self._match_id(url)
-        webpage = self._download_webpage(url, episode_id)
-        ember_data = self._parse_json(self._search_regex(
-            r'id="shoebox-ember-data-store"[^>]*>\s*({.+?})\s*<',
-            webpage, 'ember data'), episode_id)
-        ember_data = ember_data.get(episode_id) or ember_data
-        episode = ember_data['data']['attributes']
-        description = episode.get('description') or {}
-
-        series = None
-        for inc in (ember_data.get('included') or []):
-            if inc.get('type') == 'media/podcast':
-                series = try_get(inc, lambda x: x['attributes']['name'])
-
-        return {
-            'id': episode_id,
-            'title': episode['name'],
-            'url': clean_podcast_url(episode['assetUrl']),
-            'description': description.get('standard') or description.get('short'),
-            'timestamp': parse_iso8601(episode.get('releaseDateTime')),
-            'duration': int_or_none(episode.get('durationInMilliseconds'), 1000),
-            'series': series,
-        }

youtube_dl/extractor/archiveorg.py

@@ -2,17 +2,15 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
-    extract_attributes,
     unified_strdate,
-    unified_timestamp,
+    clean_html,
 )
 
 
 class ArchiveOrgIE(InfoExtractor):
     IE_NAME = 'archive.org'
     IE_DESC = 'archive.org videos'
-    _VALID_URL = r'https?://(?:www\.)?archive\.org/(?:details|embed)/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?archive\.org/(?:details|embed)/(?P<id>[^/?#]+)(?:[?].*)?$'
     _TESTS = [{
         'url': 'http://archive.org/details/XD300-23_68HighlightsAResearchCntAugHumanIntellect',
         'md5': '8af1d4cf447933ed3c7f4871162602db',
@@ -21,11 +19,8 @@ class ArchiveOrgIE(InfoExtractor):
             'ext': 'ogg',
             'title': '1968 Demo - FJCC Conference Presentation Reel #1',
             'description': 'md5:da45c349df039f1cc8075268eb1b5c25',
-            'creator': 'SRI International',
+            'upload_date': '19681210',
-            'release_date': '19681210',
+            'uploader': 'SRI International'
-            'uploader': 'SRI International',
-            'timestamp': 1268695290,
-            'upload_date': '20100315',
         }
     }, {
         'url': 'https://archive.org/details/Cops1922',
@@ -34,43 +29,22 @@ class ArchiveOrgIE(InfoExtractor):
             'id': 'Cops1922',
             'ext': 'mp4',
             'title': 'Buster Keaton\'s "Cops" (1922)',
-            'description': 'md5:43a603fd6c5b4b90d12a96b921212b9c',
+            'description': 'md5:89e7c77bf5d965dd5c0372cfb49470f6',
-            'timestamp': 1387699629,
-            'upload_date': '20131222',
         }
     }, {
         'url': 'http://archive.org/embed/XD300-23_68HighlightsAResearchCntAugHumanIntellect',
         'only_matching': True,
-    }, {
-        'url': 'https://archive.org/details/MSNBCW_20131125_040000_To_Catch_a_Predator/',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(
             'http://archive.org/embed/' + video_id, video_id)
-
+        jwplayer_playlist = self._parse_json(self._search_regex(
-        playlist = None
+            r"(?s)Play\('[^']+'\s*,\s*(\[.+\])\s*,\s*{.*?}\)",
-        play8 = self._search_regex(
+            webpage, 'jwplayer playlist'), video_id)
-            r'(<[^>]+\bclass=["\']js-play8-playlist[^>]+>)', webpage,
+        info = self._parse_jwplayer_data(
-            'playlist', default=None)
+            {'playlist': jwplayer_playlist}, video_id, base_url=url)
-        if play8:
-            attrs = extract_attributes(play8)
-            playlist = attrs.get('value')
-        if not playlist:
-            # Old jwplayer fallback
-            playlist = self._search_regex(
-                r"(?s)Play\('[^']+'\s*,\s*(\[.+\])\s*,\s*{.*?}\)",
-                webpage, 'jwplayer playlist', default='[]')
-        jwplayer_playlist = self._parse_json(playlist, video_id, fatal=False)
-        if jwplayer_playlist:
-            info = self._parse_jwplayer_data(
-                {'playlist': jwplayer_playlist}, video_id, base_url=url)
-        else:
-            # HTML5 media fallback
-            info = self._parse_html5_media_entries(url, webpage, video_id)[0]
-            info['id'] = video_id
 
         def get_optional(metadata, field):
             return metadata.get(field, [None])[0]
@@ -84,12 +58,8 @@ class ArchiveOrgIE(InfoExtractor):
             'description': clean_html(get_optional(metadata, 'description')),
         })
         if info.get('_type') != 'playlist':
-            creator = get_optional(metadata, 'creator')
             info.update({
-                'creator': creator,
+                'uploader': get_optional(metadata, 'creator'),
-                'release_date': unified_strdate(get_optional(metadata, 'date')),
+                'upload_date': unified_strdate(get_optional(metadata, 'date')),
-                'uploader': get_optional(metadata, 'publisher') or creator,
-                'timestamp': unified_timestamp(get_optional(metadata, 'publicdate')),
-                'language': get_optional(metadata, 'language'),
             })
         return info

youtube_dl/extractor/arcpublishing.py

@@ -1,174 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    extract_attributes,
-    int_or_none,
-    parse_iso8601,
-    try_get,
-)
-
-
-class ArcPublishingIE(InfoExtractor):
-    _UUID_REGEX = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}'
-    _VALID_URL = r'arcpublishing:(?P<org>[a-z]+):(?P<id>%s)' % _UUID_REGEX
-    _TESTS = [{
-        # https://www.adn.com/politics/2020/11/02/video-senate-candidates-campaign-in-anchorage-on-eve-of-election-day/
-        'url': 'arcpublishing:adn:8c99cb6e-b29c-4bc9-9173-7bf9979225ab',
-        'only_matching': True,
-    }, {
-        # https://www.bostonglobe.com/video/2020/12/30/metro/footage-released-showing-officer-talking-about-striking-protesters-with-car/
-        'url': 'arcpublishing:bostonglobe:232b7ae6-7d73-432d-bc0a-85dbf0119ab1',
-        'only_matching': True,
-    }, {
-        # https://www.actionnewsjax.com/video/live-stream/
-        'url': 'arcpublishing:cmg:cfb1cf1b-3ab5-4d1b-86c5-a5515d311f2a',
-        'only_matching': True,
-    }, {
-        # https://elcomercio.pe/videos/deportes/deporte-total-futbol-peruano-seleccion-peruana-la-valorizacion-de-los-peruanos-en-el-exterior-tras-un-2020-atipico-nnav-vr-video-noticia/
-        'url': 'arcpublishing:elcomercio:27a7e1f8-2ec7-4177-874f-a4feed2885b3',
-        'only_matching': True,
-    }, {
-        # https://www.clickondetroit.com/video/community/2020/05/15/events-surrounding-woodward-dream-cruise-being-canceled/
-        'url': 'arcpublishing:gmg:c8793fb2-8d44-4242-881e-2db31da2d9fe',
-        'only_matching': True,
-    }, {
-        # https://www.wabi.tv/video/2020/12/30/trenton-company-making-equipment-pfizer-covid-vaccine/
-        'url': 'arcpublishing:gray:0b0ba30e-032a-4598-8810-901d70e6033e',
-        'only_matching': True,
-    }, {
-        # https://www.lateja.cr/el-mundo/video-china-aprueba-con-condiciones-su-primera/dfcbfa57-527f-45ff-a69b-35fe71054143/video/
-        'url': 'arcpublishing:gruponacion:dfcbfa57-527f-45ff-a69b-35fe71054143',
-        'only_matching': True,
-    }, {
-        # https://www.fifthdomain.com/video/2018/03/09/is-america-vulnerable-to-a-cyber-attack/
-        'url': 'arcpublishing:mco:aa0ca6fe-1127-46d4-b32c-be0d6fdb8055',
-        'only_matching': True,
-    }, {
-        # https://www.vl.no/kultur/2020/12/09/en-melding-fra-en-lytter-endret-julelista-til-lewi-bergrud/
-        'url': 'arcpublishing:mentormedier:47a12084-650b-4011-bfd0-3699b6947b2d',
-        'only_matching': True,
-    }, {
-        # https://www.14news.com/2020/12/30/whiskey-theft-caught-camera-henderson-liquor-store/
-        'url': 'arcpublishing:raycom:b89f61f8-79fa-4c09-8255-e64237119bf7',
-        'only_matching': True,
-    }, {
-        # https://www.theglobeandmail.com/world/video-ethiopian-woman-who-became-symbol-of-integration-in-italy-killed-on/
-        'url': 'arcpublishing:tgam:411b34c1-8701-4036-9831-26964711664b',
-        'only_matching': True,
-    }, {
-        # https://www.pilotonline.com/460f2931-8130-4719-8ea1-ffcb2d7cb685-132.html
-        'url': 'arcpublishing:tronc:460f2931-8130-4719-8ea1-ffcb2d7cb685',
-        'only_matching': True,
-    }]
-    _POWA_DEFAULTS = [
-        (['cmg', 'prisa'], '%s-config-prod.api.cdn.arcpublishing.com/video'),
-        ([
-            'adn', 'advancelocal', 'answers', 'bonnier', 'bostonglobe', 'demo',
-            'gmg', 'gruponacion', 'infobae', 'mco', 'nzme', 'pmn', 'raycom',
-            'spectator', 'tbt', 'tgam', 'tronc', 'wapo', 'wweek',
-        ], 'video-api-cdn.%s.arcpublishing.com/api'),
-    ]
-
-    @staticmethod
-    def _extract_urls(webpage):
-        entries = []
-        # https://arcpublishing.atlassian.net/wiki/spaces/POWA/overview
-        for powa_el in re.findall(r'(<div[^>]+class="[^"]*\bpowa\b[^"]*"[^>]+data-uuid="%s"[^>]*>)' % ArcPublishingIE._UUID_REGEX, webpage):
-            powa = extract_attributes(powa_el) or {}
-            org = powa.get('data-org')
-            uuid = powa.get('data-uuid')
-            if org and uuid:
-                entries.append('arcpublishing:%s:%s' % (org, uuid))
-        return entries
-
-    def _real_extract(self, url):
-        org, uuid = re.match(self._VALID_URL, url).groups()
-        for orgs, tmpl in self._POWA_DEFAULTS:
-            if org in orgs:
-                base_api_tmpl = tmpl
-                break
-        else:
-            base_api_tmpl = '%s-prod-cdn.video-api.arcpublishing.com/api'
-        if org == 'wapo':
-            org = 'washpost'
-        video = self._download_json(
-            'https://%s/v1/ansvideos/findByUuid' % (base_api_tmpl % org),
-            uuid, query={'uuid': uuid})[0]
-        title = video['headlines']['basic']
-        is_live = video.get('status') == 'live'
-
-        urls = []
-        formats = []
-        for s in video.get('streams', []):
-            s_url = s.get('url')
-            if not s_url or s_url in urls:
-                continue
-            urls.append(s_url)
-            stream_type = s.get('stream_type')
-            if stream_type == 'smil':
-                smil_formats = self._extract_smil_formats(
-                    s_url, uuid, fatal=False)
-                for f in smil_formats:
-                    if f['url'].endswith('/cfx/st'):
-                        f['app'] = 'cfx/st'
-                        if not f['play_path'].startswith('mp4:'):
-                            f['play_path'] = 'mp4:' + f['play_path']
-                        if isinstance(f['tbr'], float):
-                            f['vbr'] = f['tbr'] * 1000
-                            del f['tbr']
-                            f['format_id'] = 'rtmp-%d' % f['vbr']
-                formats.extend(smil_formats)
-            elif stream_type in ('ts', 'hls'):
-                m3u8_formats = self._extract_m3u8_formats(
-                    s_url, uuid, 'mp4', 'm3u8' if is_live else 'm3u8_native',
-                    m3u8_id='hls', fatal=False)
-                if all([f.get('acodec') == 'none' for f in m3u8_formats]):
-                    continue
-                for f in m3u8_formats:
-                    if f.get('acodec') == 'none':
-                        f['preference'] = -40
-                    elif f.get('vcodec') == 'none':
-                        f['preference'] = -50
-                    height = f.get('height')
-                    if not height:
-                        continue
-                    vbr = self._search_regex(
-                        r'[_x]%d[_-](\d+)' % height, f['url'], 'vbr', default=None)
-                    if vbr:
-                        f['vbr'] = int(vbr)
-                formats.extend(m3u8_formats)
-            else:
-                vbr = int_or_none(s.get('bitrate'))
-                formats.append({
-                    'format_id': '%s-%d' % (stream_type, vbr) if vbr else stream_type,
-                    'vbr': vbr,
-                    'width': int_or_none(s.get('width')),
-                    'height': int_or_none(s.get('height')),
-                    'filesize': int_or_none(s.get('filesize')),
-                    'url': s_url,
-                    'preference': -1,
-                })
-        self._sort_formats(
-            formats, ('preference', 'width', 'height', 'vbr', 'filesize', 'tbr', 'ext', 'format_id'))
-
-        subtitles = {}
-        for subtitle in (try_get(video, lambda x: x['subtitles']['urls'], list) or []):
-            subtitle_url = subtitle.get('url')
-            if subtitle_url:
-                subtitles.setdefault('en', []).append({'url': subtitle_url})
-
-        return {
-            'id': uuid,
-            'title': self._live_title(title) if is_live else title,
-            'thumbnail': try_get(video, lambda x: x['promo_image']['url']),
-            'description': try_get(video, lambda x: x['subheadlines']['basic']),
-            'formats': formats,
-            'duration': int_or_none(video.get('duration'), 100),
-            'timestamp': parse_iso8601(video.get('created_date')),
-            'subtitles': subtitles,
-            'is_live': is_live,
-        }

youtube_dl/extractor/ard.py

@@ -1,7 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import json
 import re
 
 from .common import InfoExtractor
@@ -23,101 +22,7 @@ from ..utils import (
 from ..compat import compat_etree_fromstring
 
 
-class ARDMediathekBaseIE(InfoExtractor):
+class ARDMediathekIE(InfoExtractor):
-    _GEO_COUNTRIES = ['DE']
-
-    def _extract_media_info(self, media_info_url, webpage, video_id):
-        media_info = self._download_json(
-            media_info_url, video_id, 'Downloading media JSON')
-        return self._parse_media_info(media_info, video_id, '"fsk"' in webpage)
-
-    def _parse_media_info(self, media_info, video_id, fsk):
-        formats = self._extract_formats(media_info, video_id)
-
-        if not formats:
-            if fsk:
-                raise ExtractorError(
-                    'This video is only available after 20:00', expected=True)
-            elif media_info.get('_geoblocked'):
-                self.raise_geo_restricted(
-                    'This video is not available due to geoblocking',
-                    countries=self._GEO_COUNTRIES)
-
-        self._sort_formats(formats)
-
-        subtitles = {}
-        subtitle_url = media_info.get('_subtitleUrl')
-        if subtitle_url:
-            subtitles['de'] = [{
-                'ext': 'ttml',
-                'url': subtitle_url,
-            }]
-
-        return {
-            'id': video_id,
-            'duration': int_or_none(media_info.get('_duration')),
-            'thumbnail': media_info.get('_previewImage'),
-            'is_live': media_info.get('_isLive') is True,
-            'formats': formats,
-            'subtitles': subtitles,
-        }
-
-    def _extract_formats(self, media_info, video_id):
-        type_ = media_info.get('_type')
-        media_array = media_info.get('_mediaArray', [])
-        formats = []
-        for num, media in enumerate(media_array):
-            for stream in media.get('_mediaStreamArray', []):
-                stream_urls = stream.get('_stream')
-                if not stream_urls:
-                    continue
-                if not isinstance(stream_urls, list):
-                    stream_urls = [stream_urls]
-                quality = stream.get('_quality')
-                server = stream.get('_server')
-                for stream_url in stream_urls:
-                    if not url_or_none(stream_url):
-                        continue
-                    ext = determine_ext(stream_url)
-                    if quality != 'auto' and ext in ('f4m', 'm3u8'):
-                        continue
-                    if ext == 'f4m':
-                        formats.extend(self._extract_f4m_formats(
-                            update_url_query(stream_url, {
-                                'hdcore': '3.1.1',
-                                'plugin': 'aasp-3.1.1.69.124'
-                            }), video_id, f4m_id='hds', fatal=False))
-                    elif ext == 'm3u8':
-                        formats.extend(self._extract_m3u8_formats(
-                            stream_url, video_id, 'mp4', 'm3u8_native',
-                            m3u8_id='hls', fatal=False))
-                    else:
-                        if server and server.startswith('rtmp'):
-                            f = {
-                                'url': server,
-                                'play_path': stream_url,
-                                'format_id': 'a%s-rtmp-%s' % (num, quality),
-                            }
-                        else:
-                            f = {
-                                'url': stream_url,
-                                'format_id': 'a%s-%s-%s' % (num, ext, quality)
-                            }
-                        m = re.search(
-                            r'_(?P<width>\d+)x(?P<height>\d+)\.mp4$',
-                            stream_url)
-                        if m:
-                            f.update({
-                                'width': int(m.group('width')),
-                                'height': int(m.group('height')),
-                            })
-                        if type_ == 'audio':
-                            f['vcodec'] = 'none'
-                        formats.append(f)
-        return formats
-
-
-class ARDMediathekIE(ARDMediathekBaseIE):
     IE_NAME = 'ARD:mediathek'
     _VALID_URL = r'^https?://(?:(?:(?:www|classic)\.)?ardmediathek\.de|mediathek\.(?:daserste|rbb-online)\.de|one\.ard\.de)/(?:.*/)(?P<video_id>[0-9]+|[^0-9][^/\?]+)[^/\?]*(?:\?.*)?'
 
@@ -158,6 +63,94 @@ class ARDMediathekIE(ARDMediathekBaseIE):
     def suitable(cls, url):
         return False if ARDBetaMediathekIE.suitable(url) else super(ARDMediathekIE, cls).suitable(url)
 
+    def _extract_media_info(self, media_info_url, webpage, video_id):
+        media_info = self._download_json(
+            media_info_url, video_id, 'Downloading media JSON')
+
+        formats = self._extract_formats(media_info, video_id)
+
+        if not formats:
+            if '"fsk"' in webpage:
+                raise ExtractorError(
+                    'This video is only available after 20:00', expected=True)
+            elif media_info.get('_geoblocked'):
+                raise ExtractorError('This video is not available due to geo restriction', expected=True)
+
+        self._sort_formats(formats)
+
+        duration = int_or_none(media_info.get('_duration'))
+        thumbnail = media_info.get('_previewImage')
+        is_live = media_info.get('_isLive') is True
+
+        subtitles = {}
+        subtitle_url = media_info.get('_subtitleUrl')
+        if subtitle_url:
+            subtitles['de'] = [{
+                'ext': 'ttml',
+                'url': subtitle_url,
+            }]
+
+        return {
+            'id': video_id,
+            'duration': duration,
+            'thumbnail': thumbnail,
+            'is_live': is_live,
+            'formats': formats,
+            'subtitles': subtitles,
+        }
+
+    def _extract_formats(self, media_info, video_id):
+        type_ = media_info.get('_type')
+        media_array = media_info.get('_mediaArray', [])
+        formats = []
+        for num, media in enumerate(media_array):
+            for stream in media.get('_mediaStreamArray', []):
+                stream_urls = stream.get('_stream')
+                if not stream_urls:
+                    continue
+                if not isinstance(stream_urls, list):
+                    stream_urls = [stream_urls]
+                quality = stream.get('_quality')
+                server = stream.get('_server')
+                for stream_url in stream_urls:
+                    if not url_or_none(stream_url):
+                        continue
+                    ext = determine_ext(stream_url)
+                    if quality != 'auto' and ext in ('f4m', 'm3u8'):
+                        continue
+                    if ext == 'f4m':
+                        formats.extend(self._extract_f4m_formats(
+                            update_url_query(stream_url, {
+                                'hdcore': '3.1.1',
+                                'plugin': 'aasp-3.1.1.69.124'
+                            }),
+                            video_id, f4m_id='hds', fatal=False))
+                    elif ext == 'm3u8':
+                        formats.extend(self._extract_m3u8_formats(
+                            stream_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
+                    else:
+                        if server and server.startswith('rtmp'):
+                            f = {
+                                'url': server,
+                                'play_path': stream_url,
+                                'format_id': 'a%s-rtmp-%s' % (num, quality),
+                            }
+                        else:
+                            f = {
+                                'url': stream_url,
+                                'format_id': 'a%s-%s-%s' % (num, ext, quality)
+                            }
+                        m = re.search(r'_(?P<width>\d+)x(?P<height>\d+)\.mp4$', stream_url)
+                        if m:
+                            f.update({
+                                'width': int(m.group('width')),
+                                'height': int(m.group('height')),
+                            })
+                        if type_ == 'audio':
+                            f['vcodec'] = 'none'
+                        formats.append(f)
+        return formats
+
     def _real_extract(self, url):
         # determine video id from url
         m = re.match(self._VALID_URL, url)
@@ -187,13 +180,13 @@ class ARDMediathekIE(ARDMediathekBaseIE):
             if doc.tag == 'rss':
                 return GenericIE()._extract_rss(url, video_id, doc)
 
-        title = self._og_search_title(webpage, default=None) or self._html_search_regex(
+        title = self._html_search_regex(
             [r'<h1(?:\s+class="boxTopHeadline")?>(.*?)</h1>',
              r'<meta name="dcterms\.title" content="(.*?)"/>',
              r'<h4 class="headline">(.*?)</h4>',
              r'<title[^>]*>(.*?)</title>'],
             webpage, 'title')
-        description = self._og_search_description(webpage, default=None) or self._html_search_meta(
+        description = self._html_search_meta(
             'dcterms.abstract', webpage, 'description', default=None)
         if description is None:
             description = self._html_search_meta(
@@ -249,40 +242,28 @@ class ARDMediathekIE(ARDMediathekBaseIE):
 
 
 class ARDIE(InfoExtractor):
-    _VALID_URL = r'(?P<mainurl>https?://(?:www\.)?daserste\.de/(?:[^/?#&]+/)+(?P<id>[^/?#&]+))\.html'
+    _VALID_URL = r'(?P<mainurl>https?://(www\.)?daserste\.de/[^?#]+/videos/(?P<display_id>[^/?#]+)-(?P<id>[0-9]+))\.html'
     _TESTS = [{
-        # available till 7.01.2022
+        # available till 14.02.2019
-        'url': 'https://www.daserste.de/information/talk/maischberger/videos/maischberger-die-woche-video100.html',
+        'url': 'http://www.daserste.de/information/talk/maischberger/videos/das-groko-drama-zerlegen-sich-die-volksparteien-video-102.html',
-        'md5': '867d8aa39eeaf6d76407c5ad1bb0d4c1',
+        'md5': '8e4ec85f31be7c7fc08a26cdbc5a1f49',
         'info_dict': {
-            'id': 'maischberger-die-woche-video100',
+            'display_id': 'das-groko-drama-zerlegen-sich-die-volksparteien-video',
-            'display_id': 'maischberger-die-woche-video100',
+            'id': '102',
             'ext': 'mp4',
-            'duration': 3687.0,
+            'duration': 4435.0,
-            'title': 'maischberger. die woche vom 7. Januar 2021',
+            'title': 'Das GroKo-Drama: Zerlegen sich die Volksparteien?',
-            'upload_date': '20210107',
+            'upload_date': '20180214',
             'thumbnail': r're:^https?://.*\.jpg$',
         },
-    }, {
-        'url': 'https://www.daserste.de/information/politik-weltgeschehen/morgenmagazin/videosextern/dominik-kahun-aus-der-nhl-direkt-zur-weltmeisterschaft-100.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/information/nachrichten-wetter/tagesthemen/videosextern/tagesthemen-17736.html',
-        'only_matching': True,
     }, {
         'url': 'http://www.daserste.de/information/reportage-dokumentation/dokus/videos/die-story-im-ersten-mission-unter-falscher-flagge-100.html',
         'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/unterhaltung/serie/in-aller-freundschaft-die-jungen-aerzte/Drehpause-100.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/unterhaltung/film/filmmittwoch-im-ersten/videos/making-ofwendezeit-video-100.html',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        display_id = mobj.group('id')
+        display_id = mobj.group('display_id')
 
         player_url = mobj.group('mainurl') + '~playerXml.xml'
         doc = self._download_xml(player_url, display_id)
@@ -293,47 +274,25 @@ class ARDIE(InfoExtractor):
 
         formats = []
         for a in video_node.findall('.//asset'):
-            file_name = xpath_text(a, './fileName', default=None)
-            if not file_name:
-                continue
-            format_type = a.attrib.get('type')
-            format_url = url_or_none(file_name)
-            if format_url:
-                ext = determine_ext(file_name)
-                if ext == 'm3u8':
-                    formats.extend(self._extract_m3u8_formats(
-                        format_url, display_id, 'mp4', entry_protocol='m3u8_native',
-                        m3u8_id=format_type or 'hls', fatal=False))
-                    continue
-                elif ext == 'f4m':
-                    formats.extend(self._extract_f4m_formats(
-                        update_url_query(format_url, {'hdcore': '3.7.0'}),
-                        display_id, f4m_id=format_type or 'hds', fatal=False))
-                    continue
             f = {
-                'format_id': format_type,
+                'format_id': a.attrib['type'],
-                'width': int_or_none(xpath_text(a, './frameWidth')),
+                'width': int_or_none(a.find('./frameWidth').text),
-                'height': int_or_none(xpath_text(a, './frameHeight')),
+                'height': int_or_none(a.find('./frameHeight').text),
-                'vbr': int_or_none(xpath_text(a, './bitrateVideo')),
+                'vbr': int_or_none(a.find('./bitrateVideo').text),
-                'abr': int_or_none(xpath_text(a, './bitrateAudio')),
+                'abr': int_or_none(a.find('./bitrateAudio').text),
-                'vcodec': xpath_text(a, './codecVideo'),
+                'vcodec': a.find('./codecVideo').text,
-                'tbr': int_or_none(xpath_text(a, './totalBitrate')),
+                'tbr': int_or_none(a.find('./totalBitrate').text),
             }
-            server_prefix = xpath_text(a, './serverPrefix', default=None)
+            if a.find('./serverPrefix').text:
-            if server_prefix:
+                f['url'] = a.find('./serverPrefix').text
-                f.update({
+                f['playpath'] = a.find('./fileName').text
-                    'url': server_prefix,
-                    'playpath': file_name,
-                })
             else:
-                if not format_url:
+                f['url'] = a.find('./fileName').text
-                    continue
-                f['url'] = format_url
             formats.append(f)
         self._sort_formats(formats)
 
         return {
-            'id': xpath_text(video_node, './videoId', default=display_id),
+            'id': mobj.group('id'),
             'formats': formats,
             'display_id': display_id,
             'title': video_node.find('./title').text,
@@ -343,110 +302,99 @@ class ARDIE(InfoExtractor):
         }
 
 
-class ARDBetaMediathekIE(ARDMediathekBaseIE):
+class ARDBetaMediathekIE(InfoExtractor):
-    _VALID_URL = r'https://(?:(?:beta|www)\.)?ardmediathek\.de/(?:[^/]+/)?(?:player|live|video)/(?:[^/]+/)*(?P<id>Y3JpZDovL[a-zA-Z0-9]+)'
+    _VALID_URL = r'https://(?:beta|www)\.ardmediathek\.de/[^/]+/(?:player|live)/(?P<video_id>[a-zA-Z0-9]+)(?:/(?P<display_id>[^/?#]+))?'
     _TESTS = [{
-        'url': 'https://www.ardmediathek.de/mdr/video/die-robuste-roswita/Y3JpZDovL21kci5kZS9iZWl0cmFnL2Ntcy84MWMxN2MzZC0wMjkxLTRmMzUtODk4ZS0wYzhlOWQxODE2NGI/',
+        'url': 'https://beta.ardmediathek.de/ard/player/Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhdG9ydC9mYmM4NGM1NC0xNzU4LTRmZGYtYWFhZS0wYzcyZTIxNGEyMDE/die-robuste-roswita',
-        'md5': 'a1dc75a39c61601b980648f7c9f9f71d',
+        'md5': '2d02d996156ea3c397cfc5036b5d7f8f',
         'info_dict': {
             'display_id': 'die-robuste-roswita',
-            'id': '78566716',
+            'id': 'Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhdG9ydC9mYmM4NGM1NC0xNzU4LTRmZGYtYWFhZS0wYzcyZTIxNGEyMDE',
-            'title': 'Die robuste Roswita',
+            'title': 'Tatort: Die robuste Roswita',
-            'description': r're:^Der Mord.*totgeglaubte Ehefrau Roswita',
+            'description': r're:^Der Mord.*trüber ist als die Ilm.',
             'duration': 5316,
-            'thumbnail': 'https://img.ardmediathek.de/standard/00/78/56/67/84/575672121/16x9/960?mandant=ard',
+            'thumbnail': 'https://img.ardmediathek.de/standard/00/55/43/59/34/-1774185891/16x9/960?mandant=ard',
-            'timestamp': 1596658200,
+            'upload_date': '20180826',
-            'upload_date': '20200805',
             'ext': 'mp4',
         },
-    }, {
-        'url': 'https://beta.ardmediathek.de/ard/video/Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhdG9ydC9mYmM4NGM1NC0xNzU4LTRmZGYtYWFhZS0wYzcyZTIxNGEyMDE',
-        'only_matching': True,
-    }, {
-        'url': 'https://ardmediathek.de/ard/video/saartalk/saartalk-gesellschaftsgift-haltung-gegen-hass/sr-fernsehen/Y3JpZDovL3NyLW9ubGluZS5kZS9TVF84MTY4MA/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/ard/video/trailer/private-eyes-s01-e01/one/Y3JpZDovL3dkci5kZS9CZWl0cmFnLTE1MTgwYzczLWNiMTEtNGNkMS1iMjUyLTg5MGYzOWQxZmQ1YQ/',
-        'only_matching': True,
     }, {
         'url': 'https://www.ardmediathek.de/ard/player/Y3JpZDovL3N3ci5kZS9hZXgvbzEwNzE5MTU/',
         'only_matching': True,
     }, {
         'url': 'https://www.ardmediathek.de/swr/live/Y3JpZDovL3N3ci5kZS8xMzQ4MTA0Mg',
         'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/video/coronavirus-update-ndr-info/astrazeneca-kurz-lockdown-und-pims-syndrom-81/ndr/Y3JpZDovL25kci5kZS84NzE0M2FjNi0wMWEwLTQ5ODEtOTE5NS1mOGZhNzdhOTFmOTI/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/ard/player/Y3JpZDovL3dkci5kZS9CZWl0cmFnLWQ2NDJjYWEzLTMwZWYtNGI4NS1iMTI2LTU1N2UxYTcxOGIzOQ/tatort-duo-koeln-leipzig-ihr-kinderlein-kommet',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group('video_id')
+        display_id = mobj.group('display_id') or video_id
 
-        player_page = self._download_json(
+        webpage = self._download_webpage(url, display_id)
-            'https://api.ardmediathek.de/public-gateway',
+        data_json = self._search_regex(r'window\.__APOLLO_STATE__\s*=\s*(\{.*);\n', webpage, 'json')
-            video_id, data=json.dumps({
+        data = self._parse_json(data_json, display_id)
-                'query': '''{
+
-  playerPage(client: "ard", clipId: "%s") {
+        res = {
-    blockedByFsk
+            'id': video_id,
-    broadcastedOn
+            'display_id': display_id,
-    maturityContentRating
-    mediaCollection {
-      _duration
-      _geoblocked
-      _isLive
-      _mediaArray {
-        _mediaStreamArray {
-          _quality
-          _server
-          _stream
         }
-      }
+        formats = []
-      _previewImage
+        subtitles = {}
-      _subtitleUrl
+        geoblocked = False
-      _type
+        for widget in data.values():
-    }
+            if widget.get('_geoblocked') is True:
-    show {
+                geoblocked = True
-      title
+            if '_duration' in widget:
-    }
+                res['duration'] = int_or_none(widget['_duration'])
-    synopsis
+            if 'clipTitle' in widget:
-    title
+                res['title'] = widget['clipTitle']
-    tracking {
+            if '_previewImage' in widget:
-      atiCustomVars {
+                res['thumbnail'] = widget['_previewImage']
-        contentId
+            if 'broadcastedOn' in widget:
-      }
+                res['timestamp'] = unified_timestamp(widget['broadcastedOn'])
-    }
+            if 'synopsis' in widget:
-  }
+                res['description'] = widget['synopsis']
-}''' % video_id,
+            subtitle_url = url_or_none(widget.get('_subtitleUrl'))
-            }).encode(), headers={
+            if subtitle_url:
-                'Content-Type': 'application/json'
+                subtitles.setdefault('de', []).append({
-            })['data']['playerPage']
+                    'ext': 'ttml',
-        title = player_page['title']
+                    'url': subtitle_url,
-        content_id = str_or_none(try_get(
+                })
-            player_page, lambda x: x['tracking']['atiCustomVars']['contentId']))
+            if '_quality' in widget:
-        media_collection = player_page.get('mediaCollection') or {}
+                format_url = url_or_none(try_get(
-        if not media_collection and content_id:
+                    widget, lambda x: x['_stream']['json'][0]))
-            media_collection = self._download_json(
+                if not format_url:
-                'https://www.ardmediathek.de/play/media/' + content_id,
+                    continue
-                content_id, fatal=False) or {}
+                ext = determine_ext(format_url)
-        info = self._parse_media_info(
+                if ext == 'f4m':
-            media_collection, content_id or video_id,
+                    formats.extend(self._extract_f4m_formats(
-            player_page.get('blockedByFsk'))
+                        format_url + '?hdcore=3.11.0',
-        age_limit = None
+                        video_id, f4m_id='hds', fatal=False))
-        description = player_page.get('synopsis')
+                elif ext == 'm3u8':
-        maturity_content_rating = player_page.get('maturityContentRating')
+                    formats.extend(self._extract_m3u8_formats(
-        if maturity_content_rating:
+                        format_url, video_id, 'mp4', m3u8_id='hls',
-            age_limit = int_or_none(maturity_content_rating.lstrip('FSK'))
+                        fatal=False))
-        if not age_limit and description:
+                else:
-            age_limit = int_or_none(self._search_regex(
+                    # HTTP formats are not available when geoblocked is True,
-                r'\(FSK\s*(\d+)\)\s*$', description, 'age limit', default=None))
+                    # other formats are fine though
-        info.update({
+                    if geoblocked:
-            'age_limit': age_limit,
+                        continue
-            'title': title,
+                    quality = str_or_none(widget.get('_quality'))
-            'description': description,
+                    formats.append({
-            'timestamp': unified_timestamp(player_page.get('broadcastedOn')),
+                        'format_id': ('http-' + quality) if quality else 'http',
-            'series': try_get(player_page, lambda x: x['show']['title']),
+                        'url': format_url,
+                        'preference': 10,  # Plain HTTP, that's nice
+                    })
+
+        if not formats and geoblocked:
+            self.raise_geo_restricted(
+                msg='This video is not available due to geoblocking',
+                countries=['DE'])
+
+        self._sort_formats(formats)
+        res.update({
+            'subtitles': subtitles,
+            'formats': formats,
         })
-        return info
+
+        return res

youtube_dl/extractor/arkena.py

@@ -6,11 +6,13 @@ import re
 from .common import InfoExtractor
 from ..compat import compat_urlparse
 from ..utils import (
+    determine_ext,
     ExtractorError,
     float_or_none,
     int_or_none,
+    mimetype2ext,
     parse_iso8601,
-    try_get,
+    strip_jsonp,
 )
 
 
@@ -18,27 +20,22 @@ class ArkenaIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                         https?://
                             (?:
-                                video\.(?:arkena|qbrick)\.com/play2/embed/player\?|
+                                video\.arkena\.com/play2/embed/player\?|
                                 play\.arkena\.com/(?:config|embed)/avp/v\d/player/media/(?P<id>[^/]+)/[^/]+/(?P<account_id>\d+)
                             )
                         '''
     _TESTS = [{
-        'url': 'https://video.qbrick.com/play2/embed/player?accountId=1034090&mediaId=d8ab4607-00090107-aab86310',
-        'md5': '97f117754e5f3c020f5f26da4a44ebaf',
-        'info_dict': {
-            'id': 'd8ab4607-00090107-aab86310',
-            'ext': 'mp4',
-            'title': 'EM_HT20_117_roslund_v2.mp4',
-            'timestamp': 1608285912,
-            'upload_date': '20201218',
-            'duration': 1429.162667,
-            'subtitles': {
-                'sv': 'count:3',
-            },
-        },
-    }, {
         'url': 'https://play.arkena.com/embed/avp/v2/player/media/b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe/1/129411',
-        'only_matching': True,
+        'md5': 'b96f2f71b359a8ecd05ce4e1daa72365',
+        'info_dict': {
+            'id': 'b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe',
+            'ext': 'mp4',
+            'title': 'Big Buck Bunny',
+            'description': 'Royalty free test video',
+            'timestamp': 1432816365,
+            'upload_date': '20150528',
+            'is_live': False,
+        },
     }, {
         'url': 'https://play.arkena.com/config/avp/v2/player/media/b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe/1/129411/?callbackMethod=jQuery1111023664739129262213_1469227693893',
         'only_matching': True,
@@ -75,89 +72,62 @@ class ArkenaIE(InfoExtractor):
             if not video_id or not account_id:
                 raise ExtractorError('Invalid URL', expected=True)
 
-        media = self._download_json(
+        playlist = self._download_json(
-            'https://video.qbrick.com/api/v1/public/accounts/%s/medias/%s' % (account_id, video_id),
+            'https://play.arkena.com/config/avp/v2/player/media/%s/0/%s/?callbackMethod=_'
-            video_id, query={
+            % (video_id, account_id),
-                # https://video.qbrick.com/docs/api/examples/library-api.html
+            video_id, transform_source=strip_jsonp)['Playlist'][0]
-                'fields': 'asset/resources/*/renditions/*(height,id,language,links/*(href,mimeType),type,size,videos/*(audios/*(codec,sampleRate),bitrate,codec,duration,height,width),width),created,metadata/*(title,description),tags',
-            })
-        metadata = media.get('metadata') or {}
-        title = metadata['title']
 
-        duration = None
+        media_info = playlist['MediaInfo']
+        title = media_info['Title']
+        media_files = playlist['MediaFiles']
+
+        is_live = False
         formats = []
-        thumbnails = []
+        for kind_case, kind_formats in media_files.items():
-        subtitles = {}
+            kind = kind_case.lower()
-        for resource in media['asset']['resources']:
+            for f in kind_formats:
-            for rendition in (resource.get('renditions') or []):
+                f_url = f.get('Url')
-                rendition_type = rendition.get('type')
+                if not f_url:
-                for i, link in enumerate(rendition.get('links') or []):
+                    continue
-                    href = link.get('href')
+                is_live = f.get('Live') == 'true'
-                    if not href:
+                exts = (mimetype2ext(f.get('Type')), determine_ext(f_url, None))
-                        continue
+                if kind == 'm3u8' or 'm3u8' in exts:
-                    if rendition_type == 'image':
+                    formats.extend(self._extract_m3u8_formats(
-                        thumbnails.append({
+                        f_url, video_id, 'mp4', 'm3u8_native',
-                            'filesize': int_or_none(rendition.get('size')),
+                        m3u8_id=kind, fatal=False, live=is_live))
-                            'height': int_or_none(rendition.get('height')),
+                elif kind == 'flash' or 'f4m' in exts:
-                            'id': rendition.get('id'),
+                    formats.extend(self._extract_f4m_formats(
-                            'url': href,
+                        f_url, video_id, f4m_id=kind, fatal=False))
-                            'width': int_or_none(rendition.get('width')),
+                elif kind == 'dash' or 'mpd' in exts:
-                        })
+                    formats.extend(self._extract_mpd_formats(
-                    elif rendition_type == 'subtitle':
+                        f_url, video_id, mpd_id=kind, fatal=False))
-                        subtitles.setdefault(rendition.get('language') or 'en', []).append({
+                elif kind == 'silverlight':
-                            'url': href,
+                    # TODO: process when ism is supported (see
-                        })
+                    # https://github.com/ytdl-org/youtube-dl/issues/8118)
-                    elif rendition_type == 'video':
+                    continue
-                        f = {
+                else:
-                            'filesize': int_or_none(rendition.get('size')),
+                    tbr = float_or_none(f.get('Bitrate'), 1000)
-                            'format_id': rendition.get('id'),
+                    formats.append({
-                            'url': href,
+                        'url': f_url,
-                        }
+                        'format_id': '%s-%d' % (kind, tbr) if tbr else kind,
-                        video = try_get(rendition, lambda x: x['videos'][i], dict)
+                        'tbr': tbr,
-                        if video:
+                    })
-                            if not duration:
-                                duration = float_or_none(video.get('duration'))
-                            f.update({
-                                'height': int_or_none(video.get('height')),
-                                'tbr': int_or_none(video.get('bitrate'), 1000),
-                                'vcodec': video.get('codec'),
-                                'width': int_or_none(video.get('width')),
-                            })
-                            audio = try_get(video, lambda x: x['audios'][0], dict)
-                            if audio:
-                                f.update({
-                                    'acodec': audio.get('codec'),
-                                    'asr': int_or_none(audio.get('sampleRate')),
-                                })
-                        formats.append(f)
-                    elif rendition_type == 'index':
-                        mime_type = link.get('mimeType')
-                        if mime_type == 'application/smil+xml':
-                            formats.extend(self._extract_smil_formats(
-                                href, video_id, fatal=False))
-                        elif mime_type == 'application/x-mpegURL':
-                            formats.extend(self._extract_m3u8_formats(
-                                href, video_id, 'mp4', 'm3u8_native',
-                                m3u8_id='hls', fatal=False))
-                        elif mime_type == 'application/hds+xml':
-                            formats.extend(self._extract_f4m_formats(
-                                href, video_id, f4m_id='hds', fatal=False))
-                        elif mime_type == 'application/dash+xml':
-                            formats.extend(self._extract_f4m_formats(
-                                href, video_id, f4m_id='hds', fatal=False))
-                        elif mime_type == 'application/vnd.ms-sstr+xml':
-                            formats.extend(self._extract_ism_formats(
-                                href, video_id, ism_id='mss', fatal=False))
         self._sort_formats(formats)
 
+        description = media_info.get('Description')
+        video_id = media_info.get('VideoId') or video_id
+        timestamp = parse_iso8601(media_info.get('PublishDate'))
+        thumbnails = [{
+            'url': thumbnail['Url'],
+            'width': int_or_none(thumbnail.get('Size')),
+        } for thumbnail in (media_info.get('Poster') or []) if thumbnail.get('Url')]
+
         return {
             'id': video_id,
             'title': title,
-            'description': metadata.get('description'),
+            'description': description,
-            'timestamp': parse_iso8601(media.get('created')),
+            'timestamp': timestamp,
+            'is_live': is_live,
             'thumbnails': thumbnails,
-            'subtitles': subtitles,
-            'duration': duration,
-            'tags': media.get('tags'),
             'formats': formats,
         }

youtube_dl/extractor/arnes.py

@@ -1,101 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-    compat_urllib_parse_urlparse,
-)
-from ..utils import (
-    float_or_none,
-    int_or_none,
-    parse_iso8601,
-    remove_start,
-)
-
-
-class ArnesIE(InfoExtractor):
-    IE_NAME = 'video.arnes.si'
-    IE_DESC = 'Arnes Video'
-    _VALID_URL = r'https?://video\.arnes\.si/(?:[a-z]{2}/)?(?:watch|embed|api/(?:asset|public/video))/(?P<id>[0-9a-zA-Z]{12})'
-    _TESTS = [{
-        'url': 'https://video.arnes.si/watch/a1qrWTOQfVoU?t=10',
-        'md5': '4d0f4d0a03571b33e1efac25fd4a065d',
-        'info_dict': {
-            'id': 'a1qrWTOQfVoU',
-            'ext': 'mp4',
-            'title': 'Linearna neodvisnost, definicija',
-            'description': 'Linearna neodvisnost, definicija',
-            'license': 'PRIVATE',
-            'creator': 'Polona Oblak',
-            'timestamp': 1585063725,
-            'upload_date': '20200324',
-            'channel': 'Polona Oblak',
-            'channel_id': 'q6pc04hw24cj',
-            'channel_url': 'https://video.arnes.si/?channel=q6pc04hw24cj',
-            'duration': 596.75,
-            'view_count': int,
-            'tags': ['linearna_algebra'],
-            'start_time': 10,
-        }
-    }, {
-        'url': 'https://video.arnes.si/api/asset/s1YjnV7hadlC/play.mp4',
-        'only_matching': True,
-    }, {
-        'url': 'https://video.arnes.si/embed/s1YjnV7hadlC',
-        'only_matching': True,
-    }, {
-        'url': 'https://video.arnes.si/en/watch/s1YjnV7hadlC',
-        'only_matching': True,
-    }, {
-        'url': 'https://video.arnes.si/embed/s1YjnV7hadlC?t=123&hideRelated=1',
-        'only_matching': True,
-    }, {
-        'url': 'https://video.arnes.si/api/public/video/s1YjnV7hadlC',
-        'only_matching': True,
-    }]
-    _BASE_URL = 'https://video.arnes.si'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        video = self._download_json(
-            self._BASE_URL + '/api/public/video/' + video_id, video_id)['data']
-        title = video['title']
-
-        formats = []
-        for media in (video.get('media') or []):
-            media_url = media.get('url')
-            if not media_url:
-                continue
-            formats.append({
-                'url': self._BASE_URL + media_url,
-                'format_id': remove_start(media.get('format'), 'FORMAT_'),
-                'format_note': media.get('formatTranslation'),
-                'width': int_or_none(media.get('width')),
-                'height': int_or_none(media.get('height')),
-            })
-        self._sort_formats(formats)
-
-        channel = video.get('channel') or {}
-        channel_id = channel.get('url')
-        thumbnail = video.get('thumbnailUrl')
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnail': self._BASE_URL + thumbnail,
-            'description': video.get('description'),
-            'license': video.get('license'),
-            'creator': video.get('author'),
-            'timestamp': parse_iso8601(video.get('creationTime')),
-            'channel': channel.get('name'),
-            'channel_id': channel_id,
-            'channel_url': self._BASE_URL + '/?channel=' + channel_id if channel_id else None,
-            'duration': float_or_none(video.get('duration'), 1000),
-            'view_count': int_or_none(video.get('views')),
-            'tags': video.get('hashtags'),
-            'start_time': int_or_none(compat_parse_qs(
-                compat_urllib_parse_urlparse(url).query).get('t', [None])[0]),
-        }

youtube_dl/extractor/arte.py

@@ -5,56 +5,81 @@ import re
 
 from .common import InfoExtractor
 from ..compat import (
+    compat_parse_qs,
     compat_str,
-    compat_urlparse,
+    compat_urllib_parse_urlparse,
 )
 from ..utils import (
     ExtractorError,
+    find_xpath_attr,
+    get_element_by_attribute,
     int_or_none,
+    NO_DEFAULT,
     qualities,
     try_get,
     unified_strdate,
-    url_or_none,
 )
 
-
+# There are different sources of video in arte.tv, the extraction process
-class ArteTVBaseIE(InfoExtractor):
+# is different for each one. The videos usually expire in 7 days, so we can't
-    _ARTE_LANGUAGES = 'fr|de|en|es|it|pl'
+# add tests.
-    _API_BASE = 'https://api.arte.tv/api/player/v1'
 
 
-class ArteTVIE(ArteTVBaseIE):
+class ArteTvIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
+    _VALID_URL = r'https?://videos\.arte\.tv/(?P<lang>fr|de|en|es)/.*-(?P<id>.*?)\.html'
-                    https?://
+    IE_NAME = 'arte.tv'
-                        (?:
-                            (?:www\.)?arte\.tv/(?P<lang>%(langs)s)/videos|
-                            api\.arte\.tv/api/player/v\d+/config/(?P<lang_2>%(langs)s)
-                        )
-                        /(?P<id>\d{6}-\d{3}-[AF])
-                    ''' % {'langs': ArteTVBaseIE._ARTE_LANGUAGES}
-    _TESTS = [{
-        'url': 'https://www.arte.tv/en/videos/088501-000-A/mexico-stealing-petrol-to-survive/',
-        'info_dict': {
-            'id': '088501-000-A',
-            'ext': 'mp4',
-            'title': 'Mexico: Stealing Petrol to Survive',
-            'upload_date': '20190628',
-        },
-    }, {
-        'url': 'https://www.arte.tv/pl/videos/100103-000-A/usa-dyskryminacja-na-porodowce/',
-        'only_matching': True,
-    }, {
-        'url': 'https://api.arte.tv/api/player/v2/config/de/100605-013-A',
-        'only_matching': True,
-    }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
+        lang = mobj.group('lang')
         video_id = mobj.group('id')
-        lang = mobj.group('lang') or mobj.group('lang_2')
 
-        info = self._download_json(
+        ref_xml_url = url.replace('/videos/', '/do_delegate/videos/')
-            '%s/config/%s/%s' % (self._API_BASE, lang, video_id), video_id)
+        ref_xml_url = ref_xml_url.replace('.html', ',view,asPlayerXml.xml')
+        ref_xml_doc = self._download_xml(
+            ref_xml_url, video_id, note='Downloading metadata')
+        config_node = find_xpath_attr(ref_xml_doc, './/video', 'lang', lang)
+        config_xml_url = config_node.attrib['ref']
+        config = self._download_xml(
+            config_xml_url, video_id, note='Downloading configuration')
+
+        formats = [{
+            'format_id': q.attrib['quality'],
+            # The playpath starts at 'mp4:', if we don't manually
+            # split the url, rtmpdump will incorrectly parse them
+            'url': q.text.split('mp4:', 1)[0],
+            'play_path': 'mp4:' + q.text.split('mp4:', 1)[1],
+            'ext': 'flv',
+            'quality': 2 if q.attrib['quality'] == 'hd' else 1,
+        } for q in config.findall('./urls/url')]
+        self._sort_formats(formats)
+
+        title = config.find('.//name').text
+        thumbnail = config.find('.//firstThumbnailUrl').text
+        return {
+            'id': video_id,
+            'title': title,
+            'thumbnail': thumbnail,
+            'formats': formats,
+        }
+
+
+class ArteTVBaseIE(InfoExtractor):
+    @classmethod
+    def _extract_url_info(cls, url):
+        mobj = re.match(cls._VALID_URL, url)
+        lang = mobj.group('lang')
+        query = compat_parse_qs(compat_urllib_parse_urlparse(url).query)
+        if 'vid' in query:
+            video_id = query['vid'][0]
+        else:
+            # This is not a real id, it can be for example AJT for the news
+            # http://www.arte.tv/guide/fr/emissions/AJT/arte-journal
+            video_id = mobj.group('id')
+        return video_id, lang
+
+    def _extract_from_json_url(self, json_url, video_id, lang, title=None):
+        info = self._download_json(json_url, video_id)
         player_info = info['videoJsonPlayer']
 
         vsr = try_get(player_info, lambda x: x['VSR'], dict)
@@ -71,20 +96,25 @@ class ArteTVIE(ArteTVBaseIE):
         if not upload_date_str:
             upload_date_str = (player_info.get('VRA') or player_info.get('VDA') or '').split(' ')[0]
 
-        title = (player_info.get('VTI') or player_info['VID']).strip()
+        title = (player_info.get('VTI') or title or player_info['VID']).strip()
         subtitle = player_info.get('VSU', '').strip()
         if subtitle:
             title += ' - %s' % subtitle
 
-        qfunc = qualities(['MQ', 'HQ', 'EQ', 'SQ'])
+        info_dict = {
+            'id': player_info['VID'],
+            'title': title,
+            'description': player_info.get('VDE'),
+            'upload_date': unified_strdate(upload_date_str),
+            'thumbnail': player_info.get('programImage') or player_info.get('VTU', {}).get('IUR'),
+        }
+        qfunc = qualities(['HQ', 'MQ', 'EQ', 'SQ'])
 
         LANGS = {
             'fr': 'F',
             'de': 'A',
             'en': 'E[ANG]',
             'es': 'E[ESP]',
-            'it': 'E[ITA]',
-            'pl': 'E[POL]',
         }
 
         langcode = LANGS.get(lang, lang)
@@ -92,16 +122,12 @@ class ArteTVIE(ArteTVBaseIE):
         formats = []
         for format_id, format_dict in vsr.items():
             f = dict(format_dict)
-            format_url = url_or_none(f.get('url'))
-            streamer = f.get('streamer')
-            if not format_url and not streamer:
-                continue
             versionCode = f.get('versionCode')
             l = re.escape(langcode)
 
             # Language preference from most to least priority
-            # Reference: section 6.8 of
+            # Reference: section 5.6.3 of
-            # https://www.arte.tv/sites/en/corporate/files/complete-technical-guidelines-arte-geie-v1-07-1.pdf
+            # http://www.arte.tv/sites/en/corporate/files/complete-technical-guidelines-arte-geie-v1-05.pdf
             PREFERENCES = (
                 # original version in requested language, without subtitles
                 r'VO{0}$'.format(l),
@@ -138,16 +164,6 @@ class ArteTVIE(ArteTVBaseIE):
             else:
                 lang_pref = -1
 
-            media_type = f.get('mediaType')
-            if media_type == 'hls':
-                m3u8_formats = self._extract_m3u8_formats(
-                    format_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                    m3u8_id=format_id, fatal=False)
-                for m3u8_format in m3u8_formats:
-                    m3u8_format['language_preference'] = lang_pref
-                formats.extend(m3u8_formats)
-                continue
-
             format = {
                 'format_id': format_id,
                 'preference': -10 if f.get('videoFormat') == 'M3U8' else None,
@@ -159,7 +175,7 @@ class ArteTVIE(ArteTVBaseIE):
                 'quality': qfunc(f.get('quality')),
             }
 
-            if media_type == 'rtmp':
+            if f.get('mediaType') == 'rtmp':
                 format['url'] = f['streamer']
                 format['play_path'] = 'mp4:' + f['url']
                 format['ext'] = 'flv'
@@ -168,87 +184,290 @@ class ArteTVIE(ArteTVBaseIE):
 
             formats.append(format)
 
+        self._check_formats(formats, video_id)
         self._sort_formats(formats)
 
-        return {
+        info_dict['formats'] = formats
-            'id': player_info.get('VID') or video_id,
+        return info_dict
-            'title': title,
-            'description': player_info.get('VDE'),
-            'upload_date': unified_strdate(upload_date_str),
-            'thumbnail': player_info.get('programImage') or player_info.get('VTU', {}).get('IUR'),
-            'formats': formats,
-        }
 
 
-class ArteTVEmbedIE(InfoExtractor):
+class ArteTVPlus7IE(ArteTVBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?arte\.tv/player/v\d+/index\.php\?.*?\bjson_url=.+'
+    IE_NAME = 'arte.tv:+7'
+    _VALID_URL = r'https?://(?:(?:www|sites)\.)?arte\.tv/(?:[^/]+/)?(?P<lang>fr|de|en|es)/(?:videos/)?(?:[^/]+/)*(?P<id>[^/?#&]+)'
+
     _TESTS = [{
-        'url': 'https://www.arte.tv/player/v5/index.php?json_url=https%3A%2F%2Fapi.arte.tv%2Fapi%2Fplayer%2Fv2%2Fconfig%2Fde%2F100605-013-A&lang=de&autoplay=true&mute=0100605-013-A',
+        'url': 'http://www.arte.tv/guide/de/sendungen/XEN/xenius/?vid=055918-015_PLUS7-D',
-        'info_dict': {
+        'only_matching': True,
-            'id': '100605-013-A',
-            'ext': 'mp4',
-            'title': 'United we Stream November Lockdown Edition #13',
-            'description': 'md5:be40b667f45189632b78c1425c7c2ce1',
-            'upload_date': '20201116',
-        },
     }, {
-        'url': 'https://www.arte.tv/player/v3/index.php?json_url=https://api.arte.tv/api/player/v2/config/de/100605-013-A',
+        'url': 'http://sites.arte.tv/karambolage/de/video/karambolage-22',
+        'only_matching': True,
+    }, {
+        'url': 'http://www.arte.tv/de/videos/048696-000-A/der-kluge-bauch-unser-zweites-gehirn',
         'only_matching': True,
     }]
 
-    @staticmethod
+    @classmethod
-    def _extract_urls(webpage):
+    def suitable(cls, url):
-        return [url for _, url in re.findall(
+        return False if ArteTVPlaylistIE.suitable(url) else super(ArteTVPlus7IE, cls).suitable(url)
-            r'<(?:iframe|script)[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?arte\.tv/player/v\d+/index\.php\?.*?\bjson_url=.+?)\1',
-            webpage)]
 
     def _real_extract(self, url):
-        qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
+        video_id, lang = self._extract_url_info(url)
-        json_url = qs['json_url'][0]
+        webpage = self._download_webpage(url, video_id)
-        video_id = ArteTVIE._match_id(json_url)
+        return self._extract_from_webpage(webpage, video_id, lang)
-        return self.url_result(
+
-            json_url, ie=ArteTVIE.ie_key(), video_id=video_id)
+    def _extract_from_webpage(self, webpage, video_id, lang):
+        patterns_templates = (r'arte_vp_url=["\'](.*?%s.*?)["\']', r'data-url=["\']([^"]+%s[^"]+)["\']')
+        ids = (video_id, '')
+        # some pages contain multiple videos (like
+        # http://www.arte.tv/guide/de/sendungen/XEN/xenius/?vid=055918-015_PLUS7-D),
+        # so we first try to look for json URLs that contain the video id from
+        # the 'vid' parameter.
+        patterns = [t % re.escape(_id) for _id in ids for t in patterns_templates]
+        json_url = self._html_search_regex(
+            patterns, webpage, 'json vp url', default=None)
+        if not json_url:
+            def find_iframe_url(webpage, default=NO_DEFAULT):
+                return self._html_search_regex(
+                    r'<iframe[^>]+src=(["\'])(?P<url>.+\bjson_url=.+?)\1',
+                    webpage, 'iframe url', group='url', default=default)
+
+            iframe_url = find_iframe_url(webpage, None)
+            if not iframe_url:
+                embed_url = self._html_search_regex(
+                    r'arte_vp_url_oembed=\'([^\']+?)\'', webpage, 'embed url', default=None)
+                if embed_url:
+                    player = self._download_json(
+                        embed_url, video_id, 'Downloading player page')
+                    iframe_url = find_iframe_url(player['html'])
+            # en and es URLs produce react-based pages with different layout (e.g.
+            # http://www.arte.tv/guide/en/053330-002-A/carnival-italy?zone=world)
+            if not iframe_url:
+                program = self._search_regex(
+                    r'program\s*:\s*({.+?["\']embed_html["\'].+?}),?\s*\n',
+                    webpage, 'program', default=None)
+                if program:
+                    embed_html = self._parse_json(program, video_id)
+                    if embed_html:
+                        iframe_url = find_iframe_url(embed_html['embed_html'])
+            if iframe_url:
+                json_url = compat_parse_qs(
+                    compat_urllib_parse_urlparse(iframe_url).query)['json_url'][0]
+        if json_url:
+            title = self._search_regex(
+                r'<h3[^>]+title=(["\'])(?P<title>.+?)\1',
+                webpage, 'title', default=None, group='title')
+            return self._extract_from_json_url(json_url, video_id, lang, title=title)
+        # Different kind of embed URL (e.g.
+        # http://www.arte.tv/magazine/trepalium/fr/episode-0406-replay-trepalium)
+        entries = [
+            self.url_result(url)
+            for _, url in re.findall(r'<iframe[^>]+src=(["\'])(?P<url>.+?)\1', webpage)]
+        return self.playlist_result(entries)
+
+
+# It also uses the arte_vp_url url from the webpage to extract the information
+class ArteTVCreativeIE(ArteTVPlus7IE):
+    IE_NAME = 'arte.tv:creative'
+    _VALID_URL = r'https?://creative\.arte\.tv/(?P<lang>fr|de|en|es)/(?:[^/]+/)*(?P<id>[^/?#&]+)'
+
+    _TESTS = [{
+        'url': 'http://creative.arte.tv/fr/episode/osmosis-episode-1',
+        'info_dict': {
+            'id': '057405-001-A',
+            'ext': 'mp4',
+            'title': 'OSMOSIS - N\'AYEZ PLUS PEUR D\'AIMER (1)',
+            'upload_date': '20150716',
+        },
+    }, {
+        'url': 'http://creative.arte.tv/fr/Monty-Python-Reunion',
+        'playlist_count': 11,
+        'add_ie': ['Youtube'],
+    }, {
+        'url': 'http://creative.arte.tv/de/episode/agentur-amateur-4-der-erste-kunde',
+        'only_matching': True,
+    }]
+
+
+class ArteTVInfoIE(ArteTVPlus7IE):
+    IE_NAME = 'arte.tv:info'
+    _VALID_URL = r'https?://info\.arte\.tv/(?P<lang>fr|de|en|es)/(?:[^/]+/)*(?P<id>[^/?#&]+)'
+
+    _TESTS = [{
+        'url': 'http://info.arte.tv/fr/service-civique-un-cache-misere',
+        'info_dict': {
+            'id': '067528-000-A',
+            'ext': 'mp4',
+            'title': 'Service civique, un cache misère ?',
+            'upload_date': '20160403',
+        },
+    }]
+
+
+class ArteTVFutureIE(ArteTVPlus7IE):
+    IE_NAME = 'arte.tv:future'
+    _VALID_URL = r'https?://future\.arte\.tv/(?P<lang>fr|de|en|es)/(?P<id>[^/?#&]+)'
+
+    _TESTS = [{
+        'url': 'http://future.arte.tv/fr/info-sciences/les-ecrevisses-aussi-sont-anxieuses',
+        'info_dict': {
+            'id': '050940-028-A',
+            'ext': 'mp4',
+            'title': 'Les écrevisses aussi peuvent être anxieuses',
+            'upload_date': '20140902',
+        },
+    }, {
+        'url': 'http://future.arte.tv/fr/la-science-est-elle-responsable',
+        'only_matching': True,
+    }]
+
+
+class ArteTVDDCIE(ArteTVPlus7IE):
+    IE_NAME = 'arte.tv:ddc'
+    _VALID_URL = r'https?://ddc\.arte\.tv/(?P<lang>emission|folge)/(?P<id>[^/?#&]+)'
+
+    _TESTS = []
+
+    def _real_extract(self, url):
+        video_id, lang = self._extract_url_info(url)
+        if lang == 'folge':
+            lang = 'de'
+        elif lang == 'emission':
+            lang = 'fr'
+        webpage = self._download_webpage(url, video_id)
+        scriptElement = get_element_by_attribute('class', 'visu_video_block', webpage)
+        script_url = self._html_search_regex(r'src="(.*?)"', scriptElement, 'script url')
+        javascriptPlayerGenerator = self._download_webpage(script_url, video_id, 'Download javascript player generator')
+        json_url = self._search_regex(r"json_url=(.*)&rendering_place.*", javascriptPlayerGenerator, 'json url')
+        return self._extract_from_json_url(json_url, video_id, lang)
+
+
+class ArteTVConcertIE(ArteTVPlus7IE):
+    IE_NAME = 'arte.tv:concert'
+    _VALID_URL = r'https?://concert\.arte\.tv/(?P<lang>fr|de|en|es)/(?P<id>[^/?#&]+)'
+
+    _TESTS = [{
+        'url': 'http://concert.arte.tv/de/notwist-im-pariser-konzertclub-divan-du-monde',
+        'md5': '9ea035b7bd69696b67aa2ccaaa218161',
+        'info_dict': {
+            'id': '186',
+            'ext': 'mp4',
+            'title': 'The Notwist im Pariser Konzertclub "Divan du Monde"',
+            'upload_date': '20140128',
+            'description': 'md5:486eb08f991552ade77439fe6d82c305',
+        },
+    }]
+
+
+class ArteTVCinemaIE(ArteTVPlus7IE):
+    IE_NAME = 'arte.tv:cinema'
+    _VALID_URL = r'https?://cinema\.arte\.tv/(?P<lang>fr|de|en|es)/(?P<id>.+)'
+
+    _TESTS = [{
+        'url': 'http://cinema.arte.tv/fr/article/les-ailes-du-desir-de-julia-reck',
+        'md5': 'a5b9dd5575a11d93daf0e3f404f45438',
+        'info_dict': {
+            'id': '062494-000-A',
+            'ext': 'mp4',
+            'title': 'Film lauréat du concours web - "Les ailes du désir" de Julia Reck',
+            'upload_date': '20150807',
+        },
+    }]
+
+
+class ArteTVMagazineIE(ArteTVPlus7IE):
+    IE_NAME = 'arte.tv:magazine'
+    _VALID_URL = r'https?://(?:www\.)?arte\.tv/magazine/[^/]+/(?P<lang>fr|de|en|es)/(?P<id>[^/?#&]+)'
+
+    _TESTS = [{
+        # Embedded via <iframe src="http://www.arte.tv/arte_vp/index.php?json_url=..."
+        'url': 'http://www.arte.tv/magazine/trepalium/fr/entretien-avec-le-realisateur-vincent-lannoo-trepalium',
+        'md5': '2a9369bcccf847d1c741e51416299f25',
+        'info_dict': {
+            'id': '065965-000-A',
+            'ext': 'mp4',
+            'title': 'Trepalium - Extrait Ep.01',
+            'upload_date': '20160121',
+        },
+    }, {
+        # Embedded via <iframe src="http://www.arte.tv/guide/fr/embed/054813-004-A/medium"
+        'url': 'http://www.arte.tv/magazine/trepalium/fr/episode-0406-replay-trepalium',
+        'md5': 'fedc64fc7a946110fe311634e79782ca',
+        'info_dict': {
+            'id': '054813-004_PLUS7-F',
+            'ext': 'mp4',
+            'title': 'Trepalium (4/6)',
+            'description': 'md5:10057003c34d54e95350be4f9b05cb40',
+            'upload_date': '20160218',
+        },
+    }, {
+        'url': 'http://www.arte.tv/magazine/metropolis/de/frank-woeste-german-paris-metropolis',
+        'only_matching': True,
+    }]
+
+
+class ArteTVEmbedIE(ArteTVPlus7IE):
+    IE_NAME = 'arte.tv:embed'
+    _VALID_URL = r'''(?x)
+        http://www\.arte\.tv
+        /(?:playerv2/embed|arte_vp/index)\.php\?json_url=
+        (?P<json_url>
+            http://arte\.tv/papi/tvguide/videos/stream/player/
+            (?P<lang>[^/]+)/(?P<id>[^/]+)[^&]*
+        )
+    '''
+
+    _TESTS = []
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group('id')
+        lang = mobj.group('lang')
+        json_url = mobj.group('json_url')
+        return self._extract_from_json_url(json_url, video_id, lang)
+
+
+class TheOperaPlatformIE(ArteTVPlus7IE):
+    IE_NAME = 'theoperaplatform'
+    _VALID_URL = r'https?://(?:www\.)?theoperaplatform\.eu/(?P<lang>fr|de|en|es)/(?P<id>[^/?#&]+)'
+
+    _TESTS = [{
+        'url': 'http://www.theoperaplatform.eu/de/opera/verdi-otello',
+        'md5': '970655901fa2e82e04c00b955e9afe7b',
+        'info_dict': {
+            'id': '060338-009-A',
+            'ext': 'mp4',
+            'title': 'Verdi - OTELLO',
+            'upload_date': '20160927',
+        },
+    }]
 
 
 class ArteTVPlaylistIE(ArteTVBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?arte\.tv/(?P<lang>%s)/videos/(?P<id>RC-\d{6})' % ArteTVBaseIE._ARTE_LANGUAGES
+    IE_NAME = 'arte.tv:playlist'
+    _VALID_URL = r'https?://(?:www\.)?arte\.tv/guide/(?P<lang>fr|de|en|es)/[^#]*#collection/(?P<id>PL-\d+)'
+
     _TESTS = [{
-        'url': 'https://www.arte.tv/en/videos/RC-016954/earn-a-living/',
+        'url': 'http://www.arte.tv/guide/de/plus7/?country=DE#collection/PL-013263/ARTETV',
         'info_dict': {
-            'id': 'RC-016954',
+            'id': 'PL-013263',
-            'title': 'Earn a Living',
+            'title': 'Areva & Uramin',
-            'description': 'md5:d322c55011514b3a7241f7fb80d494c2',
+            'description': 'md5:a1dc0312ce357c262259139cfd48c9bf',
         },
         'playlist_mincount': 6,
     }, {
-        'url': 'https://www.arte.tv/pl/videos/RC-014123/arte-reportage/',
+        'url': 'http://www.arte.tv/guide/de/playlists?country=DE#collection/PL-013190/ARTETV',
         'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        lang, playlist_id = re.match(self._VALID_URL, url).groups()
+        playlist_id, lang = self._extract_url_info(url)
         collection = self._download_json(
-            '%s/collectionData/%s/%s?source=videos'
+            'https://api.arte.tv/api/player/v1/collectionData/%s/%s?source=videos'
-            % (self._API_BASE, lang, playlist_id), playlist_id)
+            % (lang, playlist_id), playlist_id)
-        entries = []
-        for video in collection['videos']:
-            if not isinstance(video, dict):
-                continue
-            video_url = url_or_none(video.get('url')) or url_or_none(video.get('jsonUrl'))
-            if not video_url:
-                continue
-            video_id = video.get('programId')
-            entries.append({
-                '_type': 'url_transparent',
-                'url': video_url,
-                'id': video_id,
-                'title': video.get('title'),
-                'alt_title': video.get('subtitle'),
-                'thumbnail': url_or_none(try_get(video, lambda x: x['mainImage']['url'], compat_str)),
-                'duration': int_or_none(video.get('durationSeconds')),
-                'view_count': int_or_none(video.get('views')),
-                'ie_key': ArteTVIE.ie_key(),
-            })
         title = collection.get('title')
         description = collection.get('shortDescription') or collection.get('teaserText')
+        entries = [
+            self._extract_from_json_url(
+                video['jsonUrl'], video.get('programId') or playlist_id, lang)
+            for video in collection['videos'] if video.get('jsonUrl')]
         return self.playlist_result(entries, playlist_id, title, description)

youtube_dl/extractor/asiancrush.py

@@ -1,200 +1,113 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import functools
 import re
 
 from .common import InfoExtractor
 from .kaltura import KalturaIE
 from ..utils import (
     extract_attributes,
-    int_or_none,
+    remove_end,
-    OnDemandPagedList,
-    parse_age_limit,
-    strip_or_none,
-    try_get,
 )
 
 
-class AsianCrushBaseIE(InfoExtractor):
+class AsianCrushIE(InfoExtractor):
-    _VALID_URL_BASE = r'https?://(?:www\.)?(?P<host>(?:(?:asiancrush|yuyutv|midnightpulp)\.com|(?:cocoro|retrocrush)\.tv))'
+    _VALID_URL = r'https?://(?:www\.)?asiancrush\.com/video/(?:[^/]+/)?0+(?P<id>\d+)v\b'
-    _KALTURA_KEYS = [
-        'video_url', 'progressive_url', 'download_url', 'thumbnail_url',
-        'widescreen_thumbnail_url', 'screencap_widescreen',
-    ]
-    _API_SUFFIX = {'retrocrush.tv': '-ott'}
-
-    def _call_api(self, host, endpoint, video_id, query, resource):
-        return self._download_json(
-            'https://api%s.%s/%s' % (self._API_SUFFIX.get(host, ''), host, endpoint), video_id,
-            'Downloading %s JSON metadata' % resource, query=query,
-            headers=self.geo_verification_headers())['objects']
-
-    def _download_object_data(self, host, object_id, resource):
-        return self._call_api(
-            host, 'search', object_id, {'id': object_id}, resource)[0]
-
-    def _get_object_description(self, obj):
-        return strip_or_none(obj.get('long_description') or obj.get('short_description'))
-
-    def _parse_video_data(self, video):
-        title = video['name']
-
-        entry_id, partner_id = [None] * 2
-        for k in self._KALTURA_KEYS:
-            k_url = video.get(k)
-            if k_url:
-                mobj = re.search(r'/p/(\d+)/.+?/entryId/([^/]+)/', k_url)
-                if mobj:
-                    partner_id, entry_id = mobj.groups()
-                    break
-
-        meta_categories = try_get(video, lambda x: x['meta']['categories'], list) or []
-        categories = list(filter(None, [c.get('name') for c in meta_categories]))
-
-        show_info = video.get('show_info') or {}
-
-        return {
-            '_type': 'url_transparent',
-            'url': 'kaltura:%s:%s' % (partner_id, entry_id),
-            'ie_key': KalturaIE.ie_key(),
-            'id': entry_id,
-            'title': title,
-            'description': self._get_object_description(video),
-            'age_limit': parse_age_limit(video.get('mpaa_rating') or video.get('tv_rating')),
-            'categories': categories,
-            'series': show_info.get('show_name'),
-            'season_number': int_or_none(show_info.get('season_num')),
-            'season_id': show_info.get('season_id'),
-            'episode_number': int_or_none(show_info.get('episode_num')),
-        }
-
-
-class AsianCrushIE(AsianCrushBaseIE):
-    _VALID_URL = r'%s/video/(?:[^/]+/)?0+(?P<id>\d+)v\b' % AsianCrushBaseIE._VALID_URL_BASE
     _TESTS = [{
-        'url': 'https://www.asiancrush.com/video/004289v/women-who-flirt',
+        'url': 'https://www.asiancrush.com/video/012869v/women-who-flirt/',
         'md5': 'c3b740e48d0ba002a42c0b72857beae6',
         'info_dict': {
             'id': '1_y4tmjm5r',
             'ext': 'mp4',
             'title': 'Women Who Flirt',
-            'description': 'md5:b65c7e0ae03a85585476a62a186f924c',
+            'description': 'md5:3db14e9186197857e7063522cb89a805',
             'timestamp': 1496936429,
             'upload_date': '20170608',
             'uploader_id': 'craig@crifkin.com',
-            'age_limit': 13,
-            'categories': 'count:5',
-            'duration': 5812,
         },
     }, {
         'url': 'https://www.asiancrush.com/video/she-was-pretty/011886v-pretty-episode-3/',
         'only_matching': True,
-    }, {
-        'url': 'https://www.yuyutv.com/video/013886v/the-act-of-killing/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.yuyutv.com/video/peep-show/013922v-warring-factions/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.midnightpulp.com/video/010400v/drifters/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.midnightpulp.com/video/mononoke/016378v-zashikiwarashi-part-1/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cocoro.tv/video/the-wonderful-wizard-of-oz/008878v-the-wonderful-wizard-of-oz-ep01/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.retrocrush.tv/video/true-tears/012328v-i...gave-away-my-tears',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        host, video_id = re.match(self._VALID_URL, url).groups()
+        video_id = self._match_id(url)
 
-        if host == 'cocoro.tv':
+        webpage = self._download_webpage(url, video_id)
-            webpage = self._download_webpage(url, video_id)
+
-            embed_vars = self._parse_json(self._search_regex(
+        entry_id, partner_id, title = [None] * 3
+
+        vars = self._parse_json(
+            self._search_regex(
                 r'iEmbedVars\s*=\s*({.+?})', webpage, 'embed vars',
-                default='{}'), video_id, fatal=False) or {}
+                default='{}'), video_id, fatal=False)
-            video_id = embed_vars.get('entry_id') or video_id
+        if vars:
+            entry_id = vars.get('entry_id')
+            partner_id = vars.get('partner_id')
+            title = vars.get('vid_label')
 
-        video = self._download_object_data(host, video_id, 'video')
+        if not entry_id:
-        return self._parse_video_data(video)
+            entry_id = self._search_regex(
+                r'\bentry_id["\']\s*:\s*["\'](\d+)', webpage, 'entry id')
+
+        player = self._download_webpage(
+            'https://api.asiancrush.com/embeddedVideoPlayer', video_id,
+            query={'id': entry_id})
+
+        kaltura_id = self._search_regex(
+            r'entry_id["\']\s*:\s*(["\'])(?P<id>(?:(?!\1).)+)\1', player,
+            'kaltura id', group='id')
+
+        if not partner_id:
+            partner_id = self._search_regex(
+                r'/p(?:artner_id)?/(\d+)', player, 'partner id',
+                default='513551')
+
+        return self.url_result(
+            'kaltura:%s:%s' % (partner_id, kaltura_id),
+            ie=KalturaIE.ie_key(), video_id=kaltura_id,
+            video_title=title)
 
 
-class AsianCrushPlaylistIE(AsianCrushBaseIE):
+class AsianCrushPlaylistIE(InfoExtractor):
-    _VALID_URL = r'%s/series/0+(?P<id>\d+)s\b' % AsianCrushBaseIE._VALID_URL_BASE
+    _VALID_URL = r'https?://(?:www\.)?asiancrush\.com/series/0+(?P<id>\d+)s\b'
-    _TESTS = [{
+    _TEST = {
-        'url': 'https://www.asiancrush.com/series/006447s/fruity-samurai',
+        'url': 'https://www.asiancrush.com/series/012481s/scholar-walks-night/',
         'info_dict': {
-            'id': '6447',
+            'id': '12481',
-            'title': 'Fruity Samurai',
+            'title': 'Scholar Who Walks the Night',
-            'description': 'md5:7535174487e4a202d3872a7fc8f2f154',
+            'description': 'md5:7addd7c5132a09fd4741152d96cce886',
         },
-        'playlist_count': 13,
+        'playlist_count': 20,
-    }, {
+    }
-        'url': 'https://www.yuyutv.com/series/013920s/peep-show/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.midnightpulp.com/series/016375s/mononoke/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cocoro.tv/series/008549s/the-wonderful-wizard-of-oz/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.retrocrush.tv/series/012355s/true-tears',
-        'only_matching': True,
-    }]
-    _PAGE_SIZE = 1000000000
-
-    def _fetch_page(self, domain, parent_id, page):
-        videos = self._call_api(
-            domain, 'getreferencedobjects', parent_id, {
-                'max': self._PAGE_SIZE,
-                'object_type': 'video',
-                'parent_id': parent_id,
-                'start': page * self._PAGE_SIZE,
-            }, 'page %d' % (page + 1))
-        for video in videos:
-            yield self._parse_video_data(video)
 
     def _real_extract(self, url):
-        host, playlist_id = re.match(self._VALID_URL, url).groups()
+        playlist_id = self._match_id(url)
 
-        if host == 'cocoro.tv':
+        webpage = self._download_webpage(url, playlist_id)
-            webpage = self._download_webpage(url, playlist_id)
 
-            entries = []
+        entries = []
 
-            for mobj in re.finditer(
+        for mobj in re.finditer(
-                    r'<a[^>]+href=(["\'])(?P<url>%s.*?)\1[^>]*>' % AsianCrushIE._VALID_URL,
+                r'<a[^>]+href=(["\'])(?P<url>%s.*?)\1[^>]*>' % AsianCrushIE._VALID_URL,
-                    webpage):
+                webpage):
-                attrs = extract_attributes(mobj.group(0))
+            attrs = extract_attributes(mobj.group(0))
-                if attrs.get('class') == 'clearfix':
+            if attrs.get('class') == 'clearfix':
-                    entries.append(self.url_result(
+                entries.append(self.url_result(
-                        mobj.group('url'), ie=AsianCrushIE.ie_key()))
+                    mobj.group('url'), ie=AsianCrushIE.ie_key()))
 
-            title = self._html_search_regex(
+        title = remove_end(
+            self._html_search_regex(
                 r'(?s)<h1\b[^>]\bid=["\']movieTitle[^>]+>(.+?)</h1>', webpage,
                 'title', default=None) or self._og_search_title(
                 webpage, default=None) or self._html_search_meta(
                 'twitter:title', webpage, 'title',
                 default=None) or self._search_regex(
-                r'<title>([^<]+)</title>', webpage, 'title', fatal=False)
+                r'<title>([^<]+)</title>', webpage, 'title', fatal=False),
-            if title:
+            ' | AsianCrush')
-                title = re.sub(r'\s*\|\s*.+?$', '', title)
 
-            description = self._og_search_description(
+        description = self._og_search_description(
-                webpage, default=None) or self._html_search_meta(
+            webpage, default=None) or self._html_search_meta(
-                'twitter:description', webpage, 'description', fatal=False)
+            'twitter:description', webpage, 'description', fatal=False)
-        else:
-            show = self._download_object_data(host, playlist_id, 'show')
-            title = show.get('name')
-            description = self._get_object_description(show)
-            entries = OnDemandPagedList(
-                functools.partial(self._fetch_page, host, playlist_id),
-                self._PAGE_SIZE)
 
         return self.playlist_result(entries, playlist_id, title, description)

youtube_dl/extractor/atresplayer.py

@@ -1,118 +1,202 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
+import time
+import hmac
+import hashlib
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_HTTPError
+from ..compat import compat_str
 from ..utils import (
     ExtractorError,
+    float_or_none,
     int_or_none,
+    sanitized_Request,
     urlencode_postdata,
+    xpath_text,
 )
 
 
 class AtresPlayerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/[^/]+/[^/]+/[^/]+/[^/]+/(?P<display_id>.+?)_(?P<id>[0-9a-f]{24})'
+    _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/television/[^/]+/[^/]+/[^/]+/(?P<id>.+?)_\d+\.html'
     _NETRC_MACHINE = 'atresplayer'
     _TESTS = [
         {
-            'url': 'https://www.atresplayer.com/antena3/series/pequenas-coincidencias/temporada-1/capitulo-7-asuntos-pendientes_5d4aa2c57ed1a88fc715a615/',
+            'url': 'http://www.atresplayer.com/television/programas/el-club-de-la-comedia/temporada-4/capitulo-10-especial-solidario-nochebuena_2014122100174.html',
+            'md5': 'efd56753cda1bb64df52a3074f62e38a',
             'info_dict': {
-                'id': '5d4aa2c57ed1a88fc715a615',
+                'id': 'capitulo-10-especial-solidario-nochebuena',
                 'ext': 'mp4',
-                'title': 'Capítulo 7: Asuntos pendientes',
+                'title': 'Especial Solidario de Nochebuena',
-                'description': 'md5:7634cdcb4d50d5381bedf93efb537fbc',
+                'description': 'md5:e2d52ff12214fa937107d21064075bf1',
-                'duration': 3413,
+                'duration': 5527.6,
-            },
+                'thumbnail': r're:^https?://.*\.jpg$',
-            'params': {
-                'format': 'bestvideo',
             },
             'skip': 'This video is only available for registered users'
         },
         {
-            'url': 'https://www.atresplayer.com/lasexta/programas/el-club-de-la-comedia/temporada-4/capitulo-10-especial-solidario-nochebuena_5ad08edf986b2855ed47adc4/',
+            'url': 'http://www.atresplayer.com/television/especial/videoencuentros/temporada-1/capitulo-112-david-bustamante_2014121600375.html',
-            'only_matching': True,
+            'md5': '6e52cbb513c405e403dbacb7aacf8747',
+            'info_dict': {
+                'id': 'capitulo-112-david-bustamante',
+                'ext': 'flv',
+                'title': 'David Bustamante',
+                'description': 'md5:f33f1c0a05be57f6708d4dd83a3b81c6',
+                'duration': 1439.0,
+                'thumbnail': r're:^https?://.*\.jpg$',
+            },
         },
         {
-            'url': 'https://www.atresplayer.com/antena3/series/el-secreto-de-puente-viejo/el-chico-de-los-tres-lunares/capitulo-977-29-12-14_5ad51046986b2886722ccdea/',
+            'url': 'http://www.atresplayer.com/television/series/el-secreto-de-puente-viejo/el-chico-de-los-tres-lunares/capitulo-977-29-12-14_2014122400174.html',
             'only_matching': True,
         },
     ]
-    _API_BASE = 'https://api.atresplayer.com/'
+
+    _USER_AGENT = 'Dalvik/1.6.0 (Linux; U; Android 4.3; GT-I9300 Build/JSS15J'
+    _MAGIC = 'QWtMLXs414Yo+c#_+Q#K@NN)'
+    _TIMESTAMP_SHIFT = 30000
+
+    _TIME_API_URL = 'http://servicios.atresplayer.com/api/admin/time.json'
+    _URL_VIDEO_TEMPLATE = 'https://servicios.atresplayer.com/api/urlVideo/{1}/{0}/{1}|{2}|{3}.json'
+    _PLAYER_URL_TEMPLATE = 'https://servicios.atresplayer.com/episode/getplayer.json?episodePk=%s'
+    _EPISODE_URL_TEMPLATE = 'http://www.atresplayer.com/episodexml/%s'
+
+    _LOGIN_URL = 'https://servicios.atresplayer.com/j_spring_security_check'
+
+    _ERRORS = {
+        'UNPUBLISHED': 'We\'re sorry, but this video is not yet available.',
+        'DELETED': 'This video has expired and is no longer available for online streaming.',
+        'GEOUNPUBLISHED': 'We\'re sorry, but this video is not available in your region due to right restrictions.',
+        # 'PREMIUM': 'PREMIUM',
+    }
 
     def _real_initialize(self):
         self._login()
 
-    def _handle_error(self, e, code):
-        if isinstance(e.cause, compat_HTTPError) and e.cause.code == code:
-            error = self._parse_json(e.cause.read(), None)
-            if error.get('error') == 'required_registered':
-                self.raise_login_required()
-            raise ExtractorError(error['error_description'], expected=True)
-        raise
-
     def _login(self):
         username, password = self._get_login_info()
         if username is None:
             return
 
-        self._request_webpage(
+        login_form = {
-            self._API_BASE + 'login', None, 'Downloading login page')
+            'j_username': username,
+            'j_password': password,
+        }
 
-        try:
+        request = sanitized_Request(
-            target_url = self._download_json(
+            self._LOGIN_URL, urlencode_postdata(login_form))
-                'https://account.atresmedia.com/api/login', None,
+        request.add_header('Content-Type', 'application/x-www-form-urlencoded')
-                'Logging in', headers={
+        response = self._download_webpage(
-                    'Content-Type': 'application/x-www-form-urlencoded'
+            request, None, 'Logging in')
-                }, data=urlencode_postdata({
-                    'username': username,
-                    'password': password,
-                }))['targetUrl']
-        except ExtractorError as e:
-            self._handle_error(e, 400)
 
-        self._request_webpage(target_url, None, 'Following Target URL')
+        error = self._html_search_regex(
+            r'(?s)<ul[^>]+class="[^"]*\blist_error\b[^"]*">(.+?)</ul>',
+            response, 'error', default=None)
+        if error:
+            raise ExtractorError(
+                'Unable to login: %s' % error, expected=True)
 
     def _real_extract(self, url):
-        display_id, video_id = re.match(self._VALID_URL, url).groups()
+        video_id = self._match_id(url)
 
-        try:
+        webpage = self._download_webpage(url, video_id)
-            episode = self._download_json(
-                self._API_BASE + 'client/v1/player/episode/' + video_id, video_id)
-        except ExtractorError as e:
-            self._handle_error(e, 403)
 
-        title = episode['titulo']
+        episode_id = self._search_regex(
+            r'episode="([^"]+)"', webpage, 'episode id')
+
+        request = sanitized_Request(
+            self._PLAYER_URL_TEMPLATE % episode_id,
+            headers={'User-Agent': self._USER_AGENT})
+        player = self._download_json(request, episode_id, 'Downloading player JSON')
+
+        episode_type = player.get('typeOfEpisode')
+        error_message = self._ERRORS.get(episode_type)
+        if error_message:
+            raise ExtractorError(
+                '%s returned error: %s' % (self.IE_NAME, error_message), expected=True)
 
         formats = []
-        for source in episode.get('sources', []):
+        video_url = player.get('urlVideo')
-            src = source.get('src')
+        if video_url:
-            if not src:
+            format_info = {
+                'url': video_url,
+                'format_id': 'http',
+            }
+            mobj = re.search(r'(?P<bitrate>\d+)K_(?P<width>\d+)x(?P<height>\d+)', video_url)
+            if mobj:
+                format_info.update({
+                    'width': int_or_none(mobj.group('width')),
+                    'height': int_or_none(mobj.group('height')),
+                    'tbr': int_or_none(mobj.group('bitrate')),
+                })
+            formats.append(format_info)
+
+        timestamp = int_or_none(self._download_webpage(
+            self._TIME_API_URL,
+            video_id, 'Downloading timestamp', fatal=False), 1000, time.time())
+        timestamp_shifted = compat_str(timestamp + self._TIMESTAMP_SHIFT)
+        token = hmac.new(
+            self._MAGIC.encode('ascii'),
+            (episode_id + timestamp_shifted).encode('utf-8'), hashlib.md5
+        ).hexdigest()
+
+        request = sanitized_Request(
+            self._URL_VIDEO_TEMPLATE.format('windows', episode_id, timestamp_shifted, token),
+            headers={'User-Agent': self._USER_AGENT})
+
+        fmt_json = self._download_json(
+            request, video_id, 'Downloading windows video JSON')
+
+        result = fmt_json.get('resultDes')
+        if result.lower() != 'ok':
+            raise ExtractorError(
+                '%s returned error: %s' % (self.IE_NAME, result), expected=True)
+
+        for format_id, video_url in fmt_json['resultObject'].items():
+            if format_id == 'token' or not video_url.startswith('http'):
                 continue
-            src_type = source.get('type')
+            if 'geodeswowsmpra3player' in video_url:
-            if src_type == 'application/vnd.apple.mpegurl':
+                # f4m_path = video_url.split('smil:', 1)[-1].split('free_', 1)[0]
-                formats.extend(self._extract_m3u8_formats(
+                # f4m_url = 'http://drg.antena3.com/{0}hds/es/sd.f4m'.format(f4m_path)
-                    src, video_id, 'mp4', 'm3u8_native',
+                # this videos are protected by DRM, the f4m downloader doesn't support them
-                    m3u8_id='hls', fatal=False))
+                continue
-            elif src_type == 'application/dash+xml':
+            video_url_hd = video_url.replace('free_es', 'es')
-                formats.extend(self._extract_mpd_formats(
+            formats.extend(self._extract_f4m_formats(
-                    src, video_id, mpd_id='dash', fatal=False))
+                video_url_hd[:-9] + '/manifest.f4m', video_id, f4m_id='hds',
+                fatal=False))
+            formats.extend(self._extract_mpd_formats(
+                video_url_hd[:-9] + '/manifest.mpd', video_id, mpd_id='dash',
+                fatal=False))
         self._sort_formats(formats)
 
-        heartbeat = episode.get('heartbeat') or {}
+        path_data = player.get('pathData')
-        omniture = episode.get('omniture') or {}
+
-        get_meta = lambda x: heartbeat.get(x) or omniture.get(x)
+        episode = self._download_xml(
+            self._EPISODE_URL_TEMPLATE % path_data, video_id,
+            'Downloading episode XML')
+
+        duration = float_or_none(xpath_text(
+            episode, './media/asset/info/technical/contentDuration', 'duration'))
+
+        art = episode.find('./media/asset/info/art')
+        title = xpath_text(art, './name', 'title')
+        description = xpath_text(art, './description', 'description')
+        thumbnail = xpath_text(episode, './media/asset/files/background', 'thumbnail')
+
+        subtitles = {}
+        subtitle_url = xpath_text(episode, './media/asset/files/subtitle', 'subtitle')
+        if subtitle_url:
+            subtitles['es'] = [{
+                'ext': 'srt',
+                'url': subtitle_url,
+            }]
 
         return {
-            'display_id': display_id,
             'id': video_id,
             'title': title,
-            'description': episode.get('descripcion'),
+            'description': description,
-            'thumbnail': episode.get('imgPoster'),
+            'thumbnail': thumbnail,
-            'duration': int_or_none(episode.get('duration')),
+            'duration': duration,
             'formats': formats,
-            'channel': get_meta('channel'),
+            'subtitles': subtitles,
-            'season': get_meta('season'),
-            'episode_number': int_or_none(get_meta('episodeNumber')),
         }

youtube_dl/extractor/audioboom.py

@@ -2,25 +2,22 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..utils import (
+from ..utils import float_or_none
-    clean_html,
-    float_or_none,
-)
 
 
 class AudioBoomIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?audioboom\.com/(?:boos|posts)/(?P<id>[0-9]+)'
     _TESTS = [{
-        'url': 'https://audioboom.com/posts/7398103-asim-chaudhry',
+        'url': 'https://audioboom.com/boos/4279833-3-09-2016-czaban-hour-3?t=0',
-        'md5': '7b00192e593ff227e6a315486979a42d',
+        'md5': '63a8d73a055c6ed0f1e51921a10a5a76',
         'info_dict': {
-            'id': '7398103',
+            'id': '4279833',
             'ext': 'mp3',
-            'title': 'Asim Chaudhry',
+            'title': '3/09/2016 Czaban Hour 3',
-            'description': 'md5:2f3fef17dacc2595b5362e1d7d3602fc',
+            'description': 'Guest:   Nate Davis - NFL free agency,   Guest:   Stan Gans',
-            'duration': 4000.99,
+            'duration': 2245.72,
-            'uploader': 'Sue Perkins: An hour or so with...',
+            'uploader': 'SB Nation A.M.',
-            'uploader_url': r're:https?://(?:www\.)?audioboom\.com/channel/perkins',
+            'uploader_url': r're:https?://(?:www\.)?audioboom\.com/channel/steveczabanyahoosportsradio',
         }
     }, {
         'url': 'https://audioboom.com/posts/4279833-3-09-2016-czaban-hour-3?t=0',
@@ -35,8 +32,8 @@ class AudioBoomIE(InfoExtractor):
         clip = None
 
         clip_store = self._parse_json(
-            self._html_search_regex(
+            self._search_regex(
-                r'data-new-clip-store=(["\'])(?P<json>{.+?})\1',
+                r'data-new-clip-store=(["\'])(?P<json>{.*?"clipId"\s*:\s*%s.*?})\1' % video_id,
                 webpage, 'clip store', default='{}', group='json'),
             video_id, fatal=False)
         if clip_store:
@@ -50,15 +47,14 @@ class AudioBoomIE(InfoExtractor):
 
         audio_url = from_clip('clipURLPriorToLoading') or self._og_search_property(
             'audio', webpage, 'audio url')
-        title = from_clip('title') or self._html_search_meta(
+        title = from_clip('title') or self._og_search_title(webpage)
-            ['og:title', 'og:audio:title', 'audio_title'], webpage)
+        description = from_clip('description') or self._og_search_description(webpage)
-        description = from_clip('description') or clean_html(from_clip('formattedDescription')) or self._og_search_description(webpage)
 
         duration = float_or_none(from_clip('duration') or self._html_search_meta(
             'weibo:audio:duration', webpage))
 
-        uploader = from_clip('author') or self._html_search_meta(
+        uploader = from_clip('author') or self._og_search_property(
-            ['og:audio:artist', 'twitter:audio:artist_name', 'audio_artist'], webpage, 'uploader')
+            'audio:artist', webpage, 'uploader', fatal=False)
         uploader_url = from_clip('author_url') or self._html_search_meta(
             'audioboo:channel', webpage, 'uploader url')
 

youtube_dl/extractor/awaan.py

@@ -48,7 +48,6 @@ class AWAANBaseIE(InfoExtractor):
             'duration': int_or_none(video_data.get('duration')),
             'timestamp': parse_iso8601(video_data.get('create_time'), ' '),
             'is_live': is_live,
-            'uploader_id': video_data.get('user_id'),
         }
 
 
@@ -108,7 +107,6 @@ class AWAANLiveIE(AWAANBaseIE):
             'title': 're:Dubai Al Oula [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
             'upload_date': '20150107',
             'timestamp': 1420588800,
-            'uploader_id': '71',
         },
         'params': {
             # m3u8 download

youtube_dl/extractor/azmedien.py

@@ -47,19 +47,39 @@ class AZMedienIE(InfoExtractor):
         'url': 'https://www.telebaern.tv/telebaern-news/montag-1-oktober-2018-ganze-sendung-133531189#video=0_7xjo9lf1',
         'only_matching': True
     }]
-    _API_TEMPL = 'https://www.%s/api/pub/gql/%s/NewsArticleTeaser/a4016f65fe62b81dc6664dd9f4910e4ab40383be'
+
     _PARTNER_ID = '1719221'
 
     def _real_extract(self, url):
-        host, display_id, article_id, entry_id = re.match(self._VALID_URL, url).groups()
+        mobj = re.match(self._VALID_URL, url)
+        host = mobj.group('host')
+        video_id = mobj.group('id')
+        entry_id = mobj.group('kaltura_id')
 
         if not entry_id:
-            entry_id = self._download_json(
+            api_url = 'https://www.%s/api/pub/gql/%s' % (host, host.split('.')[0])
-                self._API_TEMPL % (host, host.split('.')[0]), display_id, query={
+            payload = {
-                    'variables': json.dumps({
+                'query': '''query VideoContext($articleId: ID!) {
-                        'contextId': 'NewsArticle:' + article_id,
+                    article: node(id: $articleId) {
-                    }),
+                      ... on Article {
-                })['data']['context']['mainAsset']['video']['kaltura']['kalturaId']
+                        mainAssetRelation {
+                          asset {
+                            ... on VideoAsset {
+                              kalturaId
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }''',
+                'variables': {'articleId': 'Article:%s' % mobj.group('article_id')},
+            }
+            json_data = self._download_json(
+                api_url, video_id, headers={
+                    'Content-Type': 'application/json',
+                },
+                data=json.dumps(payload).encode())
+            entry_id = json_data['data']['article']['mainAssetRelation']['asset']['kalturaId']
 
         return self.url_result(
             'kaltura:%s:%s' % (self._PARTNER_ID, entry_id),

youtube_dl/extractor/bambuser.py

@@ -0,0 +1,142 @@
+from __future__ import unicode_literals
+
+import re
+import itertools
+
+from .common import InfoExtractor
+from ..compat import compat_str
+from ..utils import (
+    ExtractorError,
+    float_or_none,
+    int_or_none,
+    sanitized_Request,
+    urlencode_postdata,
+)
+
+
+class BambuserIE(InfoExtractor):
+    IE_NAME = 'bambuser'
+    _VALID_URL = r'https?://bambuser\.com/v/(?P<id>\d+)'
+    _API_KEY = '005f64509e19a868399060af746a00aa'
+    _LOGIN_URL = 'https://bambuser.com/user'
+    _NETRC_MACHINE = 'bambuser'
+
+    _TEST = {
+        'url': 'http://bambuser.com/v/4050584',
+        # MD5 seems to be flaky, see https://travis-ci.org/ytdl-org/youtube-dl/jobs/14051016#L388
+        # 'md5': 'fba8f7693e48fd4e8641b3fd5539a641',
+        'info_dict': {
+            'id': '4050584',
+            'ext': 'flv',
+            'title': 'Education engineering days - lightning talks',
+            'duration': 3741,
+            'uploader': 'pixelversity',
+            'uploader_id': '344706',
+            'timestamp': 1382976692,
+            'upload_date': '20131028',
+            'view_count': int,
+        },
+        'params': {
+            # It doesn't respect the 'Range' header, it would download the whole video
+            # caused the travis builds to fail: https://travis-ci.org/ytdl-org/youtube-dl/jobs/14493845#L59
+            'skip_download': True,
+        },
+    }
+
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+
+        login_form = {
+            'form_id': 'user_login',
+            'op': 'Log in',
+            'name': username,
+            'pass': password,
+        }
+
+        request = sanitized_Request(
+            self._LOGIN_URL, urlencode_postdata(login_form))
+        request.add_header('Referer', self._LOGIN_URL)
+        response = self._download_webpage(
+            request, None, 'Logging in')
+
+        login_error = self._html_search_regex(
+            r'(?s)<div class="messages error">(.+?)</div>',
+            response, 'login error', default=None)
+        if login_error:
+            raise ExtractorError(
+                'Unable to login: %s' % login_error, expected=True)
+
+    def _real_initialize(self):
+        self._login()
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        info = self._download_json(
+            'http://player-c.api.bambuser.com/getVideo.json?api_key=%s&vid=%s'
+            % (self._API_KEY, video_id), video_id)
+
+        error = info.get('error')
+        if error:
+            raise ExtractorError(
+                '%s returned error: %s' % (self.IE_NAME, error), expected=True)
+
+        result = info['result']
+
+        return {
+            'id': video_id,
+            'title': result['title'],
+            'url': result['url'],
+            'thumbnail': result.get('preview'),
+            'duration': int_or_none(result.get('length')),
+            'uploader': result.get('username'),
+            'uploader_id': compat_str(result.get('owner', {}).get('uid')),
+            'timestamp': int_or_none(result.get('created')),
+            'fps': float_or_none(result.get('framerate')),
+            'view_count': int_or_none(result.get('views_total')),
+            'comment_count': int_or_none(result.get('comment_count')),
+        }
+
+
+class BambuserChannelIE(InfoExtractor):
+    IE_NAME = 'bambuser:channel'
+    _VALID_URL = r'https?://bambuser\.com/channel/(?P<user>.*?)(?:/|#|\?|$)'
+    # The maximum number we can get with each request
+    _STEP = 50
+    _TEST = {
+        'url': 'http://bambuser.com/channel/pixelversity',
+        'info_dict': {
+            'title': 'pixelversity',
+        },
+        'playlist_mincount': 60,
+    }
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        user = mobj.group('user')
+        urls = []
+        last_id = ''
+        for i in itertools.count(1):
+            req_url = (
+                'http://bambuser.com/xhr-api/index.php?username={user}'
+                '&sort=created&access_mode=0%2C1%2C2&limit={count}'
+                '&method=broadcast&format=json&vid_older_than={last}'
+            ).format(user=user, count=self._STEP, last=last_id)
+            req = sanitized_Request(req_url)
+            # Without setting this header, we wouldn't get any result
+            req.add_header('Referer', 'http://bambuser.com/channel/%s' % user)
+            data = self._download_json(
+                req, user, 'Downloading page %d' % i)
+            results = data['result']
+            if not results:
+                break
+            last_id = results[-1]['vid']
+            urls.extend(self.url_result(v['page'], 'Bambuser') for v in results)
+
+        return {
+            '_type': 'playlist',
+            'title': user,
+            'entries': urls,
+        }

youtube_dl/extractor/bandaichannel.py

@@ -1,37 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .brightcove import BrightcoveNewIE
-from ..utils import extract_attributes
-
-
-class BandaiChannelIE(BrightcoveNewIE):
-    IE_NAME = 'bandaichannel'
-    _VALID_URL = r'https?://(?:www\.)?b-ch\.com/titles/(?P<id>\d+/\d+)'
-    _TESTS = [{
-        'url': 'https://www.b-ch.com/titles/514/001',
-        'md5': 'a0f2d787baa5729bed71108257f613a4',
-        'info_dict': {
-            'id': '6128044564001',
-            'ext': 'mp4',
-            'title': 'メタルファイターMIKU 第1話',
-            'timestamp': 1580354056,
-            'uploader_id': '5797077852001',
-            'upload_date': '20200130',
-            'duration': 1387.733,
-        },
-        'params': {
-            'format': 'bestvideo',
-            'skip_download': True,
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        attrs = extract_attributes(self._search_regex(
-            r'(<video-js[^>]+\bid="bcplayer"[^>]*>)', webpage, 'player'))
-        bc = self._download_json(
-            'https://pbifcd.b-ch.com/v1/playbackinfo/ST/70/' + attrs['data-info'],
-            video_id, headers={'X-API-KEY': attrs['data-auth'].strip()})['bc']
-        return self._parse_brightcove_metadata(bc, bc['id'])

youtube_dl/extractor/bandcamp.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import random
@@ -6,7 +5,10 @@ import re
 import time
 
 from .common import InfoExtractor
-from ..compat import compat_str
+from ..compat import (
+    compat_str,
+    compat_urlparse,
+)
 from ..utils import (
     ExtractorError,
     float_or_none,
@@ -15,32 +17,30 @@ from ..utils import (
     parse_filesize,
     str_or_none,
     try_get,
+    unescapeHTML,
     update_url_query,
     unified_strdate,
     unified_timestamp,
     url_or_none,
-    urljoin,
 )
 
 
 class BandcampIE(InfoExtractor):
-    _VALID_URL = r'https?://[^/]+\.bandcamp\.com/track/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://[^/]+\.bandcamp\.com/track/(?P<title>[^/?#&]+)'
     _TESTS = [{
         'url': 'http://youtube-dl.bandcamp.com/track/youtube-dl-test-song',
         'md5': 'c557841d5e50261777a6585648adf439',
         'info_dict': {
             'id': '1812978515',
             'ext': 'mp3',
-            'title': "youtube-dl  \"'/\\ä↭ - youtube-dl  \"'/\\ä↭ - youtube-dl test song \"'/\\ä↭",
+            'title': "youtube-dl  \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
             'duration': 9.8485,
-            'uploader': 'youtube-dl  "\'/\\ä↭',
-            'upload_date': '20121129',
-            'timestamp': 1354224127,
         },
         '_skip': 'There is a limit of 200 free downloads / month for the test song'
     }, {
         # free download
         'url': 'http://benprunty.bandcamp.com/track/lanius-battle',
+        'md5': '853e35bf34aa1d6fe2615ae612564b36',
         'info_dict': {
             'id': '2650410135',
             'ext': 'aiff',
@@ -49,7 +49,6 @@ class BandcampIE(InfoExtractor):
             'uploader': 'Ben Prunty',
             'timestamp': 1396508491,
             'upload_date': '20140403',
-            'release_timestamp': 1396483200,
             'release_date': '20140403',
             'duration': 260.877,
             'track': 'Lanius (Battle)',
@@ -70,7 +69,6 @@ class BandcampIE(InfoExtractor):
             'uploader': 'Mastodon',
             'timestamp': 1322005399,
             'upload_date': '20111122',
-            'release_timestamp': 1076112000,
             'release_date': '20040207',
             'duration': 120.79,
             'track': 'Hail to Fire',
@@ -81,16 +79,11 @@ class BandcampIE(InfoExtractor):
         },
     }]
 
-    def _extract_data_attr(self, webpage, video_id, attr='tralbum', fatal=True):
-        return self._parse_json(self._html_search_regex(
-            r'data-%s=(["\'])({.+?})\1' % attr, webpage,
-            attr + ' data', group=2), video_id, fatal=fatal)
-
     def _real_extract(self, url):
-        title = self._match_id(url)
+        mobj = re.match(self._VALID_URL, url)
+        title = mobj.group('title')
         webpage = self._download_webpage(url, title)
-        tralbum = self._extract_data_attr(webpage, title)
+        thumbnail = self._html_search_meta('og:image', webpage, default=None)
-        thumbnail = self._og_search_thumbnail(webpage)
 
         track_id = None
         track = None
@@ -98,7 +91,10 @@ class BandcampIE(InfoExtractor):
         duration = None
 
         formats = []
-        track_info = try_get(tralbum, lambda x: x['trackinfo'][0], dict)
+        track_info = self._parse_json(
+            self._search_regex(
+                r'trackinfo\s*:\s*\[\s*({.+?})\s*\]\s*,\s*?\n',
+                webpage, 'track info', default='{}'), title)
         if track_info:
             file_ = track_info.get('file')
             if isinstance(file_, dict):
@@ -115,25 +111,37 @@ class BandcampIE(InfoExtractor):
                         'abr': int_or_none(abr_str),
                     })
             track = track_info.get('title')
-            track_id = str_or_none(
+            track_id = str_or_none(track_info.get('track_id') or track_info.get('id'))
-                track_info.get('track_id') or track_info.get('id'))
             track_number = int_or_none(track_info.get('track_num'))
             duration = float_or_none(track_info.get('duration'))
 
-        embed = self._extract_data_attr(webpage, title, 'embed', False)
+        def extract(key):
-        current = tralbum.get('current') or {}
+            return self._search_regex(
-        artist = embed.get('artist') or current.get('artist') or tralbum.get('artist')
+                r'\b%s\s*["\']?\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1' % key,
-        timestamp = unified_timestamp(
+                webpage, key, default=None, group='value')
-            current.get('publish_date') or tralbum.get('album_publish_date'))
 
-        download_link = tralbum.get('freeDownloadPage')
+        artist = extract('artist')
+        album = extract('album_title')
+        timestamp = unified_timestamp(
+            extract('publish_date') or extract('album_publish_date'))
+        release_date = unified_strdate(extract('album_release_date'))
+
+        download_link = self._search_regex(
+            r'freeDownloadPage\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
+            'download link', default=None, group='url')
         if download_link:
-            track_id = compat_str(tralbum['id'])
+            track_id = self._search_regex(
+                r'(?ms)var TralbumData = .*?[{,]\s*id: (?P<id>\d+),?$',
+                webpage, 'track id')
 
             download_webpage = self._download_webpage(
                 download_link, track_id, 'Downloading free downloads page')
 
-            blob = self._extract_data_attr(download_webpage, track_id, 'blob')
+            blob = self._parse_json(
+                self._search_regex(
+                    r'data-blob=(["\'])(?P<blob>{.+?})\1', download_webpage,
+                    'blob', group='blob'),
+                track_id, transform_source=unescapeHTML)
 
             info = try_get(
                 blob, (lambda x: x['digital_items'][0],
@@ -199,20 +207,20 @@ class BandcampIE(InfoExtractor):
             'thumbnail': thumbnail,
             'uploader': artist,
             'timestamp': timestamp,
-            'release_timestamp': unified_timestamp(tralbum.get('album_release_date')),
+            'release_date': release_date,
             'duration': duration,
             'track': track,
             'track_number': track_number,
             'track_id': track_id,
             'artist': artist,
-            'album': embed.get('album_title'),
+            'album': album,
             'formats': formats,
         }
 
 
-class BandcampAlbumIE(BandcampIE):
+class BandcampAlbumIE(InfoExtractor):
     IE_NAME = 'Bandcamp:album'
-    _VALID_URL = r'https?://(?:(?P<subdomain>[^.]+)\.)?bandcamp\.com(?:/album/(?P<id>[^/?#&]+))?'
+    _VALID_URL = r'https?://(?:(?P<subdomain>[^.]+)\.)?bandcamp\.com(?:/album/(?P<album_id>[^/?#&]+))?'
 
     _TESTS = [{
         'url': 'http://blazo.bandcamp.com/album/jazz-format-mixtape-vol-1',
@@ -222,10 +230,7 @@ class BandcampAlbumIE(BandcampIE):
                 'info_dict': {
                     'id': '1353101989',
                     'ext': 'mp3',
-                    'title': 'Blazo - Intro',
+                    'title': 'Intro',
-                    'timestamp': 1311756226,
-                    'upload_date': '20110727',
-                    'uploader': 'Blazo',
                 }
             },
             {
@@ -233,10 +238,7 @@ class BandcampAlbumIE(BandcampIE):
                 'info_dict': {
                     'id': '38097443',
                     'ext': 'mp3',
-                    'title': 'Blazo - Kero One - Keep It Alive (Blazo remix)',
+                    'title': 'Kero One - Keep It Alive (Blazo remix)',
-                    'timestamp': 1311757238,
-                    'upload_date': '20110727',
-                    'uploader': 'Blazo',
                 }
             },
         ],
@@ -272,7 +274,6 @@ class BandcampAlbumIE(BandcampIE):
             'title': '"Entropy" EP',
             'uploader_id': 'jstrecords',
             'id': 'entropy-ep',
-            'description': 'md5:0ff22959c943622972596062f2f366a5',
         },
         'playlist_mincount': 3,
     }, {
@@ -282,7 +283,6 @@ class BandcampAlbumIE(BandcampIE):
             'id': 'we-are-the-plague',
             'title': 'WE ARE THE PLAGUE',
             'uploader_id': 'insulters',
-            'description': 'md5:b3cf845ee41b2b1141dc7bde9237255f',
         },
         'playlist_count': 2,
     }]
@@ -294,34 +294,41 @@ class BandcampAlbumIE(BandcampIE):
                 else super(BandcampAlbumIE, cls).suitable(url))
 
     def _real_extract(self, url):
-        uploader_id, album_id = re.match(self._VALID_URL, url).groups()
+        mobj = re.match(self._VALID_URL, url)
+        uploader_id = mobj.group('subdomain')
+        album_id = mobj.group('album_id')
         playlist_id = album_id or uploader_id
         webpage = self._download_webpage(url, playlist_id)
-        tralbum = self._extract_data_attr(webpage, playlist_id)
+        track_elements = re.findall(
-        track_info = tralbum.get('trackinfo')
+            r'(?s)<div[^>]*>(.*?<a[^>]+href="([^"]+?)"[^>]+itemprop="url"[^>]*>.*?)</div>', webpage)
-        if not track_info:
+        if not track_elements:
             raise ExtractorError('The page doesn\'t contain any tracks')
         # Only tracks with duration info have songs
         entries = [
             self.url_result(
-                urljoin(url, t['title_link']), BandcampIE.ie_key(),
+                compat_urlparse.urljoin(url, t_path),
-                str_or_none(t.get('track_id') or t.get('id')), t.get('title'))
+                ie=BandcampIE.ie_key(),
-            for t in track_info
+                video_title=self._search_regex(
-            if t.get('duration')]
+                    r'<span\b[^>]+\bitemprop=["\']name["\'][^>]*>([^<]+)',
-
+                    elem_content, 'track title', fatal=False))
-        current = tralbum.get('current') or {}
+            for elem_content, t_path in track_elements
+            if self._html_search_meta('duration', elem_content, default=None)]
 
+        title = self._html_search_regex(
+            r'album_title\s*:\s*"((?:\\.|[^"\\])+?)"',
+            webpage, 'title', fatal=False)
+        if title:
+            title = title.replace(r'\"', '"')
         return {
             '_type': 'playlist',
             'uploader_id': uploader_id,
             'id': playlist_id,
-            'title': current.get('title'),
+            'title': title,
-            'description': current.get('about'),
             'entries': entries,
         }
 
 
-class BandcampWeeklyIE(BandcampIE):
+class BandcampWeeklyIE(InfoExtractor):
     IE_NAME = 'Bandcamp:weekly'
     _VALID_URL = r'https?://(?:www\.)?bandcamp\.com/?\?(?:.*?&)?show=(?P<id>\d+)'
     _TESTS = [{
@@ -336,23 +343,29 @@ class BandcampWeeklyIE(BandcampIE):
             'release_date': '20170404',
             'series': 'Bandcamp Weekly',
             'episode': 'Magic Moments',
+            'episode_number': 208,
             'episode_id': '224',
-        },
+        }
-        'params': {
-            'format': 'opus-lo',
-        },
     }, {
         'url': 'https://bandcamp.com/?blah/blah@&show=228',
         'only_matching': True
     }]
 
     def _real_extract(self, url):
-        show_id = self._match_id(url)
+        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, show_id)
+        webpage = self._download_webpage(url, video_id)
 
-        blob = self._extract_data_attr(webpage, show_id, 'blob')
+        blob = self._parse_json(
+            self._search_regex(
+                r'data-blob=(["\'])(?P<blob>{.+?})\1', webpage,
+                'blob', group='blob'),
+            video_id, transform_source=unescapeHTML)
 
-        show = blob['bcw_data'][show_id]
+        show = blob['bcw_show']
+
+        # This is desired because any invalid show id redirects to `bandcamp.com`
+        # which happens to expose the latest Bandcamp Weekly episode.
+        show_id = int_or_none(show.get('show_id')) or int_or_none(video_id)
 
         formats = []
         for format_id, format_url in show['audio_stream'].items():
@@ -377,8 +390,20 @@ class BandcampWeeklyIE(BandcampIE):
         if subtitle:
             title += ' - %s' % subtitle
 
+        episode_number = None
+        seq = blob.get('bcw_seq')
+
+        if seq and isinstance(seq, list):
+            try:
+                episode_number = next(
+                    int_or_none(e.get('episode_number'))
+                    for e in seq
+                    if isinstance(e, dict) and int_or_none(e.get('id')) == show_id)
+            except StopIteration:
+                pass
+
         return {
-            'id': show_id,
+            'id': video_id,
             'title': title,
             'description': show.get('desc') or show.get('short_desc'),
             'duration': float_or_none(show.get('audio_duration')),
@@ -386,6 +411,7 @@ class BandcampWeeklyIE(BandcampIE):
             'release_date': unified_strdate(show.get('published_date')),
             'series': 'Bandcamp Weekly',
             'episode': show.get('subtitle'),
-            'episode_id': show_id,
+            'episode_number': episode_number,
+            'episode_id': compat_str(video_id),
             'formats': formats
         }

youtube_dl/extractor/bbc.py

@@ -1,39 +1,31 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import functools
 import itertools
-import json
 import re
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_etree_Element,
-    compat_HTTPError,
-    compat_parse_qs,
-    compat_str,
-    compat_urllib_parse_urlparse,
-    compat_urlparse,
-)
 from ..utils import (
-    ExtractorError,
-    OnDemandPagedList,
     clean_html,
     dict_get,
+    ExtractorError,
     float_or_none,
     get_element_by_class,
     int_or_none,
     js_to_json,
     parse_duration,
     parse_iso8601,
-    strip_or_none,
     try_get,
     unescapeHTML,
-    unified_timestamp,
     url_or_none,
     urlencode_postdata,
     urljoin,
 )
+from ..compat import (
+    compat_etree_Element,
+    compat_HTTPError,
+    compat_urlparse,
+)
 
 
 class BBCCoUkIE(InfoExtractor):
@@ -48,7 +40,6 @@ class BBCCoUkIE(InfoExtractor):
                             iplayer(?:/[^/]+)?/(?:episode/|playlist/)|
                             music/(?:clips|audiovideo/popular)[/#]|
                             radio/player/|
-                            sounds/play/|
                             events/[^/]+/play/[^/]+/
                         )
                         (?P<id>%s)(?!/(?:episodes|broadcasts|clips))
@@ -57,24 +48,29 @@ class BBCCoUkIE(InfoExtractor):
     _LOGIN_URL = 'https://account.bbc.com/signin'
     _NETRC_MACHINE = 'bbc'
 
-    _MEDIA_SELECTOR_URL_TEMPL = 'https://open.live.bbc.co.uk/mediaselector/6/select/version/2.0/mediaset/%s/vpid/%s'
+    _MEDIASELECTOR_URLS = [
-    _MEDIA_SETS = [
         # Provides HQ HLS streams with even better quality that pc mediaset but fails
         # with geolocation in some cases when it's even not geo restricted at all (e.g.
         # http://www.bbc.co.uk/programmes/b06bp7lf). Also may fail with selectionunavailable.
-        'iptv-all',
+        'http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/iptv-all/vpid/%s',
-        'pc',
+        'http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/pc/vpid/%s',
     ]
 
+    _MEDIASELECTION_NS = 'http://bbc.co.uk/2008/mp/mediaselection'
     _EMP_PLAYLIST_NS = 'http://bbc.co.uk/2008/emp/playlist'
 
+    _NAMESPACES = (
+        _MEDIASELECTION_NS,
+        _EMP_PLAYLIST_NS,
+    )
+
     _TESTS = [
         {
             'url': 'http://www.bbc.co.uk/programmes/b039g8p7',
             'info_dict': {
                 'id': 'b039d07m',
                 'ext': 'flv',
-                'title': 'Kaleidoscope, Leonard Cohen',
+                'title': 'Leonard Cohen, Kaleidoscope - BBC Radio 4',
                 'description': 'The Canadian poet and songwriter reflects on his musical career.',
             },
             'params': {
@@ -224,20 +220,6 @@ class BBCCoUkIE(InfoExtractor):
                 # rtmp download
                 'skip_download': True,
             },
-        }, {
-            'url': 'https://www.bbc.co.uk/sounds/play/m0007jzb',
-            'note': 'Audio',
-            'info_dict': {
-                'id': 'm0007jz9',
-                'ext': 'mp4',
-                'title': 'BBC Proms, 2019, Prom 34: West–Eastern Divan Orchestra',
-                'description': "Live BBC Proms. West–Eastern Divan Orchestra with Daniel Barenboim and Martha Argerich.",
-                'duration': 9840,
-            },
-            'params': {
-                # rtmp download
-                'skip_download': True,
-            }
         }, {
             'url': 'http://www.bbc.co.uk/iplayer/playlist/p01dvks4',
             'only_matching': True,
@@ -264,6 +246,8 @@ class BBCCoUkIE(InfoExtractor):
             'only_matching': True,
         }]
 
+    _USP_RE = r'/([^/]+?)\.ism(?:\.hlsv2\.ism)?/[^/]+\.m3u8'
+
     def _login(self):
         username, password = self._get_login_info()
         if username is None:
@@ -308,14 +292,22 @@ class BBCCoUkIE(InfoExtractor):
     def _extract_items(self, playlist):
         return playlist.findall('./{%s}item' % self._EMP_PLAYLIST_NS)
 
+    def _findall_ns(self, element, xpath):
+        elements = []
+        for ns in self._NAMESPACES:
+            elements.extend(element.findall(xpath % ns))
+        return elements
+
     def _extract_medias(self, media_selection):
-        error = media_selection.get('result')
+        error = media_selection.find('./{%s}error' % self._MEDIASELECTION_NS)
-        if error:
+        if error is None:
-            raise BBCCoUkIE.MediaSelectionError(error)
+            media_selection.find('./{%s}error' % self._EMP_PLAYLIST_NS)
-        return media_selection.get('media') or []
+        if error is not None:
+            raise BBCCoUkIE.MediaSelectionError(error.get('id'))
+        return self._findall_ns(media_selection, './{%s}media')
 
     def _extract_connections(self, media):
-        return media.get('connection') or []
+        return self._findall_ns(media, './{%s}connection')
 
     def _get_subtitles(self, media, programme_id):
         subtitles = {}
@@ -327,13 +319,13 @@ class BBCCoUkIE(InfoExtractor):
                 cc_url, programme_id, 'Downloading captions', fatal=False)
             if not isinstance(captions, compat_etree_Element):
                 continue
-            subtitles['en'] = [
+            lang = captions.get('{http://www.w3.org/XML/1998/namespace}lang', 'en')
+            subtitles[lang] = [
                 {
                     'url': connection.get('href'),
                     'ext': 'ttml',
                 },
             ]
-            break
         return subtitles
 
     def _raise_extractor_error(self, media_selection_error):
@@ -343,10 +335,10 @@ class BBCCoUkIE(InfoExtractor):
 
     def _download_media_selector(self, programme_id):
         last_exception = None
-        for media_set in self._MEDIA_SETS:
+        for mediaselector_url in self._MEDIASELECTOR_URLS:
             try:
                 return self._download_media_selector_url(
-                    self._MEDIA_SELECTOR_URL_TEMPL % (media_set, programme_id), programme_id)
+                    mediaselector_url % programme_id, programme_id)
             except BBCCoUkIE.MediaSelectionError as e:
                 if e.id in ('notukerror', 'geolocation', 'selectionunavailable'):
                     last_exception = e
@@ -355,8 +347,8 @@ class BBCCoUkIE(InfoExtractor):
         self._raise_extractor_error(last_exception)
 
     def _download_media_selector_url(self, url, programme_id=None):
-        media_selection = self._download_json(
+        media_selection = self._download_xml(
-            url, programme_id, 'Downloading media selection JSON',
+            url, programme_id, 'Downloading media selection XML',
             expected_status=(403, 404))
         return self._process_media_selector(media_selection, programme_id)
 
@@ -370,6 +362,7 @@ class BBCCoUkIE(InfoExtractor):
             if kind in ('video', 'audio'):
                 bitrate = int_or_none(media.get('bitrate'))
                 encoding = media.get('encoding')
+                service = media.get('service')
                 width = int_or_none(media.get('width'))
                 height = int_or_none(media.get('height'))
                 file_size = int_or_none(media.get('media_file_size'))
@@ -384,6 +377,8 @@ class BBCCoUkIE(InfoExtractor):
                     supplier = connection.get('supplier')
                     transfer_format = connection.get('transferFormat')
                     format_id = supplier or conn_kind or protocol
+                    if service:
+                        format_id = '%s_%s' % (service, format_id)
                     # ASX playlist
                     if supplier == 'asx':
                         for i, ref in enumerate(self._extract_asx_playlist(connection, programme_id)):
@@ -398,11 +393,20 @@ class BBCCoUkIE(InfoExtractor):
                         formats.extend(self._extract_m3u8_formats(
                             href, programme_id, ext='mp4', entry_protocol='m3u8_native',
                             m3u8_id=format_id, fatal=False))
+                        if re.search(self._USP_RE, href):
+                            usp_formats = self._extract_m3u8_formats(
+                                re.sub(self._USP_RE, r'/\1.ism/\1.m3u8', href),
+                                programme_id, ext='mp4', entry_protocol='m3u8_native',
+                                m3u8_id=format_id, fatal=False)
+                            for f in usp_formats:
+                                if f.get('height') and f['height'] > 720:
+                                    continue
+                                formats.append(f)
                     elif transfer_format == 'hds':
                         formats.extend(self._extract_f4m_formats(
                             href, programme_id, f4m_id=format_id, fatal=False))
                     else:
-                        if not supplier and bitrate:
+                        if not service and not supplier and bitrate:
                             format_id += '-%d' % bitrate
                         fmt = {
                             'format_id': format_id,
@@ -509,7 +513,7 @@ class BBCCoUkIE(InfoExtractor):
 
             def get_programme_id(item):
                 def get_from_attributes(item):
-                    for p in ('identifier', 'group'):
+                    for p in('identifier', 'group'):
                         value = item.get(p)
                         if value and re.match(r'^[pb][\da-z]{7}$', value):
                             return value
@@ -535,7 +539,7 @@ class BBCCoUkIE(InfoExtractor):
         webpage = self._download_webpage(url, group_id, 'Downloading video page')
 
         error = self._search_regex(
-            r'<div\b[^>]+\bclass=["\'](?:smp|playout)__message delta["\'][^>]*>\s*([^<]+?)\s*<',
+            r'<div\b[^>]+\bclass=["\']smp__message delta["\'][^>]*>([^<]+)<',
             webpage, 'error', default=None)
         if error:
             raise ExtractorError(error, expected=True)
@@ -588,9 +592,16 @@ class BBCIE(BBCCoUkIE):
     IE_DESC = 'BBC'
     _VALID_URL = r'https?://(?:www\.)?bbc\.(?:com|co\.uk)/(?:[^/]+/)+(?P<id>[^/#?]+)'
 
-    _MEDIA_SETS = [
+    _MEDIASELECTOR_URLS = [
-        'mobile-tablet-main',
+        # Provides HQ HLS streams but fails with geolocation in some cases when it's
-        'pc',
+        # even not geo restricted at all
+        'http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/iptv-all/vpid/%s',
+        # Provides more formats, namely direct mp4 links, but fails on some videos with
+        # notukerror for non UK (?) users (e.g.
+        # http://www.bbc.com/travel/story/20150625-sri-lankas-spicy-secret)
+        'http://open.live.bbc.co.uk/mediaselector/4/mtis/stream/%s',
+        # Provides fewer formats, but works everywhere for everybody (hopefully)
+        'http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/journalism-pc/vpid/%s',
     ]
 
     _TESTS = [{
@@ -598,7 +609,7 @@ class BBCIE(BBCCoUkIE):
         'url': 'http://www.bbc.com/news/world-europe-32668511',
         'info_dict': {
             'id': 'world-europe-32668511',
-            'title': 'Russia stages massive WW2 parade',
+            'title': 'Russia stages massive WW2 parade despite Western boycott',
             'description': 'md5:00ff61976f6081841f759a08bf78cc9c',
         },
         'playlist_count': 2,
@@ -764,17 +775,8 @@ class BBCIE(BBCCoUkIE):
         'only_matching': True,
     }, {
         # custom redirection to www.bbc.com
-        # also, video with window.__INITIAL_DATA__
         'url': 'http://www.bbc.co.uk/news/science-environment-33661876',
-        'info_dict': {
+        'only_matching': True,
-            'id': 'p02xzws1',
-            'ext': 'mp4',
-            'title': "Pluto may have 'nitrogen glaciers'",
-            'description': 'md5:6a95b593f528d7a5f2605221bc56912f',
-            'thumbnail': r're:https?://.+/.+\.jpg',
-            'timestamp': 1437785037,
-            'upload_date': '20150725',
-        },
     }, {
         # single video article embedded with data-media-vpid
         'url': 'http://www.bbc.co.uk/sport/rowing/35908187',
@@ -810,25 +812,11 @@ class BBCIE(BBCCoUkIE):
             'description': 'Learn English words and phrases from this story',
         },
         'add_ie': [BBCCoUkIE.ie_key()],
-    }, {
-        # BBC Reel
-        'url': 'https://www.bbc.com/reel/video/p07c6sb6/how-positive-thinking-is-harming-your-happiness',
-        'info_dict': {
-            'id': 'p07c6sb9',
-            'ext': 'mp4',
-            'title': 'How positive thinking is harming your happiness',
-            'alt_title': 'The downsides of positive thinking',
-            'description': 'md5:fad74b31da60d83b8265954ee42d85b4',
-            'duration': 235,
-            'thumbnail': r're:https?://.+/p07c9dsr.jpg',
-            'upload_date': '20190604',
-            'categories': ['Psychology'],
-        },
     }]
 
     @classmethod
     def suitable(cls, url):
-        EXCLUDE_IE = (BBCCoUkIE, BBCCoUkArticleIE, BBCCoUkIPlayerEpisodesIE, BBCCoUkIPlayerGroupIE, BBCCoUkPlaylistIE)
+        EXCLUDE_IE = (BBCCoUkIE, BBCCoUkArticleIE, BBCCoUkIPlayerPlaylistIE, BBCCoUkPlaylistIE)
         return (False if any(ie.suitable(url) for ie in EXCLUDE_IE)
                 else super(BBCIE, cls).suitable(url))
 
@@ -960,7 +948,7 @@ class BBCIE(BBCCoUkIE):
                                     else:
                                         entry['title'] = info['title']
                                         entry['formats'].extend(info['formats'])
-                                except ExtractorError as e:
+                                except Exception as e:
                                     # Some playlist URL may fail with 500, at the same time
                                     # the other one may work fine (e.g.
                                     # http://www.bbc.com/turkce/haberler/2015/06/150615_telabyad_kentin_cogu)
@@ -978,7 +966,7 @@ class BBCIE(BBCCoUkIE):
         group_id = self._search_regex(
             r'<div[^>]+\bclass=["\']video["\'][^>]+\bdata-pid=["\'](%s)' % self._ID_REGEX,
             webpage, 'group id', default=None)
-        if group_id:
+        if playlist_id:
             return self.url_result(
                 'https://www.bbc.co.uk/programmes/%s' % group_id,
                 ie=BBCCoUkIE.ie_key())
@@ -1011,37 +999,6 @@ class BBCIE(BBCCoUkIE):
                 'subtitles': subtitles,
             }
 
-        # bbc reel (e.g. https://www.bbc.com/reel/video/p07c6sb6/how-positive-thinking-is-harming-your-happiness)
-        initial_data = self._parse_json(self._html_search_regex(
-            r'<script[^>]+id=(["\'])initial-data\1[^>]+data-json=(["\'])(?P<json>(?:(?!\2).)+)',
-            webpage, 'initial data', default='{}', group='json'), playlist_id, fatal=False)
-        if initial_data:
-            init_data = try_get(
-                initial_data, lambda x: x['initData']['items'][0], dict) or {}
-            smp_data = init_data.get('smpData') or {}
-            clip_data = try_get(smp_data, lambda x: x['items'][0], dict) or {}
-            version_id = clip_data.get('versionID')
-            if version_id:
-                title = smp_data['title']
-                formats, subtitles = self._download_media_selector(version_id)
-                self._sort_formats(formats)
-                image_url = smp_data.get('holdingImageURL')
-                display_date = init_data.get('displayDate')
-                topic_title = init_data.get('topicTitle')
-
-                return {
-                    'id': version_id,
-                    'title': title,
-                    'formats': formats,
-                    'alt_title': init_data.get('shortTitle'),
-                    'thumbnail': image_url.replace('$recipe', 'raw') if image_url else None,
-                    'description': smp_data.get('summary') or init_data.get('shortSummary'),
-                    'upload_date': display_date.replace('-', '') if display_date else None,
-                    'subtitles': subtitles,
-                    'duration': int_or_none(clip_data.get('duration')),
-                    'categories': [topic_title] if topic_title else None,
-                }
-
         # Morph based embed (e.g. http://www.bbc.co.uk/sport/live/olympics/36895975)
         # There are several setPayload calls may be present but the video
         # seems to be always related to the first one
@@ -1103,7 +1060,7 @@ class BBCIE(BBCCoUkIE):
                 thumbnail = None
                 image_url = current_programme.get('image_url')
                 if image_url:
-                    thumbnail = image_url.replace('{recipe}', 'raw')
+                    thumbnail = image_url.replace('{recipe}', '1920x1920')
                 return {
                     'id': programme_id,
                     'title': title,
@@ -1120,26 +1077,10 @@ class BBCIE(BBCCoUkIE):
             self._search_regex(
                 r'(?s)bbcthreeConfig\s*=\s*({.+?})\s*;\s*<', webpage,
                 'bbcthree config', default='{}'),
-            playlist_id, transform_source=js_to_json, fatal=False) or {}
+            playlist_id, transform_source=js_to_json, fatal=False)
-        payload = bbc3_config.get('payload') or {}
+        if bbc3_config:
-        if payload:
-            clip = payload.get('currentClip') or {}
-            clip_vpid = clip.get('vpid')
-            clip_title = clip.get('title')
-            if clip_vpid and clip_title:
-                formats, subtitles = self._download_media_selector(clip_vpid)
-                self._sort_formats(formats)
-                return {
-                    'id': clip_vpid,
-                    'title': clip_title,
-                    'thumbnail': dict_get(clip, ('poster', 'imageUrl')),
-                    'description': clip.get('description'),
-                    'duration': parse_duration(clip.get('duration')),
-                    'formats': formats,
-                    'subtitles': subtitles,
-                }
             bbc3_playlist = try_get(
-                payload, lambda x: x['content']['bbcMedia']['playlist'],
+                bbc3_config, lambda x: x['payload']['content']['bbcMedia']['playlist'],
                 dict)
             if bbc3_playlist:
                 playlist_title = bbc3_playlist.get('title') or playlist_title
@@ -1162,56 +1103,6 @@ class BBCIE(BBCCoUkIE):
                 return self.playlist_result(
                     entries, playlist_id, playlist_title, playlist_description)
 
-        initial_data = self._parse_json(self._search_regex(
-            r'window\.__INITIAL_DATA__\s*=\s*({.+?});', webpage,
-            'preload state', default='{}'), playlist_id, fatal=False)
-        if initial_data:
-            def parse_media(media):
-                if not media:
-                    return
-                for item in (try_get(media, lambda x: x['media']['items'], list) or []):
-                    item_id = item.get('id')
-                    item_title = item.get('title')
-                    if not (item_id and item_title):
-                        continue
-                    formats, subtitles = self._download_media_selector(item_id)
-                    self._sort_formats(formats)
-                    item_desc = None
-                    blocks = try_get(media, lambda x: x['summary']['blocks'], list)
-                    if blocks:
-                        summary = []
-                        for block in blocks:
-                            text = try_get(block, lambda x: x['model']['text'], compat_str)
-                            if text:
-                                summary.append(text)
-                        if summary:
-                            item_desc = '\n\n'.join(summary)
-                    item_time = None
-                    for meta in try_get(media, lambda x: x['metadata']['items'], list) or []:
-                        if try_get(meta, lambda x: x['label']) == 'Published':
-                            item_time = unified_timestamp(meta.get('timestamp'))
-                            break
-                    entries.append({
-                        'id': item_id,
-                        'title': item_title,
-                        'thumbnail': item.get('holdingImageUrl'),
-                        'formats': formats,
-                        'subtitles': subtitles,
-                        'timestamp': item_time,
-                        'description': strip_or_none(item_desc),
-                    })
-            for resp in (initial_data.get('data') or {}).values():
-                name = resp.get('name')
-                if name == 'media-experience':
-                    parse_media(try_get(resp, lambda x: x['data']['initialItem']['mediaItem'], dict))
-                elif name == 'article':
-                    for block in (try_get(resp, lambda x: x['data']['blocks'], list) or []):
-                        if block.get('type') != 'media':
-                            continue
-                        parse_media(block.get('model'))
-            return self.playlist_result(
-                entries, playlist_id, playlist_title, playlist_description)
-
         def extract_all(pattern):
             return list(filter(None, map(
                 lambda s: self._parse_json(s, playlist_id, fatal=False),
@@ -1372,149 +1263,21 @@ class BBCCoUkPlaylistBaseIE(InfoExtractor):
             playlist_id, title, description)
 
 
-class BBCCoUkIPlayerPlaylistBaseIE(InfoExtractor):
+class BBCCoUkIPlayerPlaylistIE(BBCCoUkPlaylistBaseIE):
-    _VALID_URL_TMPL = r'https?://(?:www\.)?bbc\.co\.uk/iplayer/%%s/(?P<id>%s)' % BBCCoUkIE._ID_REGEX
+    IE_NAME = 'bbc.co.uk:iplayer:playlist'
-
+    _VALID_URL = r'https?://(?:www\.)?bbc\.co\.uk/iplayer/(?:episodes|group)/(?P<id>%s)' % BBCCoUkIE._ID_REGEX
-    @staticmethod
+    _URL_TEMPLATE = 'http://www.bbc.co.uk/iplayer/episode/%s'
-    def _get_default(episode, key, default_key='default'):
+    _VIDEO_ID_TEMPLATE = r'data-ip-id=["\'](%s)'
-        return try_get(episode, lambda x: x[key][default_key])
-
-    def _get_description(self, data):
-        synopsis = data.get(self._DESCRIPTION_KEY) or {}
-        return dict_get(synopsis, ('large', 'medium', 'small'))
-
-    def _fetch_page(self, programme_id, per_page, series_id, page):
-        elements = self._get_elements(self._call_api(
-            programme_id, per_page, page + 1, series_id))
-        for element in elements:
-            episode = self._get_episode(element)
-            episode_id = episode.get('id')
-            if not episode_id:
-                continue
-            thumbnail = None
-            image = self._get_episode_image(episode)
-            if image:
-                thumbnail = image.replace('{recipe}', 'raw')
-            category = self._get_default(episode, 'labels', 'category')
-            yield {
-                '_type': 'url',
-                'id': episode_id,
-                'title': self._get_episode_field(episode, 'subtitle'),
-                'url': 'https://www.bbc.co.uk/iplayer/episode/' + episode_id,
-                'thumbnail': thumbnail,
-                'description': self._get_description(episode),
-                'categories': [category] if category else None,
-                'series': self._get_episode_field(episode, 'title'),
-                'ie_key': BBCCoUkIE.ie_key(),
-            }
-
-    def _real_extract(self, url):
-        pid = self._match_id(url)
-        qs = compat_parse_qs(compat_urllib_parse_urlparse(url).query)
-        series_id = qs.get('seriesId', [None])[0]
-        page = qs.get('page', [None])[0]
-        per_page = 36 if page else self._PAGE_SIZE
-        fetch_page = functools.partial(self._fetch_page, pid, per_page, series_id)
-        entries = fetch_page(int(page) - 1) if page else OnDemandPagedList(fetch_page, self._PAGE_SIZE)
-        playlist_data = self._get_playlist_data(self._call_api(pid, 1))
-        return self.playlist_result(
-            entries, pid, self._get_playlist_title(playlist_data),
-            self._get_description(playlist_data))
-
-
-class BBCCoUkIPlayerEpisodesIE(BBCCoUkIPlayerPlaylistBaseIE):
-    IE_NAME = 'bbc.co.uk:iplayer:episodes'
-    _VALID_URL = BBCCoUkIPlayerPlaylistBaseIE._VALID_URL_TMPL % 'episodes'
     _TESTS = [{
         'url': 'http://www.bbc.co.uk/iplayer/episodes/b05rcz9v',
         'info_dict': {
             'id': 'b05rcz9v',
             'title': 'The Disappearance',
-            'description': 'md5:58eb101aee3116bad4da05f91179c0cb',
+            'description': 'French thriller serial about a missing teenager.',
         },
-        'playlist_mincount': 8,
+        'playlist_mincount': 6,
+        'skip': 'This programme is not currently available on BBC iPlayer',
     }, {
-        # all seasons
-        'url': 'https://www.bbc.co.uk/iplayer/episodes/b094m5t9/doctor-foster',
-        'info_dict': {
-            'id': 'b094m5t9',
-            'title': 'Doctor Foster',
-            'description': 'md5:5aa9195fad900e8e14b52acd765a9fd6',
-        },
-        'playlist_mincount': 10,
-    }, {
-        # explicit season
-        'url': 'https://www.bbc.co.uk/iplayer/episodes/b094m5t9/doctor-foster?seriesId=b094m6nv',
-        'info_dict': {
-            'id': 'b094m5t9',
-            'title': 'Doctor Foster',
-            'description': 'md5:5aa9195fad900e8e14b52acd765a9fd6',
-        },
-        'playlist_mincount': 5,
-    }, {
-        # all pages
-        'url': 'https://www.bbc.co.uk/iplayer/episodes/m0004c4v/beechgrove',
-        'info_dict': {
-            'id': 'm0004c4v',
-            'title': 'Beechgrove',
-            'description': 'Gardening show that celebrates Scottish horticulture and growing conditions.',
-        },
-        'playlist_mincount': 37,
-    }, {
-        # explicit page
-        'url': 'https://www.bbc.co.uk/iplayer/episodes/m0004c4v/beechgrove?page=2',
-        'info_dict': {
-            'id': 'm0004c4v',
-            'title': 'Beechgrove',
-            'description': 'Gardening show that celebrates Scottish horticulture and growing conditions.',
-        },
-        'playlist_mincount': 1,
-    }]
-    _PAGE_SIZE = 100
-    _DESCRIPTION_KEY = 'synopsis'
-
-    def _get_episode_image(self, episode):
-        return self._get_default(episode, 'image')
-
-    def _get_episode_field(self, episode, field):
-        return self._get_default(episode, field)
-
-    @staticmethod
-    def _get_elements(data):
-        return data['entities']['results']
-
-    @staticmethod
-    def _get_episode(element):
-        return element.get('episode') or {}
-
-    def _call_api(self, pid, per_page, page=1, series_id=None):
-        variables = {
-            'id': pid,
-            'page': page,
-            'perPage': per_page,
-        }
-        if series_id:
-            variables['sliceId'] = series_id
-        return self._download_json(
-            'https://graph.ibl.api.bbc.co.uk/', pid, headers={
-                'Content-Type': 'application/json'
-            }, data=json.dumps({
-                'id': '5692d93d5aac8d796a0305e895e61551',
-                'variables': variables,
-            }).encode('utf-8'))['data']['programme']
-
-    @staticmethod
-    def _get_playlist_data(data):
-        return data
-
-    def _get_playlist_title(self, data):
-        return self._get_default(data, 'title')
-
-
-class BBCCoUkIPlayerGroupIE(BBCCoUkIPlayerPlaylistBaseIE):
-    IE_NAME = 'bbc.co.uk:iplayer:group'
-    _VALID_URL = BBCCoUkIPlayerPlaylistBaseIE._VALID_URL_TMPL % 'group'
-    _TESTS = [{
         # Available for over a year unlike 30 days for most other programmes
         'url': 'http://www.bbc.co.uk/iplayer/group/p02tcc32',
         'info_dict': {
@@ -1523,56 +1286,14 @@ class BBCCoUkIPlayerGroupIE(BBCCoUkIPlayerPlaylistBaseIE):
             'description': 'md5:683e901041b2fe9ba596f2ab04c4dbe7',
         },
         'playlist_mincount': 10,
-    }, {
-        # all pages
-        'url': 'https://www.bbc.co.uk/iplayer/group/p081d7j7',
-        'info_dict': {
-            'id': 'p081d7j7',
-            'title': 'Music in Scotland',
-            'description': 'Perfomances in Scotland and programmes featuring Scottish acts.',
-        },
-        'playlist_mincount': 47,
-    }, {
-        # explicit page
-        'url': 'https://www.bbc.co.uk/iplayer/group/p081d7j7?page=2',
-        'info_dict': {
-            'id': 'p081d7j7',
-            'title': 'Music in Scotland',
-            'description': 'Perfomances in Scotland and programmes featuring Scottish acts.',
-        },
-        'playlist_mincount': 11,
     }]
-    _PAGE_SIZE = 200
-    _DESCRIPTION_KEY = 'synopses'
 
-    def _get_episode_image(self, episode):
+    def _extract_title_and_description(self, webpage):
-        return self._get_default(episode, 'images', 'standard')
+        title = self._search_regex(r'<h1>([^<]+)</h1>', webpage, 'title', fatal=False)
-
+        description = self._search_regex(
-    def _get_episode_field(self, episode, field):
+            r'<p[^>]+class=(["\'])subtitle\1[^>]*>(?P<value>[^<]+)</p>',
-        return episode.get(field)
+            webpage, 'description', fatal=False, group='value')
-
+        return title, description
-    @staticmethod
-    def _get_elements(data):
-        return data['elements']
-
-    @staticmethod
-    def _get_episode(element):
-        return element
-
-    def _call_api(self, pid, per_page, page=1, series_id=None):
-        return self._download_json(
-            'http://ibl.api.bbc.co.uk/ibl/v1/groups/%s/episodes' % pid,
-            pid, query={
-                'page': page,
-                'per_page': per_page,
-            })['group_episodes']
-
-    @staticmethod
-    def _get_playlist_data(data):
-        return data['group']
-
-    def _get_playlist_title(self, data):
-        return data.get('title')
 
 
 class BBCCoUkPlaylistIE(BBCCoUkPlaylistBaseIE):

youtube_dl/extractor/beampro.py

@@ -0,0 +1,188 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    compat_str,
+    float_or_none,
+    int_or_none,
+    parse_iso8601,
+    try_get,
+    urljoin,
+)
+
+
+class BeamProBaseIE(InfoExtractor):
+    _API_BASE = 'https://mixer.com/api/v1'
+    _RATINGS = {'family': 0, 'teen': 13, '18+': 18}
+
+    def _extract_channel_info(self, chan):
+        user_id = chan.get('userId') or try_get(chan, lambda x: x['user']['id'])
+        return {
+            'uploader': chan.get('token') or try_get(
+                chan, lambda x: x['user']['username'], compat_str),
+            'uploader_id': compat_str(user_id) if user_id else None,
+            'age_limit': self._RATINGS.get(chan.get('audience')),
+        }
+
+
+class BeamProLiveIE(BeamProBaseIE):
+    IE_NAME = 'Mixer:live'
+    _VALID_URL = r'https?://(?:\w+\.)?(?:beam\.pro|mixer\.com)/(?P<id>[^/?#&]+)'
+    _TEST = {
+        'url': 'http://mixer.com/niterhayven',
+        'info_dict': {
+            'id': '261562',
+            'ext': 'mp4',
+            'title': 'Introducing The Witcher 3 //  The Grind Starts Now!',
+            'description': 'md5:0b161ac080f15fe05d18a07adb44a74d',
+            'thumbnail': r're:https://.*\.jpg$',
+            'timestamp': 1483477281,
+            'upload_date': '20170103',
+            'uploader': 'niterhayven',
+            'uploader_id': '373396',
+            'age_limit': 18,
+            'is_live': True,
+            'view_count': int,
+        },
+        'skip': 'niterhayven is offline',
+        'params': {
+            'skip_download': True,
+        },
+    }
+
+    _MANIFEST_URL_TEMPLATE = '%s/channels/%%s/manifest.%%s' % BeamProBaseIE._API_BASE
+
+    @classmethod
+    def suitable(cls, url):
+        return False if BeamProVodIE.suitable(url) else super(BeamProLiveIE, cls).suitable(url)
+
+    def _real_extract(self, url):
+        channel_name = self._match_id(url)
+
+        chan = self._download_json(
+            '%s/channels/%s' % (self._API_BASE, channel_name), channel_name)
+
+        if chan.get('online') is False:
+            raise ExtractorError(
+                '{0} is offline'.format(channel_name), expected=True)
+
+        channel_id = chan['id']
+
+        def manifest_url(kind):
+            return self._MANIFEST_URL_TEMPLATE % (channel_id, kind)
+
+        formats = self._extract_m3u8_formats(
+            manifest_url('m3u8'), channel_name, ext='mp4', m3u8_id='hls',
+            fatal=False)
+        formats.extend(self._extract_smil_formats(
+            manifest_url('smil'), channel_name, fatal=False))
+        self._sort_formats(formats)
+
+        info = {
+            'id': compat_str(chan.get('id') or channel_name),
+            'title': self._live_title(chan.get('name') or channel_name),
+            'description': clean_html(chan.get('description')),
+            'thumbnail': try_get(
+                chan, lambda x: x['thumbnail']['url'], compat_str),
+            'timestamp': parse_iso8601(chan.get('updatedAt')),
+            'is_live': True,
+            'view_count': int_or_none(chan.get('viewersTotal')),
+            'formats': formats,
+        }
+        info.update(self._extract_channel_info(chan))
+
+        return info
+
+
+class BeamProVodIE(BeamProBaseIE):
+    IE_NAME = 'Mixer:vod'
+    _VALID_URL = r'https?://(?:\w+\.)?(?:beam\.pro|mixer\.com)/[^/?#&]+\?.*?\bvod=(?P<id>\d+)'
+    _TEST = {
+        'url': 'https://mixer.com/willow8714?vod=2259830',
+        'md5': 'b2431e6e8347dc92ebafb565d368b76b',
+        'info_dict': {
+            'id': '2259830',
+            'ext': 'mp4',
+            'title': 'willow8714\'s Channel',
+            'duration': 6828.15,
+            'thumbnail': r're:https://.*source\.png$',
+            'timestamp': 1494046474,
+            'upload_date': '20170506',
+            'uploader': 'willow8714',
+            'uploader_id': '6085379',
+            'age_limit': 13,
+            'view_count': int,
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }
+
+    @staticmethod
+    def _extract_format(vod, vod_type):
+        if not vod.get('baseUrl'):
+            return []
+
+        if vod_type == 'hls':
+            filename, protocol = 'manifest.m3u8', 'm3u8_native'
+        elif vod_type == 'raw':
+            filename, protocol = 'source.mp4', 'https'
+        else:
+            assert False
+
+        data = vod.get('data') if isinstance(vod.get('data'), dict) else {}
+
+        format_id = [vod_type]
+        if isinstance(data.get('Height'), compat_str):
+            format_id.append('%sp' % data['Height'])
+
+        return [{
+            'url': urljoin(vod['baseUrl'], filename),
+            'format_id': '-'.join(format_id),
+            'ext': 'mp4',
+            'protocol': protocol,
+            'width': int_or_none(data.get('Width')),
+            'height': int_or_none(data.get('Height')),
+            'fps': int_or_none(data.get('Fps')),
+            'tbr': int_or_none(data.get('Bitrate'), 1000),
+        }]
+
+    def _real_extract(self, url):
+        vod_id = self._match_id(url)
+
+        vod_info = self._download_json(
+            '%s/recordings/%s' % (self._API_BASE, vod_id), vod_id)
+
+        state = vod_info.get('state')
+        if state != 'AVAILABLE':
+            raise ExtractorError(
+                'VOD %s is not available (state: %s)' % (vod_id, state),
+                expected=True)
+
+        formats = []
+        thumbnail_url = None
+
+        for vod in vod_info['vods']:
+            vod_type = vod.get('format')
+            if vod_type in ('hls', 'raw'):
+                formats.extend(self._extract_format(vod, vod_type))
+            elif vod_type == 'thumbnail':
+                thumbnail_url = urljoin(vod.get('baseUrl'), 'source.png')
+
+        self._sort_formats(formats)
+
+        info = {
+            'id': vod_id,
+            'title': vod_info.get('name') or vod_id,
+            'duration': float_or_none(vod_info.get('duration')),
+            'thumbnail': thumbnail_url,
+            'timestamp': parse_iso8601(vod_info.get('createdAt')),
+            'view_count': int_or_none(vod_info.get('viewsTotal')),
+            'formats': formats,
+        }
+        info.update(self._extract_channel_info(vod_info.get('channel') or {}))
+
+        return info

youtube_dl/extractor/beeg.py

@@ -1,10 +1,7 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..compat import (
+from ..compat import compat_str
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
     int_or_none,
     unified_timestamp,
@@ -14,7 +11,6 @@ from ..utils import (
 class BeegIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?beeg\.(?:com|porn(?:/video)?)/(?P<id>\d+)'
     _TESTS = [{
-        # api/v6 v1
         'url': 'http://beeg.com/5416503',
         'md5': 'a1a1b1a8bc70a89e49ccfd113aed0820',
         'info_dict': {
@@ -28,14 +24,6 @@ class BeegIE(InfoExtractor):
             'tags': list,
             'age_limit': 18,
         }
-    }, {
-        # api/v6 v2
-        'url': 'https://beeg.com/1941093077?t=911-1391',
-        'only_matching': True,
-    }, {
-        # api/v6 v2 w/o t
-        'url': 'https://beeg.com/1277207756',
-        'only_matching': True,
     }, {
         'url': 'https://beeg.porn/video/5416503',
         'only_matching': True,
@@ -53,25 +41,11 @@ class BeegIE(InfoExtractor):
             r'beeg_version\s*=\s*([\da-zA-Z_-]+)', webpage, 'beeg version',
             default='1546225636701')
 
-        if len(video_id) >= 10:
-            query = {
-                'v': 2,
-            }
-            qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
-            t = qs.get('t', [''])[0].split('-')
-            if len(t) > 1:
-                query.update({
-                    's': t[0],
-                    'e': t[1],
-                })
-        else:
-            query = {'v': 1}
-
         for api_path in ('', 'api.'):
             video = self._download_json(
                 'https://%sbeeg.com/api/v6/%s/video/%s'
                 % (api_path, beeg_version, video_id), video_id,
-                fatal=api_path == 'api.', query=query)
+                fatal=api_path == 'api.')
             if video:
                 break
 

youtube_dl/extractor/bellmedia.py

@@ -22,11 +22,10 @@ class BellMediaIE(InfoExtractor):
                 bravo|
                 mtv|
                 space|
-                etalk|
+                etalk
-                marilyn
             )\.ca|
-            (?:much|cp24)\.com
+            much\.com
-        )/.*?(?:\b(?:vid(?:eoid)?|clipId)=|-vid|~|%7E|/(?:episode)?)(?P<id>[0-9]{6,})'''
+        )/.*?(?:\bvid(?:eoid)?=|-vid|~|%7E|/(?:episode)?)(?P<id>[0-9]{6,})'''
     _TESTS = [{
         'url': 'https://www.bnnbloomberg.ca/video/david-cockfield-s-top-picks~1403070',
         'md5': '36d3ef559cfe8af8efe15922cd3ce950',
@@ -62,9 +61,6 @@ class BellMediaIE(InfoExtractor):
     }, {
         'url': 'http://www.etalk.ca/video?videoid=663455',
         'only_matching': True,
-    }, {
-        'url': 'https://www.cp24.com/video?clipId=1982548',
-        'only_matching': True,
     }]
     _DOMAINS = {
         'thecomedynetwork': 'comedy',
@@ -74,7 +70,6 @@ class BellMediaIE(InfoExtractor):
         'animalplanet': 'aniplan',
         'etalk': 'ctv',
         'bnnbloomberg': 'bnn',
-        'marilyn': 'ctv_marilyn',
     }
 
     def _real_extract(self, url):

youtube_dl/extractor/bfmtv.py

@@ -1,103 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..utils import extract_attributes
-
-
-class BFMTVBaseIE(InfoExtractor):
-    _VALID_URL_BASE = r'https?://(?:www\.)?bfmtv\.com/'
-    _VALID_URL_TMPL = _VALID_URL_BASE + r'(?:[^/]+/)*[^/?&#]+_%s[A-Z]-(?P<id>\d{12})\.html'
-    _VIDEO_BLOCK_REGEX = r'(<div[^>]+class="video_block"[^>]*>)'
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
-
-    def _brightcove_url_result(self, video_id, video_block):
-        account_id = video_block.get('accountid') or '876450612001'
-        player_id = video_block.get('playerid') or 'I2qBTln4u'
-        return self.url_result(
-            self.BRIGHTCOVE_URL_TEMPLATE % (account_id, player_id, video_id),
-            'BrightcoveNew', video_id)
-
-
-class BFMTVIE(BFMTVBaseIE):
-    IE_NAME = 'bfmtv'
-    _VALID_URL = BFMTVBaseIE._VALID_URL_TMPL % 'V'
-    _TESTS = [{
-        'url': 'https://www.bfmtv.com/politique/emmanuel-macron-l-islam-est-une-religion-qui-vit-une-crise-aujourd-hui-partout-dans-le-monde_VN-202010020146.html',
-        'info_dict': {
-            'id': '6196747868001',
-            'ext': 'mp4',
-            'title': 'Emmanuel Macron: "L\'Islam est une religion qui vit une crise aujourd’hui, partout dans le monde"',
-            'description': 'Le Président s\'exprime sur la question du séparatisme depuis les Mureaux, dans les Yvelines.',
-            'uploader_id': '876450610001',
-            'upload_date': '20201002',
-            'timestamp': 1601629620,
-        },
-    }]
-
-    def _real_extract(self, url):
-        bfmtv_id = self._match_id(url)
-        webpage = self._download_webpage(url, bfmtv_id)
-        video_block = extract_attributes(self._search_regex(
-            self._VIDEO_BLOCK_REGEX, webpage, 'video block'))
-        return self._brightcove_url_result(video_block['videoid'], video_block)
-
-
-class BFMTVLiveIE(BFMTVIE):
-    IE_NAME = 'bfmtv:live'
-    _VALID_URL = BFMTVBaseIE._VALID_URL_BASE + '(?P<id>(?:[^/]+/)?en-direct)'
-    _TESTS = [{
-        'url': 'https://www.bfmtv.com/en-direct/',
-        'info_dict': {
-            'id': '5615950982001',
-            'ext': 'mp4',
-            'title': r're:^le direct BFMTV WEB \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
-            'uploader_id': '876450610001',
-            'upload_date': '20171018',
-            'timestamp': 1508329950,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://www.bfmtv.com/economie/en-direct/',
-        'only_matching': True,
-    }]
-
-
-class BFMTVArticleIE(BFMTVBaseIE):
-    IE_NAME = 'bfmtv:article'
-    _VALID_URL = BFMTVBaseIE._VALID_URL_TMPL % 'A'
-    _TESTS = [{
-        'url': 'https://www.bfmtv.com/sante/covid-19-un-responsable-de-l-institut-pasteur-se-demande-quand-la-france-va-se-reconfiner_AV-202101060198.html',
-        'info_dict': {
-            'id': '202101060198',
-            'title': 'Covid-19: un responsable de l\'Institut Pasteur se demande "quand la France va se reconfiner"',
-            'description': 'md5:947974089c303d3ac6196670ae262843',
-        },
-        'playlist_count': 2,
-    }, {
-        'url': 'https://www.bfmtv.com/international/pour-bolsonaro-le-bresil-est-en-faillite-mais-il-ne-peut-rien-faire_AD-202101060232.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.bfmtv.com/sante/covid-19-oui-le-vaccin-de-pfizer-distribue-en-france-a-bien-ete-teste-sur-des-personnes-agees_AN-202101060275.html',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        bfmtv_id = self._match_id(url)
-        webpage = self._download_webpage(url, bfmtv_id)
-
-        entries = []
-        for video_block_el in re.findall(self._VIDEO_BLOCK_REGEX, webpage):
-            video_block = extract_attributes(video_block_el)
-            video_id = video_block.get('videoid')
-            if not video_id:
-                continue
-            entries.append(self._brightcove_url_result(video_id, video_block))
-
-        return self.playlist_result(
-            entries, bfmtv_id, self._og_search_title(webpage, fatal=False),
-            self._html_search_meta(['og:description', 'description'], webpage))

youtube_dl/extractor/bibeltv.py

@@ -1,30 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-
-
-class BibelTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?bibeltv\.de/mediathek/videos/(?:crn/)?(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.bibeltv.de/mediathek/videos/329703-sprachkurs-in-malaiisch',
-        'md5': '252f908192d611de038b8504b08bf97f',
-        'info_dict': {
-            'id': 'ref:329703',
-            'ext': 'mp4',
-            'title': 'Sprachkurs in Malaiisch',
-            'description': 'md5:3e9f197d29ee164714e67351cf737dfe',
-            'timestamp': 1608316701,
-            'uploader_id': '5840105145001',
-            'upload_date': '20201218',
-        }
-    }, {
-        'url': 'https://www.bibeltv.de/mediathek/videos/crn/326374',
-        'only_matching': True,
-    }]
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/5840105145001/default_default/index.html?videoId=ref:%s'
-
-    def _real_extract(self, url):
-        crn_id = self._match_id(url)
-        return self.url_result(
-            self.BRIGHTCOVE_URL_TEMPLATE % crn_id, 'BrightcoveNew')

youtube_dl/extractor/bilibili.py

@@ -15,7 +15,6 @@ from ..utils import (
     float_or_none,
     parse_iso8601,
     smuggle_url,
-    str_or_none,
     strip_jsonp,
     unified_timestamp,
     unsmuggle_url,
@@ -24,18 +23,7 @@ from ..utils import (
 
 
 class BiliBiliIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
+    _VALID_URL = r'https?://(?:www\.|bangumi\.|)bilibili\.(?:tv|com)/(?:video/av|anime/(?P<anime_id>\d+)/play#)(?P<id>\d+)'
-                    https?://
-                        (?:(?:www|bangumi)\.)?
-                        bilibili\.(?:tv|com)/
-                        (?:
-                            (?:
-                                video/[aA][vV]|
-                                anime/(?P<anime_id>\d+)/play\#
-                            )(?P<id_bv>\d+)|
-                            video/[bB][vV](?P<id>[^/?#&]+)
-                        )
-                    '''
 
     _TESTS = [{
         'url': 'http://www.bilibili.tv/video/av1074402/',
@@ -103,10 +91,6 @@ class BiliBiliIE(InfoExtractor):
                 'skip_download': True,  # Test metadata only
             },
         }]
-    }, {
-        # new BV video id format
-        'url': 'https://www.bilibili.com/video/BV1JE411F741',
-        'only_matching': True,
     }]
 
     _APP_KEY = 'iVGUTjsxvpLeuDCf'
@@ -124,7 +108,7 @@ class BiliBiliIE(InfoExtractor):
         url, smuggled_data = unsmuggle_url(url, {})
 
         mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id') or mobj.group('id_bv')
+        video_id = mobj.group('id')
         anime_id = mobj.group('anime_id')
         webpage = self._download_webpage(url, video_id)
 
@@ -156,7 +140,6 @@ class BiliBiliIE(InfoExtractor):
             cid = js['result']['cid']
 
         headers = {
-            'Accept': 'application/json',
             'Referer': url
         }
         headers.update(self.geo_verification_headers())
@@ -233,7 +216,7 @@ class BiliBiliIE(InfoExtractor):
             webpage)
         if uploader_mobj:
             info.update({
-                'uploader': uploader_mobj.group('name').strip(),
+                'uploader': uploader_mobj.group('name'),
                 'uploader_id': uploader_mobj.group('id'),
             })
         if not info.get('uploader'):
@@ -323,129 +306,3 @@ class BiliBiliBangumiIE(InfoExtractor):
         return self.playlist_result(
             entries, bangumi_id,
             season_info.get('bangumi_title'), season_info.get('evaluate'))
-
-
-class BilibiliAudioBaseIE(InfoExtractor):
-    def _call_api(self, path, sid, query=None):
-        if not query:
-            query = {'sid': sid}
-        return self._download_json(
-            'https://www.bilibili.com/audio/music-service-c/web/' + path,
-            sid, query=query)['data']
-
-
-class BilibiliAudioIE(BilibiliAudioBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/audio/au(?P<id>\d+)'
-    _TEST = {
-        'url': 'https://www.bilibili.com/audio/au1003142',
-        'md5': 'fec4987014ec94ef9e666d4d158ad03b',
-        'info_dict': {
-            'id': '1003142',
-            'ext': 'm4a',
-            'title': '【tsukimi】YELLOW / 神山羊',
-            'artist': 'tsukimi',
-            'comment_count': int,
-            'description': 'YELLOW的mp3版！',
-            'duration': 183,
-            'subtitles': {
-                'origin': [{
-                    'ext': 'lrc',
-                }],
-            },
-            'thumbnail': r're:^https?://.+\.jpg',
-            'timestamp': 1564836614,
-            'upload_date': '20190803',
-            'uploader': 'tsukimi-つきみぐー',
-            'view_count': int,
-        },
-    }
-
-    def _real_extract(self, url):
-        au_id = self._match_id(url)
-
-        play_data = self._call_api('url', au_id)
-        formats = [{
-            'url': play_data['cdns'][0],
-            'filesize': int_or_none(play_data.get('size')),
-        }]
-
-        song = self._call_api('song/info', au_id)
-        title = song['title']
-        statistic = song.get('statistic') or {}
-
-        subtitles = None
-        lyric = song.get('lyric')
-        if lyric:
-            subtitles = {
-                'origin': [{
-                    'url': lyric,
-                }]
-            }
-
-        return {
-            'id': au_id,
-            'title': title,
-            'formats': formats,
-            'artist': song.get('author'),
-            'comment_count': int_or_none(statistic.get('comment')),
-            'description': song.get('intro'),
-            'duration': int_or_none(song.get('duration')),
-            'subtitles': subtitles,
-            'thumbnail': song.get('cover'),
-            'timestamp': int_or_none(song.get('passtime')),
-            'uploader': song.get('uname'),
-            'view_count': int_or_none(statistic.get('play')),
-        }
-
-
-class BilibiliAudioAlbumIE(BilibiliAudioBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/audio/am(?P<id>\d+)'
-    _TEST = {
-        'url': 'https://www.bilibili.com/audio/am10624',
-        'info_dict': {
-            'id': '10624',
-            'title': '每日新曲推荐（每日11:00更新）',
-            'description': '每天11:00更新，为你推送最新音乐',
-        },
-        'playlist_count': 19,
-    }
-
-    def _real_extract(self, url):
-        am_id = self._match_id(url)
-
-        songs = self._call_api(
-            'song/of-menu', am_id, {'sid': am_id, 'pn': 1, 'ps': 100})['data']
-
-        entries = []
-        for song in songs:
-            sid = str_or_none(song.get('id'))
-            if not sid:
-                continue
-            entries.append(self.url_result(
-                'https://www.bilibili.com/audio/au' + sid,
-                BilibiliAudioIE.ie_key(), sid))
-
-        if entries:
-            album_data = self._call_api('menu/info', am_id) or {}
-            album_title = album_data.get('title')
-            if album_title:
-                for entry in entries:
-                    entry['album'] = album_title
-                return self.playlist_result(
-                    entries, am_id, album_title, album_data.get('intro'))
-
-        return self.playlist_result(entries, am_id)
-
-
-class BiliBiliPlayerIE(InfoExtractor):
-    _VALID_URL = r'https?://player\.bilibili\.com/player\.html\?.*?\baid=(?P<id>\d+)'
-    _TEST = {
-        'url': 'http://player.bilibili.com/player.html?aid=92494333&cid=157926707&page=1',
-        'only_matching': True,
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self.url_result(
-            'http://www.bilibili.tv/video/av%s/' % video_id,
-            ie=BiliBiliIE.ie_key(), video_id=video_id)

youtube_dl/extractor/biobiochiletv.py

@@ -6,6 +6,7 @@ from ..utils import (
     ExtractorError,
     remove_end,
 )
+from .rudo import RudoIE
 
 
 class BioBioChileTVIE(InfoExtractor):
@@ -40,15 +41,11 @@ class BioBioChileTVIE(InfoExtractor):
     }, {
         'url': 'http://www.biobiochile.cl/noticias/bbtv/comentarios-bio-bio/2016/07/08/edecanes-del-congreso-figuras-decorativas-que-le-cuestan-muy-caro-a-los-chilenos.shtml',
         'info_dict': {
-            'id': 'b4xd0LK3SK',
+            'id': 'edecanes-del-congreso-figuras-decorativas-que-le-cuestan-muy-caro-a-los-chilenos',
             'ext': 'mp4',
-            # TODO: fix url_transparent information overriding
+            'uploader': '(none)',
-            # 'uploader': 'Juan Pablo Echenique',
+            'upload_date': '20160708',
-            'title': 'Comentario Oscar Cáceres',
+            'title': 'Edecanes del Congreso: Figuras decorativas que le cuestan muy caro a los chilenos',
-        },
-        'params': {
-            # empty m3u8 manifest
-            'skip_download': True,
         },
     }, {
         'url': 'http://tv.biobiochile.cl/notas/2015/10/22/ninos-transexuales-de-quien-es-la-decision.shtml',
@@ -63,9 +60,7 @@ class BioBioChileTVIE(InfoExtractor):
 
         webpage = self._download_webpage(url, video_id)
 
-        rudo_url = self._search_regex(
+        rudo_url = RudoIE._extract_url(webpage)
-            r'<iframe[^>]+src=(?P<q1>[\'"])(?P<url>(?:https?:)?//rudo\.video/vod/[0-9a-zA-Z]+)(?P=q1)',
-            webpage, 'embed URL', None, group='url')
         if not rudo_url:
             raise ExtractorError('No videos found')
 
@@ -73,7 +68,7 @@ class BioBioChileTVIE(InfoExtractor):
 
         thumbnail = self._og_search_thumbnail(webpage)
         uploader = self._html_search_regex(
-            r'<a[^>]+href=["\'](?:https?://(?:busca|www)\.biobiochile\.cl)?/(?:lista/)?(?:author|autor)[^>]+>(.+?)</a>',
+            r'<a[^>]+href=["\']https?://(?:busca|www)\.biobiochile\.cl/(?:lista/)?(?:author|autor)[^>]+>(.+?)</a>',
             webpage, 'uploader', fatal=False)
 
         return {

youtube_dl/extractor/biqle.py

@@ -3,11 +3,10 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from .vk import VKIE
-from ..compat import (
+from ..utils import (
-    compat_b64decode,
+    HEADRequest,
-    compat_urllib_parse_unquote,
+    int_or_none,
 )
-from ..utils import int_or_none
 
 
 class BIQLEIE(InfoExtractor):
@@ -43,21 +42,14 @@ class BIQLEIE(InfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
         embed_url = self._proto_relative_url(self._search_regex(
-            r'<iframe.+?src="((?:https?:)?//(?:daxab\.com|dxb\.to|[^/]+/player)/[^"]+)".*?></iframe>',
+            r'<iframe.+?src="((?:https?:)?//daxab\.com/[^"]+)".*?></iframe>',
             webpage, 'embed url'))
         if VKIE.suitable(embed_url):
             return self.url_result(embed_url, VKIE.ie_key(), video_id)
 
-        embed_page = self._download_webpage(
+        self._request_webpage(
-            embed_url, video_id, headers={'Referer': url})
+            HEADRequest(embed_url), video_id, headers={'Referer': url})
-        video_ext = self._get_cookies(embed_url).get('video_ext')
+        video_id, sig, _, access_token = self._get_cookies(embed_url)['video_ext'].value.split('%3A')
-        if video_ext:
-            video_ext = compat_urllib_parse_unquote(video_ext.value)
-        if not video_ext:
-            video_ext = compat_b64decode(self._search_regex(
-                r'video_ext\s*:\s*[\'"]([A-Za-z0-9+/=]+)',
-                embed_page, 'video_ext')).decode()
-        video_id, sig, _, access_token = video_ext.split(':')
         item = self._download_json(
             'https://api.vk.com/method/video.get', video_id,
             headers={'User-Agent': 'okhttp/3.4.1'}, query={