Release 2021.05.20

Update to ytdl-commit-dfbbe29
[redbulltv] fix embed data extraction dfbbe2902f
2026-03-05 05:39:42 +00:00 · 2021-05-20 19:20:07 +05:30 · 2021-05-20 19:17:17 +05:30
159 changed files with 2398 additions and 4190 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1 @@
-* text=auto
-
 Makefile* text whitespace=-tab-in-indent
-*.sh text eol=lf
--- a/.github/ISSUE_TEMPLATE/1_broken_site.md
+++ b/.github/ISSUE_TEMPLATE/1_broken_site.md
@@ -21,7 +21,7 @@ assignees: ''

 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.06.09. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.05.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
 - Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -29,7 +29,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->

 - [ ] I'm reporting a broken site support
- [ ] I've verified that I'm running yt-dlp version **2021.06.09**
+- [ ] I've verified that I'm running yt-dlp version **2021.05.11**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar issues including closed ones
@@ -44,7 +44,7 @@ Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your com
 [debug] User config: []
 [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
 [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] yt-dlp version 2021.06.09
+ [debug] yt-dlp version 2021.05.11
 [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: {}
--- a/.github/ISSUE_TEMPLATE/2_site_support_request.md
+++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md
@@ -21,7 +21,7 @@ assignees: ''

 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.06.09. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.05.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/yt-dlp/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
 - Search the bugtracker for similar site support requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -29,7 +29,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->

 - [ ] I'm reporting a new site support request
- [ ] I've verified that I'm running yt-dlp version **2021.06.09**
+- [ ] I've verified that I'm running yt-dlp version **2021.05.11**
 - [ ] 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
--- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md
@@ -21,13 +21,13 @@ assignees: ''

 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.06.09. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.05.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar site feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->

 - [ ] I'm reporting a site feature request
- [ ] I've verified that I'm running yt-dlp version **2021.06.09**
+- [ ] I've verified that I'm running yt-dlp version **2021.05.11**
 - [ ] I've searched the bugtracker for similar site feature requests including closed ones


--- a/.github/ISSUE_TEMPLATE/4_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/4_bug_report.md
@@ -21,7 +21,7 @@ assignees: ''

 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.06.09. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.05.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
 - Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -30,7 +30,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->

 - [ ] I'm reporting a broken site support issue
- [ ] I've verified that I'm running yt-dlp version **2021.06.09**
+- [ ] I've verified that I'm running yt-dlp version **2021.05.11**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar bug reports including closed ones
@@ -46,7 +46,7 @@ Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your com
 [debug] User config: []
 [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
 [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] yt-dlp version 2021.06.09
+ [debug] yt-dlp version 2021.05.11
 [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: {}
--- a/.github/ISSUE_TEMPLATE/5_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/5_feature_request.md
@@ -21,13 +21,13 @@ assignees: ''

 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.06.09. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.05.11. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->

 - [ ] I'm reporting a feature request
- [ ] I've verified that I'm running yt-dlp version **2021.06.09**
+- [ ] I've verified that I'm running yt-dlp version **2021.05.11**
 - [ ] I've searched the bugtracker for similar feature requests including closed ones


--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,13 +7,13 @@ on:

 jobs:
  build_unix:
+
    runs-on: ubuntu-latest

    outputs:
      ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
      upload_url: ${{ steps.create_release.outputs.upload_url }}
-      sha256_unix: ${{ steps.sha256_file.outputs.sha256_unix }}
-      sha512_unix: ${{ steps.sha512_file.outputs.sha512_unix }}
+      sha2_unix: ${{ steps.sha2_file.outputs.sha2_unix }}

    steps:
    - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
    - name: Print version
      run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
    - name: Run Make
-      run: make all tar
+      run: make
    - name: Create Release
      id: create_release
      uses: actions/create-release@v1
@@ -44,7 +44,7 @@ jobs:
        draft: false
        prerelease: false
    - name: Upload yt-dlp Unix binary
-      id: upload-release-asset
+      id: upload-release-asset 
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -53,21 +53,9 @@ jobs:
        asset_path: ./yt-dlp
        asset_name: yt-dlp
        asset_content_type: application/octet-stream
-    - name: Upload Source tar
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./yt-dlp.tar.gz
-        asset_name: yt-dlp.tar.gz
-        asset_content_type: application/gzip
    - name: Get SHA2-256SUMS for yt-dlp
-      id: sha256_file
-      run: echo "::set-output name=sha256_unix::$(sha256sum yt-dlp | awk '{print $1}')"
-    - name: Get SHA2-512SUMS for yt-dlp
-      id: sha512_file
-      run: echo "::set-output name=sha512_unix::$(sha512sum yt-dlp | awk '{print $1}')"
+      id: sha2_file
+      run: echo "::set-output name=sha2_unix::$(sha256sum yt-dlp | awk '{print $1}')"
    - name: Install dependencies for pypi
      env:
        PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
@@ -86,24 +74,24 @@ jobs:
        twine upload dist/*

  build_windows:
+
    runs-on: windows-latest
-    needs: build_unix

    outputs:
-      sha256_windows: ${{ steps.sha256_file_win.outputs.sha256_windows }}
-      sha512_windows: ${{ steps.sha512_file_win.outputs.sha512_windows }}
+      sha2_windows: ${{ steps.sha2_file_win.outputs.sha2_windows }}
+
+    needs: build_unix

    steps:
    - uses: actions/checkout@v2
-    # 3.8 is used for Win7 support
-    - name: Set up Python 3.8
+    - name: Set up Python
      uses: actions/setup-python@v2
      with:
          python-version: '3.8'
    - name: Upgrade pip and enable wheel support
      run: python -m pip install --upgrade pip setuptools wheel
    - name: Install Requirements
-      run: pip install pyinstaller mutagen pycryptodome websockets
+      run: pip install pyinstaller mutagen pycryptodome
    - name: Bump version
      id: bump_version
      run: python devscripts/update-version.py
@@ -122,32 +110,29 @@ jobs:
        asset_name: yt-dlp.exe
        asset_content_type: application/vnd.microsoft.portable-executable
    - name: Get SHA2-256SUMS for yt-dlp.exe
-      id: sha256_file_win
-      run: echo "::set-output name=sha256_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"
-    - name: Get SHA2-512SUMS for yt-dlp.exe
-      id: sha512_file_win
-      run: echo "::set-output name=sha512_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA512).Hash.ToLower())"
+      id: sha2_file_win
+      run: echo "::set-output name=sha2_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"

  build_windows32:
+
    runs-on: windows-latest
-    needs: [build_unix, build_windows]

    outputs:
-      sha256_windows32: ${{ steps.sha256_file_win32.outputs.sha256_windows32 }}
-      sha512_windows32: ${{ steps.sha512_file_win32.outputs.sha512_windows32 }}
+      sha2_windows32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }}
+
+    needs: [build_unix, build_windows]

    steps:
    - uses: actions/checkout@v2
-    # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
-    - name: Set up Python 3.7 32-Bit
+    - name: Set up Python 3.4.4 32-Bit
      uses: actions/setup-python@v2
      with:
-          python-version: '3.7'
+          python-version: '3.4.4'
          architecture: 'x86'
    - name: Upgrade pip and enable wheel support
-      run: python -m pip install --upgrade pip setuptools wheel
-    - name: Install Requirements
-      run: pip install pyinstaller mutagen pycryptodome websockets
+      run: python -m pip install pip==19.1.1 setuptools==43.0.0 wheel==0.33.6
+    - name: Install Requirements for 32 Bit
+      run: pip install pyinstaller==3.5 mutagen==1.42.0 pycryptodome==3.9.4
    - name: Bump version
      id: bump_version
      run: python devscripts/update-version.py
@@ -166,28 +151,20 @@ jobs:
        asset_name: yt-dlp_x86.exe
        asset_content_type: application/vnd.microsoft.portable-executable
    - name: Get SHA2-256SUMS for yt-dlp_x86.exe
-      id: sha256_file_win32
-      run: echo "::set-output name=sha256_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())"
-    - name: Get SHA2-512SUMS for yt-dlp_x86.exe
-      id: sha512_file_win32
-      run: echo "::set-output name=sha512_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA512).Hash.ToLower())"
-
-  finish:
-    runs-on: ubuntu-latest
-    needs: [build_unix, build_windows, build_windows32]
-
-    steps:
+      id: sha2_file_win32
+      run: echo "::set-output name=sha2_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())"
    - name: Make SHA2-256SUMS file
      env:
-        SHA256_WINDOWS: ${{ needs.build_windows.outputs.sha256_windows }}
-        SHA256_WINDOWS32: ${{ needs.build_windows32.outputs.sha256_windows32 }}
-        SHA256_UNIX: ${{ needs.build_unix.outputs.sha256_unix }}
+        SHA2_WINDOWS: ${{ needs.build_windows.outputs.sha2_windows }}
+        SHA2_WINDOWS32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }}
+        SHA2_UNIX: ${{ needs.build_unix.outputs.sha2_unix }}
        YTDLP_VERSION: ${{ needs.build_unix.outputs.ytdlp_version }}
      run: |
-        echo "version:${{ env.YTDLP_VERSION }}" >> SHA2-256SUMS
-        echo "yt-dlp.exe:${{ env.SHA256_WINDOWS }}" >> SHA2-256SUMS
-        echo "yt-dlp_x86.exe:${{ env.SHA256_WINDOWS32 }}" >> SHA2-256SUMS
-        echo "yt-dlp:${{ env.SHA256_UNIX }}" >> SHA2-256SUMS
+        echo "version:${env:YTDLP_VERSION}" >> SHA2-256SUMS
+        echo "yt-dlp.exe:${env:SHA2_WINDOWS}" >> SHA2-256SUMS
+        echo "yt-dlp_x86.exe:${env:SHA2_WINDOWS32}" >> SHA2-256SUMS
+        echo "yt-dlp:${env:SHA2_UNIX}" >> SHA2-256SUMS
+
    - name: Upload 256SUMS file
      id: upload-sums
      uses: actions/upload-release-asset@v1
@@ -198,22 +175,3 @@ jobs:
        asset_path: ./SHA2-256SUMS
        asset_name: SHA2-256SUMS
        asset_content_type: text/plain
-    - name: Make SHA2-512SUMS file
-      env:
-        SHA512_WINDOWS: ${{ needs.build_windows.outputs.sha512_windows }}
-        SHA512_WINDOWS32: ${{ needs.build_windows32.outputs.sha512_windows32 }}
-        SHA512_UNIX: ${{ needs.build_unix.outputs.sha512_unix }}
-      run: |
-        echo "${{ env.SHA512_WINDOWS }}  yt-dlp.exe" >> SHA2-512SUMS
-        echo "${{ env.SHA512_WINDOWS32 }}  yt-dlp_x86.exe" >> SHA2-512SUMS
-        echo "${{ env.SHA512_UNIX }}  yt-dlp" >> SHA2-512SUMS
-    - name: Upload 512SUMS file
-      id: upload-512sums
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.build_unix.outputs.upload_url }}
-        asset_path: ./SHA2-512SUMS
-        asset_name: SHA2-512SUMS
-        asset_content_type: text/plain
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -9,25 +9,53 @@ jobs:
      fail-fast: false
      matrix:
        os: [ubuntu-18.04]
-        # py3.9 is in quick-test
-        python-version: [3.7, 3.8, pypy-3.6, pypy-3.7]
+        # TODO: python 2.6
+        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
+        python-impl: [cpython]
+        ytdl-test-set: [core]
        run-tests-ext: [sh]
        include:
-        # atleast one of the tests must be in windows
+        # python 3.2 is only available on windows via setup-python
        - os: windows-latest
-          python-version: 3.6
+          python-version: 3.2
+          python-impl: cpython
+          ytdl-test-set: core
          run-tests-ext: bat
+        # jython
+        - os: ubuntu-latest
+          python-impl: jython
+          ytdl-test-set: core
+          run-tests-ext: sh
    steps:
    - uses: actions/checkout@v2
    - name: Set up Python ${{ matrix.python-version }}
      uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
      with:
        python-version: ${{ matrix.python-version }}
+    - name: 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: False
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
      env:
-        YTDL_TEST_SET: core
+        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}
  # Linter is in quick-test
--- a/.github/workflows/download.yml
+++ b/.github/workflows/download.yml
@@ -9,22 +9,52 @@ jobs:
      fail-fast: true
      matrix:
        os: [ubuntu-18.04]
-        python-version: [3.7, 3.8, 3.9, pypy-3.6, pypy-3.7]
+        # TODO: python 2.6
+        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
+        python-impl: [cpython]
+        ytdl-test-set: [download]
        run-tests-ext: [sh]
        include:
+        # python 3.2 is only available on windows via setup-python
        - os: windows-latest
-          python-version: 3.6
+          python-version: 3.2
+          python-impl: cpython
+          ytdl-test-set: download
          run-tests-ext: bat
+        # jython - disable for now since it takes too long to complete
+        # - os: ubuntu-latest
+        #   python-impl: jython
+        #   ytdl-test-set: download
+        #   run-tests-ext: sh
    steps:
    - uses: actions/checkout@v2
    - name: Set up Python ${{ matrix.python-version }}
      uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
      with:
        python-version: ${{ matrix.python-version }}
+    - name: 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: true
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
      env:
-        YTDL_TEST_SET: download
+        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,46 +1,3 @@
-# Config
-*.conf
-*.spec
-cookies
-cookies.txt
-
-# Downloaded
-*.srt
-*.ttml
-*.sbv
-*.vtt
-*.flv
-*.mp4
-*.m4a
-*.m4v
-*.mp3
-*.3gp
-*.webm
-*.wav
-*.ape
-*.mkv
-*.swf
-*.part
-*.part-*
-*.ytdl
-*.dump
-*.frag
-*.frag.urls
-*.aria2
-*.swp
-*.ogg
-*.opus
-*.info.json
-*.live_chat.json
-*.jpg
-*.png
-*.webp
-*.annotations.xml
-*.description
-
-# Allow config/media files in testdata
-!test/testdata/**
-
 # Python
 *.pyc
 *.pyo
@@ -86,6 +43,48 @@ README.txt
 yt-dlp.zip
 *.exe

+# Downloaded
+*.srt
+*.ttml
+*.sbv
+*.vtt
+*.flv
+*.mp4
+*.m4a
+*.m4v
+*.mp3
+*.3gp
+*.webm
+*.wav
+*.ape
+*.mkv
+*.swf
+*.part
+*.part-*
+*.ytdl
+*.dump
+*.frag
+*.frag.urls
+*.aria2
+*.swp
+*.ogg
+*.opus
+*.info.json
+*.live_chat.json
+*.jpg
+*.png
+*.webp
+*.annotations.xml
+*.description
+
+# Config
+*.conf
+*.spec
+cookies
+cookies.txt
+
+
+
 # Text Editor / IDE
 .idea
 *.iml
--- a/10
+++ b/10
@@ -1,7 +1,6 @@
 pukkandan (owner)
 shirt-dev (collaborator)
 colethedj (collaborator)
-Ashish0804 (collaborator)
 h-h-h-h
 pauldubois98
 nixxo
@@ -21,9 +20,11 @@ FelixFrog
 Zocker1999NET
 nao20010128nao
 kurumigi
+tsukumi
 bbepis
 animelover1984
 Pccode66
+Ashish0804
 RobinD42
 hseg
 DennyDai
@@ -47,10 +48,3 @@ craftingmod
 tpikonen
 tripulse
 king-millez
-alex-gedeon
-hhirtz
-louie-github
-MinePlayersPE
-olifre
-rhsmachine
-nihil-admirari
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,7 +10,7 @@
 * Commit to master as `Release <version>`
 * Push to origin/release using `git push origin master:release`
    build task will now run
-* Update version.py using `devscripts\update-version.py`
+* Update version.py using devscripts\update-version.py
 * Run `make issuetemplates`
 * Commit to master as `[version] update :ci skip all`
 * Push to origin/master
@@ -19,139 +19,30 @@
 -->


-### 2021.06.23
-
-* Merge youtube-dl: Upto [commit/379f52a](https://github.com/ytdl-org/youtube-dl/commit/379f52a4954013767219d25099cce9e0f9401961)
-* **Add option `--throttled-rate`** below which video data is re-extracted
-* [fragment] **Merge during download for `-N`**, and refactor `hls`/`dash`
-* [websockets] Add `WebSocketFragmentFD`by [nao20010128nao](https://github.com/nao20010128nao), [pukkandan](https://github.com/pukkandan)
-* Allow `images` formats in addition to video/audio
-* [downloader/mhtml] Add new downloader for slideshows/storyboards by [fstirlitz](https://github.com/fstirlitz)
-* [youtube] Temporary **fix for age-gate**
-* [youtube] Support ongoing live chat by [siikamiika](https://github.com/siikamiika)
-* [youtube] Improve SAPISID cookie handling by [colethedj](https://github.com/colethedj)
-* [youtube] Login is not needed for `:ytrec`
-* [youtube] Non-fatal alert reporting for unavailable videos page by [colethedj](https://github.com/colethedj)
-* [twitcasting] Websocket support by [nao20010128nao](https://github.com/nao20010128nao)
-* [mediasite] Extract slides by [fstirlitz](https://github.com/fstirlitz)
-* [funimation] Extract subtitles 
-* [pornhub] Extract `cast`
-* [hotstar] Use server time for authentication instead of local time
-* [EmbedThumbnail] Fix for already downloaded thumbnail
-* [EmbedThumbnail] Add compat-option `embed-thumbnail-atomicparsley`
-* Expand `--check-formats` to thumbnails
-* Fix id sanitization in filenames
-* Skip fixup of existing files and add `--fixup force` to force it
-* Better error handling of syntax errors in `-f`
-* Use `NamedTemporaryFile` for `--check-formats`
-* [aria2c] Lower `--min-split-size` for HTTP downloads
-* [options] Rename `--add-metadata` to `--embed-metadata`
-* [utils] Improve `LazyList` and add tests
-* [build] Build Windows x86 version with py3.7 and remove redundant tests by [pukkandan](https://github.com/pukkandan), [shirt](https://github.com/shirt-dev)
-* [docs] Clarify that `--embed-metadata` embeds chapter markers
-* [cleanup] Refactor fixup
-
-
-### 2021.06.09
-
-* Fix bug where `%(field)d` in filename template throws error
-* Improve offset parsing in outtmpl
-* [test] More rigorous tests for `prepare_filename`
-
-### 2021.06.08
-
-* Remove support for obsolete Python versions: Only 3.6+ is now supported
-* Merge youtube-dl: Upto [commit/c2350ca](https://github.com/ytdl-org/youtube-dl/commit/c2350cac243ba1ec1586fe85b0d62d1b700047a2)
-* [hls] Fix decryption for multithreaded downloader
-* [extractor] Fix pre-checking archive for some extractors
-* [extractor] Fix FourCC fallback when parsing ISM by [fstirlitz](https://github.com/fstirlitz)
-* [twitcasting] Add TwitCastingUserIE, TwitCastingLiveIE by [pukkandan](https://github.com/pukkandan), [nao20010128nao](https://github.com/nao20010128nao)
-* [vidio] Add VidioPremierIE and VidioLiveIE by [MinePlayersPE](Https://github.com/MinePlayersPE)
-* [viki] Fix extraction from [ytdl-org/youtube-dl@59e583f](https://github.com/ytdl-org/youtube-dl/commit/59e583f7e8530ca92776c866897d895c072e2a82)
-* [youtube] Support shorts URL
-* [zoom] Extract transcripts as subtitles
-* Add field `original_url` with the user-inputted URL
-* Fix and refactor `prepare_outtmpl`
-* Make more fields available for `--print` when used with `--flat-playlist`
-* [utils] Generalize `traverse_dict` to `traverse_obj`
-* [downloader/ffmpeg] Hide FFmpeg banner unless in verbose mode by [fstirlitz](https://github.com/fstirlitz)
-* [build] Release `yt-dlp.tar.gz`
-* [build,update] Add GNU-style SHA512 and prepare updater for simlar SHA256 by [nihil-admirari](https://github.com/nihil-admirari)
-* [pyinst] Show Python version in exe metadata by [nihil-admirari](https://github.com/nihil-admirari)
-* [docs] Improve documentation of dependencies
-* [cleanup] Mark unused files
-* [cleanup] Point all shebang to `python3` by [fstirlitz](https://github.com/fstirlitz)
-* [cleanup] Remove duplicate file `trovolive.py`
-
-
-### 2021.06.01
-
-* Merge youtube-dl: Upto [commit/d495292](https://github.com/ytdl-org/youtube-dl/commit/d495292852b6c2f1bd58bc2141ff2b0265c952cf)
-* Pre-check archive and filters during playlist extraction
-* Handle Basic Auth `user:pass` in URLs by [hhirtz](https://github.com/hhirtz) and [pukkandan](https://github.com/pukkandan)
-* [archiveorg] Add YoutubeWebArchiveIE by [colethedj](https://github.com/colethedj) and [alex-gedeon](https://github.com/alex-gedeon)
-* [fancode] Add extractor by [rhsmachine](https://github.com/rhsmachine)
-* [patreon] Support vimeo embeds by [rhsmachine](https://github.com/rhsmachine)
-* [Saitosan] Add new extractor by [llacb47](https://github.com/llacb47)
-* [ShemarooMe] Add extractor by [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
-* [telemundo] Add extractor by [king-millez](https://github.com/king-millez)
-* [SonyLIV] Add SonyLIVSeriesIE and subtitle support by [Ashish0804](https://github.com/Ashish0804)
-* [Hotstar] Add HotStarSeriesIE by [Ashish0804](https://github.com/Ashish0804)
-* [Voot] Add VootSeriesIE by [Ashish0804](https://github.com/Ashish0804)
-* [vidio] Support login and premium videos by [MinePlayersPE](https://github.com/MinePlayersPE)
-* [fragment] When using `-N`, do not keep the fragment content in memory
-* [ffmpeg] Download and merge in a single step if possible
-* [ThumbnailsConvertor] Support conversion to `png` and make it the default by [louie-github](https://github.com/louie-github)
-* [VideoConvertor] Generalize with remuxer and allow conditional recoding
-* [EmbedThumbnail] Embed in `mp4`/`m4a` using mutagen by [tripulse](https://github.com/tripulse) and [pukkandan](https://github.com/pukkandan)
-* [EmbedThumbnail] Embed if any thumbnail was downloaded, not just the best
-* [EmbedThumbnail] Correctly escape filename
-* [update] replace self without launching a subprocess in windows
-* [update] Block further update for unsupported systems
-* Refactor `__process_playlist` by creating `LazyList`
-* Write messages to `stderr` when both `quiet` and `verbose`
-* Sanitize and sort playlist thumbnails
-* Remove `None` values from `info.json`
-* [extractor] Always prefer native hls downloader by default
-* [extractor] Skip subtitles without URI in m3u8 manifests by [hheimbuerger](https://github.com/hheimbuerger)
-* [extractor] Functions to parse `socket.io` response as `json` by [pukkandan](https://github.com/pukkandan) and [llacb47](https://github.com/llacb47)
-* [extractor] Allow `note=False` when extracting manifests
-* [utils] Escape URLs in `sanitized_Request`, not `sanitize_url`
-* [hls] Disable external downloader for `webtt`
-* [youtube] `/live` URLs should raise error if channel is not live
-* [youtube] Bug fixes
-* [zee5] Fix m3u8 formats' extension
-* [ard] Allow URLs without `-` before id by [olifre](https://github.com/olifre)
-* [cleanup] `YoutubeDL._match_entry`
-* [cleanup] Refactor updater
-* [cleanup] Refactor ffmpeg convertors
-* [cleanup] setup.py
-
-
 ### 2021.05.20

-* **Youtube improvements**: 
+**Youtube improvements**: 
    * Support youtube music `MP`, `VL` and `browse` pages
-    * Extract more formats for youtube music by [craftingmod](https://github.com/craftingmod), [colethedj](https://github.com/colethedj) and [pukkandan](https://github.com/pukkandan)
-    * Extract multiple subtitles in same language by [pukkandan](https://github.com/pukkandan) and [tpikonen](https://github.com/tpikonen)
+    * Extract more formats for youtube music by @craftingmod, @colethedj, @pukkandan
+    * Extract multiple subtitles in same language by @pukkandan and @tpikonen
    * Redirect channels that doesn't have a `videos` tab to their `UU` playlists
    * Support in-channel search
    * Sort audio-only formats correctly
    * Always extract `maxresdefault` thumbnail
    * Extract audio language
-    * Add subtitle language names by [nixxo](https://github.com/nixxo) and [tpikonen](https://github.com/tpikonen)
+    * Add subtitle language names by @nixxo and @tpikonen
    * Show alerts only from the final webpage
-    * Add `html5=1` param to `get_video_info` page requests by [colethedj](https://github.com/colethedj)
+    * Add `html5=1` param to `get_video_info` page requests by @colethedj
    * Better message when login required
-* **Add option `--print`**: to print any field/template
-    * Deprecates: `--get-description`, `--get-duration`, `--get-filename`, `--get-format`, `--get-id`, `--get-thumbnail`, `--get-title`, `--get-url`
+**Add option `--print`**: to print any field/template
+    Deprecates: `--get-description`, `--get-duration`, `--get-filename`, `--get-format`, `--get-id`, `--get-thumbnail`, `--get-title`, `--get-url`
 * Field `additional_urls` to download additional videos from metadata using [`--parse-metadata`](https://github.com/yt-dlp/yt-dlp#modifying-metadata)
 * Merge youtube-dl: Upto [commit/dfbbe29](https://github.com/ytdl-org/youtube-dl/commit/dfbbe2902fc67f0f93ee47a8077c148055c67a9b)
 * Write thumbnail of playlist and add `pl_thumbnail` outtmpl key
-* [embedthumbnail] Add `flac` support and refactor `mutagen` code by [pukkandan](https://github.com/pukkandan) and [tripulse](https://github.com/tripulse)
-* [audius:artist] Add extractor by [king-millez](https://github.com/king-millez)
-* [parlview] Add extractor by [king-millez](https://github.com/king-millez)
-* [tenplay] Fix extractor by [king-millez](https://github.com/king-millez)
+* [embedthumbnail] Add `flac` support and refactor `mutagen` code by @pukkandan and @tripulse
+* [audius:artist] Add extractor by @king-millez
+* [parlview] Add extractor by @king-millez
+* [tenplay] Fix extractor by @king-millez
 * [rmcdecouverte] Generalize `_VALID_URL`
 * Add compat-option `no-attach-infojson`
 * Add field `name` for subtitles
@@ -162,7 +53,6 @@
 * [options] Refactor callbacks
 * [test:download] Only extract enough videos for `playlist_mincount`
 * [extractor] bugfix for when `compat_opts` is not given
-* [build] Fix x86 build by [shirt](https://github.com/shirt-dev)
 * [cleanup] code formatting, youtube tests and readme

 ### 2021.05.11
@@ -465,7 +355,7 @@

 ### 2021.02.15
 * Merge youtube-dl: Upto [2021.02.10](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.10) (except archive.org)
-* [niconico] Improved extraction and support encrypted/SMILE movies by [kurumigi](https://github.com/kurumigi), [tsukumijima](https://github.com/tsukumijima), [bbepis](https://github.com/bbepis), [pukkandan](https://github.com/pukkandan)
+* [niconico] Improved extraction and support encrypted/SMILE movies by [kurumigi](https://github.com/kurumigi), [tsukumi](https://github.com/tsukumi), [bbepis](https://github.com/bbepis), [pukkandan](https://github.com/pukkandan)
 * Fix HLS AES-128 with multiple keys in external downloaders by [shirt](https://github.com/shirt-dev)
 * [youtube_live_chat] Fix by using POST API by [siikamiika](https://github.com/siikamiika)
 * [rumble] Add support for video page
@@ -719,4 +609,4 @@
 * [generic] Extract embedded youtube and twitter videos by [diegorodriguezv](https://github.com/diegorodriguezv)
 * [ffmpeg] Ensure all streams are copied by [pukkandan](https://github.com/pukkandan)
 * [embedthumbnail] Fix for os.rename error by [pukkandan](https://github.com/pukkandan)
-* make_win.bat: don't use UPX to pack vcruntime140.dll by [jbruchon](https://github.com/jbruchon)
+* make_win.bat: don't use UPX to pack vcruntime140.dll by [jbruchon](https://github.com/jbruchon)
--- a/1
+++ b/1
@@ -25,7 +25,6 @@ completion-zsh: completions/zsh/_yt-dlp
 lazy-extractors: yt_dlp/extractor/lazy_extractors.py

 PREFIX ?= /usr/local
-DESTDIR ?= .
 BINDIR ?= $(PREFIX)/bin
 MANDIR ?= $(PREFIX)/man
 SHAREDIR ?= $(PREFIX)/share
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ yt-dlp is a [youtube-dl](https://github.com/ytdl-org/youtube-dl) fork based on t
 * [NEW FEATURES](#new-features)
    * [Differences in default behavior](#differences-in-default-behavior)
 * [INSTALLATION](#installation)
-    * [Update](#update)
    * [Dependencies](#dependencies)
+    * [Update](#update)
    * [Compile](#compile)
 * [USAGE AND OPTIONS](#usage-and-options)
    * [General Options](#general-options)
@@ -66,7 +66,7 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/

 * **[Format Sorting](#sorting-formats)**: The default format sorting options have been changed so that higher resolution and better codecs will be now preferred instead of simply using larger bitrate. Furthermore, you can now specify the sort order using `-S`. This allows for much easier format selection that what is possible by simply using `--format` ([examples](#format-selection-examples))

-* **Merged with youtube-dl [commit/379f52a](https://github.com/ytdl-org/youtube-dl/commit/379f52a4954013767219d25099cce9e0f9401961)**: (v2021.06.06) You get all the latest features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494/yt-dlc)
+* **Merged with youtube-dl [commit/dfbbe29](https://github.com/ytdl-org/youtube-dl/commit/dfbbe2902fc67f0f93ee47a8077c148055c67a9b)**: (v2021.05.16) You get all the latest features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494/yt-dlc)

 * **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--write-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, playlist infojson etc. Note that the NicoNico improvements are not available. See [#31](https://github.com/yt-dlp/yt-dlp/pull/31) for details.

@@ -84,11 +84,11 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/

 * **Aria2c with HLS/DASH**: You can use `aria2c` as the external downloader for DASH(mpd) and HLS(m3u8) formats

-* **New extractors**: AnimeLab, Philo MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula, ukcolumn, whowatch, MxplayerShow, parlview (au), YoutubeWebArchive, fancode, Saitosan, ShemarooMe, telemundo, VootSeries, SonyLIVSeries, HotstarSeries, VidioPremier, VidioLive
+* **New extractors**: AnimeLab, Philo MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula, ukcolumn, whowatch, MxplayerShow, parlview (au)

-* **Fixed extractors**: archive.org, roosterteeth.com, skyit, instagram, itv, SouthparkDe, spreaker, Vlive, akamai, ina, rumble, tennistv, amcnetworks, la7 podcasts, linuxacadamy, nitter, twitcasting, viu, crackle, curiositystream, mediasite, rmcdecouverte, sonyliv, tubi, tenplay, patreon
+* **Fixed extractors**: archive.org, roosterteeth.com, skyit, instagram, itv, SouthparkDe, spreaker, Vlive, akamai, ina, rumble, tennistv, amcnetworks, la7 podcasts, linuxacadamy, nitter, twitcasting, viu, crackle, curiositystream, mediasite, rmcdecouverte, sonyliv, tubi, tenplay

-* **Subtitle extraction from manifests**: Subtitles can be extracted from streaming media manifests. See [commit/be6202f](https://github.com/yt-dlp/yt-dlp/commit/be6202f12b97858b9d716e608394b51065d0419f) for details
+* **Subtitle extraction from manifests**: Subtitles can be extracted from streaming media manifests. See [be6202f12b97858b9d716e608394b51065d0419f](https://github.com/yt-dlp/yt-dlp/commit/be6202f12b97858b9d716e608394b51065d0419f) for details

 * **Multiple paths and output templates**: You can give different [output templates](#output-template) and download paths for different types of files. You can also set a temporary path where intermediary files are downloaded to using `--paths` (`-P`)

@@ -128,10 +128,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu
 * `playlist_index` behaves differently when used with options like `--playlist-reverse` and `--playlist-items`. See [#302](https://github.com/yt-dlp/yt-dlp/issues/302) for details. You can use `--compat-options playlist-index` if you want to keep the earlier behavior
 * The output of `-F` is listed in a new format. Use `--compat-options list-formats` to revert this
 * Youtube live chat (if available) is considered as a subtitle. Use `--sub-langs all,-live_chat` to download all subtitles except live chat. You can also use `--compat-options no-live-chat` to prevent live chat from downloading
-* Youtube channel URLs are automatically redirected to `/video`. Append a `/featured` to the URL to download only the videos in the home page. If the channel does not have a videos tab, we try to download the equivalent `UU` playlist instead. Also, `/live` URLs raise an error if there are no live videos instead of silently downloading the entire channel. You may use `--compat-options no-youtube-channel-redirect` to revert all these redirections
+* Youtube channel URLs are automatically redirected to `/video`. Either append a `/featured` to the URL or use `--compat-options no-youtube-channel-redirect` to download only the videos in the home page
 * Unavailable videos are also listed for youtube playlists. Use `--compat-options no-youtube-unavailable-videos` to remove this
-* If `ffmpeg` is used as the downloader, the downloading and merging of formats happen in a single step when possible. Use `--compat-options no-direct-merge` to revert this
-* Thumbnail embedding in `mp4` is done with mutagen if possible. Use `--compat-options embed-thumbnail-atomicparsley` to force the use of AtomicParsley instead

 For ease of use, a few more compat options are available:
 * `--compat-options all`: Use all compat options
@@ -167,38 +165,23 @@ sudo aria2c https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o
 sudo chmod a+rx /usr/local/bin/yt-dlp
 ```

+### DEPENDENCIES
+Python versions 3.6+ (CPython and PyPy) are officially supported. Other versions and implementations may or maynot work correctly.
+
+On windows, [Microsoft Visual C++ 2010 Redistributable Package (x86)](https://www.microsoft.com/en-us/download/details.aspx?id=26999) is also necessary to run yt-dlp. You probably already have this, but if the executable throws an error due to missing `MSVCR100.dll` you need to install it.
+
+Although there are no other required dependencies, `ffmpeg` and `ffprobe` are highly recommended. Other optional dependencies are `sponskrub`, `AtomicParsley`, `mutagen`, `pycryptodome`, `phantomjs` and any of the supported external downloaders. Note that the windows releases are already built with the python interpreter, mutagen and pycryptodome included.
+
 ### UPDATE
 You can use `yt-dlp -U` to update if you are using the provided release.
 If you are using `pip`, simply re-run the same command that was used to install the program.

-### DEPENDENCIES
-Python versions 3.6+ (CPython and PyPy) are supported. Other versions and implementations may or may not work correctly.
-
-<!-- https://www.microsoft.com/en-us/download/details.aspx?id=26999 -->
-On windows, [Microsoft Visual C++ 2010 SP1 Redistributable Package (x86)](https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe) is also necessary to run yt-dlp. You probably already have this, but if the executable throws an error due to missing `MSVCR100.dll` you need to install it manually.
-
-While all the other dependancies are optional, `ffmpeg` and `ffprobe` are highly recommended
-* [**ffmpeg** and **ffprobe**](https://www.ffmpeg.org) - Required for [merging seperate video and audio files](#format-selection) as well as for various [post-processing](#post-processing-options) tasks. Licence [depends on the build](https://www.ffmpeg.org/legal.html)
-* [**sponskrub**](https://github.com/faissaloo/SponSkrub) - For using the [sponskrub options](#sponskrub-sponsorblock-options). Licenced under [GPLv3+](https://github.com/faissaloo/SponSkrub/blob/master/LICENCE.md)
-* [**mutagen**](https://github.com/quodlibet/mutagen) - For embedding thumbnail in certain formats. Licenced under [GPLv2+](https://github.com/quodlibet/mutagen/blob/master/COPYING)
-* [**pycryptodome**](https://github.com/Legrandin/pycryptodome) - For decrypting various data. Licenced under [BSD2](https://github.com/Legrandin/pycryptodome/blob/master/LICENSE.rst)
-* [**websockets**](https://github.com/aaugustin/websockets) - For downloading over websocket. Licenced under [BSD3](https://github.com/aaugustin/websockets/blob/main/LICENSE)
-* [**AtomicParsley**](https://github.com/wez/atomicparsley) - For embedding thumbnail in mp4/m4a if mutagen is not present. Licenced under [GPLv2+](https://github.com/wez/atomicparsley/blob/master/COPYING)
-* [**rtmpdump**](http://rtmpdump.mplayerhq.hu) - For downloading `rtmp` streams. ffmpeg will be used as a fallback. Licenced under [GPLv2+](http://rtmpdump.mplayerhq.hu)
-* [**mplayer**](http://mplayerhq.hu/design7/info.html) or [**mpv**](https://mpv.io) - For downloading `rstp` streams. ffmpeg will be used as a fallback. Licenced under [GPLv2+](https://github.com/mpv-player/mpv/blob/master/Copyright)
-* [**phantomjs**](https://github.com/ariya/phantomjs) - Used in extractors where javascript needs to be run. Licenced under [BSD3](https://github.com/ariya/phantomjs/blob/master/LICENSE.BSD)
-* Any external downloader that you want to use with `--downloader`
-
-To use or redistribute the dependencies, you must agree to their respective licensing terms.
-
-Note that the windows releases are already built with the python interpreter, mutagen, pycryptodome and websockets included.
-
 ### COMPILE

 **For Windows**:
-To build the Windows executable, you must have pyinstaller (and optionally mutagen, pycryptodome, websockets)
+To build the Windows executable, you must have pyinstaller (and optionally mutagen and pycryptodome)

-    python3 -m pip install --upgrade pyinstaller mutagen pycryptodome websockets
+    python3 -m pip install --upgrade pyinstaller mutagen pycryptodome

 Once you have all the necessary dependencies installed, just run `py pyinst.py`. The executable will be built for the same architecture (32/64 bit) as the python used to build it.

@@ -374,9 +357,6 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     (default is 1)
    -r, --limit-rate RATE            Maximum download rate in bytes per second
                                     (e.g. 50K or 4.2M)
-    --throttled-rate RATE            Minimum download rate in bytes per second
-                                     below which throttling is assumed and the
-                                     video data is re-extracted (e.g. 100K)
    -R, --retries RETRIES            Number of retries (default is 10), or
                                     "infinite"
    --fragment-retries RETRIES       Number of retries for a fragment (default
@@ -519,10 +499,13 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     jar in
    --no-cookies                     Do not read/dump cookies (default)
    --cache-dir DIR                  Location in the filesystem where youtube-dl
-                                     can store some downloaded information (such
-                                     as client ids and signatures) permanently.
-                                     By default $XDG_CACHE_HOME/youtube-dl or
-                                     ~/.cache/youtube-dl
+                                     can store some downloaded information
+                                     permanently. By default
+                                     $XDG_CACHE_HOME/youtube-dl or
+                                     ~/.cache/youtube-dl . At the moment, only
+                                     YouTube player files (for videos with
+                                     obfuscated signatures) are cached, but that
+                                     may change
    --no-cache-dir                   Disable filesystem caching
    --rm-cache-dir                   Delete all filesystem cache files

@@ -687,10 +670,10 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
 ## Post-Processing Options:
    -x, --extract-audio              Convert video files to audio-only files
                                     (requires ffmpeg and ffprobe)
-    --audio-format FORMAT            Specify audio format to convert the audio
-                                     to when -x is used. Currently supported
-                                     formats are: best (default) or one of
-                                     aac|flac|mp3|m4a|opus|vorbis|wav
+    --audio-format FORMAT            Specify audio format: "best", "aac",
+                                     "flac", "mp3", "m4a", "opus", "vorbis", or
+                                     "wav"; "best" by default; No effect without
+                                     -x
    --audio-quality QUALITY          Specify ffmpeg audio quality, insert a
                                     value between 0 (better) and 9 (worse) for
                                     VBR or a specific bitrate like 128K
@@ -700,12 +683,12 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     |webm|mov|avi|mp3|mka|m4a|ogg|opus). If
                                     target container does not support the
                                     video/audio codec, remuxing will fail. You
-                                     can specify multiple rules; Eg.
+                                     can specify multiple rules; eg.
                                     "aac>m4a/mov>mp4/mkv" will remux aac to
                                     m4a, mov to mp4 and anything else to mkv.
    --recode-video FORMAT            Re-encode the video into another format if
-                                     re-encoding is necessary. The syntax and
-                                     supported formats are the same as --remux-video
+                                     re-encoding is necessary. The supported
+                                     formats are the same as --remux-video
    --postprocessor-args NAME:ARGS   Give these arguments to the postprocessors.
                                     Specify the postprocessor/executable name
                                     and the arguments separated by a colon ":"
@@ -715,8 +698,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     Metadata, EmbedSubtitle, EmbedThumbnail,
                                     SubtitlesConvertor, ThumbnailsConvertor,
                                     VideoRemuxer, VideoConvertor, SponSkrub,
-                                     FixupStretched, FixupM4a, FixupM3u8,
-                                     FixupTimestamp and FixupDuration. The
+                                     FixupStretched, FixupM4a and FixupM3u8. The
                                     supported executables are: AtomicParsley,
                                     FFmpeg, FFprobe, and SponSkrub. You can
                                     also specify "PP+EXE:ARGS" to give the
@@ -740,13 +722,10 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
    --embed-subs                     Embed subtitles in the video (only for mp4,
                                     webm and mkv videos)
    --no-embed-subs                  Do not embed subtitles (default)
-    --embed-thumbnail                Embed thumbnail in the video as cover art
+    --embed-thumbnail                Embed thumbnail in the audio as cover art
    --no-embed-thumbnail             Do not embed thumbnail (default)
-    --embed-metadata                 Embed metadata including chapter markers
-                                     (if supported by the format) to the video
-                                     file (Alias: --add-metadata)
-    --no-embed-metadata              Do not write metadata (default)
-                                     (Alias: --no-add-metadata)
+    --add-metadata                   Write metadata to the video file
+    --no-add-metadata                Do not write metadata (default)
    --parse-metadata FROM:TO         Parse additional metadata like title/artist
                                     from other fields; see "MODIFYING METADATA"
                                     for details
@@ -756,8 +735,7 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     file. One of never (do nothing), warn (only
                                     emit a warning), detect_or_warn (the
                                     default; fix file if we can, warn
-                                     otherwise), force (try fixing even if file
-                                     already exists
+                                     otherwise)
    --ffmpeg-location PATH           Location of the ffmpeg binary; either the
                                     path to the binary or its containing
                                     directory
@@ -771,10 +749,10 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                     fields are passed, "%(filepath)s" is
                                     appended to the end of the command
    --convert-subs FORMAT            Convert the subtitles to another format
-                                     (currently supported: srt|vtt|ass|lrc)
+                                     (currently supported: srt|ass|vtt|lrc)
                                     (Alias: --convert-subtitles)
    --convert-thumbnails FORMAT      Convert the thumbnails to another format
-                                     (currently supported: jpg|png)
+                                     (currently supported: jpg)
    --split-chapters                 Split video into multiple files based on
                                     internal chapters. The "chapter:" prefix
                                     can be used with "--paths" and "--output"
@@ -975,8 +953,6 @@ The available fields are:
 - `playlist_title` (string): Playlist title
 - `playlist_uploader` (string): Full name of the playlist uploader
 - `playlist_uploader_id` (string): Nickname or id of the playlist uploader
- - `webpage_url` (string): A URL to the video webpage which if given to yt-dlp should allow to get the same result again
- - `original_url` (string): The URL given by the user (or same as `webpage_url` for playlist entries)

 Available for the video that belongs to some logical chapter or section:

@@ -1150,7 +1126,7 @@ You can change the criteria for being considered the `best` by using `-S` (`--fo
 - `lang`: Language preference as given by the extractor
 - `quality`: The quality of the format as given by the extractor
 - `source`: Preference of the source as given by the extractor
- - `proto`: Protocol used for download (`https`/`ftps` > `http`/`ftp` > `m3u8_native`/`m3u8` > `http_dash_segments`> `websocket_frag` > other > `mms`/`rtsp` > unknown > `f4f`/`f4m`)
+ - `proto`: Protocol used for download (`https`/`ftps` > `http`/`ftp` > `m3u8_native` > `m3u8` > `http_dash_segments` > other > `mms`/`rtsp` > unknown > `f4f`/`f4m`)
 - `vcodec`: Video Codec (`av01` > `vp9.2` > `vp9` > `h265` > `h264` > `vp8` > `h263` > `theora` > other > unknown)
 - `acodec`: Audio Codec (`opus` > `vorbis` > `aac` > `mp4a` > `mp3` > `ac3` > `dts` > other > unknown)
 - `codec`: Equivalent to `vcodec,acodec`
--- a/devscripts/bash-completion.py
+++ b/devscripts/bash-completion.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 import os
--- a/devscripts/buildserver.py
+++ b/devscripts/buildserver.py
@@ -1,5 +1,3 @@
-# UNUSED
-
 #!/usr/bin/python3

 import argparse
--- a/devscripts/check-porn.py
+++ b/devscripts/check-porn.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 """
--- a/devscripts/create-github-release.py
+++ b/devscripts/create-github-release.py
@@ -1,6 +1,6 @@
 # Unused

-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 import io
--- a/devscripts/fish-completion.py
+++ b/devscripts/fish-completion.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 import optparse
--- a/devscripts/generate_aes_testdata.py
+++ b/devscripts/generate_aes_testdata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals

 import codecs
--- a/devscripts/gh-pages.unused/add-version.py
+++ b/devscripts/gh-pages.unused/add-version.py
--- a/devscripts/gh-pages.unused/generate-download.py
+++ b/devscripts/gh-pages.unused/generate-download.py
--- a/devscripts/gh-pages.unused/sign-versions.py
+++ b/devscripts/gh-pages.unused/sign-versions.py
--- a/devscripts/gh-pages.unused/update-copyright.py
+++ b/devscripts/gh-pages.unused/update-copyright.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import with_statement, unicode_literals
--- a/devscripts/gh-pages.unused/update-feed.py
+++ b/devscripts/gh-pages.unused/update-feed.py
--- a/devscripts/gh-pages.unused/update-sites.py
+++ b/devscripts/gh-pages.unused/update-sites.py
--- a/devscripts/lazy_load_template.py
+++ b/devscripts/lazy_load_template.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # coding: utf-8
 from __future__ import unicode_literals

--- a/devscripts/make_contributing.py
+++ b/devscripts/make_contributing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 # import io
--- a/devscripts/make_issue_template.py
+++ b/devscripts/make_issue_template.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 import io
--- a/devscripts/make_lazy_extractors.py
+++ b/devscripts/make_lazy_extractors.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals, print_function

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

 import io
--- a/devscripts/make_supportedsites.py
+++ b/devscripts/make_supportedsites.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 import io
--- a/devscripts/prepare_manpage.py
+++ b/devscripts/prepare_manpage.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals

 import io
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -1,5 +1,4 @@
 # Unused
-
 #!/bin/bash

 # IMPORTANT: the following assumptions are made
--- a/devscripts/show-downloads-statistics.py
+++ b/devscripts/show-downloads-statistics.py
@@ -1,6 +1,6 @@
 # Unused

-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 import itertools
--- a/devscripts/update-version.py
+++ b/devscripts/update-version.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
-
 from datetime import datetime
 # import urllib.request

--- a/devscripts/wine-py2exe.sh
+++ b/devscripts/wine-py2exe.sh
@@ -1,5 +1,3 @@
-# UNUSED
-
 #!/bin/bash

 # Run with as parameter a setup.py that works in the current directory
--- a/devscripts/zsh-completion.py
+++ b/devscripts/zsh-completion.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 import os
--- a/pyinst.py
+++ b/pyinst.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
@@ -6,7 +6,6 @@ import sys
 # import os
 import platform

-from PyInstaller.utils.hooks import collect_submodules
 from PyInstaller.utils.win32.versioninfo import (
    VarStruct, VarFileInfo, StringStruct, StringTable,
    StringFileInfo, FixedFileInfo, VSVersionInfo, SetVersion,
@@ -18,7 +17,7 @@ assert arch in ('32', '64')
 print('Building %sbit version' % arch)
 _x86 = '_x86' if arch == '32' else ''

-FILE_DESCRIPTION = 'yt-dlp%s' % (' (32 Bit)' if _x86 else '')
+FILE_DESCRIPTION = 'Media Downloader%s' % (' (32 Bit)' if _x86 else '')

 # root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 # print('Changing working directory to %s' % root_dir)
@@ -59,23 +58,22 @@ VERSION_FILE = VSVersionInfo(
                    ),
                    StringStruct('OriginalFilename', 'yt-dlp%s.exe' % _x86),
                    StringStruct('ProductName', 'yt-dlp%s' % _x86),
-                    StringStruct(
-                        'ProductVersion',
-                        '%s%s on Python %s' % (VERSION, _x86, platform.python_version())),
+                    StringStruct('ProductVersion', '%s%s' % (VERSION, _x86)),
                ])]),
        VarFileInfo([VarStruct('Translation', [0, 1200])])
    ]
 )

-dependancies = ['Crypto', 'mutagen'] + collect_submodules('websockets')
-excluded_modules = ['test', 'ytdlp_plugins', 'youtube-dl', 'youtube-dlc']
-
 PyInstaller.__main__.run([
    '--name=yt-dlp%s' % _x86,
    '--onefile',
    '--icon=devscripts/cloud.ico',
-    *[f'--exclude-module={module}' for module in excluded_modules],
-    *[f'--hidden-import={module}' for module in dependancies],
+    '--exclude-module=youtube_dl',
+    '--exclude-module=youtube_dlc',
+    '--exclude-module=test',
+    '--exclude-module=ytdlp_plugins',
+    '--hidden-import=mutagen',
+    '--hidden-import=Crypto',
    '--upx-exclude=vcruntime140.dll',
    'yt_dlp/__main__.py',
 ])
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
 mutagen
 pycryptodome
-websockets
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from setuptools import setup, Command, find_packages
@@ -9,44 +9,45 @@ from distutils.spawn import spawn


 # Get the version from yt_dlp/version.py without importing the package
-exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
+exec(compile(open('yt_dlp/version.py').read(),
+             'yt_dlp/version.py', 'exec'))


 DESCRIPTION = 'Command-line program to download videos from YouTube.com and many other other video platforms.'

 LONG_DESCRIPTION = '\n\n'.join((
    'Official repository: <https://github.com/yt-dlp/yt-dlp>',
-    '**PS**: Some links in this document will not work since this is a copy of the README.md from Github',
+    '**PS**: Many links in this document will not work since this is a copy of the README.md from Github',
    open('README.md', 'r', encoding='utf-8').read()))

-REQUIREMENTS = ['mutagen', 'pycryptodome', 'websockets']
-
-if sys.argv[1:2] == ['py2exe']:
-    raise NotImplementedError('py2exe is not currently supported; instead, use "pyinst.py" to build with pyinstaller')
+REQUIREMENTS = ['mutagen', 'pycryptodome']


-files_spec = [
-    ('share/bash-completion/completions', ['completions/bash/yt-dlp']),
-    ('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
-    ('share/fish/vendor_completions.d', ['completions/fish/yt-dlp.fish']),
-    ('share/doc/yt_dlp', ['README.txt']),
-    ('share/man/man1', ['yt-dlp.1'])
-]
-root = os.path.dirname(os.path.abspath(__file__))
-data_files = []
-for dirname, files in files_spec:
-    resfiles = []
-    for fn in files:
-        if not os.path.exists(fn):
-            warnings.warn('Skipping file %s since it is not present. Try running `make pypi-files` first' % fn)
-        else:
-            resfiles.append(fn)
-    data_files.append((dirname, resfiles))
+if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
+    print('inv')
+else:
+    files_spec = [
+        ('share/bash-completion/completions', ['completions/bash/yt-dlp']),
+        ('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
+        ('share/fish/vendor_completions.d', ['completions/fish/yt-dlp.fish']),
+        ('share/doc/yt_dlp', ['README.txt']),
+        ('share/man/man1', ['yt-dlp.1'])
+    ]
+    root = os.path.dirname(os.path.abspath(__file__))
+    data_files = []
+    for dirname, files in files_spec:
+        resfiles = []
+        for fn in files:
+            if not os.path.exists(fn):
+                warnings.warn('Skipping file %s since it is not present. Try running `make pypi-files` first.' % fn)
+            else:
+                resfiles.append(fn)
+        data_files.append((dirname, resfiles))

-params = {
-    'data_files': data_files,
-}
-params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']}
+    params = {
+        'data_files': data_files,
+    }
+    params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']}


 class build_lazy_extractors(Command):
@@ -60,8 +61,10 @@ class build_lazy_extractors(Command):
        pass

    def run(self):
-        spawn([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'],
-              dry_run=self.dry_run)
+        spawn(
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'],
+            dry_run=self.dry_run,
+        )


 packages = find_packages(exclude=('youtube_dl', 'test', 'ytdlp_plugins'))
@@ -88,16 +91,26 @@ setup(
        'Development Status :: 5 - Production/Stable',
        'Environment :: Console',
        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
        'Programming Language :: Python :: 3.6',
        'Programming Language :: Python :: 3.7',
        'Programming Language :: Python :: 3.8',
        'Programming Language :: Python :: Implementation',
        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: IronPython',
+        'Programming Language :: Python :: Implementation :: Jython',
        'Programming Language :: Python :: Implementation :: PyPy',
        'License :: Public Domain',
        'Operating System :: OS Independent',
    ],
-    python_requires='>=3.6',
+    python_requires='>=2.6',

    cmdclass={'build_lazy_extractors': build_lazy_extractors},
    **params
--- a/supportedsites.md
+++ b/supportedsites.md
@@ -225,7 +225,8 @@
 - **Culturebox**
 - **CultureUnplugged**
 - **curiositystream**
- - **curiositystream:collection**
+ - **curiositystream:collections**
+ - **curiositystream:series**
 - **CWTV**
 - **DagelijkseKost**: dagelijksekost.een.be
 - **DailyMail**
@@ -306,7 +307,6 @@
 - **EyedoTV**
 - **facebook**
 - **FacebookPluginsVideo**
- - **fancode:vod**
 - **faz.net**
 - **fc2**
 - **fc2:embed**
@@ -392,7 +392,6 @@
 - **HotNewHipHop**
 - **hotstar**
 - **hotstar:playlist**
- - **hotstar:series**
 - **Howcast**
 - **HowStuffWorks**
 - **hrfernsehen**
@@ -496,6 +495,8 @@
 - **LinuxAcademy**
 - **LiTV**
 - **LiveJournal**
+ - **LiveLeak**
+ - **LiveLeakEmbed**
 - **livestream**
 - **livestream:original**
 - **LnkGo**
@@ -858,7 +859,6 @@
 - **safari**: safaribooksonline.com online video
 - **safari:api**
 - **safari:course**: safaribooksonline.com online courses
- - **Saitosan**
 - **SAKTV**
 - **SaltTV**
 - **SampleFocus**
@@ -883,7 +883,6 @@
 - **Shahid**
 - **ShahidShow**
 - **Shared**: shared.sx
- - **ShemarooMe**
 - **ShowRoomLive**
 - **simplecast**
 - **simplecast:episode**
@@ -903,7 +902,6 @@
 - **Snotr**
 - **Sohu**
 - **SonyLIV**
- - **SonyLIVSeries**
 - **soundcloud**
 - **soundcloud:playlist**
 - **soundcloud:search**: Soundcloud search
@@ -982,7 +980,6 @@
 - **Telecinco**: telecinco.es, cuatro.com and mediaset.es
 - **Telegraaf**
 - **TeleMB**
- - **Telemundo**
 - **TeleQuebec**
 - **TeleQuebecEmission**
 - **TeleQuebecLive**
@@ -1066,8 +1063,6 @@
 - **TVPlayHome**
 - **Tweakers**
 - **TwitCasting**
- - **TwitCastingLive**
- - **TwitCastingUser**
 - **twitch:clips**
 - **twitch:stream**
 - **twitch:vod**
@@ -1129,8 +1124,6 @@
 - **videomore:video**
 - **VideoPress**
 - **Vidio**
- - **VidioLive**
- - **VidioPremier**
 - **VidLii**
 - **vidme**
 - **vidme:user**
@@ -1170,7 +1163,6 @@
 - **VODPlatform**
 - **VoiceRepublic**
 - **Voot**
- - **VootSeries**
 - **VoxMedia**
 - **VoxMediaVolume**
 - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
@@ -1200,7 +1192,6 @@
 - **wdr:mobile**
 - **WDRElefant**
 - **WDRPage**
- - **web.archive:youtube**: web.archive.org saved youtube videos
 - **Webcaster**
 - **WebcasterFeed**
 - **WebOfStories**
--- a/test/swftests.unused/.gitignore
+++ b/test/swftests.unused/.gitignore
--- a/test/swftests.unused/ArrayAccess.as
+++ b/test/swftests.unused/ArrayAccess.as
--- a/test/swftests.unused/ClassCall.as
+++ b/test/swftests.unused/ClassCall.as
--- a/test/swftests.unused/ClassConstruction.as
+++ b/test/swftests.unused/ClassConstruction.as
--- a/test/swftests.unused/ConstArrayAccess.as
+++ b/test/swftests.unused/ConstArrayAccess.as
--- a/test/swftests.unused/ConstantInt.as
+++ b/test/swftests.unused/ConstantInt.as
--- a/test/swftests.unused/DictCall.as
+++ b/test/swftests.unused/DictCall.as
--- a/test/swftests.unused/EqualsOperator.as
+++ b/test/swftests.unused/EqualsOperator.as
--- a/test/swftests.unused/LocalVars.as
+++ b/test/swftests.unused/LocalVars.as
--- a/test/swftests.unused/MemberAssignment.as
+++ b/test/swftests.unused/MemberAssignment.as
--- a/test/swftests.unused/NeOperator.as
+++ b/test/swftests.unused/NeOperator.as
--- a/test/swftests.unused/PrivateCall.as
+++ b/test/swftests.unused/PrivateCall.as
--- a/test/swftests.unused/PrivateVoidCall.as
+++ b/test/swftests.unused/PrivateVoidCall.as
--- a/test/swftests.unused/StaticAssignment.as
+++ b/test/swftests.unused/StaticAssignment.as
--- a/test/swftests.unused/StaticRetrieval.as
+++ b/test/swftests.unused/StaticRetrieval.as
--- a/test/swftests.unused/StringBasics.as
+++ b/test/swftests.unused/StringBasics.as
--- a/test/swftests.unused/StringCharCodeAt.as
+++ b/test/swftests.unused/StringCharCodeAt.as
--- a/test/swftests.unused/StringConversion.as
+++ b/test/swftests.unused/StringConversion.as
--- a/test/test_InfoExtractor.py
+++ b/test/test_InfoExtractor.py
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
@@ -17,7 +17,7 @@ from yt_dlp.compat import compat_str, compat_urllib_error
 from yt_dlp.extractor import YoutubeIE
 from yt_dlp.extractor.common import InfoExtractor
 from yt_dlp.postprocessor.common import PostProcessor
-from yt_dlp.utils import ExtractorError, int_or_none, match_filter_func
+from yt_dlp.utils import ExtractorError, match_filter_func

 TEST_URL = 'http://localhost/sample.mp4'

@@ -461,13 +461,14 @@ class TestFormatSelection(unittest.TestCase):

    def test_invalid_format_specs(self):
        def assert_syntax_error(format_spec):
-            self.assertRaises(SyntaxError, YDL, {'format': format_spec})
+            ydl = YDL({'format': format_spec})
+            info_dict = _make_result([{'format_id': 'foo', 'url': TEST_URL}])
+            self.assertRaises(SyntaxError, ydl.process_ie_result, info_dict)

        assert_syntax_error('bestvideo,,best')
        assert_syntax_error('+bestaudio')
        assert_syntax_error('bestvideo+')
        assert_syntax_error('/')
-        assert_syntax_error('[720<height]')

    def test_format_filtering(self):
        formats = [
@@ -647,131 +648,56 @@ class TestYoutubeDL(unittest.TestCase):
        self.assertEqual(test_dict['extractor'], 'Foo')
        self.assertEqual(test_dict['playlist'], 'funny videos')

-    outtmpl_info = {
-        'id': '1234',
-        'ext': 'mp4',
-        'width': None,
-        'height': 1080,
-        'title1': '$PATH',
-        'title2': '%PATH%',
-        'title3': 'foo/bar\\test',
-        'timestamp': 1618488000,
-        'duration': 100000,
-        'playlist_index': 1,
-        '_last_playlist_index': 100,
-        'n_entries': 10,
-        'formats': [{'id': 'id1'}, {'id': 'id2'}, {'id': 'id3'}]
-    }
+    def test_prepare_filename(self):
+        info = {
+            'id': '1234',
+            'ext': 'mp4',
+            'width': None,
+            'height': 1080,
+            'title1': '$PATH',
+            'title2': '%PATH%',
+            'timestamp': 1618488000,
+            'formats': [{'id': 'id1'}, {'id': 'id2'}]
+        }

-    def test_prepare_outtmpl_and_filename(self):
-        def test(tmpl, expected, *, info=None, **params):
-            params['outtmpl'] = tmpl
+        def fname(templ, na_placeholder='NA'):
+            params = {'outtmpl': templ}
+            if na_placeholder != 'NA':
+                params['outtmpl_na_placeholder'] = na_placeholder
            ydl = YoutubeDL(params)
-            ydl._num_downloads = 1
-            self.assertEqual(ydl.validate_outtmpl(tmpl), None)
-
-            outtmpl, tmpl_dict = ydl.prepare_outtmpl(tmpl, info or self.outtmpl_info)
-            out = outtmpl % tmpl_dict
-            fname = ydl.prepare_filename(info or self.outtmpl_info)
-
-            if callable(expected):
-                self.assertTrue(expected(out))
-                self.assertTrue(expected(fname))
-            elif isinstance(expected, compat_str):
-                self.assertEqual((out, fname), (expected, expected))
-            else:
-                self.assertEqual((out, fname), expected)
-
-        # Auto-generated fields
-        test('%(id)s.%(ext)s', '1234.mp4')
-        test('%(duration_string)s', ('27:46:40', '27-46-40'))
-        test('%(epoch)d', int_or_none)
-        test('%(resolution)s', '1080p')
-        test('%(playlist_index)s', '001')
-        test('%(autonumber)s', '00001')
-        test('%(autonumber+2)03d', '005', autonumber_start=3)
-        test('%(autonumber)s', '001', autonumber_size=3)
-
-        # Escaping %
-        test('%%', '%')
-        test('%%%%', '%%')
-        test('%%(width)06d.%(ext)s', '%(width)06d.mp4')
-        test('%(width)06d.%(ext)s', 'NA.mp4')
-        test('%(width)06d.%%(ext)s', 'NA.%(ext)s')
-        test('%%(width)06d.%(ext)s', '%(width)06d.mp4')
-
-        # ID sanitization
-        test('%(id)s', '_abcd', info={'id': '_abcd'})
-        test('%(some_id)s', '_abcd', info={'some_id': '_abcd'})
-        test('%(formats.0.id)s', '_abcd', info={'formats': [{'id': '_abcd'}]})
-        test('%(id)s', '-abcd', info={'id': '-abcd'})
-        test('%(id)s', '.abcd', info={'id': '.abcd'})
-        test('%(id)s', 'ab__cd', info={'id': 'ab__cd'})
-        test('%(id)s', ('ab:cd', 'ab -cd'), info={'id': 'ab:cd'})
-
-        # Invalid templates
-        self.assertTrue(isinstance(YoutubeDL.validate_outtmpl('%'), ValueError))
-        self.assertTrue(isinstance(YoutubeDL.validate_outtmpl('%(title)'), ValueError))
-        test('%(invalid@tmpl|def)s', 'none', outtmpl_na_placeholder='none')
-        test('%()s', 'NA')
-        test('%s', '%s')
-        test('%d', '%d')
-
-        # NA placeholder
-        NA_TEST_OUTTMPL = '%(uploader_date)s-%(width)d-%(x|def)s-%(id)s.%(ext)s'
-        test(NA_TEST_OUTTMPL, 'NA-NA-def-1234.mp4')
-        test(NA_TEST_OUTTMPL, 'none-none-def-1234.mp4', outtmpl_na_placeholder='none')
-        test(NA_TEST_OUTTMPL, '--def-1234.mp4', outtmpl_na_placeholder='')
-
-        # String formatting
-        FMT_TEST_OUTTMPL = '%%(height)%s.%%(ext)s'
-        test(FMT_TEST_OUTTMPL % 's', '1080.mp4')
-        test(FMT_TEST_OUTTMPL % 'd', '1080.mp4')
-        test(FMT_TEST_OUTTMPL % '6d', '  1080.mp4')
-        test(FMT_TEST_OUTTMPL % '-6d', '1080  .mp4')
-        test(FMT_TEST_OUTTMPL % '06d', '001080.mp4')
-        test(FMT_TEST_OUTTMPL % ' 06d', ' 01080.mp4')
-        test(FMT_TEST_OUTTMPL % '   06d', ' 01080.mp4')
-        test(FMT_TEST_OUTTMPL % '0 6d', ' 01080.mp4')
-        test(FMT_TEST_OUTTMPL % '0   6d', ' 01080.mp4')
-        test(FMT_TEST_OUTTMPL % '   0   6d', ' 01080.mp4')
-
-        # Type casting
-        test('%(id)d', '1234')
-        test('%(height)c', '1')
-        test('%(ext)c', 'm')
-        test('%(id)d %(id)r', "1234 '1234'")
-        test('%(id)r %(height)r', "'1234' 1080")
-        test('%(ext)s-%(ext|def)d', 'mp4-def')
-        test('%(width|0)04d', '0000')
-        test('a%(width|)d', 'a', outtmpl_na_placeholder='none')
-
-        # Internal formatting
-        FORMATS = self.outtmpl_info['formats']
-        test('%(timestamp-1000>%H-%M-%S)s', '11-43-20')
-        test('%(id+1-height+3)05d', '00158')
-        test('%(width+100)05d', 'NA')
-        test('%(formats.0) 15s', ('% 15s' % FORMATS[0], '% 15s' % str(FORMATS[0]).replace(':', ' -')))
-        test('%(formats.0)r', (repr(FORMATS[0]), repr(FORMATS[0]).replace(':', ' -')))
-        test('%(height.0)03d', '001')
-        test('%(-height.0)04d', '-001')
-        test('%(formats.-1.id)s', FORMATS[-1]['id'])
-        test('%(formats.0.id.-1)d', FORMATS[0]['id'][-1])
-        test('%(formats.3)s', 'NA')
-        test('%(formats.:2:-1)r', repr(FORMATS[:2:-1]))
-        test('%(formats.0.id.-1+id)f', '1235.000000')
-        test('%(formats.0.id.-1+formats.1.id.-1)d', '3')
-
-        # Empty filename
-        test('%(foo|)s-%(bar|)s.%(ext)s', '-.mp4')
-        # test('%(foo|)s.%(ext)s', ('.mp4', '_.mp4'))  # fixme
-        # test('%(foo|)s', ('', '_'))  # fixme
-
-        # Path expansion and escaping
-        test('Hello %(title1)s', 'Hello $PATH')
-        test('Hello %(title2)s', 'Hello %PATH%')
-        test('%(title3)s', ('foo/bar\\test', 'foo_bar_test'))
-        test('folder/%(title3)s', ('folder/foo/bar\\test', 'folder%sfoo_bar_test' % os.path.sep))
+            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' by default
+        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)s.%(ext)s'), '1080.mp4')
+        self.assertEqual(fname('%(height)d.%(ext)s'), '1080.mp4')
+        self.assertEqual(fname('%(height)6d.%(ext)s'), '  1080.mp4')
+        self.assertEqual(fname('%(height)-6d.%(ext)s'), '1080  .mp4')
+        self.assertEqual(fname('%(height)06d.%(ext)s'), '001080.mp4')
+        self.assertEqual(fname('%(height) 06d.%(ext)s'), ' 01080.mp4')
+        self.assertEqual(fname('%(height)   06d.%(ext)s'), ' 01080.mp4')
+        self.assertEqual(fname('%(height)0 6d.%(ext)s'), ' 01080.mp4')
+        self.assertEqual(fname('%(height)0   6d.%(ext)s'), ' 01080.mp4')
+        self.assertEqual(fname('%(height)   0   6d.%(ext)s'), ' 01080.mp4')
+        self.assertEqual(fname('%%'), '%')
+        self.assertEqual(fname('%%%%'), '%%')
+        self.assertEqual(fname('%%(height)06d.%(ext)s'), '%(height)06d.mp4')
+        self.assertEqual(fname('%(width)06d.%(ext)s'), 'NA.mp4')
+        self.assertEqual(fname('%(width)06d.%%(ext)s'), 'NA.%(ext)s')
+        self.assertEqual(fname('%%(width)06d.%(ext)s'), '%(width)06d.mp4')
+        self.assertEqual(fname('Hello %(title1)s'), 'Hello $PATH')
+        self.assertEqual(fname('Hello %(title2)s'), 'Hello %PATH%')
+        self.assertEqual(fname('%(timestamp+-1000>%H-%M-%S)s'), '11-43-20')
+        self.assertEqual(fname('%(id+1)05d'), '01235')
+        self.assertEqual(fname('%(width+100)05d'), 'NA')
+        self.assertEqual(fname('%(formats.0)s').replace("u", ""), "{'id' - 'id1'}")
+        self.assertEqual(fname('%(formats.-1.id)s'), 'id2')
+        self.assertEqual(fname('%(formats.2)s'), 'NA')

    def test_format_note(self):
        ydl = YoutubeDL()
@@ -830,7 +756,7 @@ class TestYoutubeDL(unittest.TestCase):
            def process_info(self, info_dict):
                super(YDL, self).process_info(info_dict)

-            def _match_entry(self, info_dict, incomplete=False):
+            def _match_entry(self, info_dict, incomplete):
                res = super(FilterYDL, self)._match_entry(info_dict, incomplete)
                if res is None:
                    self.downloaded_info_dicts.append(info_dict)
--- a/test/test_YoutubeDLCookieJar.py
+++ b/test/test_YoutubeDLCookieJar.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
--- a/test/test_aes.py
+++ b/test/test_aes.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+
 from __future__ import unicode_literals

 # Allow direct execution
--- a/test/test_age_restriction.py
+++ b/test/test_age_restriction.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 # Allow direct execution
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 from __future__ import unicode_literals

--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 from __future__ import unicode_literals

--- a/test/test_downloader_http.py
+++ b/test/test_downloader_http.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals

--- a/test/test_execution.py
+++ b/test/test_execution.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
--- a/test/test_http.py
+++ b/test/test_http.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals

--- a/test/test_iqiyi_sdk_interpreter.py
+++ b/test/test_iqiyi_sdk_interpreter.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 from __future__ import unicode_literals

--- a/test/test_jsinterp.py
+++ b/test/test_jsinterp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 from __future__ import unicode_literals

--- a/test/test_overwrites.py
+++ b/test/test_overwrites.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 import os
--- a/test/test_post_hooks.py
+++ b/test/test_post_hooks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 from __future__ import unicode_literals

--- a/test/test_postprocessors.py
+++ b/test/test_postprocessors.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 from __future__ import unicode_literals

@@ -8,14 +8,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

-from yt_dlp import YoutubeDL
-from yt_dlp.compat import compat_shlex_quote
-from yt_dlp.postprocessor import (
-    ExecAfterDownloadPP,
-    FFmpegThumbnailsConvertorPP,
-    MetadataFromFieldPP,
-    MetadataFromTitlePP,
-)
+from yt_dlp.postprocessor import MetadataFromFieldPP, MetadataFromTitlePP


 class TestMetadataFromField(unittest.TestCase):
@@ -37,35 +30,3 @@ class TestMetadataFromTitle(unittest.TestCase):
    def test_format_to_regex(self):
        pp = MetadataFromTitlePP(None, '%(title)s - %(artist)s')
        self.assertEqual(pp._titleregex, r'(?P<title>.+)\ \-\ (?P<artist>.+)')
-
-
-class TestConvertThumbnail(unittest.TestCase):
-    def test_escaping(self):
-        pp = FFmpegThumbnailsConvertorPP()
-        if not pp.available:
-            print('Skipping: ffmpeg not found')
-            return
-
-        file = 'test/testdata/thumbnails/foo %d bar/foo_%d.{}'
-        tests = (('webp', 'png'), ('png', 'jpg'))
-
-        for inp, out in tests:
-            out_file = file.format(out)
-            if os.path.exists(out_file):
-                os.remove(out_file)
-            pp.convert_thumbnail(file.format(inp), out)
-            assert os.path.exists(out_file)
-
-        for _, out in tests:
-            os.remove(file.format(out))
-
-
-class TestExecAfterDownload(unittest.TestCase):
-    def test_parse_cmd(self):
-        pp = ExecAfterDownloadPP(YoutubeDL(), '')
-        info = {'filepath': 'file name'}
-        quoted_filepath = compat_shlex_quote(info['filepath'])
-
-        self.assertEqual(pp.parse_cmd('echo', info), 'echo %s' % quoted_filepath)
-        self.assertEqual(pp.parse_cmd('echo.{}', info), 'echo.%s' % quoted_filepath)
-        self.assertEqual(pp.parse_cmd('echo "%(filepath)s"', info), 'echo "%s"' % info['filepath'])
--- a/test/test_socks.py
+++ b/test/test_socks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals

--- a/test/test_subtitles.py
+++ b/test/test_subtitles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 # Allow direct execution
--- a/test/test_swfinterp.py.disabled
+++ b/test/test_swfinterp.py.disabled
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 # Allow direct execution
--- a/test/test_unicode_literals.py.disabled
+++ b/test/test_unicode_literals.py.disabled
--- a/test/test_update.py.disabled
+++ b/test/test_update.py.disabled
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 from __future__ import unicode_literals

--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
@@ -12,7 +12,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

 # Various small unit tests
 import io
-import itertools
 import json
 import xml.etree.ElementTree

@@ -67,7 +66,6 @@ from yt_dlp.utils import (
    sanitize_filename,
    sanitize_path,
    sanitize_url,
-    sanitized_Request,
    expand_path,
    prepend_extension,
    replace_extension,
@@ -109,7 +107,6 @@ from yt_dlp.utils import (
    cli_bool_option,
    parse_codecs,
    iri_to_uri,
-    LazyList,
 )
 from yt_dlp.compat import (
    compat_chr,
@@ -128,7 +125,6 @@ class TestUtil(unittest.TestCase):
        self.assertTrue(timeconvert('bougrg') is None)

    def test_sanitize_filename(self):
-        self.assertEqual(sanitize_filename(''), '')
        self.assertEqual(sanitize_filename('abc'), 'abc')
        self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e')

@@ -242,16 +238,6 @@ class TestUtil(unittest.TestCase):
        self.assertEqual(sanitize_url('httpss://foo.bar'), 'https://foo.bar')
        self.assertEqual(sanitize_url('rmtps://foo.bar'), 'rtmps://foo.bar')
        self.assertEqual(sanitize_url('https://foo.bar'), 'https://foo.bar')
-        self.assertEqual(sanitize_url('foo bar'), 'foo bar')
-
-    def test_extract_basic_auth(self):
-        auth_header = lambda url: sanitized_Request(url).get_header('Authorization')
-        self.assertFalse(auth_header('http://foo.bar'))
-        self.assertFalse(auth_header('http://:foo.bar'))
-        self.assertEqual(auth_header('http://@foo.bar'), 'Basic Og==')
-        self.assertEqual(auth_header('http://:pass@foo.bar'), 'Basic OnBhc3M=')
-        self.assertEqual(auth_header('http://user:@foo.bar'), 'Basic dXNlcjo=')
-        self.assertEqual(auth_header('http://user:pass@foo.bar'), 'Basic dXNlcjpwYXNz')

    def test_expand_path(self):
        def env(var):
@@ -1527,47 +1513,6 @@ Line 1
        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')

-    def test_LazyList(self):
-        it = list(range(10))
-
-        self.assertEqual(list(LazyList(it)), it)
-        self.assertEqual(LazyList(it).exhaust(), it)
-        self.assertEqual(LazyList(it)[5], it[5])
-
-        self.assertEqual(LazyList(it)[::2], it[::2])
-        self.assertEqual(LazyList(it)[1::2], it[1::2])
-        self.assertEqual(LazyList(it)[6:2:-2], it[6:2:-2])
-        self.assertEqual(LazyList(it)[::-1], it[::-1])
-
-        self.assertTrue(LazyList(it))
-        self.assertFalse(LazyList(range(0)))
-        self.assertEqual(len(LazyList(it)), len(it))
-        self.assertEqual(repr(LazyList(it)), repr(it))
-        self.assertEqual(str(LazyList(it)), str(it))
-
-        self.assertEqual(list(reversed(LazyList(it))), it[::-1])
-        self.assertEqual(list(reversed(LazyList(it))[1:3:7]), it[::-1][1:3:7])
-
-    def test_LazyList_laziness(self):
-
-        def test(ll, idx, val, cache):
-            self.assertEqual(ll[idx], val)
-            self.assertEqual(getattr(ll, '_LazyList__cache'), list(cache))
-
-        ll = LazyList(range(10))
-        test(ll, 0, 0, range(1))
-        test(ll, 5, 5, range(6))
-        test(ll, -3, 7, range(10))
-
-        ll = reversed(LazyList(range(10)))
-        test(ll, -1, 0, range(1))
-        test(ll, 3, 6, range(10))
-
-        ll = LazyList(itertools.count())
-        test(ll, 10, 10, range(11))
-        reversed(ll)
-        test(ll, -15, 14, range(15))
-

 if __name__ == '__main__':
    unittest.main()
--- a/test/test_verbose_output.py
+++ b/test/test_verbose_output.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
--- a/test/test_write_annotations.py
+++ b/test/test_write_annotations.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals

--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 # Allow direct execution
--- a/test/test_youtube_misc.py
+++ b/test/test_youtube_misc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 # Allow direct execution
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 from __future__ import unicode_literals

--- a/test/testdata/thumbnails/foo
+++ b/test/testdata/thumbnails/foo
--- a/yt_dlp/YoutubeDL.py
+++ b/yt_dlp/YoutubeDL.py
--- a/yt_dlp/init.py
+++ b/yt_dlp/init.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8

 from __future__ import unicode_literals
@@ -24,7 +24,6 @@ from .utils import (
    DateRange,
    decodeOption,
    DownloadError,
-    error_to_compat_str,
    ExistingVideoReached,
    expand_path,
    match_filter_func,
@@ -32,26 +31,20 @@ from .utils import (
    preferredencoding,
    read_batch_urls,
    RejectedVideoReached,
+    REMUX_EXTENSIONS,
    render_table,
    SameFileError,
    setproctitle,
    std_headers,
    write_string,
 )
-from .update import run_update
+from .update import update_self
 from .downloader import (
    FileDownloader,
 )
 from .extractor import gen_extractors, list_extractors
 from .extractor.common import InfoExtractor
 from .extractor.adobepass import MSO_INFO
-from .postprocessor.ffmpeg import (
-    FFmpegExtractAudioPP,
-    FFmpegSubtitlesConvertorPP,
-    FFmpegThumbnailsConvertorPP,
-    FFmpegVideoConvertorPP,
-    FFmpegVideoRemuxerPP,
-)
 from .postprocessor.metadatafromfield import MetadataFromFieldPP
 from .YoutubeDL import YoutubeDL

@@ -151,11 +144,6 @@ def _real_main(argv=None):
        if numeric_limit is None:
            parser.error('invalid rate limit specified')
        opts.ratelimit = numeric_limit
-    if opts.throttledratelimit is not None:
-        numeric_limit = FileDownloader.parse_bytes(opts.throttledratelimit)
-        if numeric_limit is None:
-            parser.error('invalid rate limit specified')
-        opts.throttledratelimit = numeric_limit
    if opts.min_filesize is not None:
        numeric_limit = FileDownloader.parse_bytes(opts.min_filesize)
        if numeric_limit is None:
@@ -221,25 +209,25 @@ def _real_main(argv=None):
    if opts.playlistend not in (-1, None) and opts.playlistend < opts.playliststart:
        raise ValueError('Playlist end must be greater than playlist start')
    if opts.extractaudio:
-        if opts.audioformat not in ['best'] + list(FFmpegExtractAudioPP.SUPPORTED_EXTS):
+        if opts.audioformat not in ['best', 'aac', 'flac', 'mp3', 'm4a', 'opus', 'vorbis', 'wav']:
            parser.error('invalid audio format specified')
    if opts.audioquality:
        opts.audioquality = opts.audioquality.strip('k').strip('K')
        if not opts.audioquality.isdigit():
            parser.error('invalid audio quality specified')
    if opts.recodevideo is not None:
-        opts.recodevideo = opts.recodevideo.replace(' ', '')
-        if not re.match(FFmpegVideoConvertorPP.FORMAT_RE, opts.recodevideo):
-            parser.error('invalid video remux format specified')
+        if opts.recodevideo not in REMUX_EXTENSIONS:
+            parser.error('invalid video recode format specified')
    if opts.remuxvideo is not None:
        opts.remuxvideo = opts.remuxvideo.replace(' ', '')
-        if not re.match(FFmpegVideoRemuxerPP.FORMAT_RE, opts.remuxvideo):
+        remux_regex = r'{0}(?:/{0})*$'.format(r'(?:\w+>)?(?:%s)' % '|'.join(REMUX_EXTENSIONS))
+        if not re.match(remux_regex, opts.remuxvideo):
            parser.error('invalid video remux format specified')
    if opts.convertsubtitles is not None:
-        if opts.convertsubtitles not in FFmpegSubtitlesConvertorPP.SUPPORTED_EXTS:
+        if opts.convertsubtitles not in ('srt', 'vtt', 'ass', 'lrc'):
            parser.error('invalid subtitle format specified')
    if opts.convertthumbnails is not None:
-        if opts.convertthumbnails not in FFmpegThumbnailsConvertorPP.SUPPORTED_EXTS:
+        if opts.convertthumbnails not in ('jpg', ):
            parser.error('invalid thumbnail format specified')

    if opts.date is not None:
@@ -270,10 +258,9 @@ def _real_main(argv=None):
        return parsed_compat_opts

    all_compat_opts = [
-        'filename', 'format-sort', 'abort-on-error', 'format-spec', 'no-playlist-metafiles',
-        'multistreams', 'no-live-chat', 'playlist-index', 'list-formats', 'no-direct-merge',
+        'filename', 'format-sort', 'abort-on-error', 'format-spec', 'multistreams',
+        'no-playlist-metafiles', 'no-live-chat', 'playlist-index', 'list-formats',
        'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-attach-info-json',
-        'embed-thumbnail-atomicparsley',
    ]
    compat_opts = parse_compat_opts()

@@ -314,16 +301,6 @@ def _real_main(argv=None):
        else:
            _unused_compat_opt('filename')

-    def validate_outtmpl(tmpl, msg):
-        err = YoutubeDL.validate_outtmpl(tmpl)
-        if err:
-            parser.error('invalid %s %r: %s' % (msg, tmpl, error_to_compat_str(err)))
-
-    for k, tmpl in opts.outtmpl.items():
-        validate_outtmpl(tmpl, '%s output template' % k)
-    for tmpl in opts.forceprint:
-        validate_outtmpl(tmpl, 'print template')
-
    if opts.extractaudio and not opts.keepvideo and opts.format is None:
        opts.format = 'bestaudio/best'

@@ -503,10 +480,10 @@ def _real_main(argv=None):
        opts.postprocessor_args['default'] = opts.postprocessor_args['default-compat']

    final_ext = (
-        opts.recodevideo if opts.recodevideo in FFmpegVideoConvertorPP.SUPPORTED_EXTS
-        else opts.remuxvideo if opts.remuxvideo in FFmpegVideoRemuxerPP.SUPPORTED_EXTS
-        else opts.audioformat if (opts.extractaudio and opts.audioformat != 'best')
-        else None)
+        opts.recodevideo
+        or (opts.remuxvideo in REMUX_EXTENSIONS) and opts.remuxvideo
+        or (opts.extractaudio and opts.audioformat != 'best') and opts.audioformat
+        or None)

    match_filter = (
        None if opts.match_filter is None
@@ -557,7 +534,6 @@ def _real_main(argv=None):
        'ignoreerrors': opts.ignoreerrors,
        'force_generic_extractor': opts.force_generic_extractor,
        'ratelimit': opts.ratelimit,
-        'throttledratelimit': opts.throttledratelimit,
        'overwrites': opts.overwrites,
        'retries': opts.retries,
        'fragment_retries': opts.fragment_retries,
@@ -681,7 +657,7 @@ def _real_main(argv=None):
        # Update version
        if opts.update_self:
            # If updater returns True, exit. Required for windows
-            if run_update(ydl):
+            if update_self(ydl.to_screen, opts.verbose, ydl._opener):
                if actual_use:
                    sys.exit('ERROR: The program must exit for the update to complete')
                sys.exit()
--- a/yt_dlp/main.py
+++ b/yt_dlp/main.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals

 # Execute with
--- a/yt_dlp/compat.py
+++ b/yt_dlp/compat.py
@@ -3030,21 +3030,6 @@ except AttributeError:
    compat_Match = type(re.compile('').match(''))


-import asyncio
-try:
-    compat_asyncio_run = asyncio.run
-except AttributeError:
-    def compat_asyncio_run(coro):
-        try:
-            loop = asyncio.get_event_loop()
-        except RuntimeError:
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-        loop.run_until_complete(coro)
-
-    asyncio.run = compat_asyncio_run
-
-
 __all__ = [
    'compat_HTMLParseError',
    'compat_HTMLParser',
@@ -3052,7 +3037,6 @@ __all__ = [
    'compat_Match',
    'compat_Pattern',
    'compat_Struct',
-    'compat_asyncio_run',
    'compat_b64decode',
    'compat_basestring',
    'compat_chr',
--- a/yt_dlp/downloader/init.py
+++ b/yt_dlp/downloader/init.py
@@ -22,10 +22,8 @@ from .http import HttpFD
 from .rtmp import RtmpFD
 from .rtsp import RtspFD
 from .ism import IsmFD
-from .mhtml import MhtmlFD
 from .niconico import NiconicoDmcFD
-from .websocket import WebSocketFragmentFD
-from .youtube_live_chat import YoutubeLiveChatFD
+from .youtube_live_chat import YoutubeLiveChatReplayFD
 from .external import (
    get_external_downloader,
    FFmpegFD,
@@ -41,11 +39,8 @@ PROTOCOL_MAP = {
    'f4m': F4mFD,
    'http_dash_segments': DashSegmentsFD,
    'ism': IsmFD,
-    'mhtml': MhtmlFD,
    'niconico_dmc': NiconicoDmcFD,
-    'websocket_frag': WebSocketFragmentFD,
-    'youtube_live_chat': YoutubeLiveChatFD,
-    'youtube_live_chat_replay': YoutubeLiveChatFD,
+    'youtube_live_chat_replay': YoutubeLiveChatReplayFD,
 }


@@ -55,7 +50,6 @@ def shorten_protocol_name(proto, simplify=False):
        'rtmp_ffmpeg': 'rtmp_f',
        'http_dash_segments': 'dash',
        'niconico_dmc': 'dmc',
-        'websocket_frag': 'WSfrag',
    }
    if simplify:
        short_protocol_names.update({
--- a/yt_dlp/downloader/common.py
+++ b/yt_dlp/downloader/common.py
@@ -32,7 +32,6 @@ class FileDownloader(object):
    verbose:            Print additional info to stdout.
    quiet:              Do not print messages to stdout.
    ratelimit:          Download speed limit, in bytes/sec.
-    throttledratelimit: Assume the download is being throttled below this speed (bytes/sec)
    retries:            Number of times to retry for HTTP error 5xx
    buffersize:         Size of download buffer in bytes.
    noresizebuffer:     Do not automatically resize the download buffer.
--- a/yt_dlp/downloader/dash.py
+++ b/yt_dlp/downloader/dash.py
@@ -1,9 +1,21 @@
 from __future__ import unicode_literals

+import errno
+try:
+    import concurrent.futures
+    can_threaded_download = True
+except ImportError:
+    can_threaded_download = False
+
 from ..downloader import _get_real_downloader
 from .fragment import FragmentFD

-from ..utils import urljoin
+from ..compat import compat_urllib_error
+from ..utils import (
+    DownloadError,
+    sanitize_open,
+    urljoin,
+)


 class DashSegmentsFD(FragmentFD):
@@ -31,6 +43,9 @@ class DashSegmentsFD(FragmentFD):
        else:
            self._prepare_and_start_frag_download(ctx)

+        fragment_retries = self.params.get('fragment_retries', 0)
+        skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
+
        fragments_to_download = []
        frag_index = 0
        for i, fragment in enumerate(fragments):
@@ -61,5 +76,111 @@ class DashSegmentsFD(FragmentFD):
            if not success:
                return False
        else:
-            self.download_and_append_fragments(ctx, fragments_to_download, info_dict)
+            def download_fragment(fragment):
+                i = fragment['index']
+                frag_index = fragment['frag_index']
+                fragment_url = fragment['url']
+
+                ctx['fragment_index'] = frag_index
+
+                # In DASH, the first segment contains necessary headers to
+                # generate a valid MP4 file, so always abort for the first segment
+                fatal = i == 0 or not skip_unavailable_fragments
+                count = 0
+                while count <= fragment_retries:
+                    try:
+                        success, frag_content = self._download_fragment(ctx, fragment_url, info_dict)
+                        if not success:
+                            return False, frag_index
+                        break
+                    except compat_urllib_error.HTTPError as err:
+                        # YouTube may often return 404 HTTP error for a fragment causing the
+                        # whole download to fail. However if the same fragment is immediately
+                        # retried with the same request data this usually succeeds (1-2 attempts
+                        # is usually enough) thus allowing to download the whole file successfully.
+                        # To be future-proof we will retry all fragments that fail with any
+                        # HTTP error.
+                        count += 1
+                        if count <= fragment_retries:
+                            self.report_retry_fragment(err, frag_index, count, fragment_retries)
+                    except DownloadError:
+                        # Don't retry fragment if error occurred during HTTP downloading
+                        # itself since it has own retry settings
+                        if not fatal:
+                            break
+                        raise
+
+                if count > fragment_retries:
+                    if not fatal:
+                        return False, frag_index
+                    ctx['dest_stream'].close()
+                    self.report_error('Giving up after %s fragment retries' % fragment_retries)
+                    return False, frag_index
+
+                return frag_content, frag_index
+
+            def append_fragment(frag_content, frag_index):
+                fatal = frag_index == 1 or not skip_unavailable_fragments
+                if frag_content:
+                    fragment_filename = '%s-Frag%d' % (ctx['tmpfilename'], frag_index)
+                    try:
+                        file, frag_sanitized = sanitize_open(fragment_filename, 'rb')
+                        ctx['fragment_filename_sanitized'] = frag_sanitized
+                        file.close()
+                        self._append_fragment(ctx, frag_content)
+                        return True
+                    except EnvironmentError as ose:
+                        if ose.errno != errno.ENOENT:
+                            raise
+                        # FileNotFoundError
+                        if not fatal:
+                            self.report_skip_fragment(frag_index)
+                            return True
+                        else:
+                            ctx['dest_stream'].close()
+                            self.report_error(
+                                'fragment %s not found, unable to continue' % frag_index)
+                            return False
+                else:
+                    if not fatal:
+                        self.report_skip_fragment(frag_index)
+                        return True
+                    else:
+                        ctx['dest_stream'].close()
+                        self.report_error(
+                            'fragment %s not found, unable to continue' % frag_index)
+                        return False
+
+            max_workers = self.params.get('concurrent_fragment_downloads', 1)
+            if can_threaded_download and max_workers > 1:
+                self.report_warning('The download speed shown is only of one thread. This is a known issue')
+                with concurrent.futures.ThreadPoolExecutor(max_workers) as pool:
+                    futures = [pool.submit(download_fragment, fragment) for fragment in fragments_to_download]
+                    # timeout must be 0 to return instantly
+                    done, not_done = concurrent.futures.wait(futures, timeout=0)
+                    try:
+                        while not_done:
+                            # Check every 1 second for KeyboardInterrupt
+                            freshly_done, not_done = concurrent.futures.wait(not_done, timeout=1)
+                            done |= freshly_done
+                    except KeyboardInterrupt:
+                        for future in not_done:
+                            future.cancel()
+                        # timeout must be none to cancel
+                        concurrent.futures.wait(not_done, timeout=None)
+                        raise KeyboardInterrupt
+                results = [future.result() for future in futures]
+
+                for frag_content, frag_index in results:
+                    result = append_fragment(frag_content, frag_index)
+                    if not result:
+                        return False
+            else:
+                for fragment in fragments_to_download:
+                    frag_content, frag_index = download_fragment(fragment)
+                    result = append_fragment(frag_content, frag_index)
+                    if not result:
+                        return False
+
+            self._finish_frag_download(ctx)
        return True
--- a/yt_dlp/downloader/external.py
+++ b/yt_dlp/downloader/external.py
@@ -280,8 +280,6 @@ class Aria2cFD(ExternalFD):
               '--file-allocation=none', '-x16', '-j16', '-s16']
        if 'fragments' in info_dict:
            cmd += ['--allow-overwrite=true', '--allow-piece-length-change=true']
-        else:
-            cmd += ['--min-split-size', '1M']

        if info_dict.get('http_headers') is not None:
            for key, val in info_dict['http_headers'].items():
@@ -347,12 +345,8 @@ class FFmpegFD(ExternalFD):
        # TODO: Fix path for ffmpeg
        return FFmpegPostProcessor().available

-    def on_process_started(self, proc, stdin):
-        """ Override this in subclasses  """
-        pass
-
    def _call_downloader(self, tmpfilename, info_dict):
-        urls = [f['url'] for f in info_dict.get('requested_formats', [])] or [info_dict['url']]
+        url = info_dict['url']
        ffpp = FFmpegPostProcessor(downloader=self)
        if not ffpp.available:
            self.report_error('m3u8 download detected but ffmpeg could not be found. Please install')
@@ -365,8 +359,6 @@ class FFmpegFD(ExternalFD):
            if self.params.get(log_level, False):
                args += ['-loglevel', log_level]
                break
-        if not self.params.get('verbose'):
-            args += ['-hide_banner']

        seekable = info_dict.get('_seekable')
        if seekable is not None:
@@ -386,7 +378,7 @@ class FFmpegFD(ExternalFD):
        # if end_time:
        #     args += ['-t', compat_str(end_time - start_time)]

-        if info_dict.get('http_headers') is not None and re.match(r'^https?://', urls[0]):
+        if info_dict.get('http_headers') is not None and re.match(r'^https?://', url):
            # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
            # [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
            headers = handle_youtubedl_headers(info_dict['http_headers'])
@@ -444,15 +436,7 @@ class FFmpegFD(ExternalFD):
            elif isinstance(conn, compat_str):
                args += ['-rtmp_conn', conn]

-        for url in urls:
-            args += ['-i', url]
-        args += ['-c', 'copy']
-        if info_dict.get('requested_formats'):
-            for (i, fmt) in enumerate(info_dict['requested_formats']):
-                if fmt.get('acodec') != 'none':
-                    args.extend(['-map', '%d:a:0' % i])
-                if fmt.get('vcodec') != 'none':
-                    args.extend(['-map', '%d:v:0' % i])
+        args += ['-i', url, '-c', 'copy']

        if self.params.get('test', False):
            args += ['-fs', compat_str(self._TEST_FILE_SIZE)]
@@ -478,8 +462,6 @@ class FFmpegFD(ExternalFD):
        self._debug_cmd(args)

        proc = subprocess.Popen(args, stdin=subprocess.PIPE, env=env)
-        if url in ('-', 'pipe:'):
-            self.on_process_started(proc, proc.stdin)
        try:
            retval = proc.wait()
        except BaseException as e:
@@ -488,7 +470,7 @@ class FFmpegFD(ExternalFD):
            # produces a file that is playable (this is mostly useful for live
            # streams). Note that Windows is not affected and produces playable
            # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
-            if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32' and url not in ('-', 'pipe:'):
+            if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32':
                process_communicate_or_kill(proc, b'q')
            else:
                proc.kill()
--- a/yt_dlp/downloader/fragment.py
+++ b/yt_dlp/downloader/fragment.py
@@ -4,26 +4,9 @@ import os
 import time
 import json

-try:
-    from Crypto.Cipher import AES
-    can_decrypt_frag = True
-except ImportError:
-    can_decrypt_frag = False
-
-try:
-    import concurrent.futures
-    can_threaded_download = True
-except ImportError:
-    can_threaded_download = False
-
 from .common import FileDownloader
 from .http import HttpFD
-from ..compat import (
-    compat_urllib_error,
-    compat_struct_pack,
-)
 from ..utils import (
-    DownloadError,
    error_to_compat_str,
    encodeFilename,
    sanitize_open,
@@ -73,7 +56,7 @@ class FragmentFD(FileDownloader):

    def report_retry_fragment(self, err, frag_index, count, retries):
        self.to_screen(
-            '\r[download] Got server HTTP error: %s. Retrying fragment %d (attempt %d of %s) ...'
+            '[download] Got server HTTP error: %s. Retrying fragment %d (attempt %d of %s) ...'
            % (error_to_compat_str(err), frag_index, count, self.format_retries(retries)))

    def report_skip_fragment(self, frag_index):
@@ -129,15 +112,11 @@ class FragmentFD(FileDownloader):
            return False, None
        if fragment_info_dict.get('filetime'):
            ctx['fragment_filetime'] = fragment_info_dict.get('filetime')
-        ctx['fragment_filename_sanitized'] = fragment_filename
-        return True, self._read_fragment(ctx)
-
-    def _read_fragment(self, ctx):
-        down, frag_sanitized = sanitize_open(ctx['fragment_filename_sanitized'], 'rb')
+        down, frag_sanitized = sanitize_open(fragment_filename, 'rb')
        ctx['fragment_filename_sanitized'] = frag_sanitized
        frag_content = down.read()
        down.close()
-        return frag_content
+        return True, frag_content

    def _append_fragment(self, ctx, frag_content):
        try:
@@ -325,106 +304,3 @@ class FragmentFD(FileDownloader):
            'tmpfilename': tmpfilename,
            'fragment_index': 0,
        })
-
-    def download_and_append_fragments(self, ctx, fragments, info_dict, pack_func=None):
-        fragment_retries = self.params.get('fragment_retries', 0)
-        skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
-        test = self.params.get('test', False)
-        if not pack_func:
-            pack_func = lambda frag_content, _: frag_content
-
-        def download_fragment(fragment, ctx):
-            frag_index = ctx['fragment_index'] = fragment['frag_index']
-            headers = info_dict.get('http_headers', {})
-            byte_range = fragment.get('byte_range')
-            if byte_range:
-                headers['Range'] = 'bytes=%d-%d' % (byte_range['start'], byte_range['end'] - 1)
-
-            # Never skip the first fragment
-            fatal = (fragment.get('index') or frag_index) == 0 or not skip_unavailable_fragments
-            count, frag_content = 0, None
-            while count <= fragment_retries:
-                try:
-                    success, frag_content = self._download_fragment(ctx, fragment['url'], info_dict, headers)
-                    if not success:
-                        return False, frag_index
-                    break
-                except compat_urllib_error.HTTPError as err:
-                    # Unavailable (possibly temporary) fragments may be served.
-                    # First we try to retry then either skip or abort.
-                    # See https://github.com/ytdl-org/youtube-dl/issues/10165,
-                    # https://github.com/ytdl-org/youtube-dl/issues/10448).
-                    count += 1
-                    if count <= fragment_retries:
-                        self.report_retry_fragment(err, frag_index, count, fragment_retries)
-                except DownloadError:
-                    # Don't retry fragment if error occurred during HTTP downloading
-                    # itself since it has own retry settings
-                    if not fatal:
-                        break
-                    raise
-
-            if count > fragment_retries:
-                if not fatal:
-                    return False, frag_index
-                ctx['dest_stream'].close()
-                self.report_error('Giving up after %s fragment retries' % fragment_retries)
-                return False, frag_index
-            return frag_content, frag_index
-
-        def decrypt_fragment(fragment, frag_content):
-            decrypt_info = fragment.get('decrypt_info')
-            if not decrypt_info or decrypt_info['METHOD'] != 'AES-128':
-                return frag_content
-            iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', fragment['media_sequence'])
-            decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(
-                self._prepare_url(info_dict, info_dict.get('_decryption_key_url') or decrypt_info['URI'])).read()
-            # Don't decrypt the content in tests since the data is explicitly truncated and it's not to a valid block
-            # size (see https://github.com/ytdl-org/youtube-dl/pull/27660). Tests only care that the correct data downloaded,
-            # not what it decrypts to.
-            if test:
-                return frag_content
-            return AES.new(decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
-
-        def append_fragment(frag_content, frag_index, ctx):
-            if not frag_content:
-                fatal = frag_index == 1 or not skip_unavailable_fragments
-                if not fatal:
-                    self.report_skip_fragment(frag_index)
-                    return True
-                else:
-                    ctx['dest_stream'].close()
-                    self.report_error(
-                        'fragment %s not found, unable to continue' % frag_index)
-                    return False
-            self._append_fragment(ctx, pack_func(frag_content, frag_index))
-            return True
-
-        max_workers = self.params.get('concurrent_fragment_downloads', 1)
-        if can_threaded_download and max_workers > 1:
-
-            def _download_fragment(fragment):
-                try:
-                    ctx_copy = ctx.copy()
-                    frag_content, frag_index = download_fragment(fragment, ctx_copy)
-                    return fragment, frag_content, frag_index, ctx_copy.get('fragment_filename_sanitized')
-                except Exception:
-                    # Return immediately on exception so that it is raised in the main thread
-                    return
-
-            self.report_warning('The download speed shown is only of one thread. This is a known issue and patches are welcome')
-            with concurrent.futures.ThreadPoolExecutor(max_workers) as pool:
-                for fragment, frag_content, frag_index, frag_filename in pool.map(_download_fragment, fragments):
-                    ctx['fragment_filename_sanitized'] = frag_filename
-                    ctx['fragment_index'] = frag_index
-                    result = append_fragment(decrypt_fragment(fragment, frag_content), frag_index, ctx)
-                    if not result:
-                        return False
-        else:
-            for fragment in fragments:
-                frag_content, frag_index = download_fragment(fragment, ctx)
-                result = append_fragment(decrypt_fragment(fragment, frag_content), frag_index, ctx)
-                if not result:
-                    return False
-
-        self._finish_frag_download(ctx)
--- a/yt_dlp/downloader/hls.py
+++ b/yt_dlp/downloader/hls.py
@@ -1,18 +1,32 @@
 from __future__ import unicode_literals

+import errno
 import re
 import io
 import binascii
+try:
+    from Crypto.Cipher import AES
+    can_decrypt_frag = True
+except ImportError:
+    can_decrypt_frag = False
+try:
+    import concurrent.futures
+    can_threaded_download = True
+except ImportError:
+    can_threaded_download = False

 from ..downloader import _get_real_downloader
-from .fragment import FragmentFD, can_decrypt_frag
+from .fragment import FragmentFD
 from .external import FFmpegFD

 from ..compat import (
+    compat_urllib_error,
    compat_urlparse,
+    compat_struct_pack,
 )
 from ..utils import (
    parse_m3u8_attributes,
+    sanitize_open,
    update_url_query,
    bug_reports_message,
 )
@@ -67,6 +81,8 @@ class HlsFD(FragmentFD):
        man_url = info_dict['url']
        self.to_screen('[%s] Downloading m3u8 manifest' % self.FD_NAME)

+        is_webvtt = info_dict['ext'] == 'vtt'
+
        urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))
        man_url = urlh.geturl()
        s = urlh.read().decode('utf-8', 'ignore')
@@ -85,11 +101,7 @@ class HlsFD(FragmentFD):
            #     fd.add_progress_hook(ph)
            return fd.real_download(filename, info_dict)

-        is_webvtt = info_dict['ext'] == 'vtt'
-        if is_webvtt:
-            real_downloader = None  # Packing the fragments is not currently supported for external downloader
-        else:
-            real_downloader = _get_real_downloader(info_dict, 'm3u8_frag_urls', self.params, None)
+        real_downloader = _get_real_downloader(info_dict, 'm3u8_frag_urls', self.params, None)
        if real_downloader and not real_downloader.supports_manifest(s):
            real_downloader = None
        if real_downloader:
@@ -137,6 +149,10 @@ class HlsFD(FragmentFD):

        extra_state = ctx.setdefault('extra_state', {})

+        fragment_retries = self.params.get('fragment_retries', 0)
+        skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
+        test = self.params.get('test', False)
+
        format_index = info_dict.get('format_index')
        extra_query = None
        extra_param_to_segment_url = info_dict.get('extra_param_to_segment_url')
@@ -240,7 +256,7 @@ class HlsFD(FragmentFD):
                media_sequence += 1

        # We only download the first fragment during the test
-        if self.params.get('test', False):
+        if test:
            fragments = [fragments[0] if fragments else None]

        if real_downloader:
@@ -254,6 +270,54 @@ class HlsFD(FragmentFD):
            if not success:
                return False
        else:
+            def download_fragment(fragment):
+                frag_index = fragment['frag_index']
+                frag_url = fragment['url']
+                decrypt_info = fragment['decrypt_info']
+                byte_range = fragment['byte_range']
+                media_sequence = fragment['media_sequence']
+
+                ctx['fragment_index'] = frag_index
+
+                count = 0
+                headers = info_dict.get('http_headers', {})
+                if byte_range:
+                    headers['Range'] = 'bytes=%d-%d' % (byte_range['start'], byte_range['end'] - 1)
+                while count <= fragment_retries:
+                    try:
+                        success, frag_content = self._download_fragment(
+                            ctx, frag_url, info_dict, headers)
+                        if not success:
+                            return False, frag_index
+                        break
+                    except compat_urllib_error.HTTPError as err:
+                        # Unavailable (possibly temporary) fragments may be served.
+                        # First we try to retry then either skip or abort.
+                        # See https://github.com/ytdl-org/youtube-dl/issues/10165,
+                        # https://github.com/ytdl-org/youtube-dl/issues/10448).
+                        count += 1
+                        if count <= fragment_retries:
+                            self.report_retry_fragment(err, frag_index, count, fragment_retries)
+                if count > fragment_retries:
+                    ctx['dest_stream'].close()
+                    self.report_error('Giving up after %s fragment retries' % fragment_retries)
+                    return False, frag_index
+
+                if decrypt_info['METHOD'] == 'AES-128':
+                    iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', media_sequence)
+                    decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(
+                        self._prepare_url(info_dict, info_dict.get('_decryption_key_url') or decrypt_info['URI'])).read()
+                    # Don't decrypt the content in tests since the data is explicitly truncated and it's not to a valid block
+                    # size (see https://github.com/ytdl-org/youtube-dl/pull/27660). Tests only care that the correct data downloaded,
+                    # not what it decrypts to.
+                    if not test:
+                        frag_content = AES.new(
+                            decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
+
+                return frag_content, frag_index
+
+            pack_fragment = lambda frag_content, _: frag_content
+
            if is_webvtt:
                def pack_fragment(frag_content, frag_index):
                    output = io.StringIO()
@@ -321,7 +385,70 @@ class HlsFD(FragmentFD):
                        block.write_into(output)

                    return output.getvalue().encode('utf-8')
+
+            def append_fragment(frag_content, frag_index):
+                fatal = frag_index == 1 or not skip_unavailable_fragments
+                if frag_content:
+                    fragment_filename = '%s-Frag%d' % (ctx['tmpfilename'], frag_index)
+                    try:
+                        file, frag_sanitized = sanitize_open(fragment_filename, 'rb')
+                        ctx['fragment_filename_sanitized'] = frag_sanitized
+                        file.close()
+                        frag_content = pack_fragment(frag_content, frag_index)
+                        self._append_fragment(ctx, frag_content)
+                        return True
+                    except EnvironmentError as ose:
+                        if ose.errno != errno.ENOENT:
+                            raise
+                        # FileNotFoundError
+                        if not fatal:
+                            self.report_skip_fragment(frag_index)
+                            return True
+                        else:
+                            ctx['dest_stream'].close()
+                            self.report_error(
+                                'fragment %s not found, unable to continue' % frag_index)
+                            return False
+                else:
+                    if not fatal:
+                        self.report_skip_fragment(frag_index)
+                        return True
+                    else:
+                        ctx['dest_stream'].close()
+                        self.report_error(
+                            'fragment %s not found, unable to continue' % frag_index)
+                        return False
+
+            max_workers = self.params.get('concurrent_fragment_downloads', 1)
+            if can_threaded_download and max_workers > 1:
+                self.report_warning('The download speed shown is only of one thread. This is a known issue')
+                with concurrent.futures.ThreadPoolExecutor(max_workers) as pool:
+                    futures = [pool.submit(download_fragment, fragment) for fragment in fragments]
+                    # timeout must be 0 to return instantly
+                    done, not_done = concurrent.futures.wait(futures, timeout=0)
+                    try:
+                        while not_done:
+                            # Check every 1 second for KeyboardInterrupt
+                            freshly_done, not_done = concurrent.futures.wait(not_done, timeout=1)
+                            done |= freshly_done
+                    except KeyboardInterrupt:
+                        for future in not_done:
+                            future.cancel()
+                        # timeout must be none to cancel
+                        concurrent.futures.wait(not_done, timeout=None)
+                        raise KeyboardInterrupt
+                results = [future.result() for future in futures]
+
+                for frag_content, frag_index in results:
+                    result = append_fragment(frag_content, frag_index)
+                    if not result:
+                        return False
            else:
-                pack_fragment = None
-            self.download_and_append_fragments(ctx, fragments, info_dict, pack_fragment)
+                for fragment in fragments:
+                    frag_content, frag_index = download_fragment(fragment)
+                    result = append_fragment(frag_content, frag_index)
+                    if not result:
+                        return False
+
+            self._finish_frag_download(ctx)
        return True
--- a/yt_dlp/downloader/http.py
+++ b/yt_dlp/downloader/http.py
@@ -18,7 +18,6 @@ from ..utils import (
    int_or_none,
    sanitize_open,
    sanitized_Request,
-    ThrottledDownload,
    write_xattr,
    XAttrMetadataError,
    XAttrUnavailableError,
@@ -224,7 +223,6 @@ class HttpFD(FileDownloader):
            # measure time over whole while-loop, so slow_down() and best_block_size() work together properly
            now = None  # needed for slow_down() in the first loop run
            before = start  # start measuring
-            throttle_start = None

            def retry(e):
                to_stdout = ctx.tmpfilename == '-'
@@ -315,18 +313,6 @@ class HttpFD(FileDownloader):
                if data_len is not None and byte_counter == data_len:
                    break

-                if speed and speed < (self.params.get('throttledratelimit') or 0):
-                    # The speed must stay below the limit for 3 seconds
-                    # This prevents raising error when the speed temporarily goes down
-                    if throttle_start is None:
-                        throttle_start = now
-                    elif now - throttle_start > 3:
-                        if ctx.stream is not None and ctx.tmpfilename != '-':
-                            ctx.stream.close()
-                        raise ThrottledDownload()
-                else:
-                    throttle_start = None
-
            if not is_test and ctx.chunk_size and ctx.data_len is not None and byte_counter < ctx.data_len:
                ctx.resume_len = byte_counter
                # ctx.block_size = block_size
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pukkandan	65075de35b	Release 2021.05.20	2021-05-20 19:20:07 +05:30
Lukas Anzinger	50755db160	Update to ytdl-commit-dfbbe29 [redbulltv] fix embed data extraction `dfbbe2902f`	2021-05-20 19:17:17 +05:30