Release 2021.03.03

.gitattributes

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

.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.23. 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.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
 - Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -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.23**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar issues including closed ones
@@ -42,9 +42,9 @@ Provide the complete verbose output of yt-dlp that clearly demonstrates the prob
 Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
- [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKc']
+ [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.23
+ [debug] yt-dlp version 2021.03.01
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}

.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.23. 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.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/yt-dlp/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
 - Search the bugtracker for similar site support requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -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.23**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that none of provided URLs violate any copyrights
 - [ ] I've searched the bugtracker for similar site support requests including closed ones

.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.23. 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.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar site feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
 - [ ] I'm reporting a site feature request
-- [ ] I've verified that I'm running yt-dlp version **2021.06.23**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've searched the bugtracker for similar site feature requests including closed ones
 
 

.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.23. 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.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
 - Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -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.23**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar bug reports including closed ones
@@ -44,9 +44,9 @@ Provide the complete verbose output of yt-dlp that clearly demonstrates the prob
 Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
- [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKc']
+ [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.23
+ [debug] yt-dlp version 2021.03.01
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}

.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.23. 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.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
 - [ ] I'm reporting a feature request
-- [ ] I've verified that I'm running yt-dlp version **2021.06.23**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've searched the bugtracker for similar feature requests including closed ones
 
 

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md

@@ -42,7 +42,7 @@ Provide the complete verbose output of yt-dlp that clearly demonstrates the prob
 Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
- [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKc']
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
  [debug] yt-dlp version %(version)s
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md

@@ -44,7 +44,7 @@ Provide the complete verbose output of yt-dlp that clearly demonstrates the prob
 Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
- [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKc']
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
  [debug] yt-dlp version %(version)s
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2

.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 yt-dlp
     - 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

.github/workflows/core.yml

@@ -6,28 +6,49 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os: [ubuntu-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 http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
+        java -jar jython-installer.jar -s -d "$HOME/jython"
+        echo "$HOME/jython/bin" >> $GITHUB_PATH
     - name: Install nose
       run: pip install nose
     - name: Run tests
-      continue-on-error: False
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
       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

.github/workflows/download.yml

@@ -9,22 +9,45 @@ 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 http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
+        java -jar jython-installer.jar -s -d "$HOME/jython"
+        echo "$HOME/jython/bin" >> $GITHUB_PATH
     - name: Install nose
       run: pip install nose
     - name: Run tests
-      continue-on-error: true
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
       env:
-        YTDL_TEST_SET: download
+        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
       run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}

.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,47 @@ README.txt
 yt-dlp.zip
 *.exe
 
+# Downloaded
+*.srt
+*.ttml
+*.sbv
+*.vtt
+*.flv
+*.mp4
+*.m4a
+*.m4v
+*.mp3
+*.3gp
+*.webm
+*.wav
+*.ape
+*.mkv
+*.swf
+*.part
+*.ytdl
+*.dump
+*.frag
+*.frag.urls
+*.aria2
+*.swp
+*.ogg
+*.opus
+*.info.json
+*.live_chat.json
+*.jpg
+*.png
+*.webp
+*.annotations.xml
+*.description
+
+# Config
+*.conf
+*.spec
+cookies
+cookies.txt
+
+
+
 # Text Editor / IDE
 .idea
 *.iml

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 $ youtube-dl -v <your command line>
 [debug] System config: []
 [debug] User config: []
-[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=BaW_jenozKc']
+[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=BaW_jenozKcj']
 [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
 [debug] youtube-dl version 2015.12.06
 [debug] Git HEAD: 135392e

CONTRIBUTORS

@@ -1,7 +1,5 @@
 pukkandan (owner)
 shirt-dev (collaborator)
-colethedj (collaborator)
-Ashish0804 (collaborator)
 h-h-h-h
 pauldubois98
 nixxo
@@ -21,40 +19,12 @@ FelixFrog
 Zocker1999NET
 nao20010128nao
 kurumigi
+tsukumi
 bbepis
-animelover1984
 Pccode66
+Ashish
 RobinD42
 hseg
+colethedj
 DennyDai
 codeasashu
-teesid
-kevinoconnor7
-damianoamatruda
-2ShedsJackson
-CXwudi
-xtkoba
-llacb47
-hheimbuerger
-B0pol
-lkho
-fstirlitz
-Lamieur
-tsukumijima
-Hadi0609
-b5eff52
-craftingmod
-tpikonen
-tripulse
-king-millez
-alex-gedeon
-hhirtz
-louie-github
-MinePlayersPE
-olifre
-rhsmachine/zenerdi0de
-nihil-admirari
-krichbanana
-ohmybahgosh
-nyuszika7h
-blackjack4494

Changelog.md

@@ -6,11 +6,9 @@
 * Run `make doc`
 * Update Changelog.md and CONTRIBUTORS
 * Change "Merged with ytdl" version in Readme.md if needed
-* Add new/fixed extractors in "new features" section of Readme.md
 * 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`
+* Push to origin/release - build task will now run
+* 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,432 +17,16 @@
 -->
 
 
-### 2021.07.07
-
-* Merge youtube-dl: Upto [commit/a803582](https://github.com/ytdl-org/youtube-dl/commit/a8035827177d6b59aca03bd717acb6a9bdd75ada)
-* Add `--extractor-args` to pass extractor-specific arguments
-    * Add extractor option `skip` for `youtube`. Eg: `--extractor-args youtube:skip=hls,dash`
-    * Deprecates --youtube-skip-dash-manifest, --youtube-skip-hls-manifest, --youtube-include-dash-manifest, --youtube-include-hls-manifest
-* Allow `--list...` options to work with `--print`, `--quiet` and other `--list...` options
-* [youtube] Use `player` API for additional video extraction requests by [colethedj](https://github.com/colethedj)
-    * **Fixes youtube premium music** (format 141) extraction
-    * Adds extractor option `player_client` = `web`/`android`
-        * **`--extractor-args youtube:player_client=android` works around the throttling** for the time-being
-    * Adds extractor option `player_skip=config`
-    * Adds age-gate fallback using embedded client
-* [youtube] Choose correct Live chat API for upcoming streams by [krichbanana](https://github.com/krichbanana)
-* [youtube] Fix subtitle names for age-gated videos
-* [youtube:comments] Fix error handling and add `itct` to params by [colethedj](https://github.com/colethedj)
-* [youtube_live_chat] Fix download with cookies by [siikamiika](https://github.com/siikamiika)
-* [youtube_live_chat] use `clickTrackingParams` by [siikamiika](https://github.com/siikamiika)
-* [Funimation] Rewrite extractor
-    * Add `FunimationShowIE` by [Mevious](https://github.com/Mevious)
-    * **Treat the different versions of an episode as different formats of a single video**
-        * This changes the video `id` and will break break existing archives
-        * Compat option `seperate-video-versions` to fall back to old behavior including using the old video ids
-    * Support direct `/player/` URL
-    * Extractor options `language` and `version` to pre-select them during extraction
-        * These options may be removed in the future if we can extract all formats without additional network requests
-        * Do not rely on these for format selection and use `-f` filters instead
-* [AdobePass] Add Spectrum MSO by [kevinoconnor7](https://github.com/kevinoconnor7), [ohmybahgosh](https://github.com/ohmybahgosh)
-* [facebook] Extract description and fix title
-* [fancode] Fix extraction, support live and allow login with refresh token by [zenerdi0de](https://github.com/zenerdi0de)
-* [plutotv] Improve `_VALID_URL`
-* [RCTIPlus] Add extractor by [MinePlayersPE](https://github.com/MinePlayersPE)
-* [Soundcloud] Allow login using oauth token by [blackjack4494](https://github.com/blackjack4494)
-* [TBS] Support livestreams by [llacb47](https://github.com/llacb47)
-* [videa] Fix extraction by [nyuszika7h](https://github.com/nyuszika7h)
-* [yahoo] Fix extraction by [llacb47](https://github.com/llacb47), [pukkandan](https://github.com/pukkandan)
-* Process videos when using `--ignore-no-formats-error` by [krichbanana](https://github.com/krichbanana)
-* Fix `--throttled-rate` when using `--load-info-json`
-* Fix `--flat-playlist` when entry has no `ie_key`
-* Fix `check_formats` catching `ExtractorError` instead of `DownloadError`
-* Fix deprecated option `--list-formats-old`
-* [downloader/ffmpeg] Fix `--ppa` when using simultaneous download
-* [extractor] Prevent unnecessary download of hls manifests and refactor `hls_split_discontinuity`
-* [fragment] Handle status of download and errors in threads correctly; and minor refactoring
-* [thumbnailsconvertor] Treat `jpeg` as `jpg`
-* [utils] Fix issues with `LazyList` reversal
-* [extractor] Allow extractors to set their own login hint
-* [cleanup] Simplify format selector code with `LazyList` and `yield from`
-* [cleanup] Clean `extractor.common._merge_subtitles` signature
-* [cleanup] Fix some typos
-
-
-### 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**: 
-    * 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)
-    * 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)
-    * Show alerts only from the final webpage
-    * Add `html5=1` param to `get_video_info` page requests by [colethedj](https://github.com/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`
-* 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)
-* [rmcdecouverte] Generalize `_VALID_URL`
-* Add compat-option `no-attach-infojson`
-* Add field `name` for subtitles
-* Ensure `post_extract` and `pre_process` only run once
-* Fix `--check-formats` when there is network error
-* Standardize `write_debug` and `get_param`
-* [options] Alias `--write-comments`, `--no-write-comments`
-* [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
-* **Deprecate support for python versions < 3.6**
-* **Subtitle extraction from manifests** by [fstirlitz](https://github.com/fstirlitz). See [be6202f](https://github.com/yt-dlp/yt-dlp/commit/be6202f12b97858b9d716e608394b51065d0419f) for details
-* **Improve output template:**
-    * Allow slicing lists/strings using `field.start:end:step`
-    * A field can also be used as offset like `field1+num+field2`
-    * A default value can be given using `field|default`
-    * Prevent invalid fields from causing errors
-* **Merge youtube-dl**: Upto [commit/a726009](https://github.com/ytdl-org/youtube-dl/commit/a7260099873acc6dc7d76cafad2f6b139087afd0)
-* **Remove options** `-l`, `-t`, `-A` completely and disable `--auto-number`, `--title`, `--literal`, `--id`
-* [Plugins] Prioritize plugins over standard extractors and prevent plugins from overwriting the standard extractor classes
-* [downloader] Fix `quiet` and `to_stderr`
-* [fragment] Ensure the file is closed on error
-* [fragment] Make sure first segment is not skipped
-* [aria2c] Fix whitespace being stripped off
-* [embedthumbnail] Fix bug where jpeg thumbnails were converted again
-* [FormatSort] Fix for when some formats have quality and others don't
-* [utils] Add `network_exceptions`
-* [utils] Escape URL while sanitizing
-* [ukcolumn] Add Extractor
-* [whowatch] Add extractor by [nao20010128nao](https://github.com/nao20010128nao)
-* [CBS] Improve `_VALID_URL` to support movies
-* [crackle] Improve extraction
-* [curiositystream] Fix collections
-* [francetvinfo] Improve video id extraction
-* [generic] Respect the encoding in manifest
-* [limelight] Obey `allow_unplayable_formats`
-* [mediasite] Generalize URL pattern by [fstirlitz](https://github.com/fstirlitz)
-* [mxplayer] Add MxplayerShowIE by [Ashish0804](https://github.com/Ashish0804)
-* [nebula] Move to nebula.app by [Lamieur](https://github.com/Lamieur)
-* [niconico] Fix HLS formats by [CXwudi](https://github.com/CXwudi), [tsukumijima](https://github.com/tsukumijima), [nao20010128nao](https://github.com/nao20010128nao) and [pukkandan](https://github.com/pukkandan)
-* [niconico] Fix title and thumbnail extraction by [CXwudi](https://github.com/CXwudi)
-* [plutotv] Extract subtitles from manifests
-* [plutotv] Fix format extraction for some urls
-* [rmcdecouverte] Improve `_VALID_URL`
-* [sonyliv] Fix `title` and `series` extraction by [Ashish0804](https://github.com/Ashish0804)
-* [tubi] Raise "no video formats" error when video url is empty
-* [youtube:tab] Detect playlists inside community posts
-* [youtube] Add `oembed` to reserved names
-* [zee5] Fix extraction for some URLs by [Hadi0609](https://github.com/Hadi0609)
-* [zee5] Fix py2 compatibility
-* Fix `playlist_index` and add `playlist_autonumber`. See [#302](https://github.com/yt-dlp/yt-dlp/issues/302) for details
-* Add experimental option `--check-formats` to test the URLs before format selection
-* Option `--compat-options` to revert [some of yt-dlp's changes](https://github.com/yt-dlp/yt-dlp#differences-in-default-behavior)
-    * Deprecates `--list-formats-as-table`, `--list-formats-old`
-* Fix number of digits in `%(playlist_index)s`
-* Fix case sensitivity of format selector
-* Revert "[core] be able to hand over id and title using url_result"
-* Do not strip out whitespaces in `-o` and `-P`
-* Fix `preload_download_archive` writing verbose message to `stdout`
-* Move option warnings to `YoutubeDL`so that they obey `--no-warnings` and can output colors
-* Py2 compatibility for `FileNotFoundError`
-
-
-### 2021.04.22
-* **Improve output template:**
-    * Objects can be traversed like `%(field.key1.key2)s`
-    * An offset can be added to numeric fields as `%(field+N)s`
-    * Deprecates `--autonumber-start`
-* **Improve `--sub-langs`:**
-    * Treat `--sub-langs` entries as regex
-    * `all` can be used to refer to all the subtitles
-    * language codes can be prefixed with `-` to exclude it
-    * Deprecates `--all-subs`
-* Add option `--ignore-no-formats-error` to ignore the "no video format" and similar errors
-* Add option `--skip-playlist-after-errors` to skip the rest of a playlist after a given number of errors are encountered
-* Merge youtube-dl: Upto [commit/7e8b3f9](https://github.com/ytdl-org/youtube-dl/commit/7e8b3f9439ebefb3a3a4e5da9c0bd2b595976438)
-* [downloader] Fix bug in downloader selection
-* [BilibiliChannel] Fix pagination by [nao20010128nao](https://github.com/nao20010128nao) and [pukkandan](https://github.com/pukkandan)
-* [rai] Add support for http formats by [nixxo](https://github.com/nixxo)
-* [TubiTv] Add TubiTvShowIE by [Ashish0804](https://github.com/Ashish0804)
-* [twitcasting] Fix extractor
-* [viu:ott] Fix extractor and support series by [lkho](https://github.com/lkho) and [pukkandan](https://github.com/pukkandan)
-* [youtube:tab] Show unavailable videos in playlists by [colethedj](https://github.com/colethedj)
-* [youtube:tab] Reload with unavailable videos for all playlists
-* [youtube] Ignore invalid stretch ratio
-* [youtube] Improve channel syncid extraction to support ytcfg by [colethedj](https://github.com/colethedj)
-* [youtube] Standardize API calls for tabs, mixes and search by [colethedj](https://github.com/colethedj)
-* [youtube] Bugfix in `_extract_ytcfg`
-* [mildom:user:vod] Download only necessary amount of pages
-* [mildom] Remove proxy completely by [fstirlitz](https://github.com/fstirlitz)
-* [go] Fix `_VALID_URL`
-* [MetadataFromField] Improve regex and add tests
-* [Exec] Ensure backward compatibility when the command contains `%`
-* [extractor] Fix inconsistent use of `report_warning`
-* Ensure `mergeall` selects best format when multistreams are disabled
-* Improve the yt-dlp.sh script by [fstirlitz](https://github.com/fstirlitz)
-* [lazy_extractor] Do not load plugins
-* [ci] Disable fail-fast
-* [documentation] Clarify which deprecated options still work
-* [documentation] Fix typos
-
-
-### 2021.04.11
-* Add option `--convert-thumbnails` (only jpg currently supported)
-* Format selector `mergeall` to download and merge all formats
-* Pass any field to `--exec` using similar syntax to output template
-* Choose downloader for each protocol using `--downloader PROTO:NAME`
-    * Alias `--downloader` for `--external-downloader`
-    * Added `native` as an option for the downloader
-* Merge youtube-dl: Upto [commit/4fb25ff](https://github.com/ytdl-org/youtube-dl/commit/4fb25ff5a3be5206bb72e5c4046715b1529fb2c7) (except vimeo)
-* [DiscoveryPlusIndia] Add DiscoveryPlusIndiaShowIE by [Ashish0804](https://github.com/Ashish0804)
-* [NFHSNetwork] Add extractor by [llacb47](https://github.com/llacb47)
-* [nebula] Add extractor (watchnebula.com) by [hheimbuerger](https://github.com/hheimbuerger)
-* [nitter] Fix extraction of reply tweets and update instance list by [B0pol](https://github.com/B0pol)
-* [nitter] Fix thumbnails by [B0pol](https://github.com/B0pol)
-* [youtube] Fix thumbnail URL
-* [youtube] Parse API parameters from initial webpage by [colethedj](https://github.com/colethedj)
-* [youtube] Extract comments' approximate timestamp by [colethedj](https://github.com/colethedj)
-* [youtube] Fix alert extraction
-* [bilibili] Fix uploader
-* [utils] Add `datetime_from_str` and `datetime_add_months` by [colethedj](https://github.com/colethedj)
-* Run some `postprocessors` before actual download
-* Improve argument parsing for `-P`, `-o`, `-S`
-* Fix some `m3u8` not obeying `--allow-unplayable-formats`
-* Fix default of `dynamic_mpd`
-* Deprecate `--all-formats`, `--include-ads`, `--hls-prefer-native`, `--hls-prefer-ffmpeg`
-* [documentation] Improvements
-
-### 2021.04.03
-* Merge youtube-dl: Upto [commit/654b4f4](https://github.com/ytdl-org/youtube-dl/commit/654b4f4ff2718f38b3182c1188c5d569c14cc70a)
-* Ability to set a specific field in the file's metadata using `--parse-metadata`
-* Ability to select n'th best format like `-f bv*.2`
-* [DiscoveryPlus] Add discoveryplus.in
-* [la7] Add podcasts and podcast playlists by [nixxo](https://github.com/nixxo)
-* [mildom] Update extractor with current proxy by [nao20010128nao](https://github.com/nao20010128nao)
-* [ard:mediathek] Fix video id extraction
-* [generic] Detect Invidious' link element
-* [youtube] Show premium state in `availability` by [colethedj](https://github.com/colethedj)
-* [viewsource] Add extractor to handle `view-source:`
-* [sponskrub] Run before embedding thumbnail
-* [documentation] Improve `--parse-metadata` documentation
-
-
-### 2021.03.24.1
-* Revert [commit/8562218](https://github.com/ytdl-org/youtube-dl/commit/8562218350a79d4709da8593bb0c538aa0824acf)
-
-### 2021.03.24
-* Merge youtube-dl: Upto 2021.03.25 ([commit/8562218](https://github.com/ytdl-org/youtube-dl/commit/8562218350a79d4709da8593bb0c538aa0824acf))
-* Parse metadata from multiple fields using `--parse-metadata`
-* Ability to load playlist infojson using `--load-info-json`
-* Write current epoch to infojson when using `--no-clean-infojson`
-* [youtube_live_chat] fix bug when trying to set cookies
-* [niconico] Fix for when logged in by [CXwudi](https://github.com/CXwudi) and [xtkoba](https://github.com/xtkoba)
-* [linuxacadamy] Fix login
-
-
-### 2021.03.21
-* Merge youtube-dl: Upto [commit/7e79ba7](https://github.com/ytdl-org/youtube-dl/commit/7e79ba7dd6e6649dd2ce3a74004b2044f2182881)
-* Option `--no-clean-infojson` to keep private keys in the infojson
-* [aria2c] Support retry/abort unavailable fragments by [damianoamatruda](https://github.com/damianoamatruda)
-* [aria2c] Better default arguments
-* [movefiles] Fix bugs and make more robust
-* [formatSort] Fix `quality` being ignored
-* [splitchapters] Fix for older ffmpeg
-* [sponskrub] Pass proxy to sponskrub
-* Make sure `post_hook` gets the final filename
-* Recursively remove any private keys from infojson
-* Embed video URL metadata inside `mp4` by [damianoamatruda](https://github.com/damianoamatruda) and [pukkandan](https://github.com/pukkandan)
-* Merge `webm` formats into `mkv` if thumbnails are to be embedded by [damianoamatruda](https://github.com/damianoamatruda)
-* Use headers and cookies when downloading subtitles by [damianoamatruda](https://github.com/damianoamatruda)
-* Parse resolution in info dictionary by [damianoamatruda](https://github.com/damianoamatruda)
-* More consistent warning messages by [damianoamatruda](https://github.com/damianoamatruda) and [pukkandan](https://github.com/pukkandan)
-* [documentation] Add deprecated options and aliases in readme
-* [documentation] Fix some minor mistakes
-
-* [niconico] Partial fix adapted from [animelover1984/youtube-dl@b5eff52](https://github.com/animelover1984/youtube-dl/commit/b5eff52dd9ed5565672ea1694b38c9296db3fade) (login and smile formats still don't work)
-* [niconico] Add user extractor by [animelover1984](https://github.com/animelover1984)
-* [bilibili] Add anthology support by [animelover1984](https://github.com/animelover1984)
-* [amcnetworks] Fix extractor by [2ShedsJackson](https://github.com/2ShedsJackson)
-* [stitcher] Merge from youtube-dl by [nixxo](https://github.com/nixxo)
-* [rcs] Improved extraction by [nixxo](https://github.com/nixxo)
-* [linuxacadamy] Improve regex
-* [youtube] Show if video is `private`, `unlisted` etc in info (`availability`) by [colethedj](https://github.com/colethedj) and [pukkandan](https://github.com/pukkandan)
-* [youtube] bugfix for channel playlist extraction
-* [nbc] Improve metadata extraction by [2ShedsJackson](https://github.com/2ShedsJackson)
-
-
-### 2021.03.15
-* **Split video by chapters**: using option `--split-chapters`
-    * The output file of the split files can be set with `-o`/`-P` using the prefix `chapter:`
-    * Additional keys `section_title`, `section_number`, `section_start`, `section_end` are available in the output template
-* **Parallel fragment downloads** by [shirt](https://github.com/shirt-dev)
-    * Use option `--concurrent-fragments` (`-N`) to set the number of threads (default 1)
-* Merge youtube-dl: Upto [commit/3be0980](https://github.com/ytdl-org/youtube-dl/commit/3be098010f667b14075e3dfad1e74e5e2becc8ea)
-* [zee5] Add Show Extractor by [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
-* [rai] fix drm check [nixxo](https://github.com/nixxo)
-* [wimtv] Add extractor by [nixxo](https://github.com/nixxo)
-* [mtv] Add mtv.it and extract series metadata by [nixxo](https://github.com/nixxo)
-* [pluto.tv] Add extractor by [kevinoconnor7](https://github.com/kevinoconnor7)
-* [youtube] Rewrite comment extraction by [colethedj](https://github.com/colethedj)
-* [embedthumbnail] Set mtime correctly
-* Refactor some postprocessor/downloader code by [pukkandan](https://github.com/pukkandan) and [shirt](https://github.com/shirt-dev)
-
-
-### 2021.03.07
-* [youtube] Fix history, mixes, community pages and trending by [pukkandan](https://github.com/pukkandan) and [colethedj](https://github.com/colethedj)
-* [youtube] Fix private feeds/playlists on multi-channel accounts by [colethedj](https://github.com/colethedj)
-* [youtube] Extract alerts from continuation by [colethedj](https://github.com/colethedj)
-* [cbs] Add support for ParamountPlus by [shirt](https://github.com/shirt-dev)
-* [mxplayer] Rewrite extractor with show support by [pukkandan](https://github.com/pukkandan) and [Ashish0804](https://github.com/Ashish0804)
-* [gedi] Improvements from youtube-dl by [nixxo](https://github.com/nixxo)
-* [vimeo] Fix videos with password by [teesid](https://github.com/teesid)
-* [lbry] Support `lbry://` url by [nixxo](https://github.com/nixxo)
-* [bilibili] Change `Accept` header by [pukkandan](https://github.com/pukkandan) and [animelover1984](https://github.com/animelover1984)
-* [trovo] Pass origin header
-* [rai] Check for DRM by [nixxo](https://github.com/nixxo)
-* [downloader] Fix bug for `ffmpeg`/`httpie`
-* [update] Fix updater removing the executable bit on some UNIX distros
-* [update] Fix current build hash for UNIX
-* [documentation] Include wget/curl/aria2c install instructions for Unix by [Ashish0804](https://github.com/Ashish0804)
-* Fix some videos downloading with `m3u8` extension
-* Remove "fixup is ignored" warning when fixup wasn't passed by user
-
-
-### 2021.03.03.2
-* [build] Fix bug
-
 ### 2021.03.03
-* [youtube] Use new browse API for continuation page extraction by [colethedj](https://github.com/colethedj) and [pukkandan](https://github.com/pukkandan)
-* Fix HLS playlist downloading by [shirt](https://github.com/shirt-dev)
-* Merge youtube-dl: Upto [2021.03.03](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.03)
+* [youtube] Use new browse API for continuation page extraction by @colethedj and @pukkandan
+* Fix HLS playlist downloading by @shirt
+* **Merge youtube-dl:** Upto [2021.03.03](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.03)
 * [mtv] Fix extractor
-* [nick] Fix extractor by [DennyDai](https://github.com/DennyDai)
-* [mxplayer] Add new extractor by [codeasashu](https://github.com/codeasashu)
+* [nick] Fix extractor by @DennyDai
+* [mxplayer] Add new extractor by@codeasashu
 * [youtube] Throw error when `--extractor-retries` are exhausted
 * Reduce default of `--extractor-retries` to 3
-* Fix packaging bugs by [hseg](https://github.com/hseg)
+* Fix packaging bugs by @hseg
 
 
 ### 2021.03.01
@@ -473,10 +55,10 @@
 * Moved project to an organization [yt-dlp](https://github.com/yt-dlp)
 * **Completely changed project name to yt-dlp** by [Pccode66](https://github.com/Pccode66) and [pukkandan](https://github.com/pukkandan)
     * Also, `youtube-dlc` config files are no longer loaded
-* Merge youtube-dl: Upto [commit/4460329](https://github.com/ytdl-org/youtube-dl/commit/44603290e5002153f3ebad6230cc73aef42cc2cd) (except tmz, gedi)
+* **Merge youtube-dl:** Upto [commit/4460329](https://github.com/ytdl-org/youtube-dl/commit/44603290e5002153f3ebad6230cc73aef42cc2cd) (except tmz, gedi)
 * [Readthedocs](https://yt-dlp.readthedocs.io) support by [shirt](https://github.com/shirt-dev)
 * [youtube] Show if video was a live stream in info (`was_live`)
-* [Zee5] Add new extractor by [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
+* [Zee5] Add new extractor by [Ashish](https://github.com/Ashish) and [pukkandan](https://github.com/pukkandan)
 * [jwplatform] Add support for `hyland.com`
 * [tennistv] Fix extractor
 * [hls] Support media initialization by [shirt](https://github.com/shirt-dev)
@@ -491,7 +73,7 @@
 
 
 ### 2021.02.19
-* Merge youtube-dl: Upto [commit/cf2dbec](https://github.com/ytdl-org/youtube-dl/commit/cf2dbec6301177a1fddf72862de05fa912d9869d) (except kakao)
+* **Merge youtube-dl:** Upto [commit/cf2dbec](https://github.com/ytdl-org/youtube-dl/commit/cf2dbec6301177a1fddf72862de05fa912d9869d) (except kakao)
 * [viki] Fix extractor
 * [niconico] Extract `channel` and `channel_id` by [kurumigi](https://github.com/kurumigi)
 * [youtube] Multiple page support for hashtag URLs
@@ -516,8 +98,8 @@
 
 
 ### 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)
+* **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), [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
@@ -559,7 +141,7 @@
 
 
 ### 2021.02.04
-* Merge youtube-dl: Upto [2021.02.04.1](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.04.1)
+* **Merge youtube-dl:** Upto [2021.02.04.1](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.04.1)
 * **Date/time formatting in output template:**
     * You can use [`strftime`](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) to format date/time fields. Example: `%(upload_date>%Y-%m-%d)s`
 * **Multiple output templates:**
@@ -613,7 +195,7 @@
 
 
 ### 2021.01.24
-* Merge youtube-dl: Upto [2021.01.24](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
+* **Merge youtube-dl:** Upto [2021.01.24](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
 * Plugin support ([documentation](https://github.com/yt-dlp/yt-dlp#plugins))
 * **Multiple paths**: New option `-P`/`--paths` to give different paths for different types of files
     * The syntax is `-P "type:path" -P "type:path"` ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=-P,%20--paths%20TYPE:PATH))
@@ -642,7 +224,7 @@
 
 
 ### 2021.01.16
-* Merge youtube-dl: Upto [2021.01.16](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
+* **Merge youtube-dl:** Upto [2021.01.16](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
 * **Configuration files:**
     * Portable configuration file: `./yt-dlp.conf`
     * Allow the configuration files to be named `yt-dlp` instead of `youtube-dlc`. See [this](https://github.com/yt-dlp/yt-dlp#configuration) for details
@@ -672,7 +254,7 @@
 * [archive.org] Fix extractor and add support for audio and playlists by [wporr](https://github.com/wporr)
 * [Animelab] Added by [mariuszskon](https://github.com/mariuszskon)
 * [youtube:search] Fix view_count by [ohnonot](https://github.com/ohnonot)
-* [youtube] Show if video is embeddable in info (`playable_in_embed`)
+* [youtube] Show if video is embeddable in info
 * Update version badge automatically in README
 * Enable `test_youtube_search_matching`
 * Create `to_screen` and similar functions in postprocessor/common
@@ -688,8 +270,9 @@
 
 
 ### 2021.01.08
-* Merge youtube-dl: Upto [2021.01.08](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.08) except stitcher ([1](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc), [2](https://github.com/ytdl-org/youtube-dl/commit/a563c97c5cddf55f8989ed7ea8314ef78e30107f))
-* Moved changelog to separate file
+* **Merge youtube-dl:** Upto [2021.01.08](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.08)
+    * Extractor stitcher ([1](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc), [2](https://github.com/ytdl-org/youtube-dl/commit/a563c97c5cddf55f8989ed7ea8314ef78e30107f)) have not been merged
+* Moved changelog to seperate file
 
 
 ### 2021.01.07-1
@@ -727,7 +310,7 @@
     * Changed video format sorting to show video only files and video+audio files together.
     * Added `--video-multistreams`, `--no-video-multistreams`, `--audio-multistreams`, `--no-audio-multistreams`
     * Added `b`,`w`,`v`,`a` as alias for `best`, `worst`, `video` and `audio` respectively
-* Shortcut Options: Added `--write-link`, `--write-url-link`, `--write-webloc-link`, `--write-desktop-link` by [h-h-h-h](https://github.com/h-h-h-h) - See [Internet Shortcut Options](README.md#internet-shortcut-options) for details
+* **Shortcut Options:** Added `--write-link`, `--write-url-link`, `--write-webloc-link`, `--write-desktop-link` by [h-h-h-h](https://github.com/h-h-h-h) - See [Internet Shortcut Options](README.md#internet-shortcut-options) for details
 * **Sponskrub integration:** Added `--sponskrub`, `--sponskrub-cut`, `--sponskrub-force`, `--sponskrub-location`, `--sponskrub-args` - See [SponSkrub Options](README.md#sponskrub-sponsorblock-options) for details
 * Added `--force-download-archive` (`--force-write-archive`) by [h-h-h-h](https://github.com/h-h-h-h)
 * Added `--list-formats-as-table`,  `--list-formats-old`
@@ -737,38 +320,36 @@
 * Relaxed validation for format filters so that any arbitrary field can be used
 * Fix for embedding thumbnail in mp3 by [pauldubois98](https://github.com/pauldubois98) ([ytdl-org/youtube-dl#21569](https://github.com/ytdl-org/youtube-dl/pull/21569))
 * Make Twitch Video ID output from Playlist and VOD extractor same. This is only a temporary fix
-* Merge youtube-dl: Upto [2021.01.03](https://github.com/ytdl-org/youtube-dl/commit/8e953dcbb10a1a42f4e12e4e132657cb0100a1f8) - See [blackjack4494/yt-dlc#280](https://github.com/blackjack4494/yt-dlc/pull/280) for details
+* **Merge youtube-dl:** Upto [2021.01.03](https://github.com/ytdl-org/youtube-dl/commit/8e953dcbb10a1a42f4e12e4e132657cb0100a1f8) - See [blackjack4494/yt-dlc#280](https://github.com/blackjack4494/yt-dlc/pull/280) for details
     * Extractors [tiktok](https://github.com/ytdl-org/youtube-dl/commit/fb626c05867deab04425bad0c0b16b55473841a2) and [hotstar](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc) have not been merged
 * Cleaned up the fork for public use
 
 
-**PS**: All uncredited changes above this point are authored by [pukkandan](https://github.com/pukkandan)
-
 ### Unreleased changes in [blackjack4494/yt-dlc](https://github.com/blackjack4494/yt-dlc)
-* Updated to youtube-dl release 2020.11.26 by [pukkandan](https://github.com/pukkandan)
-* Youtube improvements by [pukkandan](https://github.com/pukkandan)
+* Updated to youtube-dl release 2020.11.26
+* [youtube]
     * Implemented all Youtube Feeds (ytfav, ytwatchlater, ytsubs, ythistory, ytrec) and SearchURL
+    * Fix ytsearch not returning results sometimes due to promoted content
+    * Temporary fix for automatic captions - disable json3
     * Fix some improper Youtube URLs
     * Redirect channel home to /video
     * Print youtube's warning message
-    * Handle Multiple pages for feeds better
-* [youtube] Fix ytsearch not returning results sometimes due to promoted content by [colethedj](https://github.com/colethedj)
-* [youtube] Temporary fix for automatic captions - disable json3 by [blackjack4494](https://github.com/blackjack4494)
+    * Multiple pages are handled better for feeds
 * Add --break-on-existing by [gergesh](https://github.com/gergesh)
-* Pre-check video IDs in the archive before downloading by [pukkandan](https://github.com/pukkandan)
-* [bitwave.tv] New extractor by [lorpus](https://github.com/lorpus)
-* [Gedi] Add extractor by [nixxo](https://github.com/nixxo)
-* [Rcs] Add new extractor by [nixxo](https://github.com/nixxo)
-* [skyit] New skyitalia extractor by [nixxo](https://github.com/nixxo)
-* [france.tv] Fix thumbnail URL by [renalid](https://github.com/renalid)
-* [ina] support mobile links by [B0pol](https://github.com/B0pol)
-* [instagram] Fix thumbnail extractor by [nao20010128nao](https://github.com/nao20010128nao)
-* [SouthparkDe] Support for English URLs by [xypwn](https://github.com/xypwn)
-* [spreaker] fix SpreakerShowIE test URL by [pukkandan](https://github.com/pukkandan)
-* [Vlive] Fix playlist handling when downloading a channel by [kyuyeunk](https://github.com/kyuyeunk)
-* [tmz] Fix extractor by [diegorodriguezv](https://github.com/diegorodriguezv)
-* [generic] Detect embedded bitchute videos by [pukkandan](https://github.com/pukkandan)
-* [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)
+* Pre-check video IDs in the archive before downloading
+* [bitwave.tv] New extractor
+* [Gedi] Add extractor
+* [Rcs] Add new extractor
+* [skyit] Add support for multiple Sky Italia website and removed old skyitalia extractor
+* [france.tv] Fix thumbnail URL
+* [ina] support mobile links
+* [instagram] Fix extractor
+* [itv] BTCC new pages' URL update (articles instead of races)
+* [SouthparkDe] Support for English URLs
+* [spreaker] fix SpreakerShowIE test URL
+* [Vlive] Fix playlist handling when downloading a channel
+* [generic] Detect embedded bitchute videos
+* [generic] Extract embedded youtube and twitter videos
+* [ffmpeg] Ensure all streams are copied
+* Fix for os.rename error when embedding thumbnail to video in a different drive
+* make_win.bat: don't use UPX to pack vcruntime140.dll

Makefile

@@ -1,4 +1,4 @@
-all: yt-dlp doc pypi-files
+all: yt-dlp doc
 clean: clean-test clean-dist clean-cache
 completions: completion-bash completion-fish completion-zsh
 doc: README.md CONTRIBUTING.md issuetemplates supportedsites
@@ -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

devscripts/bash-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import os

devscripts/buildserver.py

@@ -1,5 +1,3 @@
-# UNUSED
-
 #!/usr/bin/python3
 
 import argparse

devscripts/check-porn.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 """

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

devscripts/fish-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import optparse

devscripts/generate_aes_testdata.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
 
 import codecs

devscripts/gh-pages/update-copyright.py

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

devscripts/lazy_load_template.py

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

devscripts/make_contributing.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 # import io

devscripts/make_issue_template.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import io

devscripts/make_lazy_extractors.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals, print_function
 
 from inspect import getsource
@@ -15,14 +14,9 @@ lazy_extractors_filename = sys.argv[1]
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
 
-# Block plugins from loading
-os.rename('ytdlp_plugins', 'ytdlp_plugins_blocked')
-
 from yt_dlp.extractor import _ALL_CLASSES
 from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
 
-os.rename('ytdlp_plugins_blocked', 'ytdlp_plugins')
-
 with open('devscripts/lazy_load_template.py', 'rt') as f:
     module_template = f.read()
 

devscripts/make_readme.py

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

devscripts/make_supportedsites.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import io

devscripts/prepare_manpage.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
 
 import io

devscripts/release.sh

@@ -1,5 +1,4 @@
 # Unused
-
 #!/bin/bash
 
 # IMPORTANT: the following assumptions are made

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

devscripts/update-version.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
-
 from datetime import datetime
 # import urllib.request
 

devscripts/wine-py2exe.sh

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

devscripts/zsh-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import os

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,21 @@ 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=test',
+    '--exclude-module=ytdlp_plugins',
+    '--hidden-import=mutagen',
+    '--hidden-import=Crypto',
     '--upx-exclude=vcruntime140.dll',
     'yt_dlp/__main__.py',
 ])

requirements.txt

@@ -1,3 +1,2 @@
 mutagen
 pycryptodome
-websockets

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',
-    open('README.md', 'r', encoding='utf-8').read()))
+    '**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,21 +61,23 @@ 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'))
+packages = find_packages(exclude=("youtube_dl", "test", "ytdlp_plugins"))
 
 setup(
-    name='yt-dlp',
+    name="yt-dlp",
     version=__version__,
-    maintainer='pukkandan',
-    maintainer_email='pukkandan.ytdlp@gmail.com',
+    maintainer="pukkandan",
+    maintainer_email="pukkandan.ytdlp@gmail.com",
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    long_description_content_type='text/markdown',
-    url='https://github.com/yt-dlp/yt-dlp',
+    long_description_content_type="text/markdown",
+    url="https://github.com/yt-dlp/yt-dlp",
     packages=packages,
     install_requires=REQUIREMENTS,
     project_urls={
@@ -84,20 +87,30 @@ setup(
         #'Funding': 'https://donate.pypi.org',
     },
     classifiers=[
-        'Topic :: Multimedia :: Video',
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Programming Language :: Python',
-        '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 :: PyPy',
-        'License :: Public Domain',
-        'Operating System :: OS Independent',
+        "Topic :: Multimedia :: Video",
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: IronPython",
+        "Programming Language :: Python :: Implementation :: Jython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "License :: Public Domain",
+        "Operating System :: OS Independent",
     ],
-    python_requires='>=3.6',
+    python_requires='>=2.6',
 
     cmdclass={'build_lazy_extractors': build_lazy_extractors},
     **params

supportedsites.md

@@ -3,7 +3,6 @@
  - **20min**
  - **220.ro**
  - **23video**
- - **247sports**
  - **24video**
  - **3qsdn**: 3Q SDN
  - **3sat**
@@ -82,7 +81,6 @@
  - **audiomack**
  - **audiomack:album**
  - **Audius**: Audius.co
- - **audius:artist**: Audius.co profile/artist pages
  - **audius:playlist**: Audius.co playlists
  - **audius:track**: Audius track ID or API link. Prepend with "audius:"
  - **AWAAN**
@@ -99,8 +97,7 @@
  - **bbc**: BBC
  - **bbc.co.uk**: BBC iPlayer
  - **bbc.co.uk:article**: BBC articles
- - **bbc.co.uk:iplayer:episodes**
- - **bbc.co.uk:iplayer:group**
+ - **bbc.co.uk:iplayer:playlist**
  - **bbc.co.uk:playlist**
  - **BBVTV**
  - **Beatport**
@@ -131,6 +128,7 @@
  - **bitwave:stream**
  - **BleacherReport**
  - **BleacherReportCMS**
+ - **blinkx**
  - **Bloomberg**
  - **BokeCC**
  - **BongaCams**
@@ -172,8 +170,7 @@
  - **cbsnews**: CBS News
  - **cbsnews:embed**
  - **cbsnews:livevideo**: CBS News Live Videos
- - **cbssports**
- - **cbssports:embed**
+ - **CBSSports**
  - **CCMA**
  - **CCTV**: 央视网
  - **CDA**
@@ -251,8 +248,6 @@
  - **DiscoveryGoPlaylist**
  - **DiscoveryNetworksDe**
  - **DiscoveryPlus**
- - **DiscoveryPlusIndia**
- - **DiscoveryPlusIndiaShow**
  - **DiscoveryVR**
  - **Disney**
  - **dlive:stream**
@@ -306,7 +301,6 @@
  - **EyedoTV**
  - **facebook**
  - **FacebookPluginsVideo**
- - **fancode:vod**
  - **faz.net**
  - **fc2**
  - **fc2:embed**
@@ -353,7 +347,8 @@
  - **Gaskrank**
  - **Gazeta**
  - **GDCVault**
- - **GediDigital**
+ - **Gedi**
+ - **GediEmbeds**
  - **generic**: Generic downloader that works on some sites
  - **Gfycat**
  - **GiantBomb**
@@ -392,7 +387,6 @@
  - **HotNewHipHop**
  - **hotstar**
  - **hotstar:playlist**
- - **hotstar:series**
  - **Howcast**
  - **HowStuffWorks**
  - **hrfernsehen**
@@ -463,8 +457,6 @@
  - **kuwo:singer**: 酷我音乐 - 歌手
  - **kuwo:song**: 酷我音乐
  - **la7.it**
- - **la7.it:pod:episode**
- - **la7.it:podcast**
  - **laola1tv**
  - **laola1tv:embed**
  - **lbry**
@@ -488,14 +480,14 @@
  - **limelight**
  - **limelight:channel**
  - **limelight:channel_list**
- - **LineLive**
- - **LineLiveChannel**
  - **LineTV**
  - **linkedin:learning**
  - **linkedin:learning:course**
  - **LinuxAcademy**
  - **LiTV**
  - **LiveJournal**
+ - **LiveLeak**
+ - **LiveLeakEmbed**
  - **livestream**
  - **livestream:original**
  - **LnkGo**
@@ -514,7 +506,6 @@
  - **mangomolo:live**
  - **mangomolo:video**
  - **ManyVids**
- - **MaoriTV**
  - **Markiza**
  - **MarkizaPage**
  - **massengeschmack.tv**
@@ -553,7 +544,6 @@
  - **mixcloud:playlist**
  - **mixcloud:user**
  - **MLB**
- - **MLBVideo**
  - **Mnet**
  - **MNetTV**
  - **MoeVideo**: LetitBit video services: moevideo.net, playreplay.net and videochart.net
@@ -572,8 +562,6 @@
  - **mtg**: MTG services
  - **mtv**
  - **mtv.de**
- - **mtv.it**
- - **mtv.it:programma**
  - **mtv:video**
  - **mtvjapan**
  - **mtvservices:embedded**
@@ -584,7 +572,6 @@
  - **Mwave**
  - **MwaveMeetGreet**
  - **Mxplayer**
- - **MxplayerShow**
  - **MyChannels**
  - **MySpace**
  - **MySpace:album**
@@ -616,7 +603,6 @@
  - **ndr:embed**
  - **ndr:embed:base**
  - **NDTV**
- - **Nebula**
  - **NerdCubedFeed**
  - **netease:album**: 网易云音乐 - 专辑
  - **netease:djradio**: 网易云音乐 - 电台
@@ -635,7 +621,6 @@
  - **NextTV**: 壹電視
  - **Nexx**
  - **NexxEmbed**
- - **NFHSNetwork**
  - **nfl.com** (Currently broken)
  - **nfl.com:article** (Currently broken)
  - **NhkVod**
@@ -648,7 +633,6 @@
  - **nicknight**
  - **niconico**: ニコニコ動画
  - **NiconicoPlaylist**
- - **NiconicoUser**
  - **Nintendo**
  - **Nitter**
  - **njoy**: N-JOY
@@ -719,13 +703,9 @@
  - **OutsideTV**
  - **PacktPub**
  - **PacktPubCourse**
- - **PalcoMP3:artist**
- - **PalcoMP3:song**
- - **PalcoMP3:video**
  - **pandora.tv**: 판도라TV
  - **ParamountNetwork**
  - **parliamentlive.tv**: UK parliament videos
- - **Parlview**
  - **Patreon**
  - **pbs**: Public Broadcasting Service (PBS) and member stations: PBS: Public Broadcasting Service, APT - Alabama Public Television (WBIQ), GPB/Georgia Public Broadcasting (WGTV), Mississippi Public Broadcasting (WMPN), Nashville Public Television (WNPT), WFSU-TV (WFSU), WSRE (WSRE), WTCI (WTCI), WPBA/Channel 30 (WPBA), Alaska Public Media (KAKM), Arizona PBS (KAET), KNME-TV/Channel 5 (KNME), Vegas PBS (KLVX), AETN/ARKANSAS ETV NETWORK (KETS), KET (WKLE), WKNO/Channel 10 (WKNO), LPB/LOUISIANA PUBLIC BROADCASTING (WLPB), OETA (KETA), Ozarks Public Television (KOZK), WSIU Public Broadcasting (WSIU), KEET TV (KEET), KIXE/Channel 9 (KIXE), KPBS San Diego (KPBS), KQED (KQED), KVIE Public Television (KVIE), PBS SoCal/KOCE (KOCE), ValleyPBS (KVPT), CONNECTICUT PUBLIC TELEVISION (WEDH), KNPB Channel 5 (KNPB), SOPTV (KSYS), Rocky Mountain PBS (KRMA), KENW-TV3 (KENW), KUED Channel 7 (KUED), Wyoming PBS (KCWC), Colorado Public Television / KBDI 12 (KBDI), KBYU-TV (KBYU), Thirteen/WNET New York (WNET), WGBH/Channel 2 (WGBH), WGBY (WGBY), NJTV Public Media NJ (WNJT), WLIW21 (WLIW), mpt/Maryland Public Television (WMPB), WETA Television and Radio (WETA), WHYY (WHYY), PBS 39 (WLVT), WVPT - Your Source for PBS and More! (WVPT), Howard University Television (WHUT), WEDU PBS (WEDU), WGCU Public Media (WGCU), WPBT2 (WPBT), WUCF TV (WUCF), WUFT/Channel 5 (WUFT), WXEL/Channel 42 (WXEL), WLRN/Channel 17 (WLRN), WUSF Public Broadcasting (WUSF), ETV (WRLK), UNC-TV (WUNC), PBS Hawaii - Oceanic Cable Channel 10 (KHET), Idaho Public Television (KAID), KSPS (KSPS), OPB (KOPB), KWSU/Channel 10 & KTNW/Channel 31 (KWSU), WILL-TV (WILL), Network Knowledge - WSEC/Springfield (WSEC), WTTW11 (WTTW), Iowa Public Television/IPTV (KDIN), Nine Network (KETC), PBS39 Fort Wayne (WFWA), WFYI Indianapolis (WFYI), Milwaukee Public Television (WMVS), WNIN (WNIN), WNIT Public Television (WNIT), WPT (WPNE), WVUT/Channel 22 (WVUT), WEIU/Channel 51 (WEIU), WQPT-TV (WQPT), WYCC PBS Chicago (WYCC), WIPB-TV (WIPB), WTIU (WTIU), CET  (WCET), ThinkTVNetwork (WPTD), WBGU-TV (WBGU), WGVU TV (WGVU), NET1 (KUON), Pioneer Public Television (KWCM), SDPB Television (KUSD), TPT (KTCA), KSMQ (KSMQ), KPTS/Channel 8 (KPTS), KTWU/Channel 11 (KTWU), East Tennessee PBS (WSJK), WCTE-TV (WCTE), WLJT, Channel 11 (WLJT), WOSU TV (WOSU), WOUB/WOUC (WOUB), WVPB (WVPB), WKYU-PBS (WKYU), KERA 13 (KERA), MPBN (WCBB), Mountain Lake PBS (WCFE), NHPTV (WENH), Vermont PBS (WETK), witf (WITF), WQED Multimedia (WQED), WMHT Educational Telecommunications (WMHT), Q-TV (WDCQ), WTVS Detroit Public TV (WTVS), CMU Public Television (WCMU), WKAR-TV (WKAR), WNMU-TV Public TV 13 (WNMU), WDSE - WRPT (WDSE), WGTE TV (WGTE), Lakeland Public Television (KAWE), KMOS-TV - Channels 6.1, 6.2 and 6.3 (KMOS), MontanaPBS (KUSM), KRWG/Channel 22 (KRWG), KACV (KACV), KCOS/Channel 13 (KCOS), WCNY/Channel 24 (WCNY), WNED (WNED), WPBS (WPBS), WSKG Public TV (WSKG), WXXI (WXXI), WPSU (WPSU), WVIA Public Media Studios (WVIA), WTVI (WTVI), Western Reserve PBS (WNEO), WVIZ/PBS ideastream (WVIZ), KCTS 9 (KCTS), Basin PBS (KPBT), KUHT / Channel 8 (KUHT), KLRN (KLRN), KLRU (KLRU), WTJX Channel 12 (WTJX), WCVE PBS (WCVE), KBTC Public Television (KBTC)
  - **PearVideo**
@@ -749,14 +729,12 @@
  - **play.fm**
  - **player.sky.it**
  - **PlayPlusTV**
- - **PlayStuff**
  - **PlaysTV**
  - **Playtvak**: Playtvak.cz, iDNES.cz and Lidovky.cz
  - **Playvid**
  - **Playwire**
  - **pluralsight**
  - **pluralsight:course**
- - **PlutoTV**
  - **podomatic**
  - **Pokemon**
  - **PokemonWatch**
@@ -858,7 +836,6 @@
  - **safari**: safaribooksonline.com online video
  - **safari:api**
  - **safari:course**: safaribooksonline.com online courses
- - **Saitosan**
  - **SAKTV**
  - **SaltTV**
  - **SampleFocus**
@@ -883,7 +860,6 @@
  - **Shahid**
  - **ShahidShow**
  - **Shared**: shared.sx
- - **ShemarooMe**
  - **ShowRoomLive**
  - **simplecast**
  - **simplecast:episode**
@@ -903,7 +879,6 @@
  - **Snotr**
  - **Sohu**
  - **SonyLIV**
- - **SonyLIVSeries**
  - **soundcloud**
  - **soundcloud:playlist**
  - **soundcloud:search**: Soundcloud search
@@ -940,7 +915,6 @@
  - **stanfordoc**: Stanford Open ClassRoom
  - **Steam**
  - **Stitcher**
- - **StitcherShow**
  - **StoryFire**
  - **StoryFireSeries**
  - **StoryFireUser**
@@ -982,7 +956,6 @@
  - **Telecinco**: telecinco.es, cuatro.com and mediaset.es
  - **Telegraaf**
  - **TeleMB**
- - **Telemundo**
  - **TeleQuebec**
  - **TeleQuebecEmission**
  - **TeleQuebecLive**
@@ -1023,7 +996,6 @@
  - **TruTV**
  - **Tube8**
  - **TubiTv**
- - **TubiTvShow**
  - **Tumblr**
  - **tunein:clip**
  - **tunein:program**
@@ -1066,8 +1038,6 @@
  - **TVPlayHome**
  - **Tweakers**
  - **TwitCasting**
- - **TwitCastingLive**
- - **TwitCastingUser**
  - **twitch:clips**
  - **twitch:stream**
  - **twitch:vod**
@@ -1085,7 +1055,6 @@
  - **UDNEmbed**: 聯合影音
  - **UFCArabia**
  - **UFCTV**
- - **ukcolumn**
  - **UKTVPlay**
  - **umg:de**: Universal Music Deutschland
  - **Unistra**
@@ -1118,7 +1087,6 @@
  - **Vidbit**
  - **Viddler**
  - **Videa**
- - **video.arnes.si**: Arnes Video
  - **video.google:search**: Google Video search
  - **video.sky.it**
  - **video.sky.it:live**
@@ -1129,8 +1097,6 @@
  - **videomore:video**
  - **VideoPress**
  - **Vidio**
- - **VidioLive**
- - **VidioPremier**
  - **VidLii**
  - **vidme**
  - **vidme:user**
@@ -1170,7 +1136,6 @@
  - **VODPlatform**
  - **VoiceRepublic**
  - **Voot**
- - **VootSeries**
  - **VoxMedia**
  - **VoxMediaVolume**
  - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
@@ -1200,7 +1165,6 @@
  - **wdr:mobile**
  - **WDRElefant**
  - **WDRPage**
- - **web.archive:youtube**: web.archive.org saved youtube videos
  - **Webcaster**
  - **WebcasterFeed**
  - **WebOfStories**
@@ -1208,8 +1172,6 @@
  - **Weibo**
  - **WeiboMobile**
  - **WeiqiTV**: WQTV
- - **whowatch**
- - **WimTV**
  - **Wistia**
  - **WistiaPlaylist**
  - **wnl**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
@@ -1219,7 +1181,7 @@
  - **WWE**
  - **XBef**
  - **XboxClips**
- - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, WolfStream, XVideoSharing
+ - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, XVideoSharing
  - **XHamster**
  - **XHamsterEmbed**
  - **XHamsterUser**
@@ -1280,9 +1242,7 @@
  - **ZDF**
  - **ZDFChannel**
  - **Zee5**
- - **zee5:series**
  - **Zhihu**
  - **zingmp3**: mp3.zing.vn
- - **zingmp3:album**
  - **zoom**
  - **Zype**

test/parameters.json

@@ -1,40 +1,41 @@
 {
-    "consoletitle": false,
-    "continuedl": true,
-    "forcedescription": false,
-    "forcefilename": false,
-    "forceformat": false,
-    "forcethumbnail": false,
-    "forcetitle": false,
-    "forceurl": false,
+    "consoletitle": false, 
+    "continuedl": true, 
+    "forcedescription": false, 
+    "forcefilename": false, 
+    "forceformat": false, 
+    "forcethumbnail": false, 
+    "forcetitle": false, 
+    "forceurl": false, 
     "force_write_download_archive": false,
     "format": "best",
-    "ignoreerrors": false,
-    "listformats": null,
-    "logtostderr": false,
-    "matchtitle": null,
-    "max_downloads": null,
-    "overwrites": null,
-    "nopart": false,
-    "noprogress": false,
-    "outtmpl": "%(id)s.%(ext)s",
-    "password": null,
-    "playliststart": 1,
-    "prefer_free_formats": false,
-    "quiet": false,
-    "ratelimit": null,
-    "rejecttitle": null,
-    "retries": 10,
-    "simulate": false,
-    "subtitleslang": null,
+    "ignoreerrors": false, 
+    "listformats": null, 
+    "logtostderr": false, 
+    "matchtitle": null, 
+    "max_downloads": null, 
+    "overwrites": null, 
+    "nopart": false, 
+    "noprogress": false, 
+    "outtmpl": "%(id)s.%(ext)s", 
+    "password": null, 
+    "playlistend": -1, 
+    "playliststart": 1, 
+    "prefer_free_formats": false, 
+    "quiet": false, 
+    "ratelimit": null, 
+    "rejecttitle": null, 
+    "retries": 10, 
+    "simulate": false, 
+    "subtitleslang": null, 
     "subtitlesformat": "best",
-    "test": true,
-    "updatetime": true,
-    "usenetrc": false,
-    "username": null,
-    "verbose": true,
-    "writedescription": false,
-    "writeinfojson": true,
+    "test": true, 
+    "updatetime": true, 
+    "usenetrc": false, 
+    "username": null, 
+    "verbose": true, 
+    "writedescription": false, 
+    "writeinfojson": true, 
     "writeannotations": false,
     "writelink": false,
     "writeurllink": false,

test/test_InfoExtractor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -450,7 +450,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'language': 'en',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'audio_ext': 'mp4',
                 }, {
                     'format_id': 'aud2-English',
@@ -458,7 +458,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'language': 'en',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'audio_ext': 'mp4',
                 }, {
                     'format_id': 'aud3-English',
@@ -466,14 +466,14 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'language': 'en',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'audio_ext': 'mp4',
                 }, {
                     'format_id': '530',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 480,
                     'height': 270,
                     'vcodec': 'avc1.640015',
@@ -482,7 +482,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 480,
                     'height': 270,
                     'vcodec': 'avc1.640015',
@@ -491,7 +491,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 480,
                     'height': 270,
                     'vcodec': 'avc1.640015',
@@ -500,7 +500,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v3/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 640,
                     'height': 360,
                     'vcodec': 'avc1.64001e',
@@ -509,7 +509,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v3/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 640,
                     'height': 360,
                     'vcodec': 'avc1.64001e',
@@ -518,7 +518,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v3/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 640,
                     'height': 360,
                     'vcodec': 'avc1.64001e',
@@ -527,7 +527,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v4/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 768,
                     'height': 432,
                     'vcodec': 'avc1.64001e',
@@ -536,7 +536,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v4/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 768,
                     'height': 432,
                     'vcodec': 'avc1.64001e',
@@ -545,7 +545,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v4/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 768,
                     'height': 432,
                     'vcodec': 'avc1.64001e',
@@ -554,7 +554,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v5/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 960,
                     'height': 540,
                     'vcodec': 'avc1.640020',
@@ -563,7 +563,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v5/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 960,
                     'height': 540,
                     'vcodec': 'avc1.640020',
@@ -572,7 +572,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v5/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 960,
                     'height': 540,
                     'vcodec': 'avc1.640020',
@@ -581,7 +581,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v6/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1280,
                     'height': 720,
                     'vcodec': 'avc1.640020',
@@ -590,7 +590,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v6/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1280,
                     'height': 720,
                     'vcodec': 'avc1.640020',
@@ -599,7 +599,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v6/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1280,
                     'height': 720,
                     'vcodec': 'avc1.640020',
@@ -608,7 +608,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v7/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -617,7 +617,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v7/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -626,7 +626,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v7/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -635,7 +635,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v8/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -644,7 +644,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v8/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -653,7 +653,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v8/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -662,7 +662,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v9/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -671,7 +671,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v9/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -680,190 +680,21 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v9/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
-                }],
-                {}
-            ),
-            (
-                'bipbop_16x9',
-                'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                [{
-                    'format_id': 'bipbop_audio-BipBop Audio 2',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/alternate_audio_aac/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'language': 'eng',
-                    'ext': 'mp4',
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'vcodec': 'none',
-                    'audio_ext': 'mp4',
-                    'video_ext': 'none',
-                }, {
-                    'format_id': '41',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear0/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 41.457,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'vcodec': 'none',
-                    'acodec': 'mp4a.40.2',
-                    'audio_ext': 'mp4',
-                    'video_ext': 'none',
-                    'abr': 41.457,
-                }, {
-                    'format_id': '263',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear1/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 263.851,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 416,
-                    'height': 234,
-                    'vcodec': 'avc1.4d400d',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 263.851,
-                    'abr': 0,
-                }, {
-                    'format_id': '577',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear2/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 577.61,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 640,
-                    'height': 360,
-                    'vcodec': 'avc1.4d401e',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 577.61,
-                    'abr': 0,
-                }, {
-                    'format_id': '915',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear3/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 915.905,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 960,
-                    'height': 540,
-                    'vcodec': 'avc1.4d401f',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 915.905,
-                    'abr': 0,
-                }, {
-                    'format_id': '1030',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear4/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 1030.138,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 1280,
-                    'height': 720,
-                    'vcodec': 'avc1.4d401f',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 1030.138,
-                    'abr': 0,
-                }, {
-                    'format_id': '1924',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear5/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 1924.009,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 1920,
-                    'height': 1080,
-                    'vcodec': 'avc1.4d401f',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 1924.009,
-                    'abr': 0,
-                }],
-                {
-                    'en': [{
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/eng/prog_index.m3u8',
-                        'ext': 'vtt',
-                        'protocol': 'm3u8_native'
-                    }, {
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/eng_forced/prog_index.m3u8',
-                        'ext': 'vtt',
-                        'protocol': 'm3u8_native'
-                    }],
-                    'fr': [{
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/fra/prog_index.m3u8',
-                        'ext': 'vtt',
-                        'protocol': 'm3u8_native'
-                    }, {
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/fra_forced/prog_index.m3u8',
-                        'ext': 'vtt',
-                        'protocol': 'm3u8_native'
-                    }],
-                    'es': [{
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/spa/prog_index.m3u8',
-                        'ext': 'vtt',
-                        'protocol': 'm3u8_native'
-                    }, {
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/spa_forced/prog_index.m3u8',
-                        'ext': 'vtt',
-                        'protocol': 'm3u8_native'
-                    }],
-                    'ja': [{
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/jpn/prog_index.m3u8',
-                        'ext': 'vtt',
-                        'protocol': 'm3u8_native'
-                    }, {
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/jpn_forced/prog_index.m3u8',
-                        'ext': 'vtt',
-                        'protocol': 'm3u8_native'
-                    }],
-                }
+                }]
             ),
         ]
 
-        for m3u8_file, m3u8_url, expected_formats, expected_subs in _TEST_CASES:
+        for m3u8_file, m3u8_url, expected_formats in _TEST_CASES:
             with io.open('./test/testdata/m3u8/%s.m3u8' % m3u8_file,
                          mode='r', encoding='utf-8') as f:
-                formats, subs = self.ie._parse_m3u8_formats_and_subtitles(
+                formats = self.ie._parse_m3u8_formats(
                     f.read(), m3u8_url, ext='mp4')
                 self.ie._sort_formats(formats)
                 expect_value(self, formats, expected_formats, None)
-                expect_value(self, subs, expected_subs, None)
 
     def test_parse_mpd_formats(self):
         _TEST_CASES = [
@@ -949,8 +780,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'tbr': 5997.485,
                     'width': 1920,
                     'height': 1080,
-                }],
-                {},
+                }]
             ), (
                 # https://github.com/ytdl-org/youtube-dl/pull/14844
                 'urls_only',
@@ -1033,8 +863,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'tbr': 4400,
                     'width': 1920,
                     'height': 1080,
-                }],
-                {},
+                }]
             ), (
                 # https://github.com/ytdl-org/youtube-dl/issues/20346
                 # Media considered unfragmented even though it contains
@@ -1080,328 +909,18 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'width': 360,
                     'height': 360,
                     'fps': 30,
-                }],
-                {},
-            ), (
-                'subtitles',
-                'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/',
-                [{
-                    'format_id': 'audio=128001',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'm4a',
-                    'tbr': 128.001,
-                    'asr': 48000,
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'vcodec': 'none',
-                    'acodec': 'mp4a.40.2',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                    'audio_ext': 'm4a',
-                    'video_ext': 'none',
-                    'abr': 128.001,
-                }, {
-                    'format_id': 'video=100000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 336,
-                    'height': 144,
-                    'tbr': 100,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 100,
-                }, {
-                    'format_id': 'video=326000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 562,
-                    'height': 240,
-                    'tbr': 326,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 326,
-                }, {
-                    'format_id': 'video=698000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 844,
-                    'height': 360,
-                    'tbr': 698,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 698,
-                }, {
-                    'format_id': 'video=1493000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 1126,
-                    'height': 480,
-                    'tbr': 1493,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 1493,
-                }, {
-                    'format_id': 'video=4482000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 1688,
-                    'height': 720,
-                    'tbr': 4482,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 4482,
-                }],
-                {
-                    'en': [
-                        {
-                            'ext': 'mp4',
-                            'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                            'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                            'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                            'protocol': 'http_dash_segments',
-                        }
-                    ]
-                },
+                }]
             )
         ]
 
-        for mpd_file, mpd_url, mpd_base_url, expected_formats, expected_subtitles in _TEST_CASES:
+        for mpd_file, mpd_url, mpd_base_url, expected_formats in _TEST_CASES:
             with io.open('./test/testdata/mpd/%s.mpd' % mpd_file,
                          mode='r', encoding='utf-8') as f:
-                formats, subtitles = self.ie._parse_mpd_formats_and_subtitles(
+                formats = self.ie._parse_mpd_formats(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     mpd_base_url=mpd_base_url, mpd_url=mpd_url)
                 self.ie._sort_formats(formats)
                 expect_value(self, formats, expected_formats, None)
-                expect_value(self, subtitles, expected_subtitles, None)
-
-    def test_parse_ism_formats(self):
-        _TEST_CASES = [
-            (
-                'sintel',
-                'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                [{
-                    'format_id': 'audio-128',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'isma',
-                    'tbr': 128,
-                    'asr': 48000,
-                    'vcodec': 'none',
-                    'acodec': 'AACL',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'audio',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 0,
-                        'height': 0,
-                        'fourcc': 'AACL',
-                        'codec_private_data': '1190',
-                        'sampling_rate': 48000,
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'audio_ext': 'isma',
-                    'video_ext': 'none',
-                    'abr': 128,
-                }, {
-                    'format_id': 'video-100',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 336,
-                    'height': 144,
-                    'tbr': 100,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 336,
-                        'height': 144,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA0544EFFC2D002CBC40000003004000000C03C60CA80000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 100,
-                }, {
-                    'format_id': 'video-326',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 562,
-                    'height': 240,
-                    'tbr': 326,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 562,
-                        'height': 240,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA0241FE23FFC3BC83BA44000003000400000300C03C60CA800000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 326,
-                }, {
-                    'format_id': 'video-698',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 844,
-                    'height': 360,
-                    'tbr': 698,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 844,
-                        'height': 360,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA0350BFB97FF06AF06AD1000003000100000300300F1832A00000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 698,
-                }, {
-                    'format_id': 'video-1493',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1126,
-                    'height': 480,
-                    'tbr': 1493,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 1126,
-                        'height': 480,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA011C3DE6FFF0D890D871000003000100000300300F1832A00000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 1493,
-                }, {
-                    'format_id': 'video-4482',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1688,
-                    'height': 720,
-                    'tbr': 4482,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 1688,
-                        'height': 720,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA01A816F97FFC1ABC1AB440000003004000000C03C60CA80000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 4482,
-                }],
-                {
-                    'eng': [
-                        {
-                            'ext': 'ismt',
-                            'protocol': 'ism',
-                            'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                            'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                            '_download_params': {
-                                'stream_type': 'text',
-                                'duration': 8880746666,
-                                'timescale': 10000000,
-                                'fourcc': 'TTML',
-                                'codec_private_data': ''
-                            }
-                        }
-                    ]
-                },
-            ),
-        ]
-
-        for ism_file, ism_url, expected_formats, expected_subtitles in _TEST_CASES:
-            with io.open('./test/testdata/ism/%s.Manifest' % ism_file,
-                         mode='r', encoding='utf-8') as f:
-                formats, subtitles = self.ie._parse_ism_formats_and_subtitles(
-                    compat_etree_fromstring(f.read().encode('utf-8')), ism_url=ism_url)
-                self.ie._sort_formats(formats)
-                expect_value(self, formats, expected_formats, None)
-                expect_value(self, subtitles, expected_subtitles, None)
 
     def test_parse_f4m_formats(self):
         _TEST_CASES = [

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'
 
@@ -29,7 +29,6 @@ class YDL(FakeYDL):
         self.msgs = []
 
     def process_info(self, info_dict):
-        info_dict.pop('__original_infodict', None)
         self.downloaded_info_dicts.append(info_dict)
 
     def to_screen(self, msg):
@@ -312,8 +311,8 @@ class TestFormatSelection(unittest.TestCase):
         self.assertRaises(ExtractorError, ydl.process_ie_result, info_dict.copy())
 
     def test_youtube_format_selection(self):
-        # FIXME: Rewrite in accordance with the new format sorting options
         return
+        # disabled for now - this needs some changes
 
         order = [
             '38', '37', '46', '22', '45', '35', '44', '18', '34', '43', '6', '5', '17', '36', '13',
@@ -461,13 +460,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 = [
@@ -601,26 +601,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertTrue(subs)
         self.assertEqual(set(subs.keys()), set(['es', 'fr']))
 
-        result = get_info({'writesubtitles': True, 'subtitleslangs': ['all', '-en']})
-        subs = result['requested_subtitles']
-        self.assertTrue(subs)
-        self.assertEqual(set(subs.keys()), set(['es', 'fr']))
-
-        result = get_info({'writesubtitles': True, 'subtitleslangs': ['en', 'fr', '-en']})
-        subs = result['requested_subtitles']
-        self.assertTrue(subs)
-        self.assertEqual(set(subs.keys()), set(['fr']))
-
-        result = get_info({'writesubtitles': True, 'subtitleslangs': ['-en', 'en']})
-        subs = result['requested_subtitles']
-        self.assertTrue(subs)
-        self.assertEqual(set(subs.keys()), set(['en']))
-
-        result = get_info({'writesubtitles': True, 'subtitleslangs': ['e.+']})
-        subs = result['requested_subtitles']
-        self.assertTrue(subs)
-        self.assertEqual(set(subs.keys()), set(['es', 'en']))
-
         result = get_info({'writesubtitles': True, 'writeautomaticsub': True, 'subtitleslangs': ['es', 'pt']})
         subs = result['requested_subtitles']
         self.assertTrue(subs)
@@ -647,131 +627,47 @@ 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%',
+        }
 
-    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)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%')
 
     def test_format_note(self):
         ydl = YoutubeDL()
@@ -830,7 +726,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)

test/test_YoutubeDLCookieJar.py

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

test/test_aes.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+
 from __future__ import unicode_literals
 
 # Allow direct execution

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

test/test_all_urls.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -37,6 +37,7 @@ class TestAllURLsMatching(unittest.TestCase):
         assertPlaylist('PL63F0C78739B09958')
         assertTab('https://www.youtube.com/AsapSCIENCE')
         assertTab('https://www.youtube.com/embedded')
+        assertTab('https://www.youtube.com/feed')  # Own channel's home page
         assertTab('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')
         assertTab('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
         assertTab('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
@@ -72,6 +73,15 @@ class TestAllURLsMatching(unittest.TestCase):
         self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
         self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
 
+    def test_youtube_extract(self):
+        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
+        assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
+        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
+
     def test_facebook_matching(self):
         self.assertTrue(FacebookIE.suitable('https://www.facebook.com/Shiniknoh#!/photo.php?v=10153317450565268'))
         self.assertTrue(FacebookIE.suitable('https://www.facebook.com/cindyweather?fref=ts#!/photo.php?v=10152183998945793'))

test/test_cache.py

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

test/test_compat.py

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

test/test_download.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -121,7 +121,6 @@ def generator(test_case, tname):
         params['outtmpl'] = tname + '_' + params['outtmpl']
         if is_playlist and 'playlist' not in test_case:
             params.setdefault('extract_flat', 'in_playlist')
-            params.setdefault('playlistend', test_case.get('playlist_mincount'))
             params.setdefault('skip_download', True)
 
         ydl = YoutubeDL(params, auto_init=False)

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
 

test/test_execution.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import unicode_literals
@@ -39,16 +39,6 @@ class TestExecution(unittest.TestCase):
         _, stderr = p.communicate()
         self.assertFalse(stderr)
 
-    def test_lazy_extractors(self):
-        try:
-            subprocess.check_call([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'], cwd=rootDir, stdout=_DEV_NULL)
-            subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=_DEV_NULL)
-        finally:
-            try:
-                os.remove('yt_dlp/extractor/lazy_extractors.py')
-            except (IOError, OSError):
-                pass
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_http.py

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

test/test_iqiyi_sdk_interpreter.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 

test/test_jsinterp.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 

test/test_overwrites.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import os

test/test_post_hooks.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 

test/test_postprocessors.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -8,64 +8,16 @@ 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):
     def test_format_to_regex(self):
         pp = MetadataFromFieldPP(None, ['title:%(title)s - %(artist)s'])
-        self.assertEqual(pp._data[0]['regex'], r'(?P<title>.+)\ \-\ (?P<artist>.+)')
-
-    def test_field_to_outtmpl(self):
-        pp = MetadataFromFieldPP(None, ['title:%(title)s : %(artist)s'])
-        self.assertEqual(pp._data[0]['tmpl'], '%(title)s')
-
-    def test_in_out_seperation(self):
-        pp = MetadataFromFieldPP(None, ['%(title)s \\: %(artist)s:%(title)s : %(artist)s'])
-        self.assertEqual(pp._data[0]['in'], '%(title)s : %(artist)s')
-        self.assertEqual(pp._data[0]['out'], '%(title)s : %(artist)s')
+        self.assertEqual(pp._data[0]['regex'], r'(?P<title>[^\r\n]+)\ \-\ (?P<artist>[^\r\n]+)')
 
 
 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'])
+        self.assertEqual(pp._titleregex, r'(?P<title>[^\r\n]+)\ \-\ (?P<artist>[^\r\n]+)')

test/test_socks.py

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

test/test_subtitles.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 # Allow direct execution

test/test_swfinterp.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 # Allow direct execution

test/test_update.py.disabled

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 

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
 
@@ -24,7 +23,6 @@ from yt_dlp.utils import (
     clean_html,
     clean_podcast_url,
     date_from_str,
-    datetime_from_str,
     DateRange,
     detect_exe_version,
     determine_ext,
@@ -67,7 +65,6 @@ from yt_dlp.utils import (
     sanitize_filename,
     sanitize_path,
     sanitize_url,
-    sanitized_Request,
     expand_path,
     prepend_extension,
     replace_extension,
@@ -109,7 +106,6 @@ from yt_dlp.utils import (
     cli_bool_option,
     parse_codecs,
     iri_to_uri,
-    LazyList,
 )
 from yt_dlp.compat import (
     compat_chr,
@@ -128,7 +124,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 +237,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):
@@ -326,18 +311,8 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(date_from_str('yesterday'), date_from_str('now-1day'))
         self.assertEqual(date_from_str('now+7day'), date_from_str('now+1week'))
         self.assertEqual(date_from_str('now+14day'), date_from_str('now+2week'))
-        self.assertEqual(date_from_str('20200229+365day'), date_from_str('20200229+1year'))
-        self.assertEqual(date_from_str('20210131+28day'), date_from_str('20210131+1month'))
-
-    def test_datetime_from_str(self):
-        self.assertEqual(datetime_from_str('yesterday', precision='day'), datetime_from_str('now-1day', precision='auto'))
-        self.assertEqual(datetime_from_str('now+7day', precision='day'), datetime_from_str('now+1week', precision='auto'))
-        self.assertEqual(datetime_from_str('now+14day', precision='day'), datetime_from_str('now+2week', precision='auto'))
-        self.assertEqual(datetime_from_str('20200229+365day', precision='day'), datetime_from_str('20200229+1year', precision='auto'))
-        self.assertEqual(datetime_from_str('20210131+28day', precision='day'), datetime_from_str('20210131+1month', precision='auto'))
-        self.assertEqual(datetime_from_str('20210131+59day', precision='day'), datetime_from_str('20210131+2month', precision='auto'))
-        self.assertEqual(datetime_from_str('now+1day', precision='hour'), datetime_from_str('now+24hours', precision='auto'))
-        self.assertEqual(datetime_from_str('now+23hours', precision='hour'), datetime_from_str('now+23hours', precision='auto'))
+        self.assertEqual(date_from_str('now+365day'), date_from_str('now+1year'))
+        self.assertEqual(date_from_str('now+30day'), date_from_str('now+1month'))
 
     def test_daterange(self):
         _20century = DateRange("19000101", "20000101")
@@ -1527,47 +1502,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(LazyList(it).reverse()), it[::-1])
-        self.assertEqual(list(LazyList(it).reverse()[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 = LazyList(range(10)).reverse()
-        test(ll, -1, 0, range(1))
-        test(ll, 3, 6, range(10))
-
-        ll = LazyList(itertools.count())
-        test(ll, 10, 10, range(11))
-        ll.reverse()
-        test(ll, -15, 14, range(15))
-
 
 if __name__ == '__main__':
     unittest.main()

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

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
 

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

test/test_youtube_misc.py

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

test/test_youtube_signature.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 

test/testdata/ism/sintel.Manifest

@@ -1,988 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Created with Unified Streaming Platform (version=1.10.18-20255) -->
-<SmoothStreamingMedia
-  MajorVersion="2"
-  MinorVersion="0"
-  TimeScale="10000000"
-  Duration="8880746666">
-  <StreamIndex
-    Type="audio"
-    QualityLevels="1"
-    TimeScale="10000000"
-    Name="audio"
-    Chunks="445"
-    Url="QualityLevels({bitrate})/Fragments(audio={start time})">
-    <QualityLevel
-      Index="0"
-      Bitrate="128001"
-      CodecPrivateData="1190"
-      SamplingRate="48000"
-      Channels="2"
-      BitsPerSample="16"
-      PacketSize="4"
-      AudioTag="255"
-      FourCC="AACL" />
-    <c t="0" d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="20053333" />
-    <c d="20053333" />
-    <c d="20053334" />
-    <c d="19840000" />
-    <c d="746666" />
-  </StreamIndex>
-  <StreamIndex
-    Type="text"
-    QualityLevels="1"
-    TimeScale="10000000"
-    Language="eng"
-    Subtype="CAPT"
-    Name="textstream_eng"
-    Chunks="11"
-    Url="QualityLevels({bitrate})/Fragments(textstream_eng={start time})">
-    <QualityLevel
-      Index="0"
-      Bitrate="1000"
-      CodecPrivateData=""
-      FourCC="TTML" />
-    <c t="0" d="600000000" />
-    <c d="600000000" />
-    <c d="600000000" />
-    <c d="600000000" />
-    <c d="600000000" />
-    <c d="600000000" />
-    <c d="600000000" />
-    <c d="600000000" />
-    <c d="600000000" />
-    <c d="600000000" />
-    <c d="240000000" />
-  </StreamIndex>
-  <StreamIndex
-    Type="video"
-    QualityLevels="5"
-    TimeScale="10000000"
-    Name="video"
-    Chunks="444"
-    Url="QualityLevels({bitrate})/Fragments(video={start time})"
-    MaxWidth="1688"
-    MaxHeight="720"
-    DisplayWidth="1689"
-    DisplayHeight="720">
-    <QualityLevel
-      Index="0"
-      Bitrate="100000"
-      CodecPrivateData="00000001674D401FDA0544EFFC2D002CBC40000003004000000C03C60CA80000000168EF32C8"
-      MaxWidth="336"
-      MaxHeight="144"
-      FourCC="AVC1" />
-    <QualityLevel
-      Index="1"
-      Bitrate="326000"
-      CodecPrivateData="00000001674D401FDA0241FE23FFC3BC83BA44000003000400000300C03C60CA800000000168EF32C8"
-      MaxWidth="562"
-      MaxHeight="240"
-      FourCC="AVC1" />
-    <QualityLevel
-      Index="2"
-      Bitrate="698000"
-      CodecPrivateData="00000001674D401FDA0350BFB97FF06AF06AD1000003000100000300300F1832A00000000168EF32C8"
-      MaxWidth="844"
-      MaxHeight="360"
-      FourCC="AVC1" />
-    <QualityLevel
-      Index="3"
-      Bitrate="1493000"
-      CodecPrivateData="00000001674D401FDA011C3DE6FFF0D890D871000003000100000300300F1832A00000000168EF32C8"
-      MaxWidth="1126"
-      MaxHeight="480"
-      FourCC="AVC1" />
-    <QualityLevel
-      Index="4"
-      Bitrate="4482000"
-      CodecPrivateData="00000001674D401FDA01A816F97FFC1ABC1AB440000003004000000C03C60CA80000000168EF32C8"
-      MaxWidth="1688"
-      MaxHeight="720"
-      FourCC="AVC1" />
-    <c t="0" d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-    <c d="20000000" />
-  </StreamIndex>
-</SmoothStreamingMedia>

test/testdata/m3u8/bipbop_16x9.m3u8

@@ -1,38 +0,0 @@
-#EXTM3U
-
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="eng",NAME="BipBop Audio 1",AUTOSELECT=YES,DEFAULT=YES
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="eng",NAME="BipBop Audio 2",AUTOSELECT=NO,DEFAULT=NO,URI="alternate_audio_aac/prog_index.m3u8"
-
-
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="English",DEFAULT=YES,AUTOSELECT=YES,FORCED=NO,LANGUAGE="en",CHARACTERISTICS="public.accessibility.transcribes-spoken-dialog, public.accessibility.describes-music-and-sound",URI="subtitles/eng/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="English (Forced)",DEFAULT=NO,AUTOSELECT=NO,FORCED=YES,LANGUAGE="en",URI="subtitles/eng_forced/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="Français",DEFAULT=NO,AUTOSELECT=YES,FORCED=NO,LANGUAGE="fr",CHARACTERISTICS="public.accessibility.transcribes-spoken-dialog, public.accessibility.describes-music-and-sound",URI="subtitles/fra/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="Français (Forced)",DEFAULT=NO,AUTOSELECT=NO,FORCED=YES,LANGUAGE="fr",URI="subtitles/fra_forced/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="Español",DEFAULT=NO,AUTOSELECT=YES,FORCED=NO,LANGUAGE="es",CHARACTERISTICS="public.accessibility.transcribes-spoken-dialog, public.accessibility.describes-music-and-sound",URI="subtitles/spa/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="Español (Forced)",DEFAULT=NO,AUTOSELECT=NO,FORCED=YES,LANGUAGE="es",URI="subtitles/spa_forced/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="日本語",DEFAULT=NO,AUTOSELECT=YES,FORCED=NO,LANGUAGE="ja",CHARACTERISTICS="public.accessibility.transcribes-spoken-dialog, public.accessibility.describes-music-and-sound",URI="subtitles/jpn/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="日本語 (Forced)",DEFAULT=NO,AUTOSELECT=NO,FORCED=YES,LANGUAGE="ja",URI="subtitles/jpn_forced/prog_index.m3u8"
-
-
-#EXT-X-STREAM-INF:BANDWIDTH=263851,CODECS="mp4a.40.2, avc1.4d400d",RESOLUTION=416x234,AUDIO="bipbop_audio",SUBTITLES="subs"
-gear1/prog_index.m3u8
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=28451,CODECS="avc1.4d400d",URI="gear1/iframe_index.m3u8"
-
-#EXT-X-STREAM-INF:BANDWIDTH=577610,CODECS="mp4a.40.2, avc1.4d401e",RESOLUTION=640x360,AUDIO="bipbop_audio",SUBTITLES="subs"
-gear2/prog_index.m3u8
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=181534,CODECS="avc1.4d401e",URI="gear2/iframe_index.m3u8"
-
-#EXT-X-STREAM-INF:BANDWIDTH=915905,CODECS="mp4a.40.2, avc1.4d401f",RESOLUTION=960x540,AUDIO="bipbop_audio",SUBTITLES="subs"
-gear3/prog_index.m3u8
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=297056,CODECS="avc1.4d401f",URI="gear3/iframe_index.m3u8"
-
-#EXT-X-STREAM-INF:BANDWIDTH=1030138,CODECS="mp4a.40.2, avc1.4d401f",RESOLUTION=1280x720,AUDIO="bipbop_audio",SUBTITLES="subs"
-gear4/prog_index.m3u8
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=339492,CODECS="avc1.4d401f",URI="gear4/iframe_index.m3u8"
-
-#EXT-X-STREAM-INF:BANDWIDTH=1924009,CODECS="mp4a.40.2, avc1.4d401f",RESOLUTION=1920x1080,AUDIO="bipbop_audio",SUBTITLES="subs"
-gear5/prog_index.m3u8
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=669554,CODECS="avc1.4d401f",URI="gear5/iframe_index.m3u8"
-
-#EXT-X-STREAM-INF:BANDWIDTH=41457,CODECS="mp4a.40.2",AUDIO="bipbop_audio",SUBTITLES="subs"
-gear0/prog_index.m3u8

test/testdata/mpd/subtitles.mpd

@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Created with Unified Streaming Platform (version=1.10.18-20255) -->
-<MPD
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="urn:mpeg:dash:schema:mpd:2011"
-  xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-DASH_schema_files/DASH-MPD.xsd"
-  type="static"
-  mediaPresentationDuration="PT14M48S"
-  maxSegmentDuration="PT1M"
-  minBufferTime="PT10S"
-  profiles="urn:mpeg:dash:profile:isoff-live:2011">
-  <Period
-    id="1"
-    duration="PT14M48S">
-    <BaseURL>dash/</BaseURL>
-    <AdaptationSet
-      id="1"
-      group="1"
-      contentType="audio"
-      segmentAlignment="true"
-      audioSamplingRate="48000"
-      mimeType="audio/mp4"
-      codecs="mp4a.40.2"
-      startWithSAP="1">
-      <AudioChannelConfiguration
-        schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011"
-        value="2" />
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main" />
-      <SegmentTemplate
-        timescale="48000"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="3584" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="audio=128001"
-        bandwidth="128001">
-      </Representation>
-    </AdaptationSet>
-    <AdaptationSet
-      id="2"
-      group="3"
-      contentType="text"
-      lang="en"
-      mimeType="application/mp4"
-      codecs="stpp"
-      startWithSAP="1">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle" />
-      <SegmentTemplate
-        timescale="1000"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="60000" r="9" />
-          <S d="24000" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="textstream_eng=1000"
-        bandwidth="1000">
-      </Representation>
-    </AdaptationSet>
-    <AdaptationSet
-      id="3"
-      group="2"
-      contentType="video"
-      par="960:409"
-      minBandwidth="100000"
-      maxBandwidth="4482000"
-      maxWidth="1689"
-      maxHeight="720"
-      segmentAlignment="true"
-      mimeType="video/mp4"
-      codecs="avc1.4D401F"
-      startWithSAP="1">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main" />
-      <SegmentTemplate
-        timescale="12288"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="24576" r="443" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="video=100000"
-        bandwidth="100000"
-        width="336"
-        height="144"
-        sar="2880:2863"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=326000"
-        bandwidth="326000"
-        width="562"
-        height="240"
-        sar="115200:114929"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=698000"
-        bandwidth="698000"
-        width="844"
-        height="360"
-        sar="86400:86299"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=1493000"
-        bandwidth="1493000"
-        width="1126"
-        height="480"
-        sar="230400:230267"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=4482000"
-        bandwidth="4482000"
-        width="1688"
-        height="720"
-        sar="86400:86299"
-        scanType="progressive">
-      </Representation>
-    </AdaptationSet>
-  </Period>
-</MPD>

yt-dlp.sh

@@ -1,2 +1,2 @@
-#!/bin/sh
-exec python3 "$(dirname "$(realpath "$0")")/yt_dlp/__main__.py" "$@"
+#!/bin/bash
+python3 "$(dirname $(realpath $0))/yt_dlp/__main__.py" "$@"

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
 
@@ -67,7 +60,6 @@ def _real_main(argv=None):
     setproctitle('yt-dlp')
 
     parser, opts, args = parseOpts(argv)
-    warnings = []
 
     # Set user agent
     if opts.user_agent is not None:
@@ -136,12 +128,16 @@ def _real_main(argv=None):
         parser.error('account username missing\n')
     if opts.ap_password is not None and opts.ap_username is None:
         parser.error('TV Provider account username missing\n')
+    if opts.outtmpl is not None and (opts.usetitle or opts.autonumber or opts.useid):
+        parser.error('using output template conflicts with using title, video ID or auto number')
     if opts.autonumber_size is not None:
         if opts.autonumber_size <= 0:
             parser.error('auto number size must be positive')
     if opts.autonumber_start is not None:
         if opts.autonumber_start < 0:
             parser.error('auto number start must be positive or 0')
+    if opts.usetitle and opts.useid:
+        parser.error('using title conflicts with using video ID')
     if opts.username is not None and opts.password is None:
         opts.password = compat_getpass('Type account password and press [Return]: ')
     if opts.ap_username is not None and opts.ap_password is None:
@@ -151,11 +147,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:
@@ -186,10 +177,9 @@ def _real_main(argv=None):
             parser.error('requests sleep interval must be positive or 0')
     if opts.ap_mso and opts.ap_mso not in MSO_INFO:
         parser.error('Unsupported TV Provider, use --ap-list-mso to get a list of supported TV Providers')
-    if opts.overwrites:  # --yes-overwrites implies --no-continue
+    if opts.overwrites:
+        # --yes-overwrites implies --no-continue
         opts.continue_dl = False
-    if opts.concurrent_fragment_downloads <= 0:
-        raise ValueError('Concurrent fragments must be positive')
 
     def parse_retries(retries, name=''):
         if retries in ('inf', 'infinite'):
@@ -221,112 +211,44 @@ 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:
-            parser.error('invalid thumbnail format specified')
 
     if opts.date is not None:
         date = DateRange.day(opts.date)
     else:
         date = DateRange(opts.dateafter, opts.datebefore)
 
-    def parse_compat_opts():
-        parsed_compat_opts, compat_opts = set(), opts.compat_opts[::-1]
-        while compat_opts:
-            actual_opt = opt = compat_opts.pop().lower()
-            if opt == 'youtube-dl':
-                compat_opts.extend(['-multistreams', 'all'])
-            elif opt == 'youtube-dlc':
-                compat_opts.extend(['-no-youtube-channel-redirect', '-no-live-chat', 'all'])
-            elif opt == 'all':
-                parsed_compat_opts.update(all_compat_opts)
-            elif opt == '-all':
-                parsed_compat_opts = set()
-            else:
-                if opt[0] == '-':
-                    opt = opt[1:]
-                    parsed_compat_opts.discard(opt)
-                else:
-                    parsed_compat_opts.update([opt])
-                if opt not in all_compat_opts:
-                    parser.error('Invalid compatibility option %s' % actual_opt)
-        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',
-        'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-attach-info-json',
-        'embed-thumbnail-atomicparsley', 'seperate-video-versions',
-    ]
-    compat_opts = parse_compat_opts()
-
-    def _unused_compat_opt(name):
-        if name not in compat_opts:
-            return False
-        compat_opts.discard(name)
-        compat_opts.update(['*%s' % name])
-        return True
-
-    def set_default_compat(compat_name, opt_name, default=True, remove_compat=False):
-        attr = getattr(opts, opt_name)
-        if compat_name in compat_opts:
-            if attr is None:
-                setattr(opts, opt_name, not default)
-                return True
-            else:
-                if remove_compat:
-                    _unused_compat_opt(compat_name)
-                return False
-        elif attr is None:
-            setattr(opts, opt_name, default)
-        return None
-
-    set_default_compat('abort-on-error', 'ignoreerrors')
-    set_default_compat('no-playlist-metafiles', 'allow_playlist_files')
-    if 'format-sort' in compat_opts:
-        opts.format_sort.extend(InfoExtractor.FormatSort.ytdl_default)
-    _video_multistreams_set = set_default_compat('multistreams', 'allow_multiple_video_streams', False, remove_compat=False)
-    _audio_multistreams_set = set_default_compat('multistreams', 'allow_multiple_audio_streams', False, remove_compat=False)
-    if _video_multistreams_set is False and _audio_multistreams_set is False:
-        _unused_compat_opt('multistreams')
-    outtmpl_default = opts.outtmpl.get('default')
-    if 'filename' in compat_opts:
-        if outtmpl_default is None:
-            outtmpl_default = '%(title)s.%(id)s.%(ext)s'
-            opts.outtmpl.update({'default': outtmpl_default})
-        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')
-
+    # Do not download videos when there are audio-only formats
     if opts.extractaudio and not opts.keepvideo and opts.format is None:
         opts.format = 'bestaudio/best'
 
+    outtmpl = opts.outtmpl
+    if not outtmpl:
+        outtmpl = {'default': (
+            '%(title)s-%(id)s-%(format)s.%(ext)s' if opts.format == '-1' and opts.usetitle
+            else '%(id)s-%(format)s.%(ext)s' if opts.format == '-1'
+            else '%(autonumber)s-%(title)s-%(id)s.%(ext)s' if opts.usetitle and opts.autonumber
+            else '%(title)s-%(id)s.%(ext)s' if opts.usetitle
+            else '%(id)s.%(ext)s' if opts.useid
+            else '%(autonumber)s-%(id)s.%(ext)s' if opts.autonumber
+            else None)}
+    outtmpl_default = outtmpl.get('default')
     if outtmpl_default is not None and not os.path.splitext(outtmpl_default)[1] and opts.extractaudio:
         parser.error('Cannot download a video and extract audio into the same'
                      ' file! Use "{0}.%(ext)s" instead of "{0}" as the output'
@@ -344,7 +266,7 @@ def _real_main(argv=None):
         if re.match(MetadataFromFieldPP.regex, f) is None:
             parser.error('invalid format string "%s" specified for --parse-metadata' % f)
 
-    any_getting = opts.forceprint or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration or opts.dumpjson or opts.dump_single_json
+    any_getting = opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration or opts.dumpjson or opts.dump_single_json
     any_printing = opts.print_json
     download_archive_fn = expand_path(opts.download_archive) if opts.download_archive is not None else opts.download_archive
 
@@ -354,15 +276,10 @@ def _real_main(argv=None):
         opts.writeinfojson = True
 
     def report_conflict(arg1, arg2):
-        warnings.append('%s is ignored since %s was given' % (arg2, arg1))
-
+        write_string('WARNING: %s is ignored since %s was given\n' % (arg2, arg1), out=sys.stderr)
     if opts.remuxvideo and opts.recodevideo:
         report_conflict('--recode-video', '--remux-video')
         opts.remuxvideo = False
-    if opts.sponskrub_cut and opts.split_chapters and opts.sponskrub is not False:
-        report_conflict('--split-chapter', '--sponskrub-cut')
-        opts.sponskrub_cut = False
-
     if opts.allow_unplayable_formats:
         if opts.extractaudio:
             report_conflict('--allow-unplayable-formats', '--extract-audio')
@@ -398,22 +315,7 @@ def _real_main(argv=None):
         postprocessors.append({
             'key': 'MetadataFromField',
             'formats': opts.metafromfield,
-            # Run this immediately after extraction is complete
-            'when': 'pre_process'
-        })
-    if opts.convertsubtitles:
-        postprocessors.append({
-            'key': 'FFmpegSubtitlesConvertor',
-            'format': opts.convertsubtitles,
-            # Run this before the actual video download
-            'when': 'before_dl'
-        })
-    if opts.convertthumbnails:
-        postprocessors.append({
-            'key': 'FFmpegThumbnailsConvertor',
-            'format': opts.convertthumbnails,
-            # Run this before the actual video download
-            'when': 'before_dl'
+            'when': 'beforedl'
         })
     if opts.extractaudio:
         postprocessors.append({
@@ -442,11 +344,15 @@ def _real_main(argv=None):
     # so metadata can be added here.
     if opts.addmetadata:
         postprocessors.append({'key': 'FFmpegMetadata'})
+    if opts.convertsubtitles:
+        postprocessors.append({
+            'key': 'FFmpegSubtitlesConvertor',
+            'format': opts.convertsubtitles,
+        })
     if opts.embedsubtitles:
         already_have_subtitle = opts.writesubtitles
         postprocessors.append({
             'key': 'FFmpegEmbedSubtitle',
-            # already_have_subtitle = True prevents the file from being deleted after embedding
             'already_have_subtitle': already_have_subtitle
         })
         if not already_have_subtitle:
@@ -455,9 +361,19 @@ def _real_main(argv=None):
     # this was the old behaviour if only --all-sub was given.
     if opts.allsubtitles and not opts.writeautomaticsub:
         opts.writesubtitles = True
-    # This should be above EmbedThumbnail since sponskrub removes the thumbnail attachment
-    # but must be below EmbedSubtitle and FFmpegMetadata
-    # See https://github.com/yt-dlp/yt-dlp/issues/204 , https://github.com/faissaloo/SponSkrub/issues/29
+    if opts.embedthumbnail:
+        already_have_thumbnail = opts.writethumbnail or opts.write_all_thumbnails
+        postprocessors.append({
+            'key': 'EmbedThumbnail',
+            'already_have_thumbnail': already_have_thumbnail
+        })
+        if not already_have_thumbnail:
+            opts.writethumbnail = True
+    # XAttrMetadataPP should be run after post-processors that may change file
+    # contents
+    if opts.xattrs:
+        postprocessors.append({'key': 'XAttrMetadata'})
+    # This should be below all ffmpeg PP because it may cut parts out from the video
     # If opts.sponskrub is None, sponskrub is used, but it silently fails if the executable can't be found
     if opts.sponskrub is not False:
         postprocessors.append({
@@ -468,34 +384,20 @@ def _real_main(argv=None):
             'force': opts.sponskrub_force,
             'ignoreerror': opts.sponskrub is None,
         })
-    if opts.embedthumbnail:
-        already_have_thumbnail = opts.writethumbnail or opts.write_all_thumbnails
-        postprocessors.append({
-            'key': 'EmbedThumbnail',
-            # already_have_thumbnail = True prevents the file from being deleted after embedding
-            'already_have_thumbnail': already_have_thumbnail
-        })
-        if not already_have_thumbnail:
-            opts.writethumbnail = True
-    if opts.split_chapters:
-        postprocessors.append({'key': 'FFmpegSplitChapters'})
-    # XAttrMetadataPP should be run after post-processors that may change file contents
-    if opts.xattrs:
-        postprocessors.append({'key': 'XAttrMetadata'})
     # ExecAfterDownload must be the last PP
     if opts.exec_cmd:
         postprocessors.append({
             'key': 'ExecAfterDownload',
             'exec_cmd': opts.exec_cmd,
-            # Run this only after the files have been moved to their final locations
-            'when': 'after_move'
+            'when': 'aftermove'
         })
 
     def report_args_compat(arg, name):
-        warnings.append('%s given without specifying name. The arguments will be given to all %s' % (arg, name))
-
+        write_string(
+            'WARNING: %s given without specifying name. The arguments will be given to all %s\n' % (arg, name),
+            out=sys.stderr)
     if 'default' in opts.external_downloader_args:
-        report_args_compat('--downloader-args', 'external downloaders')
+        report_args_compat('--external-downloader-args', 'external downloaders')
 
     if 'default-compat' in opts.postprocessor_args and 'default' not in opts.postprocessor_args:
         report_args_compat('--post-processor-args', 'post-processors')
@@ -503,16 +405,17 @@ 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
         else match_filter_func(opts.match_filter))
 
     ydl_opts = {
+        'convertsubtitles': opts.convertsubtitles,
         'usenetrc': opts.usenetrc,
         'username': opts.username,
         'password': opts.password,
@@ -531,7 +434,6 @@ def _real_main(argv=None):
         'forceduration': opts.getduration,
         'forcefilename': opts.getfilename,
         'forceformat': opts.getformat,
-        'forceprint': opts.forceprint,
         'forcejson': opts.dumpjson or opts.print_json,
         'dump_single_json': opts.dump_single_json,
         'force_write_download_archive': opts.force_write_download_archive,
@@ -539,15 +441,13 @@ def _real_main(argv=None):
         'skip_download': opts.skip_download,
         'format': opts.format,
         'allow_unplayable_formats': opts.allow_unplayable_formats,
-        'ignore_no_formats_error': opts.ignore_no_formats_error,
         'format_sort': opts.format_sort,
         'format_sort_force': opts.format_sort_force,
         'allow_multiple_video_streams': opts.allow_multiple_video_streams,
         'allow_multiple_audio_streams': opts.allow_multiple_audio_streams,
-        'check_formats': opts.check_formats,
         'listformats': opts.listformats,
         'listformats_table': opts.listformats_table,
-        'outtmpl': opts.outtmpl,
+        'outtmpl': outtmpl,
         'outtmpl_na_placeholder': opts.outtmpl_na_placeholder,
         'paths': opts.paths,
         'autonumber_size': opts.autonumber_size,
@@ -557,14 +457,12 @@ 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,
         'extractor_retries': opts.extractor_retries,
         'skip_unavailable_fragments': opts.skip_unavailable_fragments,
         'keep_fragments': opts.keep_fragments,
-        'concurrent_fragment_downloads': opts.concurrent_fragment_downloads,
         'buffersize': opts.buffersize,
         'noresizebuffer': opts.noresizebuffer,
         'http_chunk_size': opts.http_chunk_size,
@@ -584,7 +482,6 @@ def _real_main(argv=None):
         'writeannotations': opts.writeannotations,
         'writeinfojson': opts.writeinfojson,
         'allow_playlist_files': opts.allow_playlist_files,
-        'clean_infojson': opts.clean_infojson,
         'getcomments': opts.getcomments,
         'writethumbnail': opts.writethumbnail,
         'write_all_thumbnails': opts.write_all_thumbnails,
@@ -619,7 +516,6 @@ def _real_main(argv=None):
         'download_archive': download_archive_fn,
         'break_on_existing': opts.break_on_existing,
         'break_on_reject': opts.break_on_reject,
-        'skip_playlist_after_errors': opts.skip_playlist_after_errors,
         'cookiefile': opts.cookiefile,
         'nocheckcertificate': opts.no_check_certificate,
         'prefer_insecure': opts.prefer_insecure,
@@ -631,7 +527,6 @@ def _real_main(argv=None):
         'include_ads': opts.include_ads,
         'default_search': opts.default_search,
         'dynamic_mpd': opts.dynamic_mpd,
-        'extractor_args': opts.extractor_args,
         'youtube_include_dash_manifest': opts.youtube_include_dash_manifest,
         'youtube_include_hls_manifest': opts.youtube_include_hls_manifest,
         'encoding': opts.encoding,
@@ -664,12 +559,9 @@ def _real_main(argv=None):
         'geo_bypass': opts.geo_bypass,
         'geo_bypass_country': opts.geo_bypass_country,
         'geo_bypass_ip_block': opts.geo_bypass_ip_block,
-        'warnings': warnings,
-        'compat_opts': compat_opts,
         # just for deprecation check
-        'autonumber': opts.autonumber or None,
-        'usetitle': opts.usetitle or None,
-        'useid': opts.useid or None,
+        'autonumber': opts.autonumber if opts.autonumber is True else None,
+        'usetitle': opts.usetitle if opts.usetitle is True else None,
     }
 
     with YoutubeDL(ydl_opts) as ydl:
@@ -682,7 +574,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()

yt_dlp/__main__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 # Execute with