.github/ISSUE_TEMPLATE/1_broken_site.md

@@ -18,7 +18,7 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.11.24. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
 - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -26,7 +26,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 youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2020.11.24**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar issues including closed ones
@@ -41,7 +41,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] youtube-dl version 2021.12.17
+ [debug] youtube-dl version 2020.11.24
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}

.github/ISSUE_TEMPLATE/2_site_support_request.md

@@ -19,7 +19,7 @@ labels: 'site-support-request'
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.11.24. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that site you are requesting is not dedicated to copyright infringement, see https://yt-dl.org/copyright-infringement. youtube-dl does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
 - Search the bugtracker for similar site support requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -27,7 +27,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 youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2020.11.24**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that none of provided URLs violate any copyrights
 - [ ] I've searched the bugtracker for similar site support requests including closed ones

.github/ISSUE_TEMPLATE/3_site_feature_request.md

@@ -18,13 +18,13 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.11.24. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
 - Finally, put x into all relevant boxes (like this [x])
 -->
 
 - [ ] I'm reporting a site feature request
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2020.11.24**
 - [ ] I've searched the bugtracker for similar site feature requests including closed ones
 
 

.github/ISSUE_TEMPLATE/4_bug_report.md

@@ -18,7 +18,7 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.11.24. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
 - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -27,7 +27,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 youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2020.11.24**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar bug reports including closed ones
@@ -43,7 +43,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] youtube-dl version 2021.12.17
+ [debug] youtube-dl version 2020.11.24
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}

.github/ISSUE_TEMPLATE/5_feature_request.md

@@ -19,13 +19,13 @@ labels: 'request'
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.11.24. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
 - Finally, put x into all relevant boxes (like this [x])
 -->
 
 - [ ] I'm reporting a feature request
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2020.11.24**
 - [ ] I've searched the bugtracker for similar feature requests including closed ones
 
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,10 +7,8 @@
 ---
 
 ### Before submitting a *pull request* make sure you have:
+- [ ] At least skimmed through [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site) and [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) sections
 - [ ] [Searched](https://github.com/ytdl-org/youtube-dl/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
-- [ ] Read [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site)
-- [ ] Read [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) and adjusted the code to meet them
-- [ ] Covered the code with tests (note that PRs without tests will be REJECTED)
 - [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)
 
 ### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:

.github/workflows/ci.yml

@@ -1,479 +0,0 @@
-name: CI
-
-env:
-  all-cpython-versions: 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12
-  main-cpython-versions: 2.7, 3.2, 3.5, 3.9, 3.11
-  pypy-versions: pypy-2.7, pypy-3.6, pypy-3.7
-  cpython-versions: main
-  test-set: core
-  # Python beta version to be built using pyenv before setup-python support
-  # Must also be included in all-cpython-versions 
-  next: 3.13
-
-on:
-  push:
-    # push inputs aren't known to GitHub
-    inputs:
-      cpython-versions:
-        type: string
-        default: all
-      test-set:
-        type: string
-        default: core
-  pull_request:
-    # pull_request inputs aren't known to GitHub
-    inputs:
-      cpython-versions:
-        type: string
-        default: main
-      test-set:
-        type: string
-        default: both
-  workflow_dispatch:
-    inputs:
-      cpython-versions:
-        type: choice
-        description: CPython versions (main = 2.7, 3.2, 3.5, 3.9, 3.11)
-        options:
-          - all
-          - main
-        required: true
-        default: main
-      test-set:
-        type: choice
-        description: core, download
-        options:
-          - both
-          - core
-          - download
-        required: true
-        default: both
-
-permissions:
-  contents: read
-
-jobs:
-  select:
-    name: Select tests from inputs
-    runs-on: ubuntu-latest
-    outputs:
-      cpython-versions: ${{ steps.run.outputs.cpython-versions }}
-      test-set: ${{ steps.run.outputs.test-set }}
-      own-pip-versions: ${{ steps.run.outputs.own-pip-versions }}
-    steps:
-    # push and pull_request inputs aren't known to GitHub (pt3)
-    - name: Set push defaults
-      if: ${{ github.event_name == 'push' }}
-      env:
-        cpython-versions: all
-        test-set: core
-      run: |
-        echo "cpython-versions=${{env.cpython-versions}}" >> "$GITHUB_ENV"
-        echo "test_set=${{env.test_set}}" >> "$GITHUB_ENV"
-    - name: Get pull_request inputs
-      if: ${{ github.event_name == 'pull_request' }}
-      env:
-        cpython-versions: main
-        test-set: both
-      run: |
-        echo "cpython-versions=${{env.cpython-versions}}" >> "$GITHUB_ENV"
-        echo "test_set=${{env.test_set}}" >> "$GITHUB_ENV"
-    - name: Make version array
-      id: run
-      run: |
-        # Make a JSON Array from comma/space-separated string (no extra escaping)
-        json_list() { \
-          ret=""; IFS="${IFS},"; set -- $*; \
-          for a in "$@"; do \
-            ret=$(printf '%s"%s"' "${ret}${ret:+, }" "$a"); \
-          done; \
-          printf '[%s]' "$ret"; }
-        tests="${{ inputs.test-set || env.test-set }}"
-        [ $tests = both ] && tests="core download"
-        printf 'test-set=%s\n' "$(json_list $tests)" >> "$GITHUB_OUTPUT"
-        versions="${{ inputs.cpython-versions || env.cpython-versions }}"
-        if [ "$versions" = all ]; then \
-          versions="${{ env.all-cpython-versions }}"; else \
-          versions="${{ env.main-cpython-versions }}"; \
-        fi
-        printf 'cpython-versions=%s\n' \
-          "$(json_list ${versions}${versions:+, }${{ env.pypy-versions }})" >> "$GITHUB_OUTPUT"
-        # versions with a special get-pip.py in a per-version subdirectory
-        printf 'own-pip-versions=%s\n' \
-          "$(json_list 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6)" >> "$GITHUB_OUTPUT"
-
-  tests:
-    name: Run tests
-    needs: select
-    permissions:
-      contents: read
-      packages: write
-    runs-on: ${{ matrix.os }}
-    env:
-      PIP: python -m pip
-      PIP_DISABLE_PIP_VERSION_CHECK: true
-      PIP_NO_PYTHON_VERSION_WARNING: true
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ubuntu-20.04]
-        python-version: ${{ fromJSON(needs.select.outputs.cpython-versions) }}
-        python-impl: [cpython]
-        ytdl-test-set: ${{ fromJSON(needs.select.outputs.test-set) }}
-        run-tests-ext: [sh]
-        include:
-        - os: windows-2019
-          python-version: 3.4
-          python-impl: cpython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}
-          run-tests-ext: bat
-        - os: windows-2019
-          python-version: 3.4
-          python-impl: cpython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download'  || 'nodownload' }}
-          run-tests-ext: bat
-        # jython
-        - os: ubuntu-20.04
-          python-version: 2.7
-          python-impl: jython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}
-          run-tests-ext: sh
-        - os: ubuntu-20.04
-          python-version: 2.7
-          python-impl: jython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download'  || 'nodownload' }}
-          run-tests-ext: sh
-    steps:
-    - name: Prepare Linux
-      if: ${{ startswith(matrix.os, 'ubuntu') }}
-      shell: bash
-      run: |
-        # apt in runner, if needed, may not be up-to-date
-        sudo apt-get update
-    - name: Checkout
-      uses: actions/checkout@v3
-    #-------- Python 3 -----
-    - name: Set up supported Python ${{ matrix.python-version }}
-      id: setup-python
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version != '2.6' && matrix.python-version != '2.7' && matrix.python-version != env.next }}
-      # wrap broken actions/setup-python@v4
-      # NB may run apt-get install in Linux
-      uses: ytdl-org/setup-python@v1
-      env:
-        # Temporary workaround for Python 3.5 failures - May 2024
-        PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache-build: true
-        allow-build: info
-    - name: Locate supported Python ${{ matrix.python-version }}
-      if: ${{ env.pythonLocation }}
-      shell: bash
-      run: |
-        echo "PYTHONHOME=${pythonLocation}" >> "$GITHUB_ENV"
-        export expected="${{ steps.setup-python.outputs.python-path }}"
-        dirname() { printf '%s\n' \
-            'import os, sys' \
-            'print(os.path.dirname(sys.argv[1]))' \
-            | ${expected} - "$1"; }
-        expd="$(dirname "$expected")"
-        export python="$(command -v python)"
-        [ "$expd" = "$(dirname "$python")" ] || echo "PATH=$expd:${PATH}" >> "$GITHUB_ENV"
-        [ -x "$python" ] || printf '%s\n' \
-            'import os' \
-            'exp = os.environ["expected"]' \
-            'python = os.environ["python"]' \
-            'exps = os.path.split(exp)' \
-            'if python and (os.path.dirname(python) == exp[0]):' \
-            '    exit(0)' \
-            'exps[1] = "python" + os.path.splitext(exps[1])[1]' \
-            'python = os.path.join(*exps)' \
-            'try:' \
-            '    os.symlink(exp, python)' \
-            'except AttributeError:' \
-            '    os.rename(exp, python)' \
-            | ${expected} -
-        printf '%s\n' \
-            'import sys' \
-            'print(sys.path)' \
-            | ${expected} -
-    #-------- Python next (was 3.12) -
-    - name: Set up CPython 3.next environment
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      shell: bash
-      run: |
-        PYENV_ROOT=$HOME/.local/share/pyenv
-        echo "PYENV_ROOT=${PYENV_ROOT}" >> "$GITHUB_ENV"
-    - name: Cache Python 3.next 
-      id: cachenext
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      uses: actions/cache@v3
-      with:
-        key: python-${{ env.next }}
-        path: |
-          ${{ env.PYENV_ROOT }}
-    - name: Build and set up Python 3.next
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next && ! steps.cachenext.outputs.cache-hit }}
-      # dl and build locally
-      shell: bash
-      run: |
-        # Install build environment
-        sudo apt-get install -y build-essential llvm libssl-dev tk-dev  \
-                      libncursesw5-dev libreadline-dev libsqlite3-dev   \
-                      libffi-dev xz-utils zlib1g-dev libbz2-dev liblzma-dev
-        # Download PyEnv from its GitHub repository.
-        export PYENV_ROOT=${{ env.PYENV_ROOT }}
-        export PATH=$PYENV_ROOT/bin:$PATH
-        git clone "https://github.com/pyenv/pyenv.git" "$PYENV_ROOT"
-        pyenv install ${{ env.next }}
-    - name: Locate Python 3.next
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      shell: bash
-      run: |
-        PYTHONHOME="$(echo "${{ env.PYENV_ROOT }}/versions/${{ env.next }}."*)"
-        test -n "$PYTHONHOME"
-        echo "PYTHONHOME=$PYTHONHOME" >> "$GITHUB_ENV"
-        echo "PATH=${PYTHONHOME}/bin:$PATH" >> "$GITHUB_ENV"
-    #-------- Python 2.7 --
-    - name: Set up Python 2.7
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.7' }}
-      # install 2.7
-      shell: bash
-      run: |
-        sudo apt-get install -y python2 python-is-python2
-        echo "PYTHONHOME=/usr" >> "$GITHUB_ENV"
-    #-------- Python 2.6 --
-    - name: Set up Python 2.6 environment
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        openssl_name=openssl-1.0.2u
-        echo "openssl_name=${openssl_name}" >> "$GITHUB_ENV"
-        openssl_dir=$HOME/.local/opt/$openssl_name
-        echo "openssl_dir=${openssl_dir}" >> "$GITHUB_ENV"
-        PYENV_ROOT=$HOME/.local/share/pyenv
-        echo "PYENV_ROOT=${PYENV_ROOT}" >> "$GITHUB_ENV"
-        sudo apt-get install -y openssl ca-certificates
-    - name: Cache Python 2.6
-      id: cache26
-      if: ${{ matrix.python-version == '2.6' }}
-      uses: actions/cache@v3
-      with:
-        key: python-2.6.9
-        path: |
-          ${{ env.openssl_dir }}
-          ${{ env.PYENV_ROOT }}
-    - name: Build and set up Python 2.6
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' && ! steps.cache26.outputs.cache-hit }}
-      # dl and build locally
-      shell: bash
-      run: |
-        # Install build environment
-        sudo apt-get install -y build-essential llvm libssl-dev tk-dev  \
-                      libncursesw5-dev libreadline-dev libsqlite3-dev   \
-                      libffi-dev xz-utils zlib1g-dev libbz2-dev liblzma-dev
-        # Download and install OpenSSL 1.0.2, back in time
-        openssl_name=${{ env.openssl_name }}
-        openssl_targz=${openssl_name}.tar.gz
-        openssl_dir=${{ env.openssl_dir }}
-        openssl_inc=$openssl_dir/include
-        openssl_lib=$openssl_dir/lib
-        openssl_ssl=$openssl_dir/ssl
-        curl -L "https://www.openssl.org/source/$openssl_targz" -o $openssl_targz
-        tar -xf $openssl_targz
-        ( cd $openssl_name; \
-          ./config --prefix=$openssl_dir --openssldir=${openssl_dir}/ssl \
-            --libdir=lib -Wl,-rpath=${openssl_dir}/lib shared zlib-dynamic && \
-          make && \
-          make install )
-        rm -rf $openssl_name
-        rmdir $openssl_ssl/certs && ln -s /etc/ssl/certs $openssl_ssl/certs
-        # Download PyEnv from its GitHub repository.
-        export PYENV_ROOT=${{ env.PYENV_ROOT }}
-        export PATH=$PYENV_ROOT/bin:$PATH
-        git clone "https://github.com/pyenv/pyenv.git" "$PYENV_ROOT"
-        # Prevent pyenv build trying (and failing) to update pip
-        export GET_PIP=get-pip-2.6.py
-        echo 'import sys; sys.exit(0)' > ${GET_PIP}
-        GET_PIP=$(realpath $GET_PIP)
-        # Build and install Python
-        export CFLAGS="-I$openssl_inc"
-        export LDFLAGS="-L$openssl_lib"
-        export LD_LIBRARY_PATH="$openssl_lib"
-        pyenv install 2.6.9
-    - name: Locate Python 2.6
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        PYTHONHOME="${{ env.PYENV_ROOT }}/versions/2.6.9"
-        echo "PYTHONHOME=$PYTHONHOME" >> "$GITHUB_ENV"
-        echo "PATH=${PYTHONHOME}/bin:$PATH" >> "$GITHUB_ENV"
-        echo "LD_LIBRARY_PATH=${{ env.openssl_dir }}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" >> "$GITHUB_ENV"
-    #-------- Jython ------
-    - name: Set up Java 8
-      if: ${{ matrix.python-impl == 'jython' }}
-      uses: actions/setup-java@v3
-      with:
-        java-version: 8
-        distribution: 'zulu'
-    - name: Setup Jython environment
-      if: ${{ matrix.python-impl == 'jython' }}
-      shell: bash
-      run: |
-        echo "JYTHON_ROOT=${HOME}/jython" >> "$GITHUB_ENV"
-        echo "PIP=pip" >> "$GITHUB_ENV"
-    - name: Cache Jython
-      id: cachejy
-      if: ${{ matrix.python-impl == 'jython' && matrix.python-version == '2.7' }}
-      uses: actions/cache@v3
-      with:
-        # 2.7.3 now available, may solve SNI issue
-        key: jython-2.7.1
-        path: |
-          ${{ env.JYTHON_ROOT }}
-    - name: Install Jython
-      if: ${{ matrix.python-impl == 'jython' && matrix.python-version == '2.7' && ! steps.cachejy.outputs.cache-hit }}
-      shell: bash
-      run: |
-        JYTHON_ROOT="${{ env.JYTHON_ROOT }}"
-        curl -L "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar" -o jython-installer.jar
-        java -jar jython-installer.jar -s -d "${JYTHON_ROOT}"
-        echo "${JYTHON_ROOT}/bin" >> "$GITHUB_PATH"
-    - name: Set up cached Jython
-      if: ${{ steps.cachejy.outputs.cache-hit }}
-      shell: bash
-      run: |
-        JYTHON_ROOT="${{ env.JYTHON_ROOT }}"
-        echo "${JYTHON_ROOT}/bin" >> $GITHUB_PATH
-    - name: Install supporting Python 2.7 if possible
-      if: ${{ steps.cachejy.outputs.cache-hit }}
-      shell: bash
-      run: |
-        sudo apt-get install -y python2.7 || true
-    #-------- pip ---------
-    - name: Set up supported Python ${{ matrix.python-version }} pip
-      if: ${{ (matrix.python-version != '3.2' && steps.setup-python.outputs.python-path) || matrix.python-version == '2.7' }}
-      # This step may run in either Linux or Windows
-      shell: bash
-      run: |
-        echo "$PATH"
-        echo "$PYTHONHOME"
-        # curl is available on both Windows and Linux, -L follows redirects, -O gets name
-        python -m ensurepip || python -m pip --version || { \
-          get_pip="${{ contains(needs.select.outputs.own-pip-versions, matrix.python-version) && format('{0}/', matrix.python-version) || '' }}"; \
-          curl -L -O "https://bootstrap.pypa.io/pip/${get_pip}get-pip.py"; \
-          python get-pip.py; }
-    - name: Set up Python 2.6 pip
-      if: ${{ matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        python -m pip --version || { \
-          curl -L -O "https://bootstrap.pypa.io/pip/2.6/get-pip.py"; \
-          curl -L -O "https://files.pythonhosted.org/packages/ac/95/a05b56bb975efa78d3557efa36acaf9cf5d2fd0ee0062060493687432e03/pip-9.0.3-py2.py3-none-any.whl"; \
-          python get-pip.py --no-setuptools --no-wheel pip-9.0.3-py2.py3-none-any.whl; }
-        # work-around to invoke pip module on 2.6: https://bugs.python.org/issue2751
-        echo "PIP=python -m pip.__main__" >> "$GITHUB_ENV"
-    - name: Set up other Python ${{ matrix.python-version }} pip
-      if: ${{ matrix.python-version == '3.2' && steps.setup-python.outputs.python-path }}
-      shell: bash
-      run: |
-        python -m pip --version || { \
-          curl -L -O "https://bootstrap.pypa.io/pip/3.2/get-pip.py"; \
-          curl -L -O "https://files.pythonhosted.org/packages/b2/d0/cd115fe345dd6f07ec1c780020a7dfe74966fceeb171e0f20d1d4905b0b7/pip-7.1.2-py2.py3-none-any.whl"; \
-          python get-pip.py --no-setuptools --no-wheel pip-7.1.2-py2.py3-none-any.whl; }
-    #-------- unittest ----
-    - name: Upgrade Unittest for Python 2.6
-      if: ${{ matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        # Work around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
-        $PIP -qq show unittest2 || { \
-          for u in "65/26/32b8464df2a97e6dd1b656ed26b2c194606c16fe163c695a992b36c11cdf/six-1.13.0-py2.py3-none-any.whl" \
-              "f2/94/3af39d34be01a24a6e65433d19e107099374224905f1e0cc6bbe1fd22a2f/argparse-1.4.0-py2.py3-none-any.whl" \
-              "c7/a3/c5da2a44c85bfbb6eebcfc1dde24933f8704441b98fdde6528f4831757a6/linecache2-1.0.0-py2.py3-none-any.whl" \
-              "17/0a/6ac05a3723017a967193456a2efa0aa9ac4b51456891af1e2353bb9de21e/traceback2-1.4.0-py2.py3-none-any.whl" \
-              "72/20/7f0f433060a962200b7272b8c12ba90ef5b903e218174301d0abfd523813/unittest2-1.1.0-py2.py3-none-any.whl"; do \
-            curl -L -O "https://files.pythonhosted.org/packages/${u}"; \
-            $PIP install ${u##*/}; \
-          done; }
-        # make tests use unittest2
-        for test in ./test/test_*.py ./test/helper.py; do
-          sed -r -i -e '/^import unittest$/s/test/test2 as unittest/' "$test"
-        done
-    #-------- nose --------
-    - name: Install nose for Python ${{ matrix.python-version }}
-      if: ${{ (matrix.python-version != '3.2' && steps.setup-python.outputs.python-path) || (matrix.python-impl == 'cpython' && (matrix.python-version == '2.7' || matrix.python-version == env.next)) }}
-      shell: bash
-      run: |
-        echo "$PATH"
-        echo "$PYTHONHOME"
-        # Use PyNose for recent Pythons instead of Nose
-        py3ver="${{ matrix.python-version }}"
-        py3ver=${py3ver#3.}
-        [ "$py3ver" != "${{ matrix.python-version }}" ] && py3ver=${py3ver%.*} || py3ver=0
-        [ "$py3ver" -ge 9 ] && nose=pynose || nose=nose
-        $PIP -qq show $nose || $PIP install $nose
-    - name: Install nose for other Python 2
-      if: ${{ matrix.python-impl == 'jython' || (matrix.python-impl == 'cpython' && matrix.python-version == '2.6') }}
-      shell: bash
-      run: |
-        # Work around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
-        $PIP -qq show nose || { \
-          curl -L -O "https://files.pythonhosted.org/packages/99/4f/13fb671119e65c4dce97c60e67d3fd9e6f7f809f2b307e2611f4701205cb/nose-1.3.7-py2-none-any.whl"; \
-          $PIP install nose-1.3.7-py2-none-any.whl; }
-    - name: Install nose for other Python 3
-      if: ${{ matrix.python-version == '3.2' && steps.setup-python.outputs.python-path }}
-      shell: bash
-      run: |
-        $PIP -qq show nose || { \
-          curl -L -O "https://files.pythonhosted.org/packages/15/d8/dd071918c040f50fa1cf80da16423af51ff8ce4a0f2399b7bf8de45ac3d9/nose-1.3.7-py3-none-any.whl"; \
-          $PIP install nose-1.3.7-py3-none-any.whl; }
-    - name: Set up nosetest test
-      if: ${{ contains(needs.select.outputs.test-set, matrix.ytdl-test-set ) }}
-      shell: bash
-      run: |
-        # set PYTHON_VER
-        PYTHON_VER=${{ matrix.python-version }}
-        [ "${PYTHON_VER#*-}" != "$PYTHON_VER" ] || PYTHON_VER="${{ matrix.python-impl }}-${PYTHON_VER}"
-        echo "PYTHON_VER=$PYTHON_VER" >> "$GITHUB_ENV"
-        echo "PYTHON_IMPL=${{ matrix.python-impl }}" >> "$GITHUB_ENV"
-        # define a test to validate the Python version used by nosetests
-        printf '%s\n' \
-          'from __future__ import unicode_literals' \
-          'import sys, os, platform' \
-          'try:' \
-          '    import unittest2 as unittest' \
-          'except ImportError:' \
-          '    import unittest' \
-          'class TestPython(unittest.TestCase):' \
-          '    def setUp(self):' \
-          '        self.ver = os.environ["PYTHON_VER"].split("-")' \
-          '    def test_python_ver(self):' \
-          '        self.assertEqual(["%d" % v for v in sys.version_info[:2]], self.ver[-1].split(".")[:2])' \
-          '        self.assertTrue(sys.version.startswith(self.ver[-1]))' \
-          '        self.assertIn(self.ver[0], ",".join((sys.version, platform.python_implementation())).lower())' \
-          '    def test_python_impl(self):' \
-          '        self.assertIn(platform.python_implementation().lower(), (os.environ["PYTHON_IMPL"], self.ver[0]))' \
-          > test/test_python.py
-    #-------- TESTS -------
-    - name: Run tests
-      if: ${{ contains(needs.select.outputs.test-set, matrix.ytdl-test-set ) }}
-      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
-      env:
-        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
-      run: |
-        ./devscripts/run_tests.${{ matrix.run-tests-ext }}
-  flake8:
-    name: Linter
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-    - name: Install flake8
-      run: pip install flake8
-    - name: Run flake8
-      run: flake8 .
-

.travis.yml

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

AUTHORS

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

CONTRIBUTING.md

@@ -150,7 +150,7 @@ After you have ensured this site is distributing its content legally, you can fo
                 # TODO more properties (see youtube_dl/extractor/common.py)
             }
     ```
-5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py). This makes the extractor available for use, as long as the class ends with `IE`.
+5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
 6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
 7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
 8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):

ChangeLog

@@ -1,742 +1,3 @@
-version 2021.12.17
-
-Core
-* [postprocessor/ffmpeg] Show ffmpeg output on error (#22680, #29336)
-
-Extractors
-* [youtube] Update signature function patterns (#30363, #30366)
-* [peertube] Only call description endpoint if necessary (#29383)
-* [periscope] Pass referer to HLS requests (#29419)
-- [liveleak] Remove extractor (#17625, #24222, #29331)
-+ [pornhub] Add support for pornhubthbh7ap3u.onion
-* [pornhub] Detect geo restriction
-* [pornhub] Dismiss tbr extracted from download URLs (#28927)
-* [curiositystream:collection] Extend _VALID_URL (#26326, #29117)
-* [youtube] Make get_video_info processing more robust (#29333)
-* [youtube] Workaround for get_video_info request (#29333)
-* [bilibili] Strip uploader name (#29202)
-* [youtube] Update invidious instance list (#29281)
-* [umg:de] Update GraphQL API URL (#29304)
-* [nrk] Switch psapi URL to https (#29344)
-+ [egghead] Add support for app.egghead.io (#28404, #29303)
-* [appleconnect] Fix extraction (#29208)
-+ [orf:tvthek] Add support for MPD formats (#28672, #29236)
-
-
-version 2021.06.06
-
-Extractors
-* [facebook] Improve login required detection
-* [youporn] Fix formats and view count extraction (#29216)
-* [orf:tvthek] Fix thumbnails extraction (#29217)
-* [formula1] Fix extraction (#29206)
-* [ard] Relax URL regular expression and fix video ids (#22724, #29091)
-+ [ustream] Detect https embeds (#29133)
-* [ted] Prefer own formats over external sources (#29142)
-* [twitch:clips] Improve extraction (#29149)
-+ [twitch:clips] Add access token query to download URLs (#29136)
-* [youtube] Fix get_video_info request (#29086, #29165)
-* [vimeo] Fix vimeo pro embed extraction (#29126)
-* [redbulltv] Fix embed data extraction (#28770)
-* [shahid] Relax URL regular expression (#28772, #28930)
-
-
-version 2021.05.16
-
-Core
-* [options] Fix thumbnail option group name (#29042)
-* [YoutubeDL] Improve extract_info doc (#28946)
-
-Extractors
-+ [playstuff] Add support for play.stuff.co.nz (#28901, #28931)
-* [eroprofile] Fix extraction (#23200, #23626, #29008)
-+ [vivo] Add support for vivo.st (#29009)
-+ [generic] Add support for og:audio (#28311, #29015)
-* [phoenix] Fix extraction (#29057)
-+ [generic] Add support for sibnet embeds
-+ [vk] Add support for sibnet embeds (#9500)
-+ [generic] Add Referer header for direct videojs download URLs (#2879,
-  #20217, #29053)
-* [orf:radio] Switch download URLs to HTTPS (#29012, #29046)
-- [blinkx] Remove extractor (#28941)
-* [medaltv] Relax URL regular expression (#28884)
-+ [funimation] Add support for optional lang code in URLs (#28950)
-+ [gdcvault] Add support for HTML5 videos
-* [dispeak] Improve FLV extraction (#13513, #28970)
-* [kaltura] Improve iframe extraction (#28969)
-* [kaltura] Make embed code alternatives actually work
-* [cda] Improve extraction (#28709, #28937)
-* [twitter] Improve formats extraction from vmap URL (#28909)
-* [xtube] Fix formats extraction (#28870)
-* [svtplay] Improve extraction (#28507, #28876)
-* [tv2dk] Fix extraction (#28888)
-
-
-version 2021.04.26
-
-Extractors
-+ [xfileshare] Add support for wolfstream.tv (#28858)
-* [francetvinfo] Improve video id extraction (#28792)
-* [medaltv] Fix extraction (#28807)
-* [tver] Redirect all downloads to Brightcove (#28849)
-* [go] Improve video id extraction (#25207, #25216, #26058)
-* [youtube] Fix lazy extractors (#28780)
-+ [bbc] Extract description and timestamp from __INITIAL_DATA__ (#28774)
-* [cbsnews] Fix extraction for python <3.6 (#23359)
-
-
-version 2021.04.17
-
-Core
-+ [utils] Add support for experimental HTTP response status code
-  308 Permanent Redirect (#27877, #28768)
-
-Extractors
-+ [lbry] Add support for HLS videos (#27877, #28768)
-* [youtube] Fix stretched ratio calculation
-* [youtube] Improve stretch extraction (#28769)
-* [youtube:tab] Improve grid extraction (#28725)
-+ [youtube:tab] Detect series playlist on playlists page (#28723)
-+ [youtube] Add more invidious instances (#28706)
-* [pluralsight] Extend anti-throttling timeout (#28712)
-* [youtube] Improve URL to extractor routing (#27572, #28335, #28742)
-+ [maoritv] Add support for maoritelevision.com (#24552)
-+ [youtube:tab] Pass innertube context and x-goog-visitor-id header along with
-  continuation requests (#28702)
-* [mtv] Fix Viacom A/B Testing Video Player extraction (#28703)
-+ [pornhub] Extract DASH and HLS formats from get_media end point (#28698)
-* [cbssports] Fix extraction (#28682)
-* [jamendo] Fix track extraction (#28686)
-* [curiositystream] Fix format extraction (#26845, #28668)
-
-
-version 2021.04.07
-
-Core
-* [extractor/common] Use compat_cookies_SimpleCookie for _get_cookies
-+ [compat] Introduce compat_cookies_SimpleCookie
-* [extractor/common] Improve JSON-LD author extraction
-* [extractor/common] Fix _get_cookies on python 2 (#20673, #23256, #20326,
-  #28640)
-
-Extractors
-* [youtube] Fix extraction of videos with restricted location (#28685)
-+ [line] Add support for live.line.me (#17205, #28658)
-* [vimeo] Improve extraction (#28591)
-* [youku] Update ccode (#17852, #28447, #28460, #28648)
-* [youtube] Prefer direct entry metadata over entry metadata from playlist
-  (#28619, #28636)
-* [screencastomatic] Fix extraction (#11976, #24489)
-+ [palcomp3] Add support for palcomp3.com (#13120)
-+ [arnes] Add support for video.arnes.si (#28483)
-+ [youtube:tab] Add support for hashtags (#28308)
-
-
-version 2021.04.01
-
-Extractors
-* [youtube] Setup CONSENT cookie when needed (#28604)
-* [vimeo] Fix password protected review extraction (#27591)
-* [youtube] Improve age-restricted video extraction (#28578)
-
-
-version 2021.03.31
-
-Extractors
-* [vlive] Fix inkey request (#28589)
-* [francetvinfo] Improve video id extraction (#28584)
-+ [instagram] Extract duration (#28469)
-* [instagram] Improve title extraction (#28469)
-+ [sbs] Add support for ondemand watch URLs (#28566)
-* [youtube] Fix video's channel extraction (#28562)
-* [picarto] Fix live stream extraction (#28532)
-* [vimeo] Fix unlisted video extraction (#28414)
-* [youtube:tab] Fix playlist/community continuation items extraction (#28266)
-* [ard] Improve clip id extraction (#22724, #28528)
-
-
-version 2021.03.25
-
-Extractors
-+ [zoom] Add support for zoom.us (#16597, #27002, #28531)
-* [bbc] Fix BBC IPlayer Episodes/Group extraction (#28360)
-* [youtube] Fix default value for youtube_include_dash_manifest (#28523)
-* [zingmp3] Fix extraction (#11589, #16409, #16968, #27205)
-+ [vgtv] Add support for new tv.aftonbladet.se URL schema (#28514)
-+ [tiktok] Detect private videos (#28453)
-* [vimeo:album] Fix extraction for albums with number of videos multiple
-  to page size (#28486)
-* [vvvvid] Fix kenc format extraction (#28473)
-* [mlb] Fix video extraction (#21241)
-* [svtplay] Improve extraction (#28448)
-* [applepodcasts] Fix extraction (#28445)
-* [rtve] Improve extraction
-    + Extract all formats
-    * Fix RTVE Infantil extraction (#24851)
-    + Extract is_live and series
-
-
-version 2021.03.14
-
-Core
-+ Introduce release_timestamp meta field (#28386)
-
-Extractors
-+ [southpark] Add support for southparkstudios.com (#28413)
-* [southpark] Fix extraction (#26763, #28413)
-* [sportdeutschland] Fix extraction (#21856, #28425)
-* [pinterest] Reduce the number of HLS format requests
-* [peertube] Improve thumbnail extraction (#28419)
-* [tver] Improve title extraction (#28418)
-* [fujitv] Fix HLS formats extension (#28416)
-* [shahid] Fix format extraction (#28383)
-+ [lbry] Add support for channel filters (#28385)
-+ [bandcamp] Extract release timestamp
-+ [lbry] Extract release timestamp (#28386)
-* [pornhub] Detect flagged videos
-+ [pornhub] Extract formats from get_media end point (#28395)
-* [bilibili] Fix video info extraction (#28341)
-+ [cbs] Add support for Paramount+ (#28342)
-+ [trovo] Add Origin header to VOD formats (#28346)
-* [voxmedia] Fix volume embed extraction (#28338)
-
-
-version 2021.03.03
-
-Extractors
-* [youtube:tab] Switch continuation to browse API (#28289, #28327)
-* [9c9media] Fix extraction for videos with multiple ContentPackages (#28309)
-+ [bbc] Add support for BBC Reel videos (#21870, #23660, #28268)
-
-
-version 2021.03.02
-
-Extractors
-* [zdf] Rework extractors (#11606, #13473, #17354, #21185, #26711, #27068,
-  #27930, #28198, #28199, #28274)
-    * Generalize cross-extractor video ids for zdf based extractors
-    * Improve extraction
-    * Fix 3sat and phoenix
-* [stretchinternet] Fix extraction (#28297)
-* [urplay] Fix episode data extraction (#28292)
-+ [bandaichannel] Add support for b-ch.com (#21404)
-* [srgssr] Improve extraction (#14717, #14725, #27231, #28238)
-    + Extract subtitle
-    * Fix extraction for new videos
-    * Update srf download domains
-* [vvvvid] Reduce season request payload size
-+ [vvvvid] Extract series sublists playlist title (#27601, #27618)
-+ [dplay] Extract Ad-Free uplynk URLs (#28160)
-+ [wat] Detect DRM protected videos (#27958)
-* [tf1] Improve extraction (#27980, #28040)
-* [tmz] Fix and improve extraction (#24603, #24687, 28211)
-+ [gedidigital] Add support for Gedi group sites (#7347, #26946)
-* [youtube] Fix get_video_info request
-
-
-version 2021.02.22
-
-Core
-+ [postprocessor/embedthumbnail] Recognize atomicparsley binary in lowercase
-  (#28112)
-
-Extractors
-* [apa] Fix and improve extraction (#27750)
-+ [youporn] Extract duration (#28019)
-+ [peertube] Add support for canard.tube (#28190)
-* [youtube] Fixup m4a_dash formats (#28165)
-+ [samplefocus] Add support for samplefocus.com (#27763)
-+ [vimeo] Add support for unlisted video source format extraction
-* [viki] Improve extraction (#26522, #28203)
-    * Extract uploader URL and episode number
-    * Report login required error
-    + Extract 480p formats
-    * Fix API v4 calls
-* [ninegag] Unescape title (#28201)
-* [youtube] Improve URL regular expression (#28193)
-+ [youtube] Add support for redirect.invidious.io (#28193)
-+ [dplay] Add support for de.hgtv.com (#28182)
-+ [dplay] Add support for discoveryplus.com (#24698)
-+ [simplecast] Add support for simplecast.com (#24107)
-* [youtube] Fix uploader extraction in flat playlist mode (#28045)
-* [yandexmusic:playlist] Request missing tracks in chunks (#27355, #28184)
-+ [storyfire] Add support for storyfire.com (#25628, #26349)
-+ [zhihu] Add support for zhihu.com (#28177)
-* [youtube] Fix controversial videos when authenticated with cookies (#28174)
-* [ccma] Fix timestamp parsing in python 2
-+ [videopress] Add support for video.wordpress.com
-* [kakao] Improve info extraction and detect geo restriction (#26577)
-* [xboxclips] Fix extraction (#27151)
-* [ard] Improve formats extraction (#28155)
-+ [canvas] Add support for dagelijksekost.een.be (#28119)
-
-
-version 2021.02.10
-
-Extractors
-* [youtube:tab] Improve grid continuation extraction (#28130)
-* [ign] Fix extraction (#24771)
-+ [xhamster] Extract format filesize
-+ [xhamster] Extract formats from xplayer settings (#28114)
-+ [youtube] Add support phone/tablet JS player (#26424)
-* [archiveorg] Fix and improve extraction (#21330, #23586, #25277, #26780,
-  #27109, #27236, #28063)
-+ [cda] Detect geo restricted videos (#28106)
-* [urplay] Fix extraction (#28073, #28074)
-* [youtube] Fix release date extraction (#28094)
-+ [youtube] Extract abr and vbr (#28100)
-* [youtube] Skip OTF formats (#28070)
-
-
-version 2021.02.04.1
-
-Extractors
-* [youtube] Prefer DASH formats (#28070)
-* [azmedien] Fix extraction (#28064)
-
-
-version 2021.02.04
-
-Extractors
-* [pornhub] Implement lazy playlist extraction
-* [svtplay] Fix video id extraction (#28058)
-+ [pornhub] Add support for authentication (#18797, #21416, #24294)
-* [pornhub:user] Improve paging
-+ [pornhub:user] Add support for URLs unavailable via /videos page (#27853)
-+ [bravotv] Add support for oxygen.com (#13357, #22500)
-+ [youtube] Pass embed URL to get_video_info request
-* [ccma] Improve metadata extraction (#27994)
-    + Extract age limit, alt title, categories, series and episode number
-    * Fix timestamp multiple subtitles extraction
-* [egghead] Update API domain (#28038)
-- [vidzi] Remove extractor (#12629)
-* [vidio] Improve metadata extraction
-* [youtube] Improve subtitles extraction
-* [youtube] Fix chapter extraction fallback
-* [youtube] Rewrite extractor
-    * Improve format sorting
-    * Remove unused code
-    * Fix series metadata extraction
-    * Fix trailer video extraction
-    * Improve error reporting
-    + Extract video location
-+ [vvvvid] Add support for youtube embeds (#27825)
-* [googledrive] Report download page errors (#28005)
-* [vlive] Fix error message decoding for python 2 (#28004)
-* [youtube] Improve DASH formats file size extraction
-* [cda] Improve birth validation detection (#14022, #27929)
-+ [awaan] Extract uploader id (#27963)
-+ [medialaan] Add support DPG Media MyChannels based websites (#14871, #15597,
-  #16106, #16489)
-* [abcnews] Fix extraction (#12394, #27920)
-* [AMP] Fix upload date and timestamp extraction (#27970)
-* [tv4] Relax URL regular expression (#27964)
-+ [tv2] Add support for mtvuutiset.fi (#27744)
-* [adn] Improve login warning reporting
-* [zype] Fix uplynk id extraction (#27956)
-+ [adn] Add support for authentication (#17091, #27841, #27937)
-
-
-version 2021.01.24.1
-
-Core
-* Introduce --output-na-placeholder (#27896)
-
-Extractors
-* [franceculture] Make thumbnail optional (#18807)
-* [franceculture] Fix extraction (#27891, #27903)
-* [njpwworld] Fix extraction (#27890)
-* [comedycentral] Fix extraction (#27905)
-* [wat] Fix format extraction (#27901)
-+ [americastestkitchen:season] Add support for seasons (#27861)
-+ [trovo] Add support for trovo.live (#26125)
-+ [aol] Add support for yahoo videos (#26650)
-* [yahoo] Fix single video extraction
-* [lbry] Unescape lbry URI (#27872)
-* [9gag] Fix and improve extraction (#23022)
-* [americastestkitchen] Improve metadata extraction for ATK episodes (#27860)
-* [aljazeera] Fix extraction (#20911, #27779)
-+ [minds] Add support for minds.com (#17934)
-* [ard] Fix title and description extraction (#27761)
-+ [spotify] Add support for Spotify Podcasts (#27443)
-
-
-version 2021.01.16
-
-Core
-* [YoutubeDL] Protect from infinite recursion due to recursively nested
-  playlists (#27833)
-* [YoutubeDL] Ignore failure to create existing directory (#27811)
-* [YoutubeDL] Raise syntax error for format selection expressions with multiple
-  + operators (#27803)
-
-Extractors
-+ [animeondemand] Add support for lazy playlist extraction (#27829)
-* [youporn] Restrict fallback download URL (#27822)
-* [youporn] Improve height and tbr extraction (#20425, #23659)
-* [youporn] Fix extraction (#27822)
-+ [twitter] Add support for unified cards (#27826)
-+ [twitch] Add Authorization header with OAuth token for GraphQL requests
-  (#27790)
-* [mixcloud:playlist:base] Extract video id in flat playlist mode (#27787)
-* [cspan] Improve info extraction (#27791)
-* [adn] Improve info extraction
-* [adn] Fix extraction (#26963, #27732)
-* [youtube:search] Extract from all sections (#27604)
-* [youtube:search] fix viewcount and try to extract all video sections (#27604)
-* [twitch] Improve login error extraction
-* [twitch] Fix authentication (#27743)
-* [3qsdn] Improve extraction (#21058)
-* [peertube] Extract formats from streamingPlaylists (#26002, #27586, #27728)
-* [khanacademy] Fix extraction (#2887, #26803)
-* [spike] Update Paramount Network feed URL (#27715)
-
-
-version 2021.01.08
-
-Core
-* [downloader/hls] Disable decryption in tests (#27660)
-+ [utils] Add a function to clean podcast URLs
-
-Extractors
-* [rai] Improve subtitles extraction (#27698, #27705)
-* [canvas] Match only supported VRT NU URLs (#27707)
-+ [bibeltv] Add support for bibeltv.de (#14361)
-+ [bfmtv] Add support for bfmtv.com (#16053, #26615)
-+ [sbs] Add support for ondemand play and news embed URLs (#17650, #27629)
-* [twitch] Drop legacy kraken API v5 code altogether and refactor
-* [twitch:vod] Switch to GraphQL for video metadata
-* [canvas] Fix VRT NU extraction (#26957, #27053)
-* [twitch] Switch access token to GraphQL and refactor (#27646)
-+ [rai] Detect ContentItem in iframe (#12652, #27673)
-* [ketnet] Fix extraction (#27662)
-+ [dplay] Add suport Discovery+ domains (#27680)
-* [motherless] Improve extraction (#26495, #27450)
-* [motherless] Fix recent videos upload date extraction (#27661)
-* [nrk] Fix extraction for videos without a legalAge rating
-- [googleplus] Remove extractor (#4955, #7400)
-+ [applepodcasts] Add support for podcasts.apple.com (#25918)
-+ [googlepodcasts] Add support for podcasts.google.com
-+ [iheart] Add support for iheart.com (#27037)
-* [acast] Clean podcast URLs
-* [stitcher] Clean podcast URLs
-+ [xfileshare] Add support for aparat.cam (#27651)
-+ [twitter] Add support for summary card (#25121)
-* [twitter] Try to use a Generic fallback for unknown twitter cards (#25982)
-+ [stitcher] Add support for shows and show metadata extraction (#20510)
-* [stv] Improve episode id extraction (#23083)
-
-
-version 2021.01.03
-
-Extractors
-* [nrk] Improve series metadata extraction (#27473)
-+ [nrk] Extract subtitles
-* [nrk] Fix age limit extraction
-* [nrk] Improve video id extraction
-+ [nrk] Add support for podcasts (#27634, #27635)
-* [nrk] Generalize and delegate all item extractors to nrk
-+ [nrk] Add support for mp3 formats
-* [nrktv] Switch to playback endpoint
-* [vvvvid] Fix season metadata extraction (#18130)
-* [stitcher] Fix extraction (#20811, #27606)
-* [acast] Fix extraction (#21444, #27612, #27613)
-+ [arcpublishing] Add support for arcpublishing.com (#2298, #9340, #17200)
-+ [sky] Add support for Sports News articles and Brighcove videos (#13054)
-+ [vvvvid] Extract akamai formats
-* [vvvvid] Skip unplayable episodes (#27599)
-* [yandexvideo] Fix extraction for Python 3.4
-
-
-version 2020.12.31
-
-Core
-* [utils] Accept only supported protocols in url_or_none
-* [YoutubeDL] Allow format filtering using audio language (#16209)
-
-Extractors
-+ [redditr] Extract all thumbnails (#27503)
-* [vvvvid] Improve info extraction
-+ [vvvvid] Add support for playlists (#18130, #27574)
-+ [yandexdisk] Extract info from webpage
-* [yandexdisk] Fix extraction (#17861, #27131)
-* [yandexvideo] Use old API call as fallback
-* [yandexvideo] Fix extraction (#25000)
-- [nbc] Remove CSNNE extractor
-* [nbc] Fix NBCSport VPlayer URL extraction (#16640)
-+ [aenetworks] Add support for biography.com (#3863)
-* [uktvplay] Match new video URLs (#17909)
-* [sevenplay] Detect API errors
-* [tenplay] Fix format extraction (#26653)
-* [brightcove] Raise error for DRM protected videos (#23467, #27568)
-
-
-version 2020.12.29
-
-Extractors
-* [youtube] Improve yt initial data extraction (#27524)
-* [youtube:tab] Improve URL matching #27559)
-* [youtube:tab] Restore retry on browse requests (#27313, #27564)
-* [aparat] Fix extraction (#22285, #22611, #23348, #24354, #24591, #24904,
-  #25418, #26070, #26350, #26738, #27563)
-- [brightcove] Remove sonyliv specific code
-* [piksel] Improve format extraction
-+ [zype] Add support for uplynk videos
-+ [toggle] Add support for live.mewatch.sg (#27555)
-+ [go] Add support for fxnow.fxnetworks.com (#13972, #22467, #23754, #26826)
-* [teachable] Improve embed detection (#26923)
-* [mitele] Fix free video extraction (#24624, #25827, #26757)
-* [telecinco] Fix extraction
-* [youtube] Update invidious.snopyta.org (#22667)
-* [amcnetworks] Improve auth only video detection (#27548)
-+ [generic] Add support for VHX Embeds (#27546)
-
-
-version 2020.12.26
-
-Extractors
-* [instagram] Fix comment count extraction
-+ [instagram] Add support for reel URLs (#26234, #26250)
-* [bbc] Switch to media selector v6 (#23232, #23933, #26303, #26432, #26821,
-  #27538)
-* [instagram] Improve thumbnail extraction
-* [instagram] Fix extraction when authenticated (#22880, #26377, #26981,
-  #27422)
-* [spankbang:playlist] Fix extraction (#24087)
-+ [spankbang] Add support for playlist videos
-* [pornhub] Improve like and dislike count extraction (#27356)
-* [pornhub] Fix lq formats extraction (#27386, #27393)
-+ [bongacams] Add support for bongacams.com (#27440)
-* [youtube:tab] Extend URL regular expression (#27501)
-* [theweatherchannel] Fix extraction (#25930, #26051)
-+ [sprout] Add support for Universal Kids (#22518)
-* [theplatform] Allow passing geo bypass countries from other extractors
-+ [wistia] Add support for playlists (#27533)
-+ [ctv] Add support for ctv.ca (#27525)
-* [9c9media] Improve info extraction
-* [youtube] Fix automatic captions extraction (#27162, #27388)
-* [sonyliv] Fix title for movies
-* [sonyliv] Fix extraction (#25667)
-* [streetvoice] Fix extraction (#27455, #27492)
-+ [facebook] Add support for watchparty pages (#27507)
-* [cbslocal] Fix video extraction
-+ [brightcove] Add another method to extract policyKey
-* [mewatch] Relax URL regular expression (#27506)
-
-
-version 2020.12.22
-
-Core
-* [common] Remove unwanted query params from unsigned akamai manifest URLs
-
-Extractors
-- [tastytrade] Remove extractor (#25716)
-* [niconico] Fix playlist extraction (#27428)
-- [everyonesmixtape] Remove extractor
-- [kanalplay] Remove extractor
-* [arkena] Fix extraction
-* [nba] Rewrite extractor
-* [turner] Improve info extraction
-* [youtube] Improve xsrf token extraction (#27442)
-* [generic] Improve RSS age limit extraction
-* [generic] Fix RSS itunes thumbnail extraction (#27405)
-+ [redditr] Extract duration (#27426)
-- [zaq1] Remove extractor
-+ [asiancrush] Add support for retrocrush.tv
-* [asiancrush] Fix extraction
-- [noco] Remove extractor (#10864)
-* [nfl] Fix extraction (#22245)
-* [skysports] Relax URL regular expression (#27435)
-+ [tv5unis] Add support for tv5unis.ca (#22399, #24890)
-+ [videomore] Add support for more.tv (#27088)
-+ [yandexmusic] Add support for music.yandex.com (#27425)
-+ [nhk:program] Add support for audio programs and program clips
-+ [nhk] Add support for NHK video programs (#27230)
-
-
-version 2020.12.14
-
-Core
-* [extractor/common] Improve JSON-LD interaction statistic extraction (#23306)
-* [downloader/hls] Delegate manifests with media initialization to ffmpeg
-+ [extractor/common] Document duration meta field for playlists
-
-Extractors
-* [mdr] Bypass geo restriction
-* [mdr] Improve extraction (#24346, #26873)
-* [yandexmusic:album] Improve album title extraction (#27418)
-* [eporner] Fix view count extraction and make optional (#23306)
-+ [eporner] Extend URL regular expression
-* [eporner] Fix hash extraction and extend _VALID_URL (#27396)
-* [slideslive] Use m3u8 entry protocol for m3u8 formats (#27400)
-* [twitcasting] Fix format extraction and improve info extraction (#24868)
-* [linuxacademy] Fix authentication and extraction (#21129, #26223, #27402)
-* [itv] Clean description from HTML tags (#27399)
-* [vlive] Sort live formats (#27404)
-* [hotstart] Fix and improve extraction
-    * Fix format extraction (#26690)
-    + Extract thumbnail URL (#16079, #20412)
-    + Add support for country specific playlist URLs (#23496)
-    * Select the last id in video URL (#26412)
-+ [youtube] Add some invidious instances (#27373)
-
-
-version 2020.12.12
-
-Core
-* [YoutubeDL] Improve thumbnail filename deducing (#26010, #27244)
-
-Extractors
-+ [ruutu] Extract more metadata
-+ [ruutu] Detect non-free videos (#21154)
-* [ruutu] Authenticate format URLs (#21031, #26782)
-+ [ruutu] Add support for static.nelonenmedia.fi (#25412)
-+ [ruutu] Extend URL regular expression (#24839)
-+ [facebook] Add support archived live video URLs (#15859)
-* [wdr] Improve overall extraction
-+ [wdr] Extend subtitles extraction (#22672, #22723)
-+ [facebook] Add support for videos attached to Relay based story pages
-  (#10795)
-+ [wdr:page] Add support for kinder.wdr.de (#27350)
-+ [facebook] Add another regular expression for handleServerJS
-* [facebook] Fix embed page extraction
-+ [facebook] Add support for Relay post pages (#26935)
-+ [facebook] Add support for watch videos (#22795, #27062)
-+ [facebook] Add support for group posts with multiple videos (#19131)
-* [itv] Fix series metadata extraction (#26897)
-- [itv] Remove old extraction method (#23177)
-* [facebook] Redirect mobile URLs to desktop URLs (#24831, #25624)
-+ [facebook] Add support for Relay based pages (#26823)
-* [facebook] Try to reduce unnecessary tahoe requests
-- [facebook] Remove hardcoded Chrome User-Agent (#18974, #25411, #26958,
-  #27329)
-- [smotri] Remove extractor (#27358)
-- [beampro] Remove extractor (#17290, #22871, #23020, #23061, #26099)
-
-
-version 2020.12.09
-
-Core
-* [extractor/common] Fix inline HTML5 media tags processing (#27345)
-
-Extractors
-* [youtube:tab] Improve identity token extraction (#27197)
-* [youtube:tab] Make click tracking params on continuation optional
-* [youtube:tab] Delegate inline playlists to tab-based playlists (27298)
-+ [tubitv] Extract release year (#27317)
-* [amcnetworks] Fix free content extraction (#20354)
-+ [lbry:channel] Add support for channels (#25584)
-+ [lbry] Add support for short and embed URLs
-* [lbry] Fix channel metadata extraction
-+ [telequebec] Add support for video.telequebec.tv (#27339)
-* [telequebec] Fix extraction (#25733, #26883)
-+ [youtube:tab] Capture and output alerts (#27340)
-* [tvplay:home] Fix extraction (#21153)
-* [americastestkitchen] Fix Extraction and add support
-  for Cook's Country and Cook's Illustrated (#17234, #27322)
-+ [slideslive] Add support for yoda service videos and extract subtitles
-  (#27323)
-
-
-version 2020.12.07
-
-Core
-* [extractor/common] Extract timestamp from Last-Modified header
-+ [extractor/common] Add support for dl8-* media tags (#27283)
-* [extractor/common] Fix media type extraction for HTML5 media tags
-  in start/end form
-
-Extractors
-* [aenetworks] Fix extraction (#23363, #23390, #26795, #26985)
-    * Fix Fastly format extraction
-    + Add support for play and watch subdomains
-    + Extract series metadata
-* [youtube] Improve youtu.be extraction in non-existing playlists (#27324)
-+ [generic] Extract RSS video description, timestamp and itunes metadata
-  (#27177)
-* [nrk] Reduce the number of instalments and episodes requests
-* [nrk] Improve extraction
-    * Improve format extraction for old akamai formats
-    + Add is_live value to entry info dict
-    * Request instalments only when available
-    * Fix skole extraction
-+ [peertube] Extract fps
-+ [peertube] Recognize audio-only formats (#27295)
-
-
-version 2020.12.05
-
-Core
-* [extractor/common] Improve Akamai HTTP format extraction
-    * Allow m3u8 manifest without an additional audio format
-    * Fix extraction for qualities starting with a number
-
-Extractors
-* [teachable:course] Improve extraction (#24507, #27286)
-* [nrk] Improve error extraction
-* [nrktv:series] Improve extraction (#21926)
-* [nrktv:season] Improve extraction
-* [nrk] Improve format extraction and geo-restriction detection (#24221)
-* [pornhub] Handle HTTP errors gracefully (#26414)
-* [nrktv] Relax URL regular expression (#27299, #26185)
-+ [zdf] Extract webm formats (#26659)
-+ [gamespot] Extract DASH and HTTP formats
-+ [tver] Add support for tver.jp (#26662, #27284)
-+ [pornhub] Add support for pornhub.org (#27276)
-
-
-version 2020.12.02
-
-Extractors
-+ [tva] Add support for qub.ca (#27235)
-+ [toggle] Detect DRM protected videos (#16479, #20805)
-+ [toggle] Add support for new MeWatch URLs (#27256)
-* [youtube:tab] Extract channels only from channels tab (#27266)
-+ [cspan] Extract info from jwplayer data (#3672, #3734, #10638, #13030,
-  #18806, #23148, #24461, #26171, #26800, #27263)
-* [cspan] Pass Referer header with format's video URL (#26032, #25729)
-* [youtube] Improve age-gated videos extraction (#27259)
-+ [mediaset] Add support for movie URLs (#27240)
-* [yandexmusic] Refactor
-+ [yandexmusic] Add support for artist's tracks and albums (#11887, #22284)
-* [yandexmusic:track] Fix extraction (#26449, #26669, #26747, #26748, #26762)
-
-
-version 2020.11.29
-
-Core
-* [YoutubeDL] Write static debug to stderr and respect quiet for dynamic debug
-  (#14579, #22593)
-
-Extractors
-* [drtv] Extend URL regular expression (#27243)
-* [tiktok] Fix extraction (#20809, #22838, #22850, #25987, #26281, #26411,
-  #26639, #26776, #27237)
-+ [ina] Add support for mobile URLs (#27229)
-* [pornhub] Fix like and dislike count extraction (#27227, #27234)
-* [youtube] Improve yt initial player response extraction (#27216)
-* [videa] Fix extraction (#25650, #25973, #26301)
-
-
-version 2020.11.26
-
-Core
-* [downloader/fragment] Set final file's mtime according to last fragment's
-  Last-Modified header (#11718, #18384, #27138)
-
-Extractors
-+ [spreaker] Add support for spreaker.com (#13480, #13877)
-* [vlive] Improve extraction for geo-restricted videos
-+ [vlive] Add support for post URLs (#27122, #27123)
-* [viki] Fix video API request (#27184)
-* [bbc] Fix BBC Three clip extraction
-* [bbc] Fix BBC News videos extraction
-+ [medaltv] Add support for medal.tv (#27149)
-* [youtube] Improve music metadata and license extraction (#26013)
-* [nrk] Fix extraction
-* [cda] Fix extraction (#17803, #24458, #24518, #26381)
-
-
 version 2020.11.24
 
 Core

devscripts/__init__.py

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

devscripts/bash-completion.py

@@ -5,12 +5,8 @@ import os
 from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
-from youtube_dl.compat import compat_open as open
-
-from utils import read_file
 
 BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
@@ -22,8 +18,9 @@ def build_completion(opt_parser):
         for option in group.option_list:
             # for every long flag
             opts_flag.append(option.get_opt_string())
-    template = read_file(BASH_COMPLETION_TEMPLATE)
-    with open(BASH_COMPLETION_FILE, "w", encoding='utf-8') as f:
+    with open(BASH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
+    with open(BASH_COMPLETION_FILE, "w") as f:
         # just using the special char
         filled_template = template.replace("{{flags}}", " ".join(opts_flag))
         f.write(filled_template)

devscripts/cli_to_api.py

@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-from __future__ import unicode_literals
-
-"""
-This script displays the API parameters corresponding to a yt-dl command line
-
-Example:
-$ ./cli_to_api.py -f best
-{u'format': 'best'}
-$
-"""
-
-# Allow direct execution
-import os
-import sys
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import youtube_dl
-from types import MethodType
-
-
-def cli_to_api(*opts):
-    YDL = youtube_dl.YoutubeDL
-
-    # to extract the parsed options, break out of YoutubeDL instantiation
-
-    # return options via this Exception
-    class ParseYTDLResult(Exception):
-        def __init__(self, result):
-            super(ParseYTDLResult, self).__init__('result')
-            self.opts = result
-
-    # replacement constructor that raises ParseYTDLResult
-    def ytdl_init(ydl, ydl_opts):
-        super(YDL, ydl).__init__(ydl_opts)
-        raise ParseYTDLResult(ydl_opts)
-
-    # patch in the constructor
-    YDL.__init__ = MethodType(ytdl_init, YDL)
-
-    # core parser
-    def parsed_options(argv):
-        try:
-            youtube_dl._real_main(list(argv))
-        except ParseYTDLResult as result:
-            return result.opts
-
-    # from https://github.com/yt-dlp/yt-dlp/issues/5859#issuecomment-1363938900
-    default = parsed_options([])
-
-    def neq_opt(a, b):
-        if a == b:
-            return False
-        if a is None and repr(type(object)).endswith(".utils.DateRange'>"):
-            return '0001-01-01 - 9999-12-31' != '{0}'.format(b)
-        return a != b
-
-    diff = dict((k, v) for k, v in parsed_options(opts).items() if neq_opt(default[k], v))
-    if 'postprocessors' in diff:
-        diff['postprocessors'] = [pp for pp in diff['postprocessors'] if pp not in default['postprocessors']]
-    return diff
-
-
-def main():
-    from pprint import PrettyPrinter
-
-    pprint = PrettyPrinter()
-    super_format = pprint.format
-
-    def format(object, context, maxlevels, level):
-        if repr(type(object)).endswith(".utils.DateRange'>"):
-            return '{0}: {1}>'.format(repr(object)[:-2], object), True, False
-        return super_format(object, context, maxlevels, level)
-
-    pprint.format = format
-
-    pprint.pprint(cli_to_api(*sys.argv))
-
-
-if __name__ == '__main__':
-    main()

devscripts/create-github-release.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import json
 import mimetypes
 import netrc
@@ -9,9 +10,7 @@ import os
 import re
 import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.compat import (
     compat_basestring,
@@ -23,7 +22,6 @@ from youtube_dl.utils import (
     make_HTTPS_handler,
     sanitized_Request,
 )
-from utils import read_file
 
 
 class GitHubReleaser(object):
@@ -91,7 +89,8 @@ def main():
 
     changelog_file, version, build_path = args
 
-    changelog = read_file(changelog_file)
+    with io.open(changelog_file, encoding='utf-8') as inf:
+        changelog = inf.read()
 
     mobj = re.search(r'(?s)version %s\n{2}(.+?)\n{3}' % version, changelog)
     body = mobj.group(1) if mobj else ''

devscripts/fish-completion.py

@@ -6,13 +6,10 @@ import os
 from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
 from youtube_dl.utils import shell_quote
 
-from utils import read_file, write_file
-
 FISH_COMPLETION_FILE = 'youtube-dl.fish'
 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
@@ -41,9 +38,11 @@ def build_completion(opt_parser):
             complete_cmd.extend(EXTRA_ARGS.get(long_option, []))
             commands.append(shell_quote(complete_cmd))
 
-    template = read_file(FISH_COMPLETION_TEMPLATE)
+    with open(FISH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
     filled_template = template.replace('{{commands}}', '\n'.join(commands))
-    write_file(FISH_COMPLETION_FILE, filled_template)
+    with open(FISH_COMPLETION_FILE, 'w') as f:
+        f.write(filled_template)
 
 
 parser = youtube_dl.parseOpts()[0]

devscripts/gh-pages/add-version.py

@@ -6,21 +6,16 @@ import sys
 import hashlib
 import os.path
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
-
-from devscripts.utils import read_file, write_file
-from youtube_dl.compat import compat_open as open
 
 if len(sys.argv) <= 1:
     print('Specify the version number as parameter')
     sys.exit()
 version = sys.argv[1]
 
-write_file('update/LATEST_VERSION', version)
+with open('update/LATEST_VERSION', 'w') as f:
+    f.write(version)
 
-versions_info = json.loads(read_file('update/versions.json'))
+versions_info = json.load(open('update/versions.json'))
 if 'signature' in versions_info:
     del versions_info['signature']
 
@@ -44,5 +39,5 @@ for key, filename in filenames.items():
 versions_info['versions'][version] = new_version
 versions_info['latest'] = version
 
-with open('update/versions.json', 'w', encoding='utf-8') as jsonf:
-    json.dumps(versions_info, jsonf, indent=4, sort_keys=True)
+with open('update/versions.json', 'w') as jsonf:
+    json.dump(versions_info, jsonf, indent=4, sort_keys=True)

devscripts/gh-pages/generate-download.py

@@ -2,21 +2,14 @@
 from __future__ import unicode_literals
 
 import json
-import os.path
-import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-
-from utils import read_file, write_file
-
-versions_info = json.loads(read_file('update/versions.json'))
+versions_info = json.load(open('update/versions.json'))
 version = versions_info['latest']
 version_dict = versions_info['versions'][version]
 
 # Read template page
-template = read_file('download.html.in')
+with open('download.html.in', 'r', encoding='utf-8') as tmplf:
+    template = tmplf.read()
 
 template = template.replace('@PROGRAM_VERSION@', version)
 template = template.replace('@PROGRAM_URL@', version_dict['bin'][0])
@@ -25,5 +18,5 @@ template = template.replace('@EXE_URL@', version_dict['exe'][0])
 template = template.replace('@EXE_SHA256SUM@', version_dict['exe'][1])
 template = template.replace('@TAR_URL@', version_dict['tar'][0])
 template = template.replace('@TAR_SHA256SUM@', version_dict['tar'][1])
-
-write_file('download.html', template)
+with open('download.html', 'w', encoding='utf-8') as dlf:
+    dlf.write(template)

devscripts/gh-pages/update-copyright.py

@@ -5,22 +5,17 @@ from __future__ import with_statement, unicode_literals
 
 import datetime
 import glob
+import io  # For Python 2 compatibility
 import os
 import re
-import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
-
-from devscripts.utils import read_file, write_file
-from youtube_dl import compat_str
-
-year = compat_str(datetime.datetime.now().year)
+year = str(datetime.datetime.now().year)
 for fn in glob.glob('*.html*'):
-    content = read_file(fn)
+    with io.open(fn, encoding='utf-8') as f:
+        content = f.read()
     newc = re.sub(r'(?P<copyright>Copyright © 2011-)(?P<year>[0-9]{4})', 'Copyright © 2011-' + year, content)
     if content != newc:
         tmpFn = fn + '.part'
-        write_file(tmpFn, newc)
+        with io.open(tmpFn, 'wt', encoding='utf-8') as outf:
+            outf.write(newc)
         os.rename(tmpFn, fn)

devscripts/gh-pages/update-feed.py

@@ -2,16 +2,10 @@
 from __future__ import unicode_literals
 
 import datetime
+import io
 import json
-import os.path
 import textwrap
-import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from utils import write_file
 
 atom_template = textwrap.dedent("""\
     <?xml version="1.0" encoding="utf-8"?>
@@ -78,4 +72,5 @@ for v in versions:
 entries_str = textwrap.indent(''.join(entries), '\t')
 atom_template = atom_template.replace('@ENTRIES@', entries_str)
 
-write_file('update/releases.atom', atom_template)
+with io.open('update/releases.atom', 'w', encoding='utf-8') as atom_file:
+    atom_file.write(atom_template)

devscripts/gh-pages/update-sites.py

@@ -5,17 +5,15 @@ import sys
 import os
 import textwrap
 
-dirn = os.path.dirname
-
 # We must be able to import youtube_dl
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import youtube_dl
-from devscripts.utils import read_file, write_file
 
 
 def main():
-    template = read_file('supportedsites.html.in')
+    with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf:
+        template = tmplf.read()
 
     ie_htmls = []
     for ie in youtube_dl.list_extractors(age_limit=None):
@@ -31,7 +29,8 @@ def main():
 
     template = template.replace('@SITES@', textwrap.indent('\n'.join(ie_htmls), '\t'))
 
-    write_file('supportedsites.html', template)
+    with open('supportedsites.html', 'w', encoding='utf-8') as sitesf:
+        sitesf.write(template)
 
 
 if __name__ == '__main__':

devscripts/install_jython.sh

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

devscripts/make_contributing.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
 import re
 
-from utils import read_file, write_file
-
 
 def main():
     parser = optparse.OptionParser(usage='%prog INFILE OUTFILE')
@@ -15,7 +14,8 @@ def main():
 
     infile, outfile = args
 
-    readme = read_file(infile)
+    with io.open(infile, encoding='utf-8') as inf:
+        readme = inf.read()
 
     bug_text = re.search(
         r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
@@ -25,7 +25,8 @@ def main():
 
     out = bug_text + dev_text
 
-    write_file(outfile, out)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 
 if __name__ == '__main__':

devscripts/make_issue_template.py

@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
-import os.path
-import sys
-
-from utils import read_file, read_version, write_file
 
 
 def main():
@@ -16,11 +13,17 @@ def main():
 
     infile, outfile = args
 
-    issue_template_tmpl = read_file(infile)
+    with io.open(infile, encoding='utf-8') as inf:
+        issue_template_tmpl = inf.read()
 
-    out = issue_template_tmpl % {'version': read_version()}
+    # Get the version from youtube_dl/version.py without importing the package
+    exec(compile(open('youtube_dl/version.py').read(),
+                 'youtube_dl/version.py', 'exec'))
 
-    write_file(outfile, out)
+    out = issue_template_tmpl % {'version': locals()['__version__']}
+
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 if __name__ == '__main__':
     main()

devscripts/make_lazy_extractors.py

@@ -1,49 +1,28 @@
 from __future__ import unicode_literals, print_function
 
 from inspect import getsource
+import io
 import os
 from os.path import dirname as dirn
-import re
 import sys
 
 print('WARNING: Lazy loading extractors is an experimental feature that may not always work', file=sys.stderr)
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 
 lazy_extractors_filename = sys.argv[1]
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
-# Py2: may be confused by leftover lazy_extractors.pyc
-if sys.version_info[0] < 3:
-    for c in ('c', 'o'):
-        try:
-            os.remove(lazy_extractors_filename + 'c')
-        except OSError:
-            pass
-
-from devscripts.utils import read_file, write_file
-from youtube_dl.compat import compat_register_utf8
-
-compat_register_utf8()
 
 from youtube_dl.extractor import _ALL_CLASSES
 from youtube_dl.extractor.common import InfoExtractor, SearchInfoExtractor
 
-module_template = read_file('devscripts/lazy_load_template.py')
-
-
-def get_source(m):
-    return re.sub(r'(?m)^\s*#.*\n', '', getsource(m))
-
+with open('devscripts/lazy_load_template.py', 'rt') as f:
+    module_template = f.read()
 
 module_contents = [
-    module_template,
-    get_source(InfoExtractor.suitable),
-    get_source(InfoExtractor._match_valid_url) + '\n',
-    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n',
-    # needed for suitable() methods of Youtube extractor (see #28780)
-    'from youtube_dl.utils import parse_qs, variadic\n',
-]
+    module_template + '\n' + getsource(InfoExtractor.suitable) + '\n',
+    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
 
 ie_template = '''
 class {name}({bases}):
@@ -75,7 +54,7 @@ def build_lazy_ie(ie, name):
         valid_url=valid_url,
         module=ie.__module__)
     if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
-        s += '\n' + get_source(ie.suitable)
+        s += '\n' + getsource(ie.suitable)
     if hasattr(ie, '_make_valid_url'):
         # search extractors
         s += make_valid_template.format(valid_url=ie._make_valid_url())
@@ -115,17 +94,7 @@ for ie in ordered_cls:
 module_contents.append(
     '_ALL_CLASSES = [{0}]'.format(', '.join(names)))
 
-module_src = '\n'.join(module_contents)
+module_src = '\n'.join(module_contents) + '\n'
 
-write_file(lazy_extractors_filename, module_src + '\n')
-
-# work around JVM byte code module limit in Jython
-if sys.platform.startswith('java') and sys.version_info[:2] == (2, 7):
-    import subprocess
-    from youtube_dl.compat import compat_subprocess_get_DEVNULL
-    # if Python 2.7 is available, use it to compile the module for Jython
-    try:
-        # if Python 2.7 is available, use it to compile the module for Jython
-        subprocess.check_call(['python2.7', '-m', 'py_compile', lazy_extractors_filename], stdout=compat_subprocess_get_DEVNULL())
-    except Exception:
-        pass
+with io.open(lazy_extractors_filename, 'wt', encoding='utf-8') as f:
+    f.write(module_src)

devscripts/make_readme.py

@@ -1,14 +1,8 @@
 from __future__ import unicode_literals
 
-import os.path
-import re
+import io
 import sys
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from utils import read_file
-from youtube_dl.compat import compat_open as open
+import re
 
 README_FILE = 'README.md'
 helptext = sys.stdin.read()
@@ -16,7 +10,8 @@ helptext = sys.stdin.read()
 if isinstance(helptext, bytes):
     helptext = helptext.decode('utf-8')
 
-oldreadme = read_file(README_FILE)
+with io.open(README_FILE, encoding='utf-8') as f:
+    oldreadme = f.read()
 
 header = oldreadme[:oldreadme.index('# OPTIONS')]
 footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
@@ -25,7 +20,7 @@ options = helptext[helptext.index('  General Options:') + 19:]
 options = re.sub(r'(?m)^  (\w.+)$', r'## \1', options)
 options = '# OPTIONS\n' + options + '\n'
 
-with open(README_FILE, 'w', encoding='utf-8') as f:
+with io.open(README_FILE, 'w', encoding='utf-8') as f:
     f.write(header)
     f.write(options)
     f.write(footer)

devscripts/make_supportedsites.py

@@ -1,19 +1,17 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
-import os.path
+import os
 import sys
 
+
 # Import youtube_dl
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
+ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
+sys.path.insert(0, ROOT_DIR)
 import youtube_dl
 
-from utils import write_file
-
 
 def main():
     parser = optparse.OptionParser(usage='%prog OUTFILE.md')
@@ -40,7 +38,8 @@ def main():
         ' - ' + md + '\n'
         for md in gen_ies_md(ies))
 
-    write_file(outfile, out)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 
 if __name__ == '__main__':

devscripts/prepare_manpage.py

@@ -1,13 +1,13 @@
 from __future__ import unicode_literals
 
+import io
 import optparse
 import os.path
 import re
 
-from utils import read_file, write_file
-
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
+
 PREFIX = r'''%YOUTUBE-DL(1)
 
 # NAME
@@ -29,7 +29,8 @@ def main():
 
     outfile, = args
 
-    readme = read_file(README_FILE)
+    with io.open(README_FILE, encoding='utf-8') as f:
+        readme = f.read()
 
     readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme)
     readme = re.sub(r'\s+youtube-dl \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
@@ -37,7 +38,8 @@ def main():
 
     readme = filter_options(readme)
 
-    write_file(outfile, readme)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(readme)
 
 
 def filter_options(readme):

devscripts/run_tests.bat

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

devscripts/utils.py

@@ -1,62 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import argparse
-import functools
-import os.path
-import subprocess
-import sys
-
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from youtube_dl.compat import (
-    compat_kwargs,
-    compat_open as open,
-)
-
-
-def read_file(fname):
-    with open(fname, encoding='utf-8') as f:
-        return f.read()
-
-
-def write_file(fname, content, mode='w'):
-    with open(fname, mode, encoding='utf-8') as f:
-        return f.write(content)
-
-
-def read_version(fname='youtube_dl/version.py'):
-    """Get the version without importing the package"""
-    exec(compile(read_file(fname), fname, 'exec'))
-    return locals()['__version__']
-
-
-def get_filename_args(has_infile=False, default_outfile=None):
-    parser = argparse.ArgumentParser()
-    if has_infile:
-        parser.add_argument('infile', help='Input file')
-    kwargs = {'nargs': '?', 'default': default_outfile} if default_outfile else {}
-    kwargs['help'] = 'Output file'
-    parser.add_argument('outfile', **compat_kwargs(kwargs))
-
-    opts = parser.parse_args()
-    if has_infile:
-        return opts.infile, opts.outfile
-    return opts.outfile
-
-
-def compose_functions(*functions):
-    return lambda x: functools.reduce(lambda y, f: f(y), functions, x)
-
-
-def run_process(*args, **kwargs):
-    kwargs.setdefault('text', True)
-    kwargs.setdefault('check', True)
-    kwargs.setdefault('capture_output', True)
-    if kwargs['text']:
-        kwargs.setdefault('encoding', 'utf-8')
-        kwargs.setdefault('errors', 'replace')
-        kwargs = compat_kwargs(kwargs)
-    return subprocess.run(args, **kwargs)

devscripts/zsh-completion.py

@@ -7,8 +7,6 @@ import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
-from utils import read_file, write_file
-
 
 ZSH_COMPLETION_FILE = "youtube-dl.zsh"
 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
@@ -36,13 +34,15 @@ def build_completion(opt_parser):
 
     flags = [opt.get_opt_string() for opt in opts]
 
-    template = read_file(ZSH_COMPLETION_TEMPLATE)
+    with open(ZSH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
 
     template = template.replace("{{fileopts}}", "|".join(fileopts))
     template = template.replace("{{diropts}}", "|".join(diropts))
     template = template.replace("{{flags}}", " ".join(flags))
 
-    write_file(ZSH_COMPLETION_FILE, template)
+    with open(ZSH_COMPLETION_FILE, "w") as f:
+        f.write(template)
 
 
 parser = youtube_dl.parseOpts()[0]

docs/supportedsites.md

@@ -1,9 +1,9 @@
 # Supported sites
  - **1tv**: Первый канал
+ - **1up.com**
  - **20min**
  - **220.ro**
  - **23video**
- - **247sports**
  - **24video**
  - **3qsdn**: 3Q SDN
  - **3sat**
@@ -35,8 +35,6 @@
  - **adobetv:video**
  - **AdultSwim**
  - **aenetworks**: A+E Networks: A&E, Lifetime, History.com, FYI Network and History Vault
- - **aenetworks:collection**
- - **aenetworks:show**
  - **afreecatv**: afreecatv.com
  - **AirMozilla**
  - **AliExpressLive**
@@ -46,20 +44,17 @@
  - **Amara**
  - **AMCNetworks**
  - **AmericasTestKitchen**
- - **AmericasTestKitchenSeason**
  - **anderetijden**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **AnimeOnDemand**
  - **Anvato**
- - **aol.com**: Yahoo screen and movies
+ - **aol.com**
  - **APA**
  - **Aparat**
  - **AppleConnect**
  - **AppleDaily**: 臺灣蘋果日報
- - **ApplePodcasts**
  - **appletrailers**
  - **appletrailers:section**
  - **archive.org**: archive.org videos
- - **ArcPublishing**
  - **ARD**
  - **ARD:mediathek**
  - **ARDBetaMediathek**
@@ -83,7 +78,6 @@
  - **awaan:video**
  - **AZMedien**: AZ Medien videos
  - **BaiduVideo**: 百度视频
- - **bandaichannel**
  - **Bandcamp**
  - **Bandcamp:album**
  - **Bandcamp:weekly**
@@ -91,8 +85,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**
@@ -102,10 +95,6 @@
  - **BellMedia**
  - **Bet**
  - **bfi:player**
- - **bfmtv**
- - **bfmtv:article**
- - **bfmtv:live**
- - **BibelTV**
  - **Bigflix**
  - **Bild**: Bild.de
  - **BiliBili**
@@ -113,15 +102,14 @@
  - **BilibiliAudioAlbum**
  - **BiliBiliPlayer**
  - **BioBioChileTV**
- - **Biography**
  - **BIQLE**
  - **BitChute**
  - **BitChuteChannel**
  - **BleacherReport**
  - **BleacherReportCMS**
+ - **blinkx**
  - **Bloomberg**
  - **BokeCC**
- - **BongaCams**
  - **BostonGlobe**
  - **Box**
  - **Bpb**: Bundeszentrale für politische Bildung
@@ -156,12 +144,10 @@
  - **CBS**
  - **CBSInteractive**
  - **CBSLocal**
- - **CBSLocalArticle**
  - **cbsnews**: CBS News
  - **cbsnews:embed**
  - **cbsnews:livevideo**: CBS News Live Videos
- - **cbssports**
- - **cbssports:embed**
+ - **CBSSports**
  - **CCMA**
  - **CCTV**: 央视网
  - **CDA**
@@ -195,6 +181,8 @@
  - **CNNArticle**
  - **CNNBlogs**
  - **ComedyCentral**
+ - **ComedyCentralFullEpisodes**
+ - **ComedyCentralShortname**
  - **ComedyCentralTV**
  - **CondeNast**: Condé Nast media group: Allure, Architectural Digest, Ars Technica, Bon Appétit, Brides, Condé Nast, Condé Nast Traveler, Details, Epicurious, GQ, Glamour, Golf Digest, SELF, Teen Vogue, The New Yorker, Vanity Fair, Vogue, W Magazine, WIRED
  - **CONtv**
@@ -205,9 +193,9 @@
  - **CrooksAndLiars**
  - **crunchyroll**
  - **crunchyroll:playlist**
+ - **CSNNE**
  - **CSpan**: C-SPAN
  - **CtsNews**: 華視新聞
- - **CTV**
  - **CTVNews**
  - **cu.ntv.co.jp**: Nippon Television Network
  - **Culturebox**
@@ -215,7 +203,6 @@
  - **curiositystream**
  - **curiositystream:collection**
  - **CWTV**
- - **DagelijkseKost**: dagelijksekost.een.be
  - **DailyMail**
  - **dailymotion**
  - **dailymotion:playlist**
@@ -237,7 +224,6 @@
  - **DiscoveryGo**
  - **DiscoveryGoPlaylist**
  - **DiscoveryNetworksDe**
- - **DiscoveryPlus**
  - **DiscoveryVR**
  - **Disney**
  - **dlive:stream**
@@ -280,6 +266,7 @@
  - **ESPNArticle**
  - **EsriVideo**
  - **Europa**
+ - **EveryonesMixtape**
  - **EWETV**
  - **ExpoTV**
  - **Expressen**
@@ -321,11 +308,11 @@
  - **FrontendMasters**
  - **FrontendMastersCourse**
  - **FrontendMastersLesson**
- - **FujiTVFODPlus7**
  - **Funimation**
  - **Funk**
  - **Fusion**
  - **Fux**
+ - **FXNetworks**
  - **Gaia**
  - **GameInformer**
  - **GameSpot**
@@ -333,7 +320,6 @@
  - **Gaskrank**
  - **Gazeta**
  - **GDCVault**
- - **GediDigital**
  - **generic**: Generic downloader that works on some sites
  - **Gfycat**
  - **GiantBomb**
@@ -345,8 +331,6 @@
  - **Go**
  - **GodTube**
  - **Golem**
- - **google:podcasts**
- - **google:podcasts:feed**
  - **GoogleDrive**
  - **Goshgay**
  - **GPUTechConf**
@@ -359,10 +343,8 @@
  - **HentaiStigma**
  - **hetklokhuis**
  - **hgtv.com:show**
- - **HGTVDe**
  - **HiDive**
  - **HistoricFilms**
- - **history:player**
  - **history:topic**: History.com Topic
  - **hitbox**
  - **hitbox:live**
@@ -382,10 +364,6 @@
  - **HungamaSong**
  - **Hypem**
  - **ign.com**
- - **IGNArticle**
- - **IGNVideo**
- - **IHeartRadio**
- - **iheartradio:podcast**
  - **imdb**: Internet Movie Database trailers
  - **imdb:list**: Internet Movie Database lists
  - **Imgur**
@@ -419,14 +397,14 @@
  - **JWPlatform**
  - **Kakao**
  - **Kaltura**
+ - **KanalPlay**: Kanal 5/9/11 Play
  - **Kankan**
  - **Karaoketv**
  - **KarriereVideos**
  - **Katsomo**
  - **KeezMovies**
  - **Ketnet**
- - **khanacademy**
- - **khanacademy:unit**
+ - **KhanAcademy**
  - **KickStarter**
  - **KinjaEmbed**
  - **KinoPoisk**
@@ -443,8 +421,7 @@
  - **la7.it**
  - **laola1tv**
  - **laola1tv:embed**
- - **lbry**
- - **lbry:channel**
+ - **lbry.tv**
  - **LCI**
  - **Lcp**
  - **LcpPlay**
@@ -464,14 +441,14 @@
  - **limelight**
  - **limelight:channel**
  - **limelight:channel_list**
- - **LineLive**
- - **LineLiveChannel**
  - **LineTV**
  - **linkedin:learning**
  - **linkedin:learning:course**
  - **LinuxAcademy**
  - **LiTV**
  - **LiveJournal**
+ - **LiveLeak**
+ - **LiveLeakEmbed**
  - **livestream**
  - **livestream:original**
  - **LnkGo**
@@ -489,13 +466,11 @@
  - **mangomolo:live**
  - **mangomolo:video**
  - **ManyVids**
- - **MaoriTV**
  - **Markiza**
  - **MarkizaPage**
  - **massengeschmack.tv**
  - **MatchTV**
  - **MDR**: MDR.DE and KiKA
- - **MedalTV**
  - **media.ccc.de**
  - **media.ccc.de:lists**
  - **Medialaan**
@@ -510,13 +485,9 @@
  - **META**
  - **metacafe**
  - **Metacritic**
- - **mewatch**
  - **Mgoon**
  - **MGTV**: 芒果TV
  - **MiaoPai**
- - **minds**
- - **minds:channel**
- - **minds:group**
  - **MinistryGrid**
  - **Minoto**
  - **miomio.tv**
@@ -524,8 +495,9 @@
  - **mixcloud**
  - **mixcloud:playlist**
  - **mixcloud:user**
+ - **Mixer:live**
+ - **Mixer:vod**
  - **MLB**
- - **MLBVideo**
  - **Mnet**
  - **MNetTV**
  - **MoeVideo**: LetitBit video services: moevideo.net, playreplay.net and videochart.net
@@ -547,7 +519,6 @@
  - **mtv:video**
  - **mtvjapan**
  - **mtvservices:embedded**
- - **MTVUutisetArticle**
  - **MuenchenTV**: münchen.tv
  - **mva**: Microsoft Virtual Academy videos
  - **mva:course**: Microsoft Virtual Academy courses
@@ -566,11 +537,6 @@
  - **NationalGeographicTV**
  - **Naver**
  - **NBA**
- - **nba:watch**
- - **nba:watch:collection**
- - **NBAChannel**
- - **NBAEmbed**
- - **NBAWatchEmbed**
  - **NBC**
  - **NBCNews**
  - **nbcolympics**
@@ -600,10 +566,8 @@
  - **NextTV**: 壹電視
  - **Nexx**
  - **NexxEmbed**
- - **nfl.com** (Currently broken)
- - **nfl.com:article** (Currently broken)
+ - **nfl.com**
  - **NhkVod**
- - **NhkVodProgram**
  - **nhl.com**
  - **nick.com**
  - **nick.de**
@@ -617,6 +581,7 @@
  - **njoy:embed**
  - **NJPWWorld**: 新日本プロレスワールド
  - **NobelPrize**
+ - **Noco**
  - **NonkTube**
  - **Noovo**
  - **Normalboots**
@@ -634,7 +599,6 @@
  - **Npr**
  - **NRK**
  - **NRKPlaylist**
- - **NRKRadioPodkast**
  - **NRKSkole**: NRK Skole
  - **NRKTV**: NRK TV and NRK Radio
  - **NRKTVDirekte**: NRK TV Direkte and NRK Radio Direkte
@@ -681,14 +645,12 @@
  - **OutsideTV**
  - **PacktPub**
  - **PacktPubCourse**
- - **PalcoMP3:artist**
- - **PalcoMP3:song**
- - **PalcoMP3:video**
  - **pandora.tv**: 판도라TV
  - **ParamountNetwork**
  - **parliamentlive.tv**: UK parliament videos
  - **Patreon**
  - **pbs**: Public Broadcasting Service (PBS) and member stations: PBS: Public Broadcasting Service, APT - Alabama Public Television (WBIQ), GPB/Georgia Public Broadcasting (WGTV), Mississippi Public Broadcasting (WMPN), Nashville Public Television (WNPT), WFSU-TV (WFSU), WSRE (WSRE), WTCI (WTCI), WPBA/Channel 30 (WPBA), Alaska Public Media (KAKM), Arizona PBS (KAET), KNME-TV/Channel 5 (KNME), Vegas PBS (KLVX), AETN/ARKANSAS ETV NETWORK (KETS), KET (WKLE), WKNO/Channel 10 (WKNO), LPB/LOUISIANA PUBLIC BROADCASTING (WLPB), OETA (KETA), Ozarks Public Television (KOZK), WSIU Public Broadcasting (WSIU), KEET TV (KEET), KIXE/Channel 9 (KIXE), KPBS San Diego (KPBS), KQED (KQED), KVIE Public Television (KVIE), PBS SoCal/KOCE (KOCE), ValleyPBS (KVPT), CONNECTICUT PUBLIC TELEVISION (WEDH), KNPB Channel 5 (KNPB), SOPTV (KSYS), Rocky Mountain PBS (KRMA), KENW-TV3 (KENW), KUED Channel 7 (KUED), Wyoming PBS (KCWC), Colorado Public Television / KBDI 12 (KBDI), KBYU-TV (KBYU), Thirteen/WNET New York (WNET), WGBH/Channel 2 (WGBH), WGBY (WGBY), NJTV Public Media NJ (WNJT), WLIW21 (WLIW), mpt/Maryland Public Television (WMPB), WETA Television and Radio (WETA), WHYY (WHYY), PBS 39 (WLVT), WVPT - Your Source for PBS and More! (WVPT), Howard University Television (WHUT), WEDU PBS (WEDU), WGCU Public Media (WGCU), WPBT2 (WPBT), WUCF TV (WUCF), WUFT/Channel 5 (WUFT), WXEL/Channel 42 (WXEL), WLRN/Channel 17 (WLRN), WUSF Public Broadcasting (WUSF), ETV (WRLK), UNC-TV (WUNC), PBS Hawaii - Oceanic Cable Channel 10 (KHET), Idaho Public Television (KAID), KSPS (KSPS), OPB (KOPB), KWSU/Channel 10 & KTNW/Channel 31 (KWSU), WILL-TV (WILL), Network Knowledge - WSEC/Springfield (WSEC), WTTW11 (WTTW), Iowa Public Television/IPTV (KDIN), Nine Network (KETC), PBS39 Fort Wayne (WFWA), WFYI Indianapolis (WFYI), Milwaukee Public Television (WMVS), WNIN (WNIN), WNIT Public Television (WNIT), WPT (WPNE), WVUT/Channel 22 (WVUT), WEIU/Channel 51 (WEIU), WQPT-TV (WQPT), WYCC PBS Chicago (WYCC), WIPB-TV (WIPB), WTIU (WTIU), CET  (WCET), ThinkTVNetwork (WPTD), WBGU-TV (WBGU), WGVU TV (WGVU), NET1 (KUON), Pioneer Public Television (KWCM), SDPB Television (KUSD), TPT (KTCA), KSMQ (KSMQ), KPTS/Channel 8 (KPTS), KTWU/Channel 11 (KTWU), East Tennessee PBS (WSJK), WCTE-TV (WCTE), WLJT, Channel 11 (WLJT), WOSU TV (WOSU), WOUB/WOUC (WOUB), WVPB (WVPB), WKYU-PBS (WKYU), KERA 13 (KERA), MPBN (WCBB), Mountain Lake PBS (WCFE), NHPTV (WENH), Vermont PBS (WETK), witf (WITF), WQED Multimedia (WQED), WMHT Educational Telecommunications (WMHT), Q-TV (WDCQ), WTVS Detroit Public TV (WTVS), CMU Public Television (WCMU), WKAR-TV (WKAR), WNMU-TV Public TV 13 (WNMU), WDSE - WRPT (WDSE), WGTE TV (WGTE), Lakeland Public Television (KAWE), KMOS-TV - Channels 6.1, 6.2 and 6.3 (KMOS), MontanaPBS (KUSM), KRWG/Channel 22 (KRWG), KACV (KACV), KCOS/Channel 13 (KCOS), WCNY/Channel 24 (WCNY), WNED (WNED), WPBS (WPBS), WSKG Public TV (WSKG), WXXI (WXXI), WPSU (WPSU), WVIA Public Media Studios (WVIA), WTVI (WTVI), Western Reserve PBS (WNEO), WVIZ/PBS ideastream (WVIZ), KCTS 9 (KCTS), Basin PBS (KPBT), KUHT / Channel 8 (KUHT), KLRN (KLRN), KLRU (KLRU), WTJX Channel 12 (WTJX), WCVE PBS (WCVE), KBTC Public Television (KBTC)
+ - **pcmag**
  - **PearVideo**
  - **PeerTube**
  - **People**
@@ -710,13 +672,13 @@
  - **play.fm**
  - **player.sky.it**
  - **PlayPlusTV**
- - **PlayStuff**
  - **PlaysTV**
  - **Playtvak**: Playtvak.cz, iDNES.cz and Lidovky.cz
  - **Playvid**
  - **Playwire**
  - **pluralsight**
  - **pluralsight:course**
+ - **plus.google**: Google Plus
  - **podomatic**
  - **Pokemon**
  - **PolskieRadio**
@@ -746,7 +708,6 @@
  - **qqmusic:singer**: QQ音乐 - 歌手
  - **qqmusic:toplist**: QQ音乐 - 排行榜
  - **QuantumTV**
- - **Qub**
  - **Quickline**
  - **QuicklineLive**
  - **R7**
@@ -816,7 +777,6 @@
  - **safari:course**: safaribooksonline.com online courses
  - **SAKTV**
  - **SaltTV**
- - **SampleFocus**
  - **Sapo**: SAPO Vídeos
  - **savefrom.net**
  - **SBS**: sbs.com.au
@@ -839,21 +799,21 @@
  - **ShahidShow**
  - **Shared**: shared.sx
  - **ShowRoomLive**
- - **simplecast**
- - **simplecast:episode**
- - **simplecast:podcast**
  - **Sina**
  - **sky.it**
- - **sky:news**
- - **sky:sports**
- - **sky:sports:news**
  - **skyacademy.it**
  - **SkylineWebcams**
+ - **SkyNews**
  - **skynewsarabia:article**
  - **skynewsarabia:video**
+ - **SkySports**
  - **Slideshare**
  - **SlidesLive**
  - **Slutload**
+ - **smotri**: Smotri.com
+ - **smotri:broadcast**: Smotri.com broadcasts
+ - **smotri:community**: Smotri.com community videos
+ - **smotri:user**: Smotri.com user videos
  - **Snotr**
  - **Sohu**
  - **SonyLIV**
@@ -879,12 +839,6 @@
  - **Sport5**
  - **SportBox**
  - **SportDeutschland**
- - **spotify**
- - **spotify:show**
- - **Spreaker**
- - **SpreakerPage**
- - **SpreakerShow**
- - **SpreakerShowPage**
  - **SpringboardPlatform**
  - **Sprout**
  - **sr:mediathek**: Saarländischer Rundfunk
@@ -893,10 +847,6 @@
  - **stanfordoc**: Stanford Open ClassRoom
  - **Steam**
  - **Stitcher**
- - **StitcherShow**
- - **StoryFire**
- - **StoryFireSeries**
- - **StoryFireUser**
  - **Streamable**
  - **streamcloud.eu**
  - **StreamCZ**
@@ -917,6 +867,7 @@
  - **Tagesschau**
  - **tagesschau:player**
  - **Tass**
+ - **TastyTrade**
  - **TBS**
  - **TDSLifeway**
  - **Teachable**
@@ -939,7 +890,6 @@
  - **TeleQuebecEmission**
  - **TeleQuebecLive**
  - **TeleQuebecSquat**
- - **TeleQuebecVideo**
  - **TeleTask**
  - **Telewebion**
  - **TennisTV**
@@ -957,7 +907,7 @@
  - **ThisAV**
  - **ThisOldHouse**
  - **TikTok**
- - **TikTokUser** (Currently broken)
+ - **TikTokUser**
  - **tinypic**: tinypic.com videos
  - **TMZ**
  - **TMZArticle**
@@ -965,13 +915,12 @@
  - **TNAFlixNetworkEmbed**
  - **toggle**
  - **ToonGoggles**
+ - **Tosh**: Tosh.0
  - **tou.tv**
  - **Toypics**: Toypics video
  - **ToypicsUser**: Toypics user profile
  - **TrailerAddict** (Currently broken)
  - **Trilulilu**
- - **Trovo**
- - **TrovoVod**
  - **TruNews**
  - **TruTV**
  - **Tube8**
@@ -991,15 +940,12 @@
  - **TV2DKBornholmPlay**
  - **TV4**: tv4.se and tv4play.se
  - **TV5MondePlus**: TV5MONDE+
- - **tv5unis**
- - **tv5unis:video**
  - **tv8.it**
  - **TVA**
  - **TVANouvelles**
  - **TVANouvellesArticle**
  - **TVC**
  - **TVCArticle**
- - **TVer**
  - **tvigle**: Интернет-телевидение Tvigle.ru
  - **tvland.com**
  - **TVN24**
@@ -1065,7 +1011,6 @@
  - **Vidbit**
  - **Viddler**
  - **Videa**
- - **video.arnes.si**: Arnes Video
  - **video.google:search**: Google Video search
  - **video.sky.it**
  - **video.sky.it:live**
@@ -1080,6 +1025,7 @@
  - **vidme**
  - **vidme:user**
  - **vidme:user:likes**
+ - **Vidzi**
  - **vier**: vier.be and vijf.be
  - **vier:videos**
  - **viewlift**
@@ -1109,7 +1055,6 @@
  - **vk:wallpost**
  - **vlive**
  - **vlive:channel**
- - **vlive:post**
  - **Vodlocker**
  - **VODPl**
  - **VODPlatform**
@@ -1124,12 +1069,10 @@
  - **vrv**
  - **vrv:series**
  - **VShare**
- - **VTM**
  - **VTXTV**
  - **vube**: Vube.com
  - **VuClip**
  - **VVVVID**
- - **VVVVIDShow**
  - **VyboryMos**
  - **Vzaar**
  - **Wakanim**
@@ -1152,7 +1095,6 @@
  - **WeiboMobile**
  - **WeiqiTV**: WQTV
  - **Wistia**
- - **WistiaPlaylist**
  - **wnl**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **WorldStarHipHop**
  - **WSJ**: Wall Street Journal
@@ -1160,7 +1102,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: ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, XVideoSharing
  - **XHamster**
  - **XHamsterEmbed**
  - **XHamsterUser**
@@ -1184,8 +1126,6 @@
  - **yahoo:japannews**: Yahoo! Japan News
  - **YandexDisk**
  - **yandexmusic:album**: Яндекс.Музыка - Альбом
- - **yandexmusic:artist:albums**: Яндекс.Музыка - Артист - Альбомы
- - **yandexmusic:artist:tracks**: Яндекс.Музыка - Артист - Треки
  - **yandexmusic:playlist**: Яндекс.Музыка - Плейлист
  - **yandexmusic:track**: Яндекс.Музыка - Трек
  - **YandexVideo**
@@ -1212,15 +1152,12 @@
  - **youtube:subscriptions**: YouTube.com subscriptions feed, "ytsubs" keyword (requires authentication)
  - **youtube:tab**: YouTube.com tab
  - **youtube:watchlater**: Youtube watch later list, ":ytwatchlater" for short (requires authentication)
- - **YoutubeYtBe**
  - **YoutubeYtUser**
  - **Zapiks**
+ - **Zaq1**
  - **Zattoo**
  - **ZattooLive**
  - **ZDF**
  - **ZDFChannel**
- - **Zhihu**
  - **zingmp3**: mp3.zing.vn
- - **zingmp3:album**
- - **zoom**
  - **Zype**

test/helper.py

@@ -1,24 +1,22 @@
 from __future__ import unicode_literals
 
 import errno
+import io
 import hashlib
 import json
 import os.path
 import re
+import types
 import ssl
 import sys
-import types
-import unittest
 
 import youtube_dl.extractor
 from youtube_dl import YoutubeDL
 from youtube_dl.compat import (
-    compat_open as open,
     compat_os_name,
     compat_str,
 )
 from youtube_dl.utils import (
-    IDENTITY,
     preferredencoding,
     write_string,
 )
@@ -29,10 +27,10 @@ def get_params(override=None):
                                    "parameters.json")
     LOCAL_PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                          "local_parameters.json")
-    with open(PARAMETERS_FILE, encoding='utf-8') as pf:
+    with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
         parameters = json.load(pf)
     if os.path.exists(LOCAL_PARAMETERS_FILE):
-        with open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf:
+        with io.open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf:
             parameters.update(json.load(pf))
     if override:
         parameters.update(override)
@@ -74,8 +72,7 @@ class FakeYDL(YoutubeDL):
     def to_screen(self, s, skip_eol=None):
         print(s)
 
-    def trouble(self, *args, **kwargs):
-        s = args[0] if len(args) > 0 else kwargs.get('message', 'Missing message')
+    def trouble(self, s, tb=None):
         raise Exception(s)
 
     def download(self, x):
@@ -92,17 +89,6 @@ class FakeYDL(YoutubeDL):
         self.report_warning = types.MethodType(report_warning, self)
 
 
-class FakeLogger(object):
-    def debug(self, msg):
-        pass
-
-    def warning(self, msg):
-        pass
-
-    def error(self, msg):
-        pass
-
-
 def gettestcases(include_onlymatching=False):
     for ie in youtube_dl.extractor.gen_extractors():
         for tc in ie.get_testcases(include_onlymatching):
@@ -142,12 +128,6 @@ def expect_value(self, got, expected, field):
         self.assertTrue(
             contains_str in got,
             'field %s (value: %r) should contain %r' % (field, got, contains_str))
-    elif isinstance(expected, compat_str) and re.match(r'lambda \w+:', expected):
-        fn = eval(expected)
-        suite = expected.split(':', 1)[1].strip()
-        self.assertTrue(
-            fn(got),
-            'Expected field %s to meet condition %s, but value %r failed ' % (field, suite, got))
     elif isinstance(expected, type):
         self.assertTrue(
             isinstance(got, expected),
@@ -157,7 +137,7 @@ def expect_value(self, got, expected, field):
     elif isinstance(expected, list) and isinstance(got, list):
         self.assertEqual(
             len(expected), len(got),
-            'Expected a list of length %d, but got a list of length %d for field %s' % (
+            'Expect a list of length %d, but got a list of length %d for field %s' % (
                 len(expected), len(got), field))
         for index, (item_got, item_expected) in enumerate(zip(got, expected)):
             type_got = type(item_got)
@@ -181,18 +161,18 @@ def expect_value(self, got, expected, field):
             op, _, expected_num = expected.partition(':')
             expected_num = int(expected_num)
             if op == 'mincount':
-                assert_func = self.assertGreaterEqual
+                assert_func = assertGreaterEqual
                 msg_tmpl = 'Expected %d items in field %s, but only got %d'
             elif op == 'maxcount':
-                assert_func = self.assertLessEqual
+                assert_func = assertLessEqual
                 msg_tmpl = 'Expected maximum %d items in field %s, but got %d'
             elif op == 'count':
-                assert_func = self.assertEqual
+                assert_func = assertEqual
                 msg_tmpl = 'Expected exactly %d items in field %s, but got %d'
             else:
                 assert False
             assert_func(
-                len(got), expected_num,
+                self, len(got), expected_num,
                 msg_tmpl % (expected_num, field, len(got)))
             return
         self.assertEqual(
@@ -262,6 +242,27 @@ def assertRegexpMatches(self, text, regexp, msg=None):
             self.assertTrue(m, msg)
 
 
+def assertGreaterEqual(self, got, expected, msg=None):
+    if not (got >= expected):
+        if msg is None:
+            msg = '%r not greater than or equal to %r' % (got, expected)
+        self.assertTrue(got >= expected, msg)
+
+
+def assertLessEqual(self, got, expected, msg=None):
+    if not (got <= expected):
+        if msg is None:
+            msg = '%r not less than or equal to %r' % (got, expected)
+        self.assertTrue(got <= expected, msg)
+
+
+def assertEqual(self, got, expected, msg=None):
+    if not (got == expected):
+        if msg is None:
+            msg = '%r not equal to %r' % (got, expected)
+        self.assertTrue(got == expected, msg)
+
+
 def expect_warnings(ydl, warnings_re):
     real_warning = ydl.report_warning
 
@@ -279,7 +280,3 @@ def http_server_port(httpd):
     else:
         sock = httpd.socket
     return sock.getsockname()[1]
-
-
-def expectedFailureIf(cond):
-    return unittest.expectedFailure if cond else IDENTITY

test/parameters.json

@@ -18,6 +18,7 @@
     "noprogress": false, 
     "outtmpl": "%(id)s.%(ext)s", 
     "password": null, 
+    "playlistend": -1, 
     "playliststart": 1, 
     "prefer_free_formats": false, 
     "quiet": false, 

test/test_InfoExtractor.py

@@ -3,36 +3,18 @@
 from __future__ import unicode_literals
 
 # Allow direct execution
+import io
 import os
 import sys
 import unittest
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import threading
-
-from test.helper import (
-    expect_dict,
-    expect_value,
-    FakeYDL,
-    http_server_port,
-)
-from youtube_dl.compat import (
-    compat_etree_fromstring,
-    compat_http_server,
-    compat_open as open,
-)
+from test.helper import FakeYDL, expect_dict, expect_value, http_server_port
+from youtube_dl.compat import compat_etree_fromstring, compat_http_server
 from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.extractor import (
-    get_info_extractor,
-    YoutubeIE,
-)
-from youtube_dl.utils import (
-    encode_data_uri,
-    ExtractorError,
-    RegexNotFoundError,
-    strip_jsonp,
-)
+from youtube_dl.extractor import YoutubeIE, get_info_extractor
+from youtube_dl.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
+import threading
 
 
 TEAPOT_RESPONSE_STATUS = 418
@@ -53,13 +35,13 @@ class InfoExtractorTestRequestHandler(compat_http_server.BaseHTTPRequestHandler)
             assert False
 
 
-class DummyIE(InfoExtractor):
+class TestIE(InfoExtractor):
     pass
 
 
 class TestInfoExtractor(unittest.TestCase):
     def setUp(self):
-        self.ie = DummyIE(FakeYDL())
+        self.ie = TestIE(FakeYDL())
 
     def test_ie_key(self):
         self.assertEqual(get_info_extractor(YoutubeIE.ie_key()), YoutubeIE)
@@ -80,7 +62,6 @@ class TestInfoExtractor(unittest.TestCase):
             <meta name="og:test1" content='foo > < bar'/>
             <meta name="og:test2" content="foo >//< bar"/>
             <meta property=og-test3 content='Ill-formatted opengraph'/>
-            <meta property=og:test4 content=unquoted-value/>
             '''
         self.assertEqual(ie._og_search_title(html), 'Foo')
         self.assertEqual(ie._og_search_description(html), 'Some video\'s description ')
@@ -93,7 +74,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertEqual(ie._og_search_property(('test0', 'test1'), html), 'foo > < bar')
         self.assertRaises(RegexNotFoundError, ie._og_search_property, 'test0', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._og_search_property, ('test0', 'test00'), html, None, fatal=True)
-        self.assertEqual(ie._og_search_property('test4', html), 'unquoted-value')
 
     def test_html_search_meta(self):
         ie = self.ie
@@ -118,123 +98,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertRaises(RegexNotFoundError, ie._html_search_meta, 'z', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._html_search_meta, ('z', 'x'), html, None, fatal=True)
 
-    def test_search_nextjs_data(self):
-        html = '''
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content=
-  "text/html; charset=utf-8">
-  <meta name="viewport" content="width=device-width">
-  <title>Test _search_nextjs_data()</title>
-</head>
-<body>
-  <div id="__next">
-    <div style="background-color:#17171E" class="FU" dir="ltr">
-      <div class="sc-93de261d-0 dyzzYE">
-        <div>
-          <header class="HD"></header>
-          <main class="MN">
-            <div style="height:0" class="HT0">
-              <div style="width:NaN%" data-testid=
-              "stream-container" class="WDN"></div>
-            </div>
-          </main>
-        </div>
-        <footer class="sc-6e5faf91-0 dEGaHS"></footer>
-      </div>
-    </div>
-  </div>
-  <script id="__NEXT_DATA__" type="application/json">
-  {"props":{"pageProps":{"video":{"id":"testid"}}}}
-  </script>
-</body>
-</html>
-'''
-        search = self.ie._search_nextjs_data(html, 'testID')
-        self.assertEqual(search['props']['pageProps']['video']['id'], 'testid')
-        search = self.ie._search_nextjs_data(
-            'no next.js data here, move along', 'testID', default={'status': 0})
-        self.assertEqual(search['status'], 0)
-
-    def test_search_nuxt_data(self):
-        html = '''
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content=
-  "text/html; charset=utf-8">
-  <title>Nuxt.js Test Page</title>
-  <meta name="viewport" content=
-  "width=device-width, initial-scale=1">
-  <meta data-hid="robots" name="robots" content="all">
-</head>
-<body class="BD">
-  <div id="__layout">
-    <h1 class="H1">Example heading</h1>
-    <div class="IN">
-      <p>Decoy text</p>
-    </div>
-  </div>
-  <script>
-  window.__NUXT__=(function(a,b,c,d,e,f,g,h){return {decoy:" default",data:[{track:{id:f,title:g}}]}}(null,null,"c",null,null,"testid","Nuxt.js title",null));
-  </script>
-  <script src="/_nuxt/a12345b.js" defer="defer"></script>
-</body>
-</html>
-'''
-        search = self.ie._search_nuxt_data(html, 'testID')
-        self.assertEqual(search['track']['id'], 'testid')
-
-    def test_search_json_ld_realworld(self):
-        # https://github.com/ytdl-org/youtube-dl/issues/23306
-        expect_dict(
-            self,
-            self.ie._search_json_ld(r'''<script type="application/ld+json">
-{
-"@context": "http://schema.org/",
-"@type": "VideoObject",
-"name": "1 On 1 With Kleio",
-"url": "https://www.eporner.com/hd-porn/xN49A1cT3eB/1-On-1-With-Kleio/",
-"duration": "PT0H12M23S",
-"thumbnailUrl": ["https://static-eu-cdn.eporner.com/thumbs/static4/7/78/780/780814/9_360.jpg", "https://imggen.eporner.com/780814/1920/1080/9.jpg"],
-"contentUrl": "https://gvideo.eporner.com/xN49A1cT3eB/xN49A1cT3eB.mp4",
-"embedUrl": "https://www.eporner.com/embed/xN49A1cT3eB/1-On-1-With-Kleio/",
-"image": "https://static-eu-cdn.eporner.com/thumbs/static4/7/78/780/780814/9_360.jpg",
-"width": "1920",
-"height": "1080",
-"encodingFormat": "mp4",
-"bitrate": "6617kbps",
-"isFamilyFriendly": "False",
-"description": "Kleio Valentien",
-"uploadDate": "2015-12-05T21:24:35+01:00",
-"interactionStatistic": {
-"@type": "InteractionCounter",
-"interactionType": { "@type": "http://schema.org/WatchAction" },
-"userInteractionCount": 1120958
-}, "aggregateRating": {
-"@type": "AggregateRating",
-"ratingValue": "88",
-"ratingCount": "630",
-"bestRating": "100",
-"worstRating": "0"
-}, "actor": [{
-"@type": "Person",
-"name": "Kleio Valentien",
-"url": "https://www.eporner.com/pornstar/kleio-valentien/"
-}]}
-</script>''', None),
-            {
-                'title': '1 On 1 With Kleio',
-                'description': 'Kleio Valentien',
-                'url': 'https://gvideo.eporner.com/xN49A1cT3eB/xN49A1cT3eB.mp4',
-                'timestamp': 1449347075,
-                'duration': 743.0,
-                'view_count': 1120958,
-                'width': 1920,
-                'height': 1080,
-            })
-
     def test_download_json(self):
         uri = encode_data_uri(b'{"foo": "blah"}', 'application/json')
         self.assertEqual(self.ie._download_json(uri, None), {'foo': 'blah'})
@@ -245,18 +108,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertEqual(self.ie._download_json(uri, None, fatal=False), None)
 
     def test_parse_html5_media_entries(self):
-        # inline video tag
-        expect_dict(
-            self,
-            self.ie._parse_html5_media_entries(
-                'https://127.0.0.1/video.html',
-                r'<html><video src="/vid.mp4" /></html>', None)[0],
-            {
-                'formats': [{
-                    'url': 'https://127.0.0.1/vid.mp4',
-                }],
-            })
-
         # from https://www.r18.com/
         # with kpbs in label
         expect_dict(
@@ -434,24 +285,6 @@ class TestInfoExtractor(unittest.TestCase):
                 }],
             })
 
-        # from https://0000.studio/
-        # with type attribute but without extension in URL
-        expect_dict(
-            self,
-            self.ie._parse_html5_media_entries(
-                'https://0000.studio',
-                r'''
-                <video src="https://d1ggyt9m8pwf3g.cloudfront.net/protected/ap-northeast-1:1864af40-28d5-492b-b739-b32314b1a527/archive/clip/838db6a7-8973-4cd6-840d-8517e4093c92"
-                    controls="controls" type="video/mp4" preload="metadata" autoplay="autoplay" playsinline class="object-contain">
-                </video>
-                ''', None)[0],
-            {
-                'formats': [{
-                    'url': 'https://d1ggyt9m8pwf3g.cloudfront.net/protected/ap-northeast-1:1864af40-28d5-492b-b739-b32314b1a527/archive/clip/838db6a7-8973-4cd6-840d-8517e4093c92',
-                    'ext': 'mp4',
-                }],
-            })
-
     def test_extract_jwplayer_data_realworld(self):
         # from http://www.suffolk.edu/sjc/
         expect_dict(
@@ -905,8 +738,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for m3u8_file, m3u8_url, expected_formats in _TEST_CASES:
-            with open('./test/testdata/m3u8/%s.m3u8' % m3u8_file,
-                      mode='r', encoding='utf-8') as f:
+            with io.open('./test/testdata/m3u8/%s.m3u8' % m3u8_file,
+                         mode='r', encoding='utf-8') as f:
                 formats = self.ie._parse_m3u8_formats(
                     f.read(), m3u8_url, ext='mp4')
                 self.ie._sort_formats(formats)
@@ -996,8 +829,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',
@@ -1080,8 +912,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
@@ -1127,185 +958,18 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'width': 360,
                     'height': 360,
                     'fps': 30,
-                }],
-                {},
-            ), (
-                # https://github.com/ytdl-org/youtube-dl/issues/30235
-                # Bento4 generated test mpd
-                # mp4dash --mpd-name=manifest.mpd --no-split --use-segment-list mediafiles
-                'url_and_range',
-                'http://unknown/manifest.mpd',  # mpd_url
-                'http://unknown/',  # mpd_base_url
-                [{
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/',
-                    'ext': 'm4a',
-                    'format_id': 'audio-und-mp4a.40.2',
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'mp4a.40.2',
-                    'vcodec': 'none',
-                    'tbr': 98.808,
-                }, {
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/',
-                    'ext': 'mp4',
-                    'format_id': 'video-avc1',
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'none',
-                    'vcodec': 'avc1.4D401E',
-                    'tbr': 699.597,
-                    'width': 768,
-                    'height': 432
-                }],
-                {},
-            ), (
-                # https://github.com/ytdl-org/youtube-dl/issues/27575
-                # GPAC generated test mpd
-                # MP4Box -dash 10000 -single-file -out manifest.mpd mediafiles
-                'range_only',
-                'http://unknown/manifest.mpd',  # mpd_url
-                'http://unknown/',  # mpd_base_url
-                [{
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/audio_dashinit.mp4',
-                    'ext': 'm4a',
-                    'format_id': '2',
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'mp4a.40.2',
-                    'vcodec': 'none',
-                    'tbr': 98.096,
-                }, {
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/video_dashinit.mp4',
-                    'ext': 'mp4',
-                    'format_id': '1',
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'none',
-                    'vcodec': 'avc1.4D401E',
-                    'tbr': 526.987,
-                    'width': 768,
-                    'height': 432
-                }],
-                {},
-            ), (
-                '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',
-                }, {
-                    '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',
-                }, {
-                    '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',
-                }, {
-                    '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',
-                }, {
-                    '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',
-                }, {
-                    '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',
-                }],
-                {
-                    '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:
-            with open('./test/testdata/mpd/%s.mpd' % mpd_file,
-                      mode='r', encoding='utf-8') as f:
-                formats, subtitles = self.ie._parse_mpd_formats_and_subtitles(
+        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 = 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_f4m_formats(self):
         _TEST_CASES = [
@@ -1326,8 +990,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for f4m_file, f4m_url, expected_formats in _TEST_CASES:
-            with open('./test/testdata/f4m/%s.f4m' % f4m_file,
-                      mode='r', encoding='utf-8') as f:
+            with io.open('./test/testdata/f4m/%s.f4m' % f4m_file,
+                         mode='r', encoding='utf-8') as f:
                 formats = self.ie._parse_f4m_formats(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     f4m_url, None)
@@ -1374,8 +1038,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for xspf_file, xspf_url, expected_entries in _TEST_CASES:
-            with open('./test/testdata/xspf/%s.xspf' % xspf_file,
-                      mode='r', encoding='utf-8') as f:
+            with io.open('./test/testdata/xspf/%s.xspf' % xspf_file,
+                         mode='r', encoding='utf-8') as f:
                 entries = self.ie._parse_xspf(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     xspf_file, xspf_url=xspf_url, xspf_base_url=xspf_url)

test/test_YoutubeDL.py

@@ -10,31 +10,14 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import copy
-import json
 
-from test.helper import (
-    FakeYDL,
-    assertRegexpMatches,
-    try_rm,
-)
+from test.helper import FakeYDL, assertRegexpMatches
 from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
-    compat_http_cookiejar_Cookie,
-    compat_http_cookies_SimpleCookie,
-    compat_kwargs,
-    compat_open as open,
-    compat_str,
-    compat_urllib_error,
-)
-
+from youtube_dl.compat import compat_str, compat_urllib_error
 from youtube_dl.extractor import YoutubeIE
 from youtube_dl.extractor.common import InfoExtractor
 from youtube_dl.postprocessor.common import PostProcessor
-from youtube_dl.utils import (
-    ExtractorError,
-    match_filter_func,
-    traverse_obj,
-)
+from youtube_dl.utils import ExtractorError, match_filter_func
 
 TEST_URL = 'http://localhost/sample.mp4'
 
@@ -46,14 +29,11 @@ class YDL(FakeYDL):
         self.msgs = []
 
     def process_info(self, info_dict):
-        self.downloaded_info_dicts.append(info_dict.copy())
+        self.downloaded_info_dicts.append(info_dict)
 
     def to_screen(self, msg):
         self.msgs.append(msg)
 
-    def dl(self, *args, **kwargs):
-        assert False, 'Downloader must not be invoked for test_YoutubeDL'
-
 
 def _make_result(formats, **kwargs):
     res = {
@@ -62,9 +42,8 @@ def _make_result(formats, **kwargs):
         'title': 'testttitle',
         'extractor': 'testex',
         'extractor_key': 'TestEx',
-        'webpage_url': 'http://example.com/watch?v=shenanigans',
     }
-    res.update(**compat_kwargs(kwargs))
+    res.update(**kwargs)
     return res
 
 
@@ -485,7 +464,6 @@ class TestFormatSelection(unittest.TestCase):
         assert_syntax_error('+bestaudio')
         assert_syntax_error('bestvideo+')
         assert_syntax_error('/')
-        assert_syntax_error('bestvideo+bestvideo+bestaudio')
 
     def test_format_filtering(self):
         formats = [
@@ -654,20 +632,13 @@ class TestYoutubeDL(unittest.TestCase):
             'title2': '%PATH%',
         }
 
-        def fname(templ, na_placeholder='NA'):
-            params = {'outtmpl': templ}
-            if na_placeholder != 'NA':
-                params['outtmpl_na_placeholder'] = na_placeholder
-            ydl = YoutubeDL(params)
+        def fname(templ):
+            ydl = YoutubeDL({'outtmpl': templ})
             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')
+        # Replace missing fields with 'NA'
+        self.assertEqual(fname('%(uploader_date)s-%(id)s.%(ext)s'), 'NA-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')
@@ -702,12 +673,12 @@ class TestYoutubeDL(unittest.TestCase):
 
         class SimplePP(PostProcessor):
             def run(self, info):
-                with open(audiofile, 'w') as f:
+                with open(audiofile, 'wt') as f:
                     f.write('EXAMPLE')
                 return [info['filepath']], info
 
         def run_pp(params, PP):
-            with open(filename, 'w') as f:
+            with open(filename, 'wt') as f:
                 f.write('EXAMPLE')
             ydl = YoutubeDL(params)
             ydl.add_post_processor(PP())
@@ -726,7 +697,7 @@ class TestYoutubeDL(unittest.TestCase):
 
         class ModifierPP(PostProcessor):
             def run(self, info):
-                with open(info['filepath'], 'w') as f:
+                with open(info['filepath'], 'wt') as f:
                     f.write('MODIFIED')
                 return [], info
 
@@ -951,11 +922,17 @@ class TestYoutubeDL(unittest.TestCase):
     # Test case for https://github.com/ytdl-org/youtube-dl/issues/27064
     def test_ignoreerrors_for_playlist_with_url_transparent_iterable_entries(self):
 
-        ydl = YDL({
+        class _YDL(YDL):
+            def __init__(self, *args, **kwargs):
+                super(_YDL, self).__init__(*args, **kwargs)
+
+            def trouble(self, s, tb=None):
+                pass
+
+        ydl = _YDL({
             'format': 'extra',
             'ignoreerrors': True,
         })
-        ydl.trouble = lambda *_, **__: None
 
         class VideoIE(InfoExtractor):
             _VALID_URL = r'video:(?P<id>\d+)'
@@ -1012,180 +989,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertEqual(downloaded['extractor'], 'Video')
         self.assertEqual(downloaded['extractor_key'], 'Video')
 
-    def test_default_times(self):
-        """Test addition of missing upload/release/_date from /release_/timestamp"""
-        info = {
-            'id': '1234',
-            'url': TEST_URL,
-            'title': 'Title',
-            'ext': 'mp4',
-            'timestamp': 1631352900,
-            'release_timestamp': 1632995931,
-        }
-
-        params = {'simulate': True, }
-        ydl = FakeYDL(params)
-        out_info = ydl.process_ie_result(info)
-        self.assertTrue(isinstance(out_info['upload_date'], compat_str))
-        self.assertEqual(out_info['upload_date'], '20210911')
-        self.assertTrue(isinstance(out_info['release_date'], compat_str))
-        self.assertEqual(out_info['release_date'], '20210930')
-
-
-class TestYoutubeDLCookies(unittest.TestCase):
-
-    @staticmethod
-    def encode_cookie(cookie):
-        if not isinstance(cookie, dict):
-            cookie = vars(cookie)
-        for name, value in cookie.items():
-            yield name, compat_str(value)
-
-    @classmethod
-    def comparable_cookies(cls, cookies):
-        # Work around cookiejar cookies not being unicode strings
-        return sorted(map(tuple, map(sorted, map(cls.encode_cookie, cookies))))
-
-    def assertSameCookies(self, c1, c2, msg=None):
-        return self.assertEqual(
-            *map(self.comparable_cookies, (c1, c2)),
-            msg=msg)
-
-    def assertSameCookieStrings(self, c1, c2, msg=None):
-        return self.assertSameCookies(
-            *map(lambda c: compat_http_cookies_SimpleCookie(c).values(), (c1, c2)),
-            msg=msg)
-
-    def test_header_cookies(self):
-
-        ydl = FakeYDL()
-        ydl.report_warning = lambda *_, **__: None
-
-        def cookie(name, value, version=None, domain='', path='', secure=False, expires=None):
-            return compat_http_cookiejar_Cookie(
-                version or 0, name, value, None, False,
-                domain, bool(domain), bool(domain), path, bool(path),
-                secure, expires, False, None, None, rest={})
-
-        test_url, test_domain = (t % ('yt.dl',) for t in ('https://%s/test', '.%s'))
-
-        def test(encoded_cookies, cookies, headers=False, round_trip=None, error_re=None):
-            def _test():
-                ydl.cookiejar.clear()
-                ydl._load_cookies(encoded_cookies, autoscope=headers)
-                if headers:
-                    ydl._apply_header_cookies(test_url)
-                data = {'url': test_url}
-                ydl._calc_headers(data)
-                self.assertSameCookies(
-                    cookies, ydl.cookiejar,
-                    'Extracted cookiejar.Cookie is not the same')
-                if not headers:
-                    self.assertSameCookieStrings(
-                        data.get('cookies'), round_trip or encoded_cookies,
-                        msg='Cookie is not the same as round trip')
-                ydl.__dict__['_YoutubeDL__header_cookies'] = []
-
-            try:
-                _test()
-            except AssertionError:
-                raise
-            except Exception as e:
-                if not error_re:
-                    raise
-                assertRegexpMatches(self, e.args[0], error_re.join(('.*',) * 2))
-
-        test('test=value; Domain=' + test_domain, [cookie('test', 'value', domain=test_domain)])
-        test('test=value', [cookie('test', 'value')], error_re='Unscoped cookies are not allowed')
-        test('cookie1=value1; Domain={0}; Path=/test; cookie2=value2; Domain={0}; Path=/'.format(test_domain), [
-            cookie('cookie1', 'value1', domain=test_domain, path='/test'),
-            cookie('cookie2', 'value2', domain=test_domain, path='/')])
-        cookie_kw = compat_kwargs(
-            {'domain': test_domain, 'path': '/test', 'secure': True, 'expires': '9999999999', })
-        test('test=value; Domain={domain}; Path={path}; Secure; Expires={expires}'.format(**cookie_kw), [
-            cookie('test', 'value', **cookie_kw)])
-        test('test="value; "; path=/test; domain=' + test_domain, [
-            cookie('test', 'value; ', domain=test_domain, path='/test')],
-            round_trip='test="value\\073 "; Domain={0}; Path=/test'.format(test_domain))
-        test('name=; Domain=' + test_domain, [cookie('name', '', domain=test_domain)],
-             round_trip='name=""; Domain=' + test_domain)
-        test('test=value', [cookie('test', 'value', domain=test_domain)], headers=True)
-        test('cookie1=value; Domain={0}; cookie2=value'.format(test_domain), [],
-             headers=True, error_re='Invalid syntax')
-        ydl.report_warning = ydl.report_error
-        test('test=value', [], headers=True, error_re='Passing cookies as a header is a potential security risk')
-
-    def test_infojson_cookies(self):
-        TEST_FILE = 'test_infojson_cookies.info.json'
-        TEST_URL = 'https://example.com/example.mp4'
-        COOKIES = 'a=b; Domain=.example.com; c=d; Domain=.example.com'
-        COOKIE_HEADER = {'Cookie': 'a=b; c=d'}
-
-        ydl = FakeYDL()
-        ydl.process_info = lambda x: ydl._write_info_json('test', x, TEST_FILE)
-
-        def make_info(info_header_cookies=False, fmts_header_cookies=False, cookies_field=False):
-            fmt = {'url': TEST_URL}
-            if fmts_header_cookies:
-                fmt['http_headers'] = COOKIE_HEADER
-            if cookies_field:
-                fmt['cookies'] = COOKIES
-            return _make_result([fmt], http_headers=COOKIE_HEADER if info_header_cookies else None)
-
-        def test(initial_info, note):
-
-            def failure_msg(why):
-                return ' when '.join((why, note))
-
-            result = {}
-            result['processed'] = ydl.process_ie_result(initial_info)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=failure_msg('No cookies set in cookiejar after initial process'))
-            ydl.cookiejar.clear()
-            with open(TEST_FILE) as infojson:
-                result['loaded'] = ydl.sanitize_info(json.load(infojson), True)
-            result['final'] = ydl.process_ie_result(result['loaded'].copy(), download=False)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=failure_msg('No cookies set in cookiejar after final process'))
-            ydl.cookiejar.clear()
-            for key in ('processed', 'loaded', 'final'):
-                info = result[key]
-                self.assertIsNone(
-                    traverse_obj(info, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False),
-                    msg=failure_msg('Cookie header not removed in {0} result'.format(key)))
-                self.assertSameCookieStrings(
-                    traverse_obj(info, ((None, ('formats', 0)), 'cookies'), get_all=False), COOKIES,
-                    msg=failure_msg('No cookies field found in {0} result'.format(key)))
-
-        test({'url': TEST_URL, 'http_headers': COOKIE_HEADER, 'id': '1', 'title': 'x'}, 'no formats field')
-        test(make_info(info_header_cookies=True), 'info_dict header cokies')
-        test(make_info(fmts_header_cookies=True), 'format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True), 'info_dict and format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True, cookies_field=True), 'all cookies fields')
-        test(make_info(cookies_field=True), 'cookies format field')
-        test({'url': TEST_URL, 'cookies': COOKIES, 'id': '1', 'title': 'x'}, 'info_dict cookies field only')
-
-        try_rm(TEST_FILE)
-
-    def test_add_headers_cookie(self):
-        def check_for_cookie_header(result):
-            return traverse_obj(result, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False)
-
-        ydl = FakeYDL({'http_headers': {'Cookie': 'a=b'}})
-        ydl._apply_header_cookies(_make_result([])['webpage_url'])  # Scope to input webpage URL: .example.com
-
-        fmt = {'url': 'https://example.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies in result info_dict')
-        self.assertEqual(result.get('cookies'), 'a=b; Domain=.example.com', msg='No cookies were set in cookies field')
-        self.assertIn('a=b', ydl.cookiejar.get_cookie_header(fmt['url']), msg='No cookies were set in cookiejar')
-
-        fmt = {'url': 'https://wrong.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies for wrong domain')
-        self.assertFalse(result.get('cookies'), msg='Cookies set in cookies field for wrong domain')
-        self.assertFalse(ydl.cookiejar.get_cookie_header(fmt['url']), msg='Cookies set in cookiejar for wrong domain')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_YoutubeDLCookieJar.py

@@ -46,20 +46,6 @@ class TestYoutubeDLCookieJar(unittest.TestCase):
         # will be ignored
         self.assertFalse(cookiejar._cookies)
 
-    def test_get_cookie_header(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/httponly_cookies.txt')
-        cookiejar.load(ignore_discard=True, ignore_expires=True)
-        header = cookiejar.get_cookie_header('https://www.foobar.foobar')
-        self.assertIn('HTTPONLY_COOKIE', header)
-
-    def test_get_cookies_for_url(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/session_cookies.txt')
-        cookiejar.load(ignore_discard=True, ignore_expires=True)
-        cookies = cookiejar.get_cookies_for_url('https://www.foobar.foobar/')
-        self.assertEqual(len(cookies), 2)
-        cookies = cookiejar.get_cookies_for_url('https://foobar.foobar/')
-        self.assertFalse(cookies)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_aes.py

@@ -8,7 +8,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text, aes_ecb_encrypt
+from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
 from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes
 import base64
 
@@ -58,13 +58,6 @@ class TestAES(unittest.TestCase):
         decrypted = (aes_decrypt_text(encrypted, password, 32))
         self.assertEqual(decrypted, self.secret_msg)
 
-    def test_ecb_encrypt(self):
-        data = bytes_to_intlist(self.secret_msg)
-        encrypted = intlist_to_bytes(aes_ecb_encrypt(data, self.key))
-        self.assertEqual(
-            encrypted,
-            b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_age_restriction.py

@@ -11,7 +11,6 @@ from test.helper import try_rm
 
 
 from youtube_dl import YoutubeDL
-from youtube_dl.utils import DownloadError
 
 
 def _download_restricted(url, filename, age):
@@ -27,10 +26,7 @@ def _download_restricted(url, filename, age):
     ydl.add_default_info_extractors()
     json_filename = os.path.splitext(filename)[0] + '.info.json'
     try_rm(json_filename)
-    try:
-        ydl.download([url])
-    except DownloadError:
-        try_rm(json_filename)
+    ydl.download([url])
     res = os.path.exists(json_filename)
     try_rm(json_filename)
     return res
@@ -42,12 +38,12 @@ class TestAgeRestriction(unittest.TestCase):
         self.assertFalse(_download_restricted(url, filename, age))
 
     def test_youtube(self):
-        self._assert_restricted('HtVdAasjOgU', 'HtVdAasjOgU.mp4', 10)
+        self._assert_restricted('07FYdnEawAQ', '07FYdnEawAQ.mp4', 10)
 
     def test_youporn(self):
         self._assert_restricted(
-            'https://www.youporn.com/watch/16715086/sex-ed-in-detention-18-asmr/',
-            '16715086.mp4', 2, old_age=25)
+            'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
+            '505835.mp4', 2, old_age=25)
 
 
 if __name__ == '__main__':

test/test_all_urls.py

@@ -36,7 +36,7 @@ class TestAllURLsMatching(unittest.TestCase):
         assertPlaylist('UUBABnxM4Ar9ten8Mdjj1j0Q')  # 585
         assertPlaylist('PL63F0C78739B09958')
         assertTab('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')
-        assertTab('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
+        assertPlaylist('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
         assertTab('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
         assertTab('https://www.youtube.com/watch?v=AV6J6_AeFEQ&playnext=1&list=PL4023E734DA416012')  # 668
         self.assertFalse('youtube:playlist' in self.matching_ies('PLtS2H6bU1M'))
@@ -57,8 +57,8 @@ class TestAllURLsMatching(unittest.TestCase):
         assertChannel('https://www.youtube.com/channel/HCtnHdj3df7iM?feature=gb_ch_rec')
         assertChannel('https://www.youtube.com/channel/HCtnHdj3df7iM/videos')
 
-    def test_youtube_user_matching(self):
-        self.assertMatch('http://www.youtube.com/NASAgovVideo/videos', ['youtube:tab'])
+    # def test_youtube_user_matching(self):
+    #     self.assertMatch('http://www.youtube.com/NASAgovVideo/videos', ['youtube:tab'])
 
     def test_youtube_feeds(self):
         self.assertMatch('https://www.youtube.com/feed/library', ['youtube:tab'])
@@ -66,9 +66,18 @@ class TestAllURLsMatching(unittest.TestCase):
         self.assertMatch('https://www.youtube.com/feed/watch_later', ['youtube:tab'])
         self.assertMatch('https://www.youtube.com/feed/subscriptions', ['youtube:tab'])
 
-    def test_youtube_search_matching(self):
-        self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
-        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+    # def test_youtube_search_matching(self):
+    #     self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
+    #     self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+
+    def test_youtube_extract(self):
+        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
+        assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
+        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
 
     def test_facebook_matching(self):
         self.assertTrue(FacebookIE.suitable('https://www.facebook.com/Shiniknoh#!/photo.php?v=10153317450565268'))

test/test_cache.py

@@ -3,18 +3,17 @@
 
 from __future__ import unicode_literals
 
+import shutil
+
 # Allow direct execution
 import os
 import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import shutil
 
 from test.helper import FakeYDL
 from youtube_dl.cache import Cache
-from youtube_dl.utils import version_tuple
-from youtube_dl.version import __version__
 
 
 def _is_empty(d):
@@ -55,17 +54,6 @@ class TestCache(unittest.TestCase):
         self.assertFalse(os.path.exists(self.test_dir))
         self.assertEqual(c.load('test_cache', 'k.'), None)
 
-    def test_cache_validation(self):
-        ydl = FakeYDL({
-            'cachedir': self.test_dir,
-        })
-        c = Cache(ydl)
-        obj = {'x': 1, 'y': ['ä', '\\a', True]}
-        c.store('test_cache', 'k.', obj)
-        self.assertEqual(c.load('test_cache', 'k.', min_ver='1970.01.01'), obj)
-        new_version = '.'.join(('%d' % ((v + 1) if i == 0 else v, )) for i, v in enumerate(version_tuple(__version__)))
-        self.assertIs(c.load('test_cache', 'k.', min_ver=new_version), None)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_compat.py

@@ -11,7 +11,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 from youtube_dl.compat import (
-    compat_casefold,
     compat_getenv,
     compat_setenv,
     compat_etree_Element,
@@ -23,7 +22,6 @@ from youtube_dl.compat import (
     compat_urllib_parse_unquote,
     compat_urllib_parse_unquote_plus,
     compat_urllib_parse_urlencode,
-    compat_urllib_request,
 )
 
 
@@ -49,11 +47,10 @@ class TestCompat(unittest.TestCase):
 
     def test_all_present(self):
         import youtube_dl.compat
-        all_names = sorted(
-            youtube_dl.compat.__all__ + youtube_dl.compat.legacy)
-        present_names = set(map(compat_str, filter(
+        all_names = youtube_dl.compat.__all__
+        present_names = set(filter(
             lambda c: '_' in c and not c.startswith('_'),
-            dir(youtube_dl.compat)))) - set(['unicode_literals'])
+            dir(youtube_dl.compat))) - set(['unicode_literals'])
         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_unquote(self):
@@ -121,34 +118,9 @@ class TestCompat(unittest.TestCase):
 <smil xmlns="http://www.w3.org/2001/SMIL20/Language"></smil>'''
         compat_etree_fromstring(xml)
 
-    def test_compat_struct_unpack(self):
+    def test_struct_unpack(self):
         self.assertEqual(compat_struct_unpack('!B', b'\x00'), (0,))
 
-    def test_compat_casefold(self):
-        if hasattr(compat_str, 'casefold'):
-            # don't bother to test str.casefold() (again)
-            return
-        # thanks https://bugs.python.org/file24232/casefolding.patch
-        self.assertEqual(compat_casefold('hello'), 'hello')
-        self.assertEqual(compat_casefold('hELlo'), 'hello')
-        self.assertEqual(compat_casefold('ß'), 'ss')
-        self.assertEqual(compat_casefold('fi'), 'fi')
-        self.assertEqual(compat_casefold('\u03a3'), '\u03c3')
-        self.assertEqual(compat_casefold('A\u0345\u03a3'), 'a\u03b9\u03c3')
-
-    def test_compat_urllib_request_Request(self):
-        self.assertEqual(
-            compat_urllib_request.Request('http://127.0.0.1', method='PUT').get_method(),
-            'PUT')
-
-        class PUTrequest(compat_urllib_request.Request):
-            def get_method(self):
-                return 'PUT'
-
-        self.assertEqual(
-            PUTrequest('http://127.0.0.1').get_method(),
-            'PUT')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_download.py

@@ -9,6 +9,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import (
+    assertGreaterEqual,
     expect_warnings,
     get_params,
     gettestcases,
@@ -19,35 +20,26 @@ from test.helper import (
 
 
 import hashlib
+import io
 import json
 import socket
 
 import youtube_dl.YoutubeDL
 from youtube_dl.compat import (
     compat_http_client,
-    compat_HTTPError,
-    compat_open as open,
     compat_urllib_error,
+    compat_HTTPError,
 )
 from youtube_dl.utils import (
     DownloadError,
     ExtractorError,
-    error_to_compat_str,
     format_bytes,
-    IDENTITY,
-    preferredencoding,
     UnavailableVideoError,
 )
 from youtube_dl.extractor import get_info_extractor
 
 RETRIES = 3
 
-# Some unittest APIs require actual str
-if not isinstance('TEST', str):
-    _encode_str = lambda s: s.encode(preferredencoding())
-else:
-    _encode_str = IDENTITY
-
 
 class YoutubeDL(youtube_dl.YoutubeDL):
     def __init__(self, *args, **kwargs):
@@ -108,31 +100,27 @@ def generator(test_case, tname):
 
         def print_skipping(reason):
             print('Skipping %s: %s' % (test_case['name'], reason))
-            self.skipTest(_encode_str(reason))
-
         if not ie.working():
             print_skipping('IE marked as not _WORKING')
+            return
 
         for tc in test_cases:
             info_dict = tc.get('info_dict', {})
             if not (info_dict.get('id') and info_dict.get('ext')):
-                raise Exception('Test definition (%s) requires both \'id\' and \'ext\' keys present to define the output file' % (tname, ))
+                raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
 
         if 'skip' in test_case:
             print_skipping(test_case['skip'])
-
+            return
         for other_ie in other_ies:
             if not other_ie.working():
                 print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
+                return
 
         params = get_params(test_case.get('params', {}))
         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['playlist_maxcount'] + 1
-                              if test_case.get('playlist_maxcount')
-                              else test_case.get('playlist_mincount'))
             params.setdefault('skip_download', True)
 
         ydl = YoutubeDL(params, auto_init=False)
@@ -158,7 +146,6 @@ def generator(test_case, tname):
                 try_rm(tc_filename)
                 try_rm(tc_filename + '.part')
                 try_rm(os.path.splitext(tc_filename)[0] + '.info.json')
-
         try_rm_tcs_files()
         try:
             try_num = 1
@@ -173,9 +160,7 @@ def generator(test_case, tname):
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one
                     if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503):
-                        msg = getattr(err, 'msg', error_to_compat_str(err))
-                        err.msg = '%s (%s)' % (msg, tname, )
-                        raise err
+                        raise
 
                     if try_num == RETRIES:
                         report_warning('%s failed due to network errors, skipping...' % tname)
@@ -193,19 +178,13 @@ def generator(test_case, tname):
                 expect_info_dict(self, res_dict, test_case.get('info_dict', {}))
 
             if 'playlist_mincount' in test_case:
-                self.assertGreaterEqual(
+                assertGreaterEqual(
+                    self,
                     len(res_dict['entries']),
                     test_case['playlist_mincount'],
                     'Expected at least %d in playlist %s, but got only %d' % (
                         test_case['playlist_mincount'], test_case['url'],
                         len(res_dict['entries'])))
-            if 'playlist_maxcount' in test_case:
-                self.assertLessEqual(
-                    len(res_dict['entries']),
-                    test_case['playlist_maxcount'],
-                    'Expected at most %d in playlist %s, but got %d' % (
-                        test_case['playlist_maxcount'], test_case['url'],
-                        len(res_dict['entries'])))
             if 'playlist_count' in test_case:
                 self.assertEqual(
                     len(res_dict['entries']),
@@ -230,15 +209,7 @@ def generator(test_case, tname):
                 # First, check test cases' data against extracted data alone
                 expect_info_dict(self, tc_res_dict, tc.get('info_dict', {}))
                 # Now, check downloaded file consistency
-                # support test-case with volatile ID, signalled by regexp value
-                if tc.get('info_dict', {}).get('id', '').startswith('re:'):
-                    test_id = tc['info_dict']['id']
-                    tc['info_dict']['id'] = tc_res_dict['id']
-                else:
-                    test_id = None
                 tc_filename = get_tc_filename(tc)
-                if test_id:
-                    tc['info_dict']['id'] = test_id
                 if not test_case.get('params', {}).get('skip_download', False):
                     self.assertTrue(os.path.exists(tc_filename), msg='Missing file ' + tc_filename)
                     self.assertTrue(tc_filename in finished_hook_called)
@@ -247,8 +218,8 @@ def generator(test_case, tname):
                         if params.get('test'):
                             expected_minsize = max(expected_minsize, 10000)
                         got_fsize = os.path.getsize(tc_filename)
-                        self.assertGreaterEqual(
-                            got_fsize, expected_minsize,
+                        assertGreaterEqual(
+                            self, got_fsize, expected_minsize,
                             'Expected %s to be at least %s, but it\'s only %s ' %
                             (tc_filename, format_bytes(expected_minsize),
                                 format_bytes(got_fsize)))
@@ -261,7 +232,7 @@ def generator(test_case, tname):
                 self.assertTrue(
                     os.path.exists(info_json_fn),
                     'Missing info file %s' % info_json_fn)
-                with open(info_json_fn, encoding='utf-8') as infof:
+                with io.open(info_json_fn, encoding='utf-8') as infof:
                     info_dict = json.load(infof)
                 expect_info_dict(self, info_dict, tc.get('info_dict', {}))
         finally:

test/test_downloader_external.py

@@ -1,272 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import re
-import sys
-import subprocess
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from test.helper import (
-    FakeLogger,
-    FakeYDL,
-    http_server_port,
-    try_rm,
-)
-from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
-    compat_contextlib_suppress,
-    compat_http_cookiejar_Cookie,
-    compat_http_server,
-    compat_kwargs,
-)
-from youtube_dl.utils import (
-    encodeFilename,
-    join_nonempty,
-)
-from youtube_dl.downloader.external import (
-    Aria2cFD,
-    Aria2pFD,
-    AxelFD,
-    CurlFD,
-    FFmpegFD,
-    HttpieFD,
-    WgetFD,
-)
-from youtube_dl.postprocessor import (
-    FFmpegPostProcessor,
-)
-import threading
-
-TEST_SIZE = 10 * 1024
-
-TEST_COOKIE = {
-    'version': 0,
-    'name': 'test',
-    'value': 'ytdlp',
-    'port': None,
-    'port_specified': False,
-    'domain': '.example.com',
-    'domain_specified': True,
-    'domain_initial_dot': False,
-    'path': '/',
-    'path_specified': True,
-    'secure': False,
-    'expires': None,
-    'discard': False,
-    'comment': None,
-    'comment_url': None,
-    'rest': {},
-}
-
-TEST_COOKIE_VALUE = join_nonempty('name', 'value', delim='=', from_dict=TEST_COOKIE)
-
-TEST_INFO = {'url': 'http://www.example.com/'}
-
-
-def cookiejar_Cookie(**cookie_args):
-    return compat_http_cookiejar_Cookie(**compat_kwargs(cookie_args))
-
-
-def ifExternalFDAvailable(externalFD):
-    return unittest.skipUnless(externalFD.available(),
-                               externalFD.get_basename() + ' not found')
-
-
-class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
-    def log_message(self, format, *args):
-        pass
-
-    def send_content_range(self, total=None):
-        range_header = self.headers.get('Range')
-        start = end = None
-        if range_header:
-            mobj = re.match(r'bytes=(\d+)-(\d+)', range_header)
-            if mobj:
-                start, end = (int(mobj.group(i)) for i in (1, 2))
-        valid_range = start is not None and end is not None
-        if valid_range:
-            content_range = 'bytes %d-%d' % (start, end)
-            if total:
-                content_range += '/%d' % total
-            self.send_header('Content-Range', content_range)
-        return (end - start + 1) if valid_range else total
-
-    def serve(self, range=True, content_length=True):
-        self.send_response(200)
-        self.send_header('Content-Type', 'video/mp4')
-        size = TEST_SIZE
-        if range:
-            size = self.send_content_range(TEST_SIZE)
-        if content_length:
-            self.send_header('Content-Length', size)
-        self.end_headers()
-        self.wfile.write(b'#' * size)
-
-    def do_GET(self):
-        if self.path == '/regular':
-            self.serve()
-        elif self.path == '/no-content-length':
-            self.serve(content_length=False)
-        elif self.path == '/no-range':
-            self.serve(range=False)
-        elif self.path == '/no-range-no-content-length':
-            self.serve(range=False, content_length=False)
-        else:
-            assert False, 'unrecognised server path'
-
-
-@ifExternalFDAvailable(Aria2pFD)
-class TestAria2pFD(unittest.TestCase):
-    def setUp(self):
-        self.httpd = compat_http_server.HTTPServer(
-            ('127.0.0.1', 0), HTTPTestRequestHandler)
-        self.port = http_server_port(self.httpd)
-        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
-        self.server_thread.daemon = True
-        self.server_thread.start()
-
-    def download(self, params, ep):
-        with subprocess.Popen(
-            ['aria2c', '--enable-rpc'],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL
-        ) as process:
-            if not process.poll():
-                filename = 'testfile.mp4'
-                params['logger'] = FakeLogger()
-                params['outtmpl'] = filename
-                ydl = YoutubeDL(params)
-                try_rm(encodeFilename(filename))
-                self.assertEqual(ydl.download(['http://127.0.0.1:%d/%s' % (self.port, ep)]), 0)
-                self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE)
-                try_rm(encodeFilename(filename))
-            process.kill()
-
-    def download_all(self, params):
-        for ep in ('regular', 'no-content-length', 'no-range', 'no-range-no-content-length'):
-            self.download(params, ep)
-
-    def test_regular(self):
-        self.download_all({'external_downloader': 'aria2p'})
-
-    def test_chunked(self):
-        self.download_all({
-            'external_downloader': 'aria2p',
-            'http_chunk_size': 1000,
-        })
-
-
-@ifExternalFDAvailable(HttpieFD)
-class TestHttpieFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = HttpieFD(ydl, {})
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['http', '--download', '--output', 'test', 'http://www.example.com/'])
-
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['http', '--download', '--output', 'test',
-                 'http://www.example.com/', 'Cookie:' + TEST_COOKIE_VALUE])
-
-
-@ifExternalFDAvailable(AxelFD)
-class TestAxelFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = AxelFD(ydl, {})
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['axel', '-o', 'test', '--', 'http://www.example.com/'])
-
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['axel', '-o', 'test', '-H', 'Cookie: ' + TEST_COOKIE_VALUE,
-                 '--max-redirect=0', '--', 'http://www.example.com/'])
-
-
-@ifExternalFDAvailable(WgetFD)
-class TestWgetFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = WgetFD(ydl, {})
-            self.assertNotIn('--load-cookies', downloader._make_cmd('test', TEST_INFO))
-            # Test cookiejar tempfile arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertIn('--load-cookies', downloader._make_cmd('test', TEST_INFO))
-
-
-@ifExternalFDAvailable(CurlFD)
-class TestCurlFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = CurlFD(ydl, {})
-            self.assertNotIn('--cookie', downloader._make_cmd('test', TEST_INFO))
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertIn('--cookie', downloader._make_cmd('test', TEST_INFO))
-            self.assertIn(TEST_COOKIE_VALUE, downloader._make_cmd('test', TEST_INFO))
-
-
-@ifExternalFDAvailable(Aria2cFD)
-class TestAria2cFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = Aria2cFD(ydl, {})
-            downloader._make_cmd('test', TEST_INFO)
-            self.assertFalse(hasattr(downloader, '_cookies_tempfile'))
-
-            # Test cookiejar tempfile arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            cmd = downloader._make_cmd('test', TEST_INFO)
-            self.assertIn('--load-cookies=%s' % downloader._cookies_tempfile, cmd)
-
-
-# Handle delegated availability
-def ifFFmpegFDAvailable(externalFD):
-    # raise SkipTest, or set False!
-    avail = ifExternalFDAvailable(externalFD) and False
-    with compat_contextlib_suppress(Exception):
-        avail = FFmpegPostProcessor(downloader=None).available
-    return unittest.skipUnless(
-        avail, externalFD.get_basename() + ' not found')
-
-
-@ifFFmpegFDAvailable(FFmpegFD)
-class TestFFmpegFD(unittest.TestCase):
-    _args = []
-
-    def _test_cmd(self, args):
-        self._args = args
-
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = FFmpegFD(ydl, {})
-            downloader._debug_cmd = self._test_cmd
-            info_dict = TEST_INFO.copy()
-            info_dict['ext'] = 'mp4'
-
-            downloader._call_downloader('test', info_dict)
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-i', 'http://www.example.com/',
-                '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-            # Test cookies arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            downloader._call_downloader('test', info_dict)
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-cookies', TEST_COOKIE_VALUE + '; path=/; domain=.example.com;\r\n',
-                '-i', 'http://www.example.com/', '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_downloader_http.py

@@ -9,11 +9,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import (
-    FakeLogger,
-    http_server_port,
-    try_rm,
-)
+from test.helper import http_server_port, try_rm
 from youtube_dl import YoutubeDL
 from youtube_dl.compat import compat_http_server
 from youtube_dl.downloader.http import HttpFD
@@ -70,6 +66,17 @@ class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
             assert False
 
 
+class FakeLogger(object):
+    def debug(self, msg):
+        pass
+
+    def warning(self, msg):
+        pass
+
+    def error(self, msg):
+        pass
+
+
 class TestHttpFD(unittest.TestCase):
     def setUp(self):
         self.httpd = compat_http_server.HTTPServer(
@@ -88,7 +95,7 @@ class TestHttpFD(unittest.TestCase):
         self.assertTrue(downloader.real_download(filename, {
             'url': 'http://127.0.0.1:%d/%s' % (self.port, ep),
         }))
-        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE, ep)
+        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE)
         try_rm(encodeFilename(filename))
 
     def download_all(self, params):

test/test_execution.py

@@ -8,55 +8,37 @@ import unittest
 import sys
 import os
 import subprocess
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from youtube_dl.utils import encodeArgument
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-sys.path.insert(0, rootDir)
 
-from youtube_dl.compat import compat_register_utf8, compat_subprocess_get_DEVNULL
-from youtube_dl.utils import encodeArgument
-
-compat_register_utf8()
-
-
-_DEV_NULL = compat_subprocess_get_DEVNULL()
+try:
+    _DEV_NULL = subprocess.DEVNULL
+except AttributeError:
+    _DEV_NULL = open(os.devnull, 'wb')
 
 
 class TestExecution(unittest.TestCase):
-    def setUp(self):
-        self.module = 'youtube_dl'
-        if sys.version_info < (2, 7):
-            self.module += '.__main__'
-
     def test_import(self):
         subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
 
     def test_module_exec(self):
-        subprocess.check_call([sys.executable, '-m', self.module, '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        if sys.version_info >= (2, 7):  # Python 2.6 doesn't support package execution
+            subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_main_exec(self):
-        subprocess.check_call([sys.executable, os.path.normpath('youtube_dl/__main__.py'), '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_cmdline_umlauts(self):
-        os.environ['PYTHONIOENCODING'] = 'utf-8'
         p = subprocess.Popen(
-            [sys.executable, '-m', self.module, encodeArgument('ä'), '--version'],
+            [sys.executable, 'youtube_dl/__main__.py', encodeArgument('ä'), '--version'],
             cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
         _, stderr = p.communicate()
         self.assertFalse(stderr)
 
-    def test_lazy_extractors(self):
-        lazy_extractors = os.path.normpath('youtube_dl/extractor/lazy_extractors.py')
-        try:
-            subprocess.check_call([sys.executable, os.path.normpath('devscripts/make_lazy_extractors.py'), lazy_extractors], cwd=rootDir, stdout=_DEV_NULL)
-            subprocess.check_call([sys.executable, os.path.normpath('test/test_all_urls.py')], cwd=rootDir, stdout=_DEV_NULL)
-        finally:
-            for x in ('', 'c') if sys.version_info[0] < 3 else ('',):
-                try:
-                    os.remove(lazy_extractors + x)
-                except OSError:
-                    pass
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_http.py

@@ -8,163 +8,30 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import contextlib
-import gzip
-import io
-import ssl
-import tempfile
-import threading
-import zlib
-
-# avoid deprecated alias assertRaisesRegexp
-if hasattr(unittest.TestCase, 'assertRaisesRegex'):
-    unittest.TestCase.assertRaisesRegexp = unittest.TestCase.assertRaisesRegex
-
-try:
-    import brotli
-except ImportError:
-    brotli = None
-try:
-    from urllib.request import pathname2url
-except ImportError:
-    from urllib import pathname2url
-
-from youtube_dl.compat import (
-    compat_http_cookiejar_Cookie,
-    compat_http_server,
-    compat_str as str,
-    compat_urllib_error,
-    compat_urllib_HTTPError,
-    compat_urllib_parse,
-    compat_urllib_request,
-)
-
-from youtube_dl.utils import (
-    sanitized_Request,
-    update_Request,
-    urlencode_postdata,
-)
-
-from test.helper import (
-    expectedFailureIf,
-    FakeYDL,
-    FakeLogger,
-    http_server_port,
-)
+from test.helper import http_server_port
 from youtube_dl import YoutubeDL
+from youtube_dl.compat import compat_http_server, compat_urllib_request
+import ssl
+import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
-    protocol_version = 'HTTP/1.1'
-
-    # work-around old/new -style class inheritance
-    def super(self, meth_name, *args, **kwargs):
-        from types import MethodType
-        try:
-            super()
-            fn = lambda s, m, *a, **k: getattr(super(), m)(*a, **k)
-        except TypeError:
-            fn = lambda s, m, *a, **k: getattr(compat_http_server.BaseHTTPRequestHandler, m)(s, *a, **k)
-        self.super = MethodType(fn, self)
-        return self.super(meth_name, *args, **kwargs)
-
     def log_message(self, format, *args):
         pass
 
-    def _headers(self):
-        payload = str(self.headers).encode('utf-8')
-        self.send_response(200)
-        self.send_header('Content-Type', 'application/json')
-        self.send_header('Content-Length', str(len(payload)))
-        self.end_headers()
-        self.wfile.write(payload)
-
-    def _redirect(self):
-        self.send_response(int(self.path[len('/redirect_'):]))
-        self.send_header('Location', '/method')
-        self.send_header('Content-Length', '0')
-        self.end_headers()
-
-    def _method(self, method, payload=None):
-        self.send_response(200)
-        self.send_header('Content-Length', str(len(payload or '')))
-        self.send_header('Method', method)
-        self.end_headers()
-        if payload:
-            self.wfile.write(payload)
-
-    def _status(self, status):
-        payload = '<html>{0} NOT FOUND</html>'.format(status).encode('utf-8')
-        self.send_response(int(status))
-        self.send_header('Content-Type', 'text/html; charset=utf-8')
-        self.send_header('Content-Length', str(len(payload)))
-        self.end_headers()
-        self.wfile.write(payload)
-
-    def _read_data(self):
-        if 'Content-Length' in self.headers:
-            return self.rfile.read(int(self.headers['Content-Length']))
-
-    def _test_url(self, path, host='127.0.0.1', scheme='http', port=None):
-        return '{0}://{1}:{2}/{3}'.format(
-            scheme, host,
-            port if port is not None
-            else http_server_port(self.server), path)
-
-    def do_POST(self):
-        data = self._read_data()
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('POST', data)
-        elif self.path.startswith('/headers'):
-            self._headers()
-        else:
-            self._status(404)
-
-    def do_HEAD(self):
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('HEAD')
-        else:
-            self._status(404)
-
-    def do_PUT(self):
-        data = self._read_data()
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('PUT', data)
-        else:
-            self._status(404)
-
     def do_GET(self):
-
-        def respond(payload=b'<html><video src="/vid.mp4" /></html>',
-                    payload_type='text/html; charset=utf-8',
-                    payload_encoding=None,
-                    resp_code=200):
-            self.send_response(resp_code)
-            self.send_header('Content-Type', payload_type)
-            if payload_encoding:
-                self.send_header('Content-Encoding', payload_encoding)
-            self.send_header('Content-Length', str(len(payload)))  # required for persistent connections
-            self.end_headers()
-            self.wfile.write(payload)
-
-        def gzip_compress(p):
-            buf = io.BytesIO()
-            with contextlib.closing(gzip.GzipFile(fileobj=buf, mode='wb')) as f:
-                f.write(p)
-            return buf.getvalue()
-
         if self.path == '/video.html':
-            respond()
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
+            self.end_headers()
+            self.wfile.write(b'<html><video src="/vid.mp4" /></html>')
         elif self.path == '/vid.mp4':
-            respond(b'\x00\x00\x00\x00\x20\x66\x74[video]', 'video/mp4')
+            self.send_response(200)
+            self.send_header('Content-Type', 'video/mp4')
+            self.end_headers()
+            self.wfile.write(b'\x00\x00\x00\x00\x20\x66\x74[video]')
         elif self.path == '/302':
             if sys.version_info[0] == 3:
                 # XXX: Python 3 http server does not allow non-ASCII header values
@@ -172,336 +39,71 @@ class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
                 self.end_headers()
                 return
 
-            new_url = self._test_url('中文.html')
+            new_url = 'http://127.0.0.1:%d/中文.html' % http_server_port(self.server)
             self.send_response(302)
             self.send_header(b'Location', new_url.encode('utf-8'))
             self.end_headers()
         elif self.path == '/%E4%B8%AD%E6%96%87.html':
-            respond()
-        elif self.path == '/%c7%9f':
-            respond()
-        elif self.path == '/redirect_dotsegments':
-            self.send_response(301)
-            # redirect to /headers but with dot segments before
-            self.send_header('Location', '/a/b/./../../headers')
-            self.send_header('Content-Length', '0')
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
             self.end_headers()
-        elif self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('GET')
-        elif self.path.startswith('/headers'):
-            self._headers()
-        elif self.path.startswith('/308-to-headers'):
-            self.send_response(308)
-            self.send_header('Location', '/headers')
-            self.send_header('Content-Length', '0')
-            self.end_headers()
-        elif self.path == '/trailing_garbage':
-            payload = b'<html><video src="/vid.mp4" /></html>'
-            compressed = gzip_compress(payload) + b'trailing garbage'
-            respond(compressed, payload_encoding='gzip')
-        elif self.path == '/302-non-ascii-redirect':
-            new_url = self._test_url('中文.html')
-            # actually respond with permanent redirect
-            self.send_response(301)
-            self.send_header('Location', new_url)
-            self.send_header('Content-Length', '0')
-            self.end_headers()
-        elif self.path == '/content-encoding':
-            encodings = self.headers.get('ytdl-encoding', '')
-            payload = b'<html><video src="/vid.mp4" /></html>'
-            for encoding in filter(None, (e.strip() for e in encodings.split(','))):
-                if encoding == 'br' and brotli:
-                    payload = brotli.compress(payload)
-                elif encoding == 'gzip':
-                    payload = gzip_compress(payload)
-                elif encoding == 'deflate':
-                    payload = zlib.compress(payload)
-                elif encoding == 'unsupported':
-                    payload = b'raw'
-                    break
-                else:
-                    self._status(415)
-                    return
-            respond(payload, payload_encoding=encodings)
-
+            self.wfile.write(b'<html><video src="/vid.mp4" /></html>')
         else:
-            self._status(404)
+            assert False
 
-    def send_header(self, keyword, value):
-        """
-        Forcibly allow HTTP server to send non percent-encoded non-ASCII characters in headers.
-        This is against what is defined in RFC 3986: but we need to test that we support this
-        since some sites incorrectly do this.
-        """
-        if keyword.lower() == 'connection':
-            return self.super('send_header', keyword, value)
 
-        if not hasattr(self, '_headers_buffer'):
-            self._headers_buffer = []
+class FakeLogger(object):
+    def debug(self, msg):
+        pass
 
-        self._headers_buffer.append('{0}: {1}\r\n'.format(keyword, value).encode('utf-8'))
+    def warning(self, msg):
+        pass
 
-    def end_headers(self):
-        if hasattr(self, '_headers_buffer'):
-            self.wfile.write(b''.join(self._headers_buffer))
-            self._headers_buffer = []
-        self.super('end_headers')
+    def error(self, msg):
+        pass
 
 
 class TestHTTP(unittest.TestCase):
-    # when does it make sense to check the SSL certificate?
-    _check_cert = (
-        sys.version_info >= (3, 2)
-        or (sys.version_info[0] == 2 and sys.version_info[1:] >= (7, 19)))
-
     def setUp(self):
-        # HTTP server
-        self.http_httpd = compat_http_server.HTTPServer(
+        self.httpd = compat_http_server.HTTPServer(
             ('127.0.0.1', 0), HTTPTestRequestHandler)
-        self.http_port = http_server_port(self.http_httpd)
-
-        self.http_server_thread = threading.Thread(target=self.http_httpd.serve_forever)
-        self.http_server_thread.daemon = True
-        self.http_server_thread.start()
-
-        try:
-            from http.server import ThreadingHTTPServer
-        except ImportError:
-            try:
-                from socketserver import ThreadingMixIn
-            except ImportError:
-                from SocketServer import ThreadingMixIn
-
-            class ThreadingHTTPServer(ThreadingMixIn, compat_http_server.HTTPServer):
-                pass
-
-        # HTTPS server
-        certfn = os.path.join(TEST_DIR, 'testcert.pem')
-        self.https_httpd = ThreadingHTTPServer(
-            ('127.0.0.1', 0), HTTPTestRequestHandler)
-        try:
-            sslctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-            sslctx.verify_mode = ssl.CERT_NONE
-            sslctx.check_hostname = False
-            sslctx.load_cert_chain(certfn, None)
-            self.https_httpd.socket = sslctx.wrap_socket(
-                self.https_httpd.socket, server_side=True)
-        except AttributeError:
-            self.https_httpd.socket = ssl.wrap_socket(
-                self.https_httpd.socket, certfile=certfn, server_side=True)
-
-        self.https_port = http_server_port(self.https_httpd)
-        self.https_server_thread = threading.Thread(target=self.https_httpd.serve_forever)
-        self.https_server_thread.daemon = True
-        self.https_server_thread.start()
-
-    def tearDown(self):
-
-        def closer(svr):
-            def _closer():
-                svr.shutdown()
-                svr.server_close()
-            return _closer
-
-        shutdown_thread = threading.Thread(target=closer(self.http_httpd))
-        shutdown_thread.start()
-        self.http_server_thread.join(2.0)
-
-        shutdown_thread = threading.Thread(target=closer(self.https_httpd))
-        shutdown_thread.start()
-        self.https_server_thread.join(2.0)
-
-    def _test_url(self, path, host='127.0.0.1', scheme='http', port=None):
-        return '{0}://{1}:{2}/{3}'.format(
-            scheme, host,
-            port if port is not None
-            else self.https_port if scheme == 'https'
-            else self.http_port, path)
-
-    @unittest.skipUnless(_check_cert, 'No support for certificate check in SSL')
-    def test_nocheckcertificate(self):
-        with FakeYDL({'logger': FakeLogger()}) as ydl:
-            with self.assertRaises(compat_urllib_error.URLError):
-                ydl.urlopen(sanitized_Request(self._test_url('headers', scheme='https')))
-
-        with FakeYDL({'logger': FakeLogger(), 'nocheckcertificate': True}) as ydl:
-            r = ydl.urlopen(sanitized_Request(self._test_url('headers', scheme='https')))
-            self.assertEqual(r.getcode(), 200)
-            r.close()
-
-    def test_percent_encode(self):
-        with FakeYDL() as ydl:
-            # Unicode characters should be encoded with uppercase percent-encoding
-            res = ydl.urlopen(sanitized_Request(self._test_url('中文.html')))
-            self.assertEqual(res.getcode(), 200)
-            res.close()
-            # don't normalize existing percent encodings
-            res = ydl.urlopen(sanitized_Request(self._test_url('%c7%9f')))
-            self.assertEqual(res.getcode(), 200)
-            res.close()
+        self.port = http_server_port(self.httpd)
+        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
+        self.server_thread.daemon = True
+        self.server_thread.start()
 
     def test_unicode_path_redirection(self):
-        with FakeYDL() as ydl:
-            r = ydl.urlopen(sanitized_Request(self._test_url('302-non-ascii-redirect')))
-            self.assertEqual(r.url, self._test_url('%E4%B8%AD%E6%96%87.html'))
-            r.close()
+        # XXX: Python 3 http server does not allow non-ASCII header values
+        if sys.version_info[0] == 3:
+            return
 
-    def test_redirect(self):
-        with FakeYDL() as ydl:
-            def do_req(redirect_status, method, check_no_content=False):
-                data = b'testdata' if method in ('POST', 'PUT') else None
-                res = ydl.urlopen(sanitized_Request(
-                    self._test_url('redirect_{0}'.format(redirect_status)),
-                    method=method, data=data))
-                if check_no_content:
-                    self.assertNotIn('Content-Type', res.headers)
-                return res.read().decode('utf-8'), res.headers.get('method', '')
-            # A 303 must either use GET or HEAD for subsequent request
-            self.assertEqual(do_req(303, 'POST'), ('', 'GET'))
-            self.assertEqual(do_req(303, 'HEAD'), ('', 'HEAD'))
+        ydl = YoutubeDL({'logger': FakeLogger()})
+        r = ydl.extract_info('http://127.0.0.1:%d/302' % self.port)
+        self.assertEqual(r['entries'][0]['url'], 'http://127.0.0.1:%d/vid.mp4' % self.port)
 
-            self.assertEqual(do_req(303, 'PUT'), ('', 'GET'))
 
-            # 301 and 302 turn POST only into a GET, with no Content-Type
-            self.assertEqual(do_req(301, 'POST', True), ('', 'GET'))
-            self.assertEqual(do_req(301, 'HEAD'), ('', 'HEAD'))
-            self.assertEqual(do_req(302, 'POST', True), ('', 'GET'))
-            self.assertEqual(do_req(302, 'HEAD'), ('', 'HEAD'))
+class TestHTTPS(unittest.TestCase):
+    def setUp(self):
+        certfn = os.path.join(TEST_DIR, 'testcert.pem')
+        self.httpd = compat_http_server.HTTPServer(
+            ('127.0.0.1', 0), HTTPTestRequestHandler)
+        self.httpd.socket = ssl.wrap_socket(
+            self.httpd.socket, certfile=certfn, server_side=True)
+        self.port = http_server_port(self.httpd)
+        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
+        self.server_thread.daemon = True
+        self.server_thread.start()
 
-            self.assertEqual(do_req(301, 'PUT'), ('testdata', 'PUT'))
-            self.assertEqual(do_req(302, 'PUT'), ('testdata', 'PUT'))
+    def test_nocheckcertificate(self):
+        if sys.version_info >= (2, 7, 9):  # No certificate checking anyways
+            ydl = YoutubeDL({'logger': FakeLogger()})
+            self.assertRaises(
+                Exception,
+                ydl.extract_info, 'https://127.0.0.1:%d/video.html' % self.port)
 
-            # 307 and 308 should not change method
-            for m in ('POST', 'PUT'):
-                self.assertEqual(do_req(307, m), ('testdata', m))
-                self.assertEqual(do_req(308, m), ('testdata', m))
-
-            self.assertEqual(do_req(307, 'HEAD'), ('', 'HEAD'))
-            self.assertEqual(do_req(308, 'HEAD'), ('', 'HEAD'))
-
-            # These should not redirect and instead raise an HTTPError
-            for code in (300, 304, 305, 306):
-                with self.assertRaises(compat_urllib_HTTPError):
-                    do_req(code, 'GET')
-
-    # Jython 2.7.1 times out for some reason
-    @expectedFailureIf(sys.platform.startswith('java') and sys.version_info < (2, 7, 2))
-    def test_content_type(self):
-        # https://github.com/yt-dlp/yt-dlp/commit/379a4f161d4ad3e40932dcf5aca6e6fb9715ab28
-        with FakeYDL({'nocheckcertificate': True}) as ydl:
-            # method should be auto-detected as POST
-            r = sanitized_Request(self._test_url('headers', scheme='https'), data=urlencode_postdata({'test': 'test'}))
-
-            headers = ydl.urlopen(r).read().decode('utf-8')
-            self.assertIn('Content-Type: application/x-www-form-urlencoded', headers)
-
-            # test http
-            r = sanitized_Request(self._test_url('headers'), data=urlencode_postdata({'test': 'test'}))
-            headers = ydl.urlopen(r).read().decode('utf-8')
-            self.assertIn('Content-Type: application/x-www-form-urlencoded', headers)
-
-    def test_update_req(self):
-        req = sanitized_Request('http://example.com')
-        assert req.data is None
-        assert req.get_method() == 'GET'
-        assert not req.has_header('Content-Type')
-        # Test that zero-byte payloads will be sent
-        req = update_Request(req, data=b'')
-        assert req.data == b''
-        assert req.get_method() == 'POST'
-        # yt-dl expects data to be encoded and Content-Type to be added by sender
-        # assert req.get_header('Content-Type') == 'application/x-www-form-urlencoded'
-
-    def test_cookiejar(self):
-        with FakeYDL() as ydl:
-            ydl.cookiejar.set_cookie(compat_http_cookiejar_Cookie(
-                0, 'test', 'ytdl', None, False, '127.0.0.1', True,
-                False, '/headers', True, False, None, False, None, None, {}))
-            data = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'))).read().decode('utf-8')
-            self.assertIn('Cookie: test=ytdl', data)
-
-    def test_passed_cookie_header(self):
-        # We should accept a Cookie header being passed as in normal headers and handle it appropriately.
-        with FakeYDL() as ydl:
-            # Specified Cookie header should be used
-            res = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertIn('Cookie: test=test', res)
-
-            # Specified Cookie header should be removed on any redirect
-            res = ydl.urlopen(sanitized_Request(
-                self._test_url('308-to-headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertNotIn('Cookie: test=test', res)
-
-            # Specified Cookie header should override global cookiejar for that request
-            ydl.cookiejar.set_cookie(compat_http_cookiejar_Cookie(
-                0, 'test', 'ytdlp', None, False, '127.0.0.1', True,
-                False, '/headers', True, False, None, False, None, None, {}))
-            data = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertNotIn('Cookie: test=ytdlp', data)
-            self.assertIn('Cookie: test=test', data)
-
-    def test_no_compression_compat_header(self):
-        with FakeYDL() as ydl:
-            data = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('headers'),
-                    headers={'Youtubedl-no-compression': True})).read()
-            self.assertIn(b'Accept-Encoding: identity', data)
-            self.assertNotIn(b'youtubedl-no-compression', data.lower())
-
-    def test_gzip_trailing_garbage(self):
-        # https://github.com/ytdl-org/youtube-dl/commit/aa3e950764337ef9800c936f4de89b31c00dfcf5
-        # https://github.com/ytdl-org/youtube-dl/commit/6f2ec15cee79d35dba065677cad9da7491ec6e6f
-        with FakeYDL() as ydl:
-            data = ydl.urlopen(sanitized_Request(self._test_url('trailing_garbage'))).read().decode('utf-8')
-            self.assertEqual(data, '<html><video src="/vid.mp4" /></html>')
-
-    def __test_compression(self, encoding):
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('content-encoding'),
-                    headers={'ytdl-encoding': encoding}))
-            # decoded encodings are removed: only check for valid decompressed data
-            self.assertEqual(res.read(), b'<html><video src="/vid.mp4" /></html>')
-
-    @unittest.skipUnless(brotli, 'brotli support is not installed')
-    def test_brotli(self):
-        self.__test_compression('br')
-
-    def test_deflate(self):
-        self.__test_compression('deflate')
-
-    def test_gzip(self):
-        self.__test_compression('gzip')
-
-    def test_multiple_encodings(self):
-        # https://www.rfc-editor.org/rfc/rfc9110.html#section-8.4
-        for pair in ('gzip,deflate', 'deflate, gzip', 'gzip, gzip', 'deflate, deflate'):
-            self.__test_compression(pair)
-
-    def test_unsupported_encoding(self):
-        # it should return the raw content
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('content-encoding'),
-                    headers={'ytdl-encoding': 'unsupported'}))
-            self.assertEqual(res.headers.get('Content-Encoding'), 'unsupported')
-            self.assertEqual(res.read(), b'raw')
-
-    def test_remove_dot_segments(self):
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(sanitized_Request(self._test_url('a/b/./../../headers')))
-            self.assertEqual(compat_urllib_parse.urlparse(res.geturl()).path, '/headers')
-
-            res = ydl.urlopen(sanitized_Request(self._test_url('redirect_dotsegments')))
-            self.assertEqual(compat_urllib_parse.urlparse(res.geturl()).path, '/headers')
+        ydl = YoutubeDL({'logger': FakeLogger(), 'nocheckcertificate': True})
+        r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)
+        self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)
 
 
 def _build_proxy_handler(name):
@@ -515,7 +117,7 @@ def _build_proxy_handler(name):
             self.send_response(200)
             self.send_header('Content-Type', 'text/plain; charset=utf-8')
             self.end_headers()
-            self.wfile.write('{0}: {1}'.format(self.proxy_name, self.path).encode('utf-8'))
+            self.wfile.write('{self.proxy_name}: {self.path}'.format(self=self).encode('utf-8'))
     return HTTPTestRequestHandler
 
 
@@ -535,30 +137,10 @@ class TestProxy(unittest.TestCase):
         self.geo_proxy_thread.daemon = True
         self.geo_proxy_thread.start()
 
-    def tearDown(self):
-
-        def closer(svr):
-            def _closer():
-                svr.shutdown()
-                svr.server_close()
-            return _closer
-
-        shutdown_thread = threading.Thread(target=closer(self.proxy))
-        shutdown_thread.start()
-        self.proxy_thread.join(2.0)
-
-        shutdown_thread = threading.Thread(target=closer(self.geo_proxy))
-        shutdown_thread.start()
-        self.geo_proxy_thread.join(2.0)
-
-    def _test_proxy(self, host='127.0.0.1', port=None):
-        return '{0}:{1}'.format(
-            host, port if port is not None else self.port)
-
     def test_proxy(self):
-        geo_proxy = self._test_proxy(port=self.geo_port)
+        geo_proxy = '127.0.0.1:{0}'.format(self.geo_port)
         ydl = YoutubeDL({
-            'proxy': self._test_proxy(),
+            'proxy': '127.0.0.1:{0}'.format(self.port),
             'geo_verification_proxy': geo_proxy,
         })
         url = 'http://foo.com/bar'
@@ -572,7 +154,7 @@ class TestProxy(unittest.TestCase):
 
     def test_proxy_with_idn(self):
         ydl = YoutubeDL({
-            'proxy': self._test_proxy(),
+            'proxy': '127.0.0.1:{0}'.format(self.port),
         })
         url = 'http://中文.tw/'
         response = ydl.urlopen(url).read().decode('utf-8')
@@ -580,25 +162,5 @@ class TestProxy(unittest.TestCase):
         self.assertEqual(response, 'normal: http://xn--fiq228c.tw/')
 
 
-class TestFileURL(unittest.TestCase):
-    # See https://github.com/ytdl-org/youtube-dl/issues/8227
-    def test_file_urls(self):
-        tf = tempfile.NamedTemporaryFile(delete=False)
-        tf.write(b'foobar')
-        tf.close()
-        url = compat_urllib_parse.urljoin('file://', pathname2url(tf.name))
-        with FakeYDL() as ydl:
-            self.assertRaisesRegexp(
-                compat_urllib_error.URLError, 'file:// scheme is explicitly disabled in youtube-dl for security reasons', ydl.urlopen, url)
-        # not yet implemented
-        """
-        with FakeYDL({'enable_file_urls': True}) as ydl:
-            res = ydl.urlopen(url)
-            self.assertEqual(res.read(), b'foobar')
-            res.close()
-        """
-        os.unlink(tf.name)
-
-
 if __name__ == '__main__':
     unittest.main()

test/test_jsinterp.py

@@ -8,24 +8,17 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import math
-import re
-
-from youtube_dl.jsinterp import JS_Undefined, JSInterpreter
+from youtube_dl.jsinterp import JSInterpreter
 
 
 class TestJSInterpreter(unittest.TestCase):
     def test_basic(self):
         jsi = JSInterpreter('function x(){;}')
         self.assertEqual(jsi.call_function('x'), None)
-        self.assertEqual(repr(jsi.extract_function('x')), 'F<x>')
 
         jsi = JSInterpreter('function x3(){return 42;}')
         self.assertEqual(jsi.call_function('x3'), 42)
 
-        jsi = JSInterpreter('function x3(){42}')
-        self.assertEqual(jsi.call_function('x3'), None)
-
         jsi = JSInterpreter('var x5 = function(){return 42;}')
         self.assertEqual(jsi.call_function('x5'), 42)
 
@@ -33,55 +26,6 @@ class TestJSInterpreter(unittest.TestCase):
         jsi = JSInterpreter('function x4(a){return 2*a+1;}')
         self.assertEqual(jsi.call_function('x4', 3), 7)
 
-    def test_add(self):
-        jsi = JSInterpreter('function f(){return 42 + 7;}')
-        self.assertEqual(jsi.call_function('f'), 49)
-        jsi = JSInterpreter('function f(){return 42 + undefined;}')
-        self.assertTrue(math.isnan(jsi.call_function('f')))
-        jsi = JSInterpreter('function f(){return 42 + null;}')
-        self.assertEqual(jsi.call_function('f'), 42)
-
-    def test_sub(self):
-        jsi = JSInterpreter('function f(){return 42 - 7;}')
-        self.assertEqual(jsi.call_function('f'), 35)
-        jsi = JSInterpreter('function f(){return 42 - undefined;}')
-        self.assertTrue(math.isnan(jsi.call_function('f')))
-        jsi = JSInterpreter('function f(){return 42 - null;}')
-        self.assertEqual(jsi.call_function('f'), 42)
-
-    def test_mul(self):
-        jsi = JSInterpreter('function f(){return 42 * 7;}')
-        self.assertEqual(jsi.call_function('f'), 294)
-        jsi = JSInterpreter('function f(){return 42 * undefined;}')
-        self.assertTrue(math.isnan(jsi.call_function('f')))
-        jsi = JSInterpreter('function f(){return 42 * null;}')
-        self.assertEqual(jsi.call_function('f'), 0)
-
-    def test_div(self):
-        jsi = JSInterpreter('function f(a, b){return a / b;}')
-        self.assertTrue(math.isnan(jsi.call_function('f', 0, 0)))
-        self.assertTrue(math.isnan(jsi.call_function('f', JS_Undefined, 1)))
-        self.assertTrue(math.isinf(jsi.call_function('f', 2, 0)))
-        self.assertEqual(jsi.call_function('f', 0, 3), 0)
-
-    def test_mod(self):
-        jsi = JSInterpreter('function f(){return 42 % 7;}')
-        self.assertEqual(jsi.call_function('f'), 0)
-        jsi = JSInterpreter('function f(){return 42 % 0;}')
-        self.assertTrue(math.isnan(jsi.call_function('f')))
-        jsi = JSInterpreter('function f(){return 42 % undefined;}')
-        self.assertTrue(math.isnan(jsi.call_function('f')))
-
-    def test_exp(self):
-        jsi = JSInterpreter('function f(){return 42 ** 2;}')
-        self.assertEqual(jsi.call_function('f'), 1764)
-        jsi = JSInterpreter('function f(){return 42 ** undefined;}')
-        self.assertTrue(math.isnan(jsi.call_function('f')))
-        jsi = JSInterpreter('function f(){return 42 ** null;}')
-        self.assertEqual(jsi.call_function('f'), 1)
-        jsi = JSInterpreter('function f(){return undefined ** 42;}')
-        self.assertTrue(math.isnan(jsi.call_function('f')))
-
     def test_empty_return(self):
         jsi = JSInterpreter('function f(){return; y()}')
         self.assertEqual(jsi.call_function('f'), None)
@@ -101,32 +45,14 @@ class TestJSInterpreter(unittest.TestCase):
         jsi = JSInterpreter('function f(){return 1 << 5;}')
         self.assertEqual(jsi.call_function('f'), 32)
 
-        jsi = JSInterpreter('function f(){return 2 ** 5}')
-        self.assertEqual(jsi.call_function('f'), 32)
-
         jsi = JSInterpreter('function f(){return 19 & 21;}')
         self.assertEqual(jsi.call_function('f'), 17)
 
         jsi = JSInterpreter('function f(){return 11 >> 2;}')
         self.assertEqual(jsi.call_function('f'), 2)
 
-        jsi = JSInterpreter('function f(){return []? 2+3: 4;}')
-        self.assertEqual(jsi.call_function('f'), 5)
-
-        jsi = JSInterpreter('function f(){return 1 == 2}')
-        self.assertEqual(jsi.call_function('f'), False)
-
-        jsi = JSInterpreter('function f(){return 0 && 1 || 2;}')
-        self.assertEqual(jsi.call_function('f'), 2)
-
-        jsi = JSInterpreter('function f(){return 0 ?? 42;}')
-        self.assertEqual(jsi.call_function('f'), 0)
-
-        jsi = JSInterpreter('function f(){return "life, the universe and everything" < 42;}')
-        self.assertFalse(jsi.call_function('f'))
-
     def test_array_access(self):
-        jsi = JSInterpreter('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}')
+        jsi = JSInterpreter('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2] = 7; return x;}')
         self.assertEqual(jsi.call_function('f'), [5, 2, 7])
 
     def test_parens(self):
@@ -136,10 +62,6 @@ class TestJSInterpreter(unittest.TestCase):
         jsi = JSInterpreter('function f(){return (1 + 2) * 3;}')
         self.assertEqual(jsi.call_function('f'), 9)
 
-    def test_quotes(self):
-        jsi = JSInterpreter(r'function f(){return "a\"\\("}')
-        self.assertEqual(jsi.call_function('f'), r'a"\(')
-
     def test_assignments(self):
         jsi = JSInterpreter('function f(){var x = 20; x = 30 + 1; return x;}')
         self.assertEqual(jsi.call_function('f'), 31)
@@ -182,412 +104,13 @@ class TestJSInterpreter(unittest.TestCase):
         }''')
         self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50])
 
-    def test_builtins(self):
-        jsi = JSInterpreter('''
-        function x() { return NaN }
-        ''')
-        self.assertTrue(math.isnan(jsi.call_function('x')))
-
-    def test_Date(self):
-        jsi = JSInterpreter('''
-        function x(dt) { return new Date(dt) - 0; }
-        ''')
-        self.assertEqual(jsi.call_function('x', 'Wednesday 31 December 1969 18:01:26 MDT'), 86000)
-
-        # date format m/d/y
-        self.assertEqual(jsi.call_function('x', '12/31/1969 18:01:26 MDT'), 86000)
-
-        # epoch 0
-        self.assertEqual(jsi.call_function('x', '1 January 1970 00:00:00 UTC'), 0)
-
     def test_call(self):
         jsi = JSInterpreter('''
         function x() { return 2; }
-        function y(a) { return x() + (a?a:0); }
+        function y(a) { return x() + a; }
         function z() { return y(3); }
         ''')
         self.assertEqual(jsi.call_function('z'), 5)
-        self.assertEqual(jsi.call_function('y'), 2)
-
-    def test_if(self):
-        jsi = JSInterpreter('''
-        function x() {
-            let a = 9;
-            if (0==0) {a++}
-            return a
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-        jsi = JSInterpreter('''
-        function x() {
-            if (0==0) {return 10}
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-        jsi = JSInterpreter('''
-        function x() {
-            if (0!=0) {return 1}
-            else {return 10}
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-        """  # Unsupported
-        jsi = JSInterpreter('''
-        function x() {
-            if (0!=0) return 1;
-            else {return 10}
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-        """
-
-    def test_elseif(self):
-        jsi = JSInterpreter('''
-        function x() {
-            if (0!=0) {return 1}
-            else if (1==0) {return 2}
-            else {return 10}
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-        """  # Unsupported
-        jsi = JSInterpreter('''
-        function x() {
-            if (0!=0) return 1;
-            else if (1==0) {return 2}
-            else {return 10}
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-        # etc
-        """
-
-    def test_for_loop(self):
-        # function x() { a=0; for (i=0; i-10; i++) {a++} a }
-        jsi = JSInterpreter('''
-        function x() { a=0; for (i=0; i-10; i++) {a++} return a }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-    def test_while_loop(self):
-        # function x() { a=0; while (a<10) {a++} a }
-        jsi = JSInterpreter('''
-        function x() { a=0; while (a<10) {a++} return a }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-    def test_switch(self):
-        jsi = JSInterpreter('''
-        function x(f) { switch(f){
-            case 1:f+=1;
-            case 2:f+=2;
-            case 3:f+=3;break;
-            case 4:f+=4;
-            default:f=0;
-        } return f }
-        ''')
-        self.assertEqual(jsi.call_function('x', 1), 7)
-        self.assertEqual(jsi.call_function('x', 3), 6)
-        self.assertEqual(jsi.call_function('x', 5), 0)
-
-    def test_switch_default(self):
-        jsi = JSInterpreter('''
-        function x(f) { switch(f){
-            case 2: f+=2;
-            default: f-=1;
-            case 5:
-            case 6: f+=6;
-            case 0: break;
-            case 1: f+=1;
-        } return f }
-        ''')
-        self.assertEqual(jsi.call_function('x', 1), 2)
-        self.assertEqual(jsi.call_function('x', 5), 11)
-        self.assertEqual(jsi.call_function('x', 9), 14)
-
-    def test_try(self):
-        jsi = JSInterpreter('''
-        function x() { try{return 10} catch(e){return 5} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-    def test_catch(self):
-        jsi = JSInterpreter('''
-        function x() { try{throw 10} catch(e){return 5} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 5)
-
-    def test_finally(self):
-        jsi = JSInterpreter('''
-        function x() { try{throw 10} finally {return 42} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 42)
-        jsi = JSInterpreter('''
-        function x() { try{throw 10} catch(e){return 5} finally {return 42} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 42)
-
-    def test_nested_try(self):
-        jsi = JSInterpreter('''
-        function x() {try {
-            try{throw 10} finally {throw 42}
-            } catch(e){return 5} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 5)
-
-    def test_for_loop_continue(self):
-        jsi = JSInterpreter('''
-        function x() { a=0; for (i=0; i-10; i++) { continue; a++ } return a }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 0)
-
-    def test_for_loop_break(self):
-        jsi = JSInterpreter('''
-        function x() { a=0; for (i=0; i-10; i++) { break; a++ } return a }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 0)
-
-    def test_for_loop_try(self):
-        jsi = JSInterpreter('''
-        function x() {
-            for (i=0; i-10; i++) { try { if (i == 5) throw i} catch {return 10} finally {break} };
-            return 42 }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 42)
-
-    def test_literal_list(self):
-        jsi = JSInterpreter('''
-        function x() { return [1, 2, "asdf", [5, 6, 7]][3] }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [5, 6, 7])
-
-    def test_comma(self):
-        jsi = JSInterpreter('''
-        function x() { a=5; a -= 1, a+=3; return a }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 7)
-        jsi = JSInterpreter('''
-        function x() { a=5; return (a -= 1, a+=3, a); }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 7)
-
-        jsi = JSInterpreter('''
-        function x() { return (l=[0,1,2,3], function(a, b){return a+b})((l[1], l[2]), l[3]) }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 5)
-
-    def test_void(self):
-        jsi = JSInterpreter('''
-        function x() { return void 42; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), None)
-
-    def test_return_function(self):
-        jsi = JSInterpreter('''
-        function x() { return [1, function(){return 1}][1] }
-        ''')
-        self.assertEqual(jsi.call_function('x')([]), 1)
-
-    def test_null(self):
-        jsi = JSInterpreter('''
-        function x() { return null; }
-        ''')
-        self.assertIs(jsi.call_function('x'), None)
-
-        jsi = JSInterpreter('''
-        function x() { return [null > 0, null < 0, null == 0, null === 0]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [False, False, False, False])
-
-        jsi = JSInterpreter('''
-        function x() { return [null >= 0, null <= 0]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [True, True])
-
-    def test_undefined(self):
-        jsi = JSInterpreter('''
-        function x() { return undefined === undefined; }
-        ''')
-        self.assertTrue(jsi.call_function('x'))
-
-        jsi = JSInterpreter('''
-        function x() { return undefined; }
-        ''')
-        self.assertIs(jsi.call_function('x'), JS_Undefined)
-
-        jsi = JSInterpreter('''
-        function x() { let v; return v; }
-        ''')
-        self.assertIs(jsi.call_function('x'), JS_Undefined)
-
-        jsi = JSInterpreter('''
-        function x() { return [undefined === undefined, undefined == undefined, undefined < undefined, undefined > undefined]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [True, True, False, False])
-
-        jsi = JSInterpreter('''
-        function x() { return [undefined === 0, undefined == 0, undefined < 0, undefined > 0]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [False, False, False, False])
-
-        jsi = JSInterpreter('''
-        function x() { return [undefined >= 0, undefined <= 0]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [False, False])
-
-        jsi = JSInterpreter('''
-        function x() { return [undefined > null, undefined < null, undefined == null, undefined === null]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [False, False, True, False])
-
-        jsi = JSInterpreter('''
-        function x() { return [undefined === null, undefined == null, undefined < null, undefined > null]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [False, True, False, False])
-
-        jsi = JSInterpreter('''
-        function x() { let v; return [42+v, v+42, v**42, 42**v, 0**v]; }
-        ''')
-        for y in jsi.call_function('x'):
-            self.assertTrue(math.isnan(y))
-
-        jsi = JSInterpreter('''
-        function x() { let v; return v**0; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 1)
-
-        jsi = JSInterpreter('''
-        function x() { let v; return [v>42, v<=42, v&&42, 42&&v]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [False, False, JS_Undefined, JS_Undefined])
-
-        jsi = JSInterpreter('function x(){return undefined ?? 42; }')
-        self.assertEqual(jsi.call_function('x'), 42)
-
-    def test_object(self):
-        jsi = JSInterpreter('''
-        function x() { return {}; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), {})
-
-        jsi = JSInterpreter('''
-        function x() { let a = {m1: 42, m2: 0 }; return [a["m1"], a.m2]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), [42, 0])
-
-        jsi = JSInterpreter('''
-        function x() { let a; return a?.qq; }
-        ''')
-        self.assertIs(jsi.call_function('x'), JS_Undefined)
-
-        jsi = JSInterpreter('''
-        function x() { let a = {m1: 42, m2: 0 }; return a?.qq; }
-        ''')
-        self.assertIs(jsi.call_function('x'), JS_Undefined)
-
-    def test_regex(self):
-        jsi = JSInterpreter('''
-        function x() { let a=/,,[/,913,/](,)}/; }
-        ''')
-        self.assertIs(jsi.call_function('x'), None)
-
-        jsi = JSInterpreter('''
-        function x() { let a=/,,[/,913,/](,)}/; "".replace(a, ""); return a; }
-        ''')
-        attrs = set(('findall', 'finditer', 'match', 'scanner', 'search',
-                     'split', 'sub', 'subn'))
-        if sys.version_info >= (2, 7):
-            # documented for 2.6 but may not be found
-            attrs.update(('flags', 'groupindex', 'groups', 'pattern'))
-        self.assertSetEqual(set(dir(jsi.call_function('x'))) & attrs, attrs)
-
-        jsi = JSInterpreter('''
-        function x() { let a=/,,[/,913,/](,)}/i; return a; }
-        ''')
-        self.assertEqual(jsi.call_function('x').flags & ~re.U, re.I)
-
-        jsi = JSInterpreter(r'''
-        function x() { let a="data-name".replace("data-", ""); return a }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 'name')
-
-        jsi = JSInterpreter(r'''
-        function x() { let a="data-name".replace(new RegExp("^.+-"), ""); return a; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 'name')
-
-        jsi = JSInterpreter(r'''
-        function x() { let a="data-name".replace(/^.+-/, ""); return a; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 'name')
-
-        jsi = JSInterpreter(r'''
-        function x() { let a="data-name".replace(/a/g, "o"); return a; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 'doto-nome')
-
-        jsi = JSInterpreter(r'''
-        function x() { let a="data-name".replaceAll("a", "o"); return a; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 'doto-nome')
-
-        jsi = JSInterpreter(r'''
-        function x() { let a=[/[)\\]/]; return a[0]; }
-        ''')
-        self.assertEqual(jsi.call_function('x').pattern, r'[)\\]')
-
-        """  # fails
-        jsi = JSInterpreter(r'''
-        function x() { let a=100; a/=/[0-9]+/.exec('divide by 20 today')[0]; }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 5)
-        """
-
-    def test_char_code_at(self):
-        jsi = JSInterpreter('function x(i){return "test".charCodeAt(i)}')
-        self.assertEqual(jsi.call_function('x', 0), 116)
-        self.assertEqual(jsi.call_function('x', 1), 101)
-        self.assertEqual(jsi.call_function('x', 2), 115)
-        self.assertEqual(jsi.call_function('x', 3), 116)
-        self.assertEqual(jsi.call_function('x', 4), None)
-        self.assertEqual(jsi.call_function('x', 'not_a_number'), 116)
-
-    def test_bitwise_operators_overflow(self):
-        jsi = JSInterpreter('function x(){return -524999584 << 5}')
-        self.assertEqual(jsi.call_function('x'), 379882496)
-
-        jsi = JSInterpreter('function x(){return 1236566549 << 5}')
-        self.assertEqual(jsi.call_function('x'), 915423904)
-
-    def test_bitwise_operators_madness(self):
-        jsi = JSInterpreter('function x(){return null << 5}')
-        self.assertEqual(jsi.call_function('x'), 0)
-
-        jsi = JSInterpreter('function x(){return undefined >> 5}')
-        self.assertEqual(jsi.call_function('x'), 0)
-
-        jsi = JSInterpreter('function x(){return 42 << NaN}')
-        self.assertEqual(jsi.call_function('x'), 42)
-
-        jsi = JSInterpreter('function x(){return 42 << Infinity}')
-        self.assertEqual(jsi.call_function('x'), 42)
-
-    def test_32066(self):
-        jsi = JSInterpreter("function x(){return Math.pow(3, 5) + new Date('1970-01-01T08:01:42.000+08:00') / 1000 * -239 - -24205;}")
-        self.assertEqual(jsi.call_function('x'), 70)
-
-    def test_unary_operators(self):
-        jsi = JSInterpreter('function f(){return 2  -  - - 2;}')
-        self.assertEqual(jsi.call_function('f'), 0)
-        jsi = JSInterpreter('function f(){return 2 + - + - - 2;}')
-        self.assertEqual(jsi.call_function('f'), 0)
-        # https://github.com/ytdl-org/youtube-dl/issues/32815
-        jsi = JSInterpreter('function f(){return 0  - 7 * - 6;}')
-        self.assertEqual(jsi.call_function('f'), 42)
-
-    """ # fails so far
-    def test_packed(self):
-        jsi = JSInterpreter('''function x(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''')
-        self.assertEqual(jsi.call_function('x', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|')))
-    """
 
 
 if __name__ == '__main__':

test/test_subtitles.py

@@ -38,9 +38,6 @@ class BaseTestSubtitles(unittest.TestCase):
         self.DL = FakeYDL()
         self.ie = self.IE()
         self.DL.add_info_extractor(self.ie)
-        if not self.IE.working():
-            print('Skipping: %s marked as not _WORKING' % self.IE.ie_key())
-            self.skipTest('IE marked as not _WORKING')
 
     def getInfoDict(self):
         info_dict = self.DL.extract_info(self.url, download=False)
@@ -59,21 +56,6 @@ class BaseTestSubtitles(unittest.TestCase):
 
 
 class TestYoutubeSubtitles(BaseTestSubtitles):
-    # Available subtitles for QRS8MkLhQmM:
-    # Language formats
-    # ru       vtt, ttml, srv3, srv2, srv1, json3
-    # fr       vtt, ttml, srv3, srv2, srv1, json3
-    # en       vtt, ttml, srv3, srv2, srv1, json3
-    # nl       vtt, ttml, srv3, srv2, srv1, json3
-    # de       vtt, ttml, srv3, srv2, srv1, json3
-    # ko       vtt, ttml, srv3, srv2, srv1, json3
-    # it       vtt, ttml, srv3, srv2, srv1, json3
-    # zh-Hant  vtt, ttml, srv3, srv2, srv1, json3
-    # hi       vtt, ttml, srv3, srv2, srv1, json3
-    # pt-BR    vtt, ttml, srv3, srv2, srv1, json3
-    # es-MX    vtt, ttml, srv3, srv2, srv1, json3
-    # ja       vtt, ttml, srv3, srv2, srv1, json3
-    # pl       vtt, ttml, srv3, srv2, srv1, json3
     url = 'QRS8MkLhQmM'
     IE = YoutubeIE
 
@@ -82,60 +64,41 @@ class TestYoutubeSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(len(subtitles.keys()), 13)
-        self.assertEqual(md5(subtitles['en']), 'ae1bd34126571a77aabd4d276b28044d')
-        self.assertEqual(md5(subtitles['it']), '0e0b667ba68411d88fd1c5f4f4eab2f9')
+        self.assertEqual(md5(subtitles['en']), '3cb210999d3e021bd6c7f0ea751eab06')
+        self.assertEqual(md5(subtitles['it']), '6d752b98c31f1cf8d597050c7a2cb4b5')
         for lang in ['fr', 'de']:
             self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
 
-    def _test_subtitles_format(self, fmt, md5_hash, lang='en'):
-        self.DL.params['writesubtitles'] = True
-        self.DL.params['subtitlesformat'] = fmt
-        subtitles = self.getSubtitles()
-        self.assertEqual(md5(subtitles[lang]), md5_hash)
-
     def test_youtube_subtitles_ttml_format(self):
-        self._test_subtitles_format('ttml', 'c97ddf1217390906fa9fbd34901f3da2')
+        self.DL.params['writesubtitles'] = True
+        self.DL.params['subtitlesformat'] = 'ttml'
+        subtitles = self.getSubtitles()
+        self.assertEqual(md5(subtitles['en']), 'e306f8c42842f723447d9f63ad65df54')
 
     def test_youtube_subtitles_vtt_format(self):
-        self._test_subtitles_format('vtt', 'ae1bd34126571a77aabd4d276b28044d')
-
-    def test_youtube_subtitles_json3_format(self):
-        self._test_subtitles_format('json3', '688dd1ce0981683867e7fe6fde2a224b')
-
-    def _test_automatic_captions(self, url, lang):
-        self.url = url
-        self.DL.params['writeautomaticsub'] = True
-        self.DL.params['subtitleslangs'] = [lang]
+        self.DL.params['writesubtitles'] = True
+        self.DL.params['subtitlesformat'] = 'vtt'
         subtitles = self.getSubtitles()
-        self.assertTrue(subtitles[lang] is not None)
+        self.assertEqual(md5(subtitles['en']), '3cb210999d3e021bd6c7f0ea751eab06')
 
     def test_youtube_automatic_captions(self):
-        # Available automatic captions for 8YoUxe5ncPo:
-        # Language formats (all in vtt, ttml, srv3, srv2, srv1, json3)
-        # gu, zh-Hans, zh-Hant, gd, ga, gl, lb, la, lo, tt, tr,
-        # lv, lt, tk, th, tg, te, fil, haw, yi, ceb, yo, de, da,
-        # el, eo, en, eu, et, es, ru, rw, ro, bn, be, bg, uk, jv,
-        # bs, ja, or, xh, co, ca, cy, cs, ps, pt, pa, vi, pl, hy,
-        # hr, ht, hu, hmn, hi, ha, mg, uz, ml, mn, mi, mk, ur,
-        # mt, ms, mr, ug, ta, my, af, sw, is, am,
-        #                                         *it*, iw, sv, ar,
-        # su, zu, az, id, ig, nl, no, ne, ny, fr, ku, fy, fa, fi,
-        # ka, kk, sr, sq, ko, kn, km, st, sk, si, so, sn, sm, sl,
-        # ky, sd
-        # ...
-        self._test_automatic_captions('8YoUxe5ncPo', 'it')
+        self.url = '8YoUxe5ncPo'
+        self.DL.params['writeautomaticsub'] = True
+        self.DL.params['subtitleslangs'] = ['it']
+        subtitles = self.getSubtitles()
+        self.assertTrue(subtitles['it'] is not None)
 
-    @unittest.skip('ASR subs all in all supported langs now')
     def test_youtube_translated_subtitles(self):
-        # This video has a subtitles track, which can be translated (#4555)
-        self._test_automatic_captions('Ky9eprVWzlI', 'it')
+        # This video has a subtitles track, which can be translated
+        self.url = 'Ky9eprVWzlI'
+        self.DL.params['writeautomaticsub'] = True
+        self.DL.params['subtitleslangs'] = ['it']
+        subtitles = self.getSubtitles()
+        self.assertTrue(subtitles['it'] is not None)
 
     def test_youtube_nosubtitles(self):
         self.DL.expect_warning('video doesn\'t have subtitles')
-        # Available automatic captions for 8YoUxe5ncPo:
-        # ...
-        # 8YoUxe5ncPo has no subtitles
-        self.url = '8YoUxe5ncPo'
+        self.url = 'n5BB19UTcdA'
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
@@ -165,7 +128,6 @@ class TestDailymotionSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestTedSubtitles(BaseTestSubtitles):
     url = 'http://www.ted.com/talks/dan_dennett_on_our_consciousness.html'
     IE = TEDIE
@@ -190,19 +152,18 @@ class TestVimeoSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['de', 'en', 'es', 'fr']))
-        self.assertEqual(md5(subtitles['en']), '386cbc9320b94e25cb364b97935e5dd1')
-        self.assertEqual(md5(subtitles['fr']), 'c9b69eef35bc6641c0d4da8a04f9dfac')
+        self.assertEqual(md5(subtitles['en']), '8062383cf4dec168fc40a088aa6d5888')
+        self.assertEqual(md5(subtitles['fr']), 'b6191146a6c5d3a452244d853fde6dc8')
 
     def test_nosubtitles(self):
         self.DL.expect_warning('video doesn\'t have subtitles')
-        self.url = 'http://vimeo.com/68093876'
+        self.url = 'http://vimeo.com/56015672'
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestWallaSubtitles(BaseTestSubtitles):
     url = 'http://vod.walla.co.il/movie/2705958/the-yes-men'
     IE = WallaIE
@@ -224,7 +185,6 @@ class TestWallaSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestCeskaTelevizeSubtitles(BaseTestSubtitles):
     url = 'http://www.ceskatelevize.cz/ivysilani/10600540290-u6-uzasny-svet-techniky'
     IE = CeskaTelevizeIE
@@ -246,7 +206,6 @@ class TestCeskaTelevizeSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestLyndaSubtitles(BaseTestSubtitles):
     url = 'http://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html'
     IE = LyndaIE
@@ -259,7 +218,6 @@ class TestLyndaSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), '09bbe67222259bed60deaa26997d73a7')
 
 
-@unittest.skip('IE broken')
 class TestNPOSubtitles(BaseTestSubtitles):
     url = 'http://www.npo.nl/nos-journaal/28-08-2014/POW_00722860'
     IE = NPOIE
@@ -272,7 +230,6 @@ class TestNPOSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['nl']), 'fc6435027572b63fb4ab143abd5ad3f4')
 
 
-@unittest.skip('IE broken')
 class TestMTVSubtitles(BaseTestSubtitles):
     url = 'http://www.cc.com/video-clips/p63lk0/adam-devine-s-house-party-chasing-white-swans'
     IE = ComedyCentralIE
@@ -295,33 +252,23 @@ class TestNRKSubtitles(BaseTestSubtitles):
     def test_allsubtitles(self):
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
-        self.DL.params['format'] = 'best/bestvideo'
         subtitles = self.getSubtitles()
-        self.assertEqual(set(subtitles.keys()), set(['nb-ttv']))
-        self.assertEqual(md5(subtitles['nb-ttv']), '67e06ff02d0deaf975e68f6cb8f6a149')
+        self.assertEqual(set(subtitles.keys()), set(['no']))
+        self.assertEqual(md5(subtitles['no']), '544fa917d3197fcbee64634559221cc2')
 
 
 class TestRaiPlaySubtitles(BaseTestSubtitles):
+    url = 'http://www.raiplay.it/video/2014/04/Report-del-07042014-cb27157f-9dd0-4aee-b788-b1f67643a391.html'
     IE = RaiPlayIE
 
-    def test_subtitles_key(self):
-        self.url = 'http://www.raiplay.it/video/2014/04/Report-del-07042014-cb27157f-9dd0-4aee-b788-b1f67643a391.html'
+    def test_allsubtitles(self):
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['it']))
         self.assertEqual(md5(subtitles['it']), 'b1d90a98755126b61e667567a1f6680a')
 
-    def test_subtitles_array_key(self):
-        self.url = 'https://www.raiplay.it/video/2020/12/Report---04-01-2021-2e90f1de-8eee-4de4-ac0e-78d21db5b600.html'
-        self.DL.params['writesubtitles'] = True
-        self.DL.params['allsubtitles'] = True
-        subtitles = self.getSubtitles()
-        self.assertEqual(set(subtitles.keys()), set(['it']))
-        self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
 
-
-@unittest.skip('IE broken - DRM only')
 class TestVikiSubtitles(BaseTestSubtitles):
     url = 'http://www.viki.com/videos/1060846v-punch-episode-18'
     IE = VikiIE
@@ -348,7 +295,6 @@ class TestThePlatformSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), '97e7670cbae3c4d26ae8bcc7fdd78d4b')
 
 
-@unittest.skip('IE broken')
 class TestThePlatformFeedSubtitles(BaseTestSubtitles):
     url = 'http://feed.theplatform.com/f/7wvmTC/msnbc_video-p-test?form=json&pretty=true&range=-40&byGuid=n_hardball_5biden_140207'
     IE = ThePlatformFeedIE
@@ -384,7 +330,7 @@ class TestDemocracynowSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['en']))
-        self.assertEqual(md5(subtitles['en']), 'a3cc4c0b5eadd74d9974f1c1f5101045')
+        self.assertEqual(md5(subtitles['en']), 'acaca989e24a9e45a6719c9b3d60815c')
 
     def test_subtitles_in_page(self):
         self.url = 'http://www.democracynow.org/2015/7/3/this_flag_comes_down_today_bree'
@@ -392,7 +338,7 @@ class TestDemocracynowSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['en']))
-        self.assertEqual(md5(subtitles['en']), 'a3cc4c0b5eadd74d9974f1c1f5101045')
+        self.assertEqual(md5(subtitles['en']), 'acaca989e24a9e45a6719c9b3d60815c')
 
 
 if __name__ == '__main__':

test/test_swfinterp.py

@@ -5,18 +5,16 @@ from __future__ import unicode_literals
 import os
 import sys
 import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
 
 import errno
+import io
 import json
 import re
 import subprocess
 
 from youtube_dl.swfinterp import SWFInterpreter
-from youtube_dl.compat import compat_open as open
 
 
 TEST_DIR = os.path.join(
@@ -45,7 +43,7 @@ def _make_testfunc(testfile):
                     '-static-link-runtime-shared-libraries', as_file])
             except OSError as ose:
                 if ose.errno == errno.ENOENT:
-                    self.skipTest('mxmlc not found!')
+                    print('mxmlc not found! Skipping test.')
                     return
                 raise
 
@@ -53,7 +51,7 @@ def _make_testfunc(testfile):
             swf_content = swf_f.read()
         swfi = SWFInterpreter(swf_content)
 
-        with open(as_file, 'r', encoding='utf-8') as as_f:
+        with io.open(as_file, 'r', encoding='utf-8') as as_f:
             as_content = as_f.read()
 
         def _find_spec(key):

test/test_traversal.py

@@ -1,509 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import sys
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import re
-
-from youtube_dl.traversal import (
-    dict_get,
-    get_first,
-    T,
-    traverse_obj,
-)
-from youtube_dl.compat import (
-    compat_etree_fromstring,
-    compat_http_cookies,
-    compat_str,
-)
-from youtube_dl.utils import (
-    int_or_none,
-    str_or_none,
-)
-
-_TEST_DATA = {
-    100: 100,
-    1.2: 1.2,
-    'str': 'str',
-    'None': None,
-    '...': Ellipsis,
-    'urls': [
-        {'index': 0, 'url': 'https://www.example.com/0'},
-        {'index': 1, 'url': 'https://www.example.com/1'},
-    ],
-    'data': (
-        {'index': 2},
-        {'index': 3},
-    ),
-    'dict': {},
-}
-
-
-if sys.version_info < (3, 0):
-    class _TestCase(unittest.TestCase):
-
-        def assertCountEqual(self, *args, **kwargs):
-            return self.assertItemsEqual(*args, **kwargs)
-else:
-    _TestCase = unittest.TestCase
-
-
-class TestTraversal(_TestCase):
-    def assertMaybeCountEqual(self, *args, **kwargs):
-        if sys.version_info < (3, 7):
-            # random dict order
-            return self.assertCountEqual(*args, **kwargs)
-        else:
-            return self.assertEqual(*args, **kwargs)
-
-    def test_traverse_obj(self):
-        # instant compat
-        str = compat_str
-
-        # define a pukka Iterable
-        def iter_range(stop):
-            for from_ in range(stop):
-                yield from_
-
-        # Test base functionality
-        self.assertEqual(traverse_obj(_TEST_DATA, ('str',)), 'str',
-                         msg='allow tuple path')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['str']), 'str',
-                         msg='allow list path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (value for value in ("str",))), 'str',
-                         msg='allow iterable path')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str'), 'str',
-                         msg='single items should be treated as a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, None), _TEST_DATA)
-        self.assertEqual(traverse_obj(_TEST_DATA, 100), 100)
-        self.assertEqual(traverse_obj(_TEST_DATA, 1.2), 1.2)
-
-        # Test Ellipsis behavior
-        self.assertCountEqual(traverse_obj(_TEST_DATA, Ellipsis),
-                              (item for item in _TEST_DATA.values() if item not in (None, {})),
-                              msg='`...` should give all non-discarded values')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', 0, Ellipsis)), _TEST_DATA['urls'][0].values(),
-                              msg='`...` selection for dicts should select all values')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, Ellipsis, 'url')),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='nested `...` queries should work')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, Ellipsis, 'index')), iter_range(4),
-                              msg='`...` query result should be flattened')
-        self.assertEqual(traverse_obj(iter(range(4)), Ellipsis), list(range(4)),
-                         msg='`...` should accept iterables')
-
-        # Test function as key
-        self.assertEqual(traverse_obj(_TEST_DATA, lambda x, y: x == 'urls' and isinstance(y, list)),
-                         [_TEST_DATA['urls']],
-                         msg='function as query key should perform a filter based on (key, value)')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, lambda _, x: isinstance(x[0], str)), set(('str',)),
-                              msg='exceptions in the query function should be caught')
-        self.assertEqual(traverse_obj(iter(range(4)), lambda _, x: x % 2 == 0), [0, 2],
-                         msg='function key should accept iterables')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a: Ellipsis)
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a, b, c: Ellipsis)
-
-        # Test set as key (transformation/type, like `expected_type`)
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str.upper), )), ['STR'],
-                         msg='Function in set should be a transformation')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('fail', T(lambda _: 'const'))), 'const',
-                         msg='Function in set should always be called')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str))), ['str'],
-                         msg='Type in set should be a type filter')
-        self.assertMaybeCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str, int))), [100, 'str'],
-                                   msg='Multiple types in set should be a type filter')
-        self.assertEqual(traverse_obj(_TEST_DATA, T(dict)), _TEST_DATA,
-                         msg='A single set should be wrapped into a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str.upper))), ['STR'],
-                         msg='Transformation function should not raise')
-        self.assertMaybeCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str_or_none))),
-                                   [item for item in map(str_or_none, _TEST_DATA.values()) if item is not None],
-                                   msg='Function in set should be a transformation')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, set())
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, set((str.upper, str)))
-
-        # Test `slice` as a key
-        _SLICE_DATA = [0, 1, 2, 3, 4]
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', slice(1))), None,
-                         msg='slice on a dictionary should not throw')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1)), _SLICE_DATA[:1],
-                         msg='slice key should apply slice to sequence')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 2)), _SLICE_DATA[1:2],
-                         msg='slice key should apply slice to sequence')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 4, 2)), _SLICE_DATA[1:4:2],
-                         msg='slice key should apply slice to sequence')
-
-        # Test alternative paths
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'str'), 'str',
-                         msg='multiple `paths` should be treated as alternative paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str', 100), 'str',
-                         msg='alternatives should exit early')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'fail'), None,
-                         msg='alternatives should return `default` if exhausted')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, 'fail'), 100), 100,
-                         msg='alternatives should track their own branching return')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', Ellipsis), ('data', Ellipsis)), list(_TEST_DATA['data']),
-                         msg='alternatives on empty objects should search further')
-
-        # Test branch and path nesting
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', (3, 0), 'url')), ['https://www.example.com/0'],
-                         msg='tuple as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', [3, 0], 'url')), ['https://www.example.com/0'],
-                         msg='list as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ((1, 'fail'), (0, 'url')))), ['https://www.example.com/0'],
-                         msg='double nesting in path should be treated as paths')
-        self.assertEqual(traverse_obj(['0', [1, 2]], [(0, 1), 0]), [1],
-                         msg='do not fail early on branching')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', ((1, ('fail', 'url')), (0, 'url')))),
-                              ['https://www.example.com/0', 'https://www.example.com/1'],
-                              msg='triple nesting in path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ('fail', (Ellipsis, 'url')))),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='ellipsis as branch path start gets flattened')
-
-        # Test dictionary as key
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}), {0: 100, 1: 1.2},
-                         msg='dict key should result in a dict with the same keys')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', 0, 'url')}),
-                         {0: 'https://www.example.com/0'},
-                         msg='dict key should allow paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', (3, 0), 'url')}),
-                         {0: ['https://www.example.com/0']},
-                         msg='tuple in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, 'fail'), (0, 'url')))}),
-                         {0: ['https://www.example.com/0']},
-                         msg='double nesting in dict path should be treated as paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, ('fail', 'url')), (0, 'url')))}),
-                         {0: ['https://www.example.com/1', 'https://www.example.com/0']},
-                         msg='triple nesting in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}), {},
-                         msg='remove `None` values when top level dict key fails')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}, default=Ellipsis), {0: Ellipsis},
-                         msg='use `default` if key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}), {},
-                         msg='remove empty values when dict key')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}, default=Ellipsis), {0: Ellipsis},
-                         msg='use `default` when dict key and a default')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}), {},
-                         msg='remove empty values when nested dict key fails')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}), {},
-                         msg='default to dict if pruned')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}, default=Ellipsis), {0: Ellipsis},
-                         msg='default to dict if pruned and default is given')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}, default=Ellipsis), {0: {0: Ellipsis}},
-                         msg='use nested `default` when nested dict key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('dict', Ellipsis)}), {},
-                         msg='remove key if branch in dict key not successful')
-
-        # Testing default parameter behavior
-        _DEFAULT_DATA = {'None': None, 'int': 0, 'list': []}
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail'), None,
-                         msg='default value should be `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', 'fail', default=Ellipsis), Ellipsis,
-                         msg='chained fails should result in default')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', 'int'), 0,
-                         msg='should not short cirquit on `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', default=1), 1,
-                         msg='invalid dict key should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', default=1), 1,
-                         msg='`None` is a deliberate sentinel and should become `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', 10)), None,
-                         msg='`IndexError` should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail'), default=1), 1,
-                         msg='if branched but not successful return `default` if defined, not `[]`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail'), default=None), None,
-                         msg='if branched but not successful return `default` even if `default` is `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail')), [],
-                         msg='if branched but not successful return `[]`, not `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', Ellipsis)), [],
-                         msg='if branched but object is empty return `[]`, not `default`')
-        self.assertEqual(traverse_obj(None, Ellipsis), [],
-                         msg='if branched but object is `None` return `[]`, not `default`')
-        self.assertEqual(traverse_obj({0: None}, (0, Ellipsis)), [],
-                         msg='if branched but state is `None` return `[]`, not `default`')
-
-        branching_paths = [
-            ('fail', Ellipsis),
-            (Ellipsis, 'fail'),
-            100 * ('fail',) + (Ellipsis,),
-            (Ellipsis,) + 100 * ('fail',),
-        ]
-        for branching_path in branching_paths:
-            self.assertEqual(traverse_obj({}, branching_path), [],
-                             msg='if branched but state is `None`, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({}, 'fail', branching_path), [],
-                             msg='if branching in last alternative and previous did not match, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({0: 'x'}, 0, branching_path), 'x',
-                             msg='if branching in last alternative and previous did match, return single value')
-            self.assertEqual(traverse_obj({0: 'x'}, branching_path, 0), 'x',
-                             msg='if branching in first alternative and non-branching path does match, return single value')
-            self.assertEqual(traverse_obj({}, branching_path, 'fail'), None,
-                             msg='if branching in first alternative and non-branching path does not match, return `default`')
-
-        # Testing expected_type behavior
-        _EXPECTED_TYPE_DATA = {'str': 'str', 'int': 0}
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=str),
-                         'str', msg='accept matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=int),
-                         None, msg='reject non-matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'int', expected_type=lambda x: str(x)),
-                         '0', msg='transform type using type function')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=lambda _: 1 / 0),
-                         None, msg='wrap expected_type function in try_call')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, Ellipsis, expected_type=str),
-                         ['str'], msg='eliminate items that expected_type fails on')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}, expected_type=int),
-                         {0: 100}, msg='type as expected_type should filter dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2, 2: 'None'}, expected_type=str_or_none),
-                         {0: '100', 1: '1.2'}, msg='function as expected_type should transform dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, ({0: 1.2}, 0, set((int_or_none,))), expected_type=int),
-                         1, msg='expected_type should not filter non-final dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 100, 1: 'str'}}, expected_type=int),
-                         {0: {0: 100}}, msg='expected_type should transform deep dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, [({0: '...'}, {0: '...'})], expected_type=type(Ellipsis)),
-                         [{0: Ellipsis}, {0: Ellipsis}], msg='expected_type should transform branched dict values')
-        self.assertEqual(traverse_obj({1: {3: 4}}, [(1, 2), 3], expected_type=int),
-                         [4], msg='expected_type regression for type matching in tuple branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['data', Ellipsis], expected_type=int),
-                         [], msg='expected_type regression for type matching in dict result')
-
-        # Test get_all behavior
-        _GET_ALL_DATA = {'key': [0, 1, 2]}
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, ('key', Ellipsis), get_all=False), 0,
-                         msg='if not `get_all`, return only first matching value')
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, Ellipsis, get_all=False), [0, 1, 2],
-                         msg='do not overflatten if not `get_all`')
-
-        # Test casesense behavior
-        _CASESENSE_DATA = {
-            'KeY': 'value0',
-            0: {
-                'KeY': 'value1',
-                0: {'KeY': 'value2'},
-            },
-            # FULLWIDTH LATIN CAPITAL LETTER K
-            '\uff2bey': 'value3',
-        }
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'key'), None,
-                         msg='dict keys should be case sensitive unless `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'keY',
-                                      casesense=False), 'value0',
-                         msg='allow non matching key case if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, '\uff4bey',  # FULLWIDTH LATIN SMALL LETTER K
-                                      casesense=False), 'value3',
-                         msg='allow non matching Unicode key case if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ('keY',)),
-                                      casesense=False), ['value1'],
-                         msg='allow non matching key case in branch if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ((0, 'keY'),)),
-                                      casesense=False), ['value2'],
-                         msg='allow non matching key case in branch path if `casesense`')
-
-        # Test traverse_string behavior
-        _TRAVERSE_STRING_DATA = {'str': 'str', 1.2: 1.2}
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0)), None,
-                         msg='do not traverse into string if not `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0),
-                                      _traverse_string=True), 's',
-                         msg='traverse into string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, (1.2, 1),
-                                      _traverse_string=True), '.',
-                         msg='traverse into converted data if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', Ellipsis),
-                                      _traverse_string=True), 'str',
-                         msg='`...` should result in string (same value) if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', slice(0, None, 2)),
-                                      _traverse_string=True), 'sr',
-                         msg='`slice` should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', lambda i, v: i or v == 's'),
-                                      _traverse_string=True), 'str',
-                         msg='function should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', (0, 2)),
-                                      _traverse_string=True), ['s', 'r'],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, Ellipsis), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, lambda x, y: True), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, slice(1)), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-
-        # Test re.Match as input obj
-        mobj = re.match(r'^0(12)(?P<group>3)(4)?$', '0123')
-        self.assertEqual(traverse_obj(mobj, Ellipsis), [x for x in mobj.groups() if x is not None],
-                         msg='`...` on a `re.Match` should give its `groups()`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 2)), ['0123', '3'],
-                         msg='function on a `re.Match` should give groupno, value starting at 0')
-        self.assertEqual(traverse_obj(mobj, 'group'), '3',
-                         msg='str key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 2), '3',
-                         msg='int key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 'gRoUp', casesense=False), '3',
-                         msg='str key on a `re.Match` should respect casesense')
-        self.assertEqual(traverse_obj(mobj, 'fail'), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 'gRoUpS', casesense=False), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 8), None,
-                         msg='failing int key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 'group')), ['0123', '3'],
-                         msg='function on a `re.Match` should give group name as well')
-
-        # Test xml.etree.ElementTree.Element as input obj
-        etree = compat_etree_fromstring('''<?xml version="1.0"?>
-        <data>
-            <country name="Liechtenstein">
-                <rank>1</rank>
-                <year>2008</year>
-                <gdppc>141100</gdppc>
-                <neighbor name="Austria" direction="E"/>
-                <neighbor name="Switzerland" direction="W"/>
-            </country>
-            <country name="Singapore">
-                <rank>4</rank>
-                <year>2011</year>
-                <gdppc>59900</gdppc>
-                <neighbor name="Malaysia" direction="N"/>
-            </country>
-            <country name="Panama">
-                <rank>68</rank>
-                <year>2011</year>
-                <gdppc>13600</gdppc>
-                <neighbor name="Costa Rica" direction="W"/>
-                <neighbor name="Colombia" direction="E"/>
-            </country>
-        </data>''')
-        self.assertEqual(traverse_obj(etree, ''), etree,
-                         msg='empty str key should return the element itself')
-        self.assertEqual(traverse_obj(etree, 'country'), list(etree),
-                         msg='str key should return all children with that tag name')
-        self.assertEqual(traverse_obj(etree, Ellipsis), list(etree),
-                         msg='`...` as key should return all children')
-        self.assertEqual(traverse_obj(etree, lambda _, x: x[0].text == '4'), [etree[1]],
-                         msg='function as key should get element as value')
-        self.assertEqual(traverse_obj(etree, lambda i, _: i == 1), [etree[1]],
-                         msg='function as key should get index as key')
-        self.assertEqual(traverse_obj(etree, 0), etree[0],
-                         msg='int key should return the nth child')
-        self.assertEqual(traverse_obj(etree, './/neighbor/@name'),
-                         ['Austria', 'Switzerland', 'Malaysia', 'Costa Rica', 'Colombia'],
-                         msg='`@<attribute>` at end of path should give that attribute')
-        self.assertEqual(traverse_obj(etree, '//neighbor/@fail'), [None, None, None, None, None],
-                         msg='`@<nonexistent>` at end of path should give `None`')
-        self.assertEqual(traverse_obj(etree, ('//neighbor/@', 2)), {'name': 'Malaysia', 'direction': 'N'},
-                         msg='`@` should give the full attribute dict')
-        self.assertEqual(traverse_obj(etree, '//year/text()'), ['2008', '2011', '2011'],
-                         msg='`text()` at end of path should give the inner text')
-        self.assertEqual(traverse_obj(etree, '//*[@direction]/@direction'), ['E', 'W', 'N', 'W', 'E'],
-                         msg='full python xpath features should be supported')
-        self.assertEqual(traverse_obj(etree, (0, '@name')), 'Liechtenstein',
-                         msg='special transformations should act on current element')
-        self.assertEqual(traverse_obj(etree, ('country', 0, Ellipsis, 'text()', T(int_or_none))), [1, 2008, 141100],
-                         msg='special transformations should act on current element')
-
-    def test_traversal_unbranching(self):
-        self.assertEqual(traverse_obj(_TEST_DATA, [(100, 1.2), all]), [100, 1.2],
-                         msg='`all` should give all results as list')
-        self.assertEqual(traverse_obj(_TEST_DATA, [(100, 1.2), any]), 100,
-                         msg='`any` should give the first result')
-        self.assertEqual(traverse_obj(_TEST_DATA, [100, all]), [100],
-                         msg='`all` should give list if non branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [100, any]), 100,
-                         msg='`any` should give single item if non branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100), all]), [100],
-                         msg='`all` should filter `None` and empty dict')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100), any]), 100,
-                         msg='`any` should filter `None` and empty dict')
-        self.assertEqual(traverse_obj(_TEST_DATA, [{
-            'all': [('dict', 'None', 100, 1.2), all],
-            'any': [('dict', 'None', 100, 1.2), any],
-        }]), {'all': [100, 1.2], 'any': 100},
-            msg='`all`/`any` should apply to each dict path separately')
-        self.assertEqual(traverse_obj(_TEST_DATA, [{
-            'all': [('dict', 'None', 100, 1.2), all],
-            'any': [('dict', 'None', 100, 1.2), any],
-        }], get_all=False), {'all': [100, 1.2], 'any': 100},
-            msg='`all`/`any` should apply to dict regardless of `get_all`')
-        self.assertIs(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), all, T(float)]), None,
-                      msg='`all` should reset branching status')
-        self.assertIs(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), any, T(float)]), None,
-                      msg='`any` should reset branching status')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), all, Ellipsis, T(float)]), [1.2],
-                         msg='`all` should allow further branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 'urls', 'data'), any, Ellipsis, 'index']), [0, 1],
-                         msg='`any` should allow further branching')
-
-    def test_traversal_morsel(self):
-        values = {
-            'expires': 'a',
-            'path': 'b',
-            'comment': 'c',
-            'domain': 'd',
-            'max-age': 'e',
-            'secure': 'f',
-            'httponly': 'g',
-            'version': 'h',
-            'samesite': 'i',
-        }
-        # SameSite added in Py3.8, breaks .update for 3.5-3.7
-        if sys.version_info < (3, 8):
-            del values['samesite']
-        morsel = compat_http_cookies.Morsel()
-        morsel.set(str('item_key'), 'item_value', 'coded_value')
-        morsel.update(values)
-        values['key'] = str('item_key')
-        values['value'] = 'item_value'
-        values = dict((str(k), v) for k, v in values.items())
-        # make test pass even without ordered dict
-        value_set = set(values.values())
-
-        for key, value in values.items():
-            self.assertEqual(traverse_obj(morsel, key), value,
-                             msg='Morsel should provide access to all values')
-        self.assertEqual(set(traverse_obj(morsel, Ellipsis)), value_set,
-                         msg='`...` should yield all values')
-        self.assertEqual(set(traverse_obj(morsel, lambda k, v: True)), value_set,
-                         msg='function key should yield all values')
-        self.assertIs(traverse_obj(morsel, [(None,), any]), morsel,
-                      msg='Morsel should not be implicitly changed to dict on usage')
-
-    def test_get_first(self):
-        self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')
-
-    def test_dict_get(self):
-        FALSE_VALUES = {
-            'none': None,
-            'false': False,
-            'zero': 0,
-            'empty_string': '',
-            'empty_list': [],
-        }
-        d = FALSE_VALUES.copy()
-        d['a'] = 42
-        self.assertEqual(dict_get(d, 'a'), 42)
-        self.assertEqual(dict_get(d, 'b'), None)
-        self.assertEqual(dict_get(d, 'b', 42), 42)
-        self.assertEqual(dict_get(d, ('a', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'a', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'c', 'a', 'd', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'c', )), None)
-        self.assertEqual(dict_get(d, ('b', 'c', ), 42), 42)
-        for key, false_value in FALSE_VALUES.items():
-            self.assertEqual(dict_get(d, ('b', 'c', key, )), None)
-            self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_unicode_literals.py

@@ -2,21 +2,19 @@ from __future__ import unicode_literals
 
 # Allow direct execution
 import os
-import re
 import sys
 import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-dirn = os.path.dirname
+import io
+import re
 
-rootDir = dirn(dirn(os.path.abspath(__file__)))
-
-sys.path.insert(0, rootDir)
+rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 IGNORED_FILES = [
     'setup.py',  # http://bugs.python.org/issue13943
     'conf.py',
     'buildserver.py',
-    'get-pip.py',
 ]
 
 IGNORED_DIRS = [
@@ -25,7 +23,6 @@ IGNORED_DIRS = [
 ]
 
 from test.helper import assertRegexpMatches
-from youtube_dl.compat import compat_open as open
 
 
 class TestUnicodeLiterals(unittest.TestCase):
@@ -43,7 +40,7 @@ class TestUnicodeLiterals(unittest.TestCase):
                     continue
 
                 fn = os.path.join(dirpath, basename)
-                with open(fn, encoding='utf-8') as inf:
+                with io.open(fn, encoding='utf-8') as inf:
                     code = inf.read()
 
                 if "'" not in code and '"' not in code:

test/test_utils.py

@@ -12,27 +12,24 @@ 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
 
 from youtube_dl.utils import (
     age_restricted,
     args_to_str,
-    base_url,
+    encode_base_n,
     caesar,
     clean_html,
-    clean_podcast_url,
     date_from_str,
     DateRange,
     detect_exe_version,
     determine_ext,
-    encode_base_n,
+    dict_get,
     encode_compat_str,
     encodeFilename,
     escape_rfc3986,
     escape_url,
-    expand_path,
     extract_attributes,
     ExtractorError,
     find_xpath_attr,
@@ -46,11 +43,8 @@ from youtube_dl.utils import (
     int_or_none,
     intlist_to_bytes,
     is_html,
-    join_nonempty,
     js_to_json,
-    LazyList,
     limit_length,
-    lowercase_escape,
     merge_dicts,
     mimetype2ext,
     month_by_name,
@@ -59,26 +53,24 @@ from youtube_dl.utils import (
     OnDemandPagedList,
     orderedSet,
     parse_age_limit,
-    parse_bitrate,
     parse_duration,
     parse_filesize,
-    parse_codecs,
     parse_count,
     parse_iso8601,
     parse_resolution,
-    parse_qs,
+    parse_bitrate,
     pkcs1pad,
-    prepend_extension,
     read_batch_urls,
-    remove_start,
-    remove_end,
-    remove_quotes,
-    replace_extension,
-    rot47,
     sanitize_filename,
     sanitize_path,
     sanitize_url,
-    sanitized_Request,
+    expand_path,
+    prepend_extension,
+    replace_extension,
+    remove_start,
+    remove_end,
+    remove_quotes,
+    rot47,
     shell_quote,
     smuggle_url,
     str_to_int,
@@ -86,19 +78,19 @@ from youtube_dl.utils import (
     strip_or_none,
     subtitles_filename,
     timeconvert,
-    try_call,
     unescapeHTML,
     unified_strdate,
     unified_timestamp,
     unsmuggle_url,
     uppercase_escape,
+    lowercase_escape,
     url_basename,
     url_or_none,
+    base_url,
     urljoin,
     urlencode_postdata,
     urshift,
     update_url_query,
-    variadic,
     version_tuple,
     xpath_with_ns,
     xpath_element,
@@ -111,7 +103,7 @@ from youtube_dl.utils import (
     cli_option,
     cli_valueless_option,
     cli_bool_option,
-    YoutubeDLHandler,
+    parse_codecs,
 )
 from youtube_dl.compat import (
     compat_chr,
@@ -119,13 +111,12 @@ from youtube_dl.compat import (
     compat_getenv,
     compat_os_name,
     compat_setenv,
-    compat_str,
     compat_urlparse,
+    compat_parse_qs,
 )
 
 
 class TestUtil(unittest.TestCase):
-
     def test_timeconvert(self):
         self.assertTrue(timeconvert('') is None)
         self.assertTrue(timeconvert('bougrg') is None)
@@ -244,19 +235,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_sanitized_Request(self):
-        self.assertFalse(sanitized_Request('http://foo.bar').has_header('Authorization'))
-        self.assertFalse(sanitized_Request('http://:foo.bar').has_header('Authorization'))
-        self.assertEqual(sanitized_Request('http://@foo.bar').get_header('Authorization'),
-                         'Basic Og==')
-        self.assertEqual(sanitized_Request('http://:pass@foo.bar').get_header('Authorization'),
-                         'Basic OnBhc3M=')
-        self.assertEqual(sanitized_Request('http://user:@foo.bar').get_header('Authorization'),
-                         'Basic dXNlcjo=')
-        self.assertEqual(sanitized_Request('http://user:pass@foo.bar').get_header('Authorization'),
-                         'Basic dXNlcjpwYXNz')
 
     def test_expand_path(self):
         def env(var):
@@ -391,9 +369,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unified_timestamp('Sep 11, 2013 | 5:49 AM'), 1378878540)
         self.assertEqual(unified_timestamp('December 15, 2017 at 7:49 am'), 1513324140)
         self.assertEqual(unified_timestamp('2018-03-14T08:32:43.1493874+00:00'), 1521016363)
-        self.assertEqual(unified_timestamp('December 31 1969 20:00:01 EDT'), 1)
-        self.assertEqual(unified_timestamp('Wednesday 31 December 1969 18:01:26 MDT'), 86)
-        self.assertEqual(unified_timestamp('12/31/1969 20:01:18 EDT', False), 78)
 
     def test_determine_ext(self):
         self.assertEqual(determine_ext('http://example.com/foo/bar.mp4/?download'), 'mp4')
@@ -515,14 +490,11 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(float_or_none(set()), None)
 
     def test_int_or_none(self):
-        self.assertEqual(int_or_none(42), 42)
         self.assertEqual(int_or_none('42'), 42)
         self.assertEqual(int_or_none(''), None)
         self.assertEqual(int_or_none(None), None)
         self.assertEqual(int_or_none([]), None)
         self.assertEqual(int_or_none(set()), None)
-        self.assertEqual(int_or_none('42', base=8), 34)
-        self.assertRaises(TypeError, int_or_none(42, base=8))
 
     def test_str_to_int(self):
         self.assertEqual(str_to_int('123,456'), 123456)
@@ -582,11 +554,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(url_or_none('http$://foo.de'), None)
         self.assertEqual(url_or_none('http://foo.de'), 'http://foo.de')
         self.assertEqual(url_or_none('//foo.de'), '//foo.de')
-        self.assertEqual(url_or_none('s3://foo.de'), None)
-        self.assertEqual(url_or_none('rtmpte://foo.de'), 'rtmpte://foo.de')
-        self.assertEqual(url_or_none('mms://foo.de'), 'mms://foo.de')
-        self.assertEqual(url_or_none('rtspu://foo.de'), 'rtspu://foo.de')
-        self.assertEqual(url_or_none('ftps://foo.de'), 'ftps://foo.de')
 
     def test_parse_age_limit(self):
         self.assertEqual(parse_age_limit(None), None)
@@ -689,36 +656,38 @@ class TestUtil(unittest.TestCase):
         self.assertTrue(isinstance(data, bytes))
 
     def test_update_url_query(self):
-        self.assertEqual(parse_qs(update_url_query(
+        def query_dict(url):
+            return compat_parse_qs(compat_urlparse.urlparse(url).query)
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'quality': ['HD'], 'format': ['mp4']})),
-            parse_qs('http://example.com/path?quality=HD&format=mp4'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?quality=HD&format=mp4'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'system': ['LINUX', 'WINDOWS']})),
-            parse_qs('http://example.com/path?system=LINUX&system=WINDOWS'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?system=LINUX&system=WINDOWS'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': 'id,formats,subtitles'})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?fields=id,formats,subtitles'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': ('id,formats,subtitles', 'thumbnails')})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles&fields=thumbnails'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?fields=id,formats,subtitles&fields=thumbnails'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path?manifest=f4m', {'manifest': []})),
-            parse_qs('http://example.com/path'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path?system=LINUX&system=WINDOWS', {'system': 'LINUX'})),
-            parse_qs('http://example.com/path?system=LINUX'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?system=LINUX'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': b'id,formats,subtitles'})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?fields=id,formats,subtitles'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'width': 1080, 'height': 720})),
-            parse_qs('http://example.com/path?width=1080&height=720'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?width=1080&height=720'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'bitrate': 5020.43})),
-            parse_qs('http://example.com/path?bitrate=5020.43'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?bitrate=5020.43'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'test': '第二行тест'})),
-            parse_qs('http://example.com/path?test=%E7%AC%AC%E4%BA%8C%E8%A1%8C%D1%82%D0%B5%D1%81%D1%82'))
+            query_dict('http://example.com/path?test=%E7%AC%AC%E4%BA%8C%E8%A1%8C%D1%82%D0%B5%D1%81%D1%82'))
 
     def test_multipart_encode(self):
         self.assertEqual(
@@ -730,6 +699,28 @@ class TestUtil(unittest.TestCase):
         self.assertRaises(
             ValueError, multipart_encode, {b'field': b'value'}, boundary='value')
 
+    def test_dict_get(self):
+        FALSE_VALUES = {
+            'none': None,
+            'false': False,
+            'zero': 0,
+            'empty_string': '',
+            'empty_list': [],
+        }
+        d = FALSE_VALUES.copy()
+        d['a'] = 42
+        self.assertEqual(dict_get(d, 'a'), 42)
+        self.assertEqual(dict_get(d, 'b'), None)
+        self.assertEqual(dict_get(d, 'b', 42), 42)
+        self.assertEqual(dict_get(d, ('a', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'a', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'c', 'a', 'd', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'c', )), None)
+        self.assertEqual(dict_get(d, ('b', 'c', ), 42), 42)
+        for key, false_value in FALSE_VALUES.items():
+            self.assertEqual(dict_get(d, ('b', 'c', key, )), None)
+            self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)
+
     def test_merge_dicts(self):
         self.assertEqual(merge_dicts({'a': 1}, {'b': 2}), {'a': 1, 'b': 2})
         self.assertEqual(merge_dicts({'a': 1}, {'a': 2}), {'a': 1})
@@ -888,111 +879,6 @@ class TestUtil(unittest.TestCase):
         )
         self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
 
-    def test_remove_dot_segments(self):
-
-        def remove_dot_segments(p):
-            q = '' if p.startswith('/') else '/'
-            p = 'http://example.com' + q + p
-            p = compat_urlparse.urlsplit(YoutubeDLHandler._fix_path(p)).path
-            return p[1:] if q else p
-
-        self.assertEqual(remove_dot_segments('/a/b/c/./../../g'), '/a/g')
-        self.assertEqual(remove_dot_segments('mid/content=5/../6'), 'mid/6')
-        self.assertEqual(remove_dot_segments('/ad/../cd'), '/cd')
-        self.assertEqual(remove_dot_segments('/ad/../cd/'), '/cd/')
-        self.assertEqual(remove_dot_segments('/..'), '/')
-        self.assertEqual(remove_dot_segments('/./'), '/')
-        self.assertEqual(remove_dot_segments('/./a'), '/a')
-        self.assertEqual(remove_dot_segments('/abc/./.././d/././e/.././f/./../../ghi'), '/ghi')
-        self.assertEqual(remove_dot_segments('/'), '/')
-        self.assertEqual(remove_dot_segments('/t'), '/t')
-        self.assertEqual(remove_dot_segments('t'), 't')
-        self.assertEqual(remove_dot_segments(''), '')
-        self.assertEqual(remove_dot_segments('/../a/b/c'), '/a/b/c')
-        self.assertEqual(remove_dot_segments('../a'), 'a')
-        self.assertEqual(remove_dot_segments('./a'), 'a')
-        self.assertEqual(remove_dot_segments('.'), '')
-        self.assertEqual(remove_dot_segments('////'), '////')
-
-    def test_js_to_json_vars_strings(self):
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'null': a,
-                    'nullStr': b,
-                    'true': c,
-                    'trueStr': d,
-                    'false': e,
-                    'falseStr': f,
-                    'unresolvedVar': g,
-                }''',
-                {
-                    'a': 'null',
-                    'b': '"null"',
-                    'c': 'true',
-                    'd': '"true"',
-                    'e': 'false',
-                    'f': '"false"',
-                    'g': 'var',
-                }
-            )),
-            {
-                'null': None,
-                'nullStr': 'null',
-                'true': True,
-                'trueStr': 'true',
-                'false': False,
-                'falseStr': 'false',
-                'unresolvedVar': 'var'
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'int': a,
-                    'intStr': b,
-                    'float': c,
-                    'floatStr': d,
-                }''',
-                {
-                    'a': '123',
-                    'b': '"123"',
-                    'c': '1.23',
-                    'd': '"1.23"',
-                }
-            )),
-            {
-                'int': 123,
-                'intStr': '123',
-                'float': 1.23,
-                'floatStr': '1.23',
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'object': a,
-                    'objectStr': b,
-                    'array': c,
-                    'arrayStr': d,
-                }''',
-                {
-                    'a': '{}',
-                    'b': '"{}"',
-                    'c': '[]',
-                    'd': '"[]"',
-                }
-            )),
-            {
-                'object': {},
-                'objectStr': '{}',
-                'array': [],
-                'arrayStr': '[]',
-            }
-        )
-
     def test_js_to_json_realworld(self):
         inp = '''{
             'clip':{'provider':'pseudo'}
@@ -1063,10 +949,10 @@ class TestUtil(unittest.TestCase):
             !42: 42
         }''')
         self.assertEqual(json.loads(on), {
-            'a': True,
-            'b': False,
-            'c': False,
-            'd': True,
+            'a': 0,
+            'b': 1,
+            'c': 0,
+            'd': 42.42,
             'e': [],
             'f': "abc",
             'g': "",
@@ -1136,26 +1022,10 @@ class TestUtil(unittest.TestCase):
         on = js_to_json('{ "040": "040" }')
         self.assertEqual(json.loads(on), {'040': '040'})
 
-        on = js_to_json('[1,//{},\n2]')
-        self.assertEqual(json.loads(on), [1, 2])
-
-        on = js_to_json(r'"\^\$\#"')
-        self.assertEqual(json.loads(on), R'^$#', msg='Unnecessary escapes should be stripped')
-
-        on = js_to_json('\'"\\""\'')
-        self.assertEqual(json.loads(on), '"""', msg='Unnecessary quote escape should be escaped')
-
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
 
-    def test_js_to_json_template_literal(self):
-        self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"')
-        self.assertEqual(js_to_json('`${name}${name}`', {'name': '"X"'}), '"XX"')
-        self.assertEqual(js_to_json('`${name}${name}`', {'name': '5'}), '"55"')
-        self.assertEqual(js_to_json('`${name}"${name}"`', {'name': '5'}), '"5\\"5\\""')
-        self.assertEqual(js_to_json('`${name}`', {}), '"name"')
-
     def test_extract_attributes(self):
         self.assertEqual(extract_attributes('<e x="y">'), {'x': 'y'})
         self.assertEqual(extract_attributes("<e x='y'>"), {'x': 'y'})
@@ -1595,88 +1465,6 @@ Line 1
         self.assertEqual(get_elements_by_attribute('class', 'foo', html), [])
         self.assertEqual(get_elements_by_attribute('class', 'no-such-foo', html), [])
 
-    def test_clean_podcast_url(self):
-        self.assertEqual(clean_podcast_url('https://www.podtrac.com/pts/redirect.mp3/chtbl.com/track/5899E/traffic.megaphone.fm/HSW7835899191.mp3'), 'https://traffic.megaphone.fm/HSW7835899191.mp3')
-        self.assertEqual(clean_podcast_url('https://play.podtrac.com/npr-344098539/edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3'), 'https://edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3')
-
-    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)[5:], it[5:])
-        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)[5::-1], it[5::-1])
-        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(compat_str(LazyList(it)), compat_str(it))
-
-        self.assertEqual(list(LazyList(it, reverse=True)), it[::-1])
-        self.assertEqual(list(reversed(LazyList(it))[::-1]), it)
-        self.assertEqual(list(reversed(LazyList(it))[1:3:7]), it[::-1][1:3:7])
-
-    def test_LazyList_laziness(self):
-
-        def test(ll, idx, val, cache):
-            self.assertEqual(ll[idx], val)
-            self.assertEqual(ll._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=True)
-        test(ll, -1, 0, range(1))
-        test(ll, 3, 6, range(10))
-
-        ll = LazyList(itertools.count())
-        test(ll, 10, 10, range(11))
-        ll = reversed(ll)
-        test(ll, -15, 14, range(15))
-
-    def test_try_call(self):
-        def total(*x, **kwargs):
-            return sum(x) + sum(kwargs.values())
-
-        self.assertEqual(try_call(None), None,
-                         msg='not a fn should give None')
-        self.assertEqual(try_call(lambda: 1), 1,
-                         msg='int fn with no expected_type should give int')
-        self.assertEqual(try_call(lambda: 1, expected_type=int), 1,
-                         msg='int fn with expected_type int should give int')
-        self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
-                         msg='int fn with wrong expected_type should give None')
-        self.assertEqual(try_call(total, args=(0, 1, 0, ), expected_type=int), 1,
-                         msg='fn should accept arglist')
-        self.assertEqual(try_call(total, kwargs={'a': 0, 'b': 1, 'c': 0}, expected_type=int), 1,
-                         msg='fn should accept kwargs')
-        self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
-                         msg='int fn with no expected_type should give None')
-        self.assertEqual(try_call(lambda x: {}, total, args=(42, ), expected_type=int), 42,
-                         msg='expect first int result with expected_type int')
-
-    def test_variadic(self):
-        self.assertEqual(variadic(None), (None, ))
-        self.assertEqual(variadic('spam'), ('spam', ))
-        self.assertEqual(variadic('spam', allowed_types=dict), 'spam')
-        self.assertEqual(variadic('spam', allowed_types=[dict]), 'spam')
-
-    def test_join_nonempty(self):
-        self.assertEqual(join_nonempty('a', 'b'), 'a-b')
-        self.assertEqual(join_nonempty(
-            'a', 'b', 'c', 'd',
-            from_dict={'a': 'c', 'c': [], 'b': 'd', 'd': None}), 'c-d')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_write_annotations.py

@@ -11,11 +11,12 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from test.helper import get_params, try_rm
 
 
+import io
+
 import xml.etree.ElementTree
 
 import youtube_dl.YoutubeDL
 import youtube_dl.extractor
-from youtube_dl.compat import compat_open as open
 
 
 class YoutubeDL(youtube_dl.YoutubeDL):
@@ -50,7 +51,7 @@ class TestAnnotations(unittest.TestCase):
         ydl.download([TEST_ID])
         self.assertTrue(os.path.exists(ANNOTATIONS_FILE))
         annoxml = None
-        with open(ANNOTATIONS_FILE, 'r', encoding='utf-8') as annof:
+        with io.open(ANNOTATIONS_FILE, 'r', encoding='utf-8') as annof:
             annoxml = xml.etree.ElementTree.parse(annof)
         self.assertTrue(annoxml is not None, 'Failed to parse annotations XML')
         root = annoxml.getroot()

test/test_youtube_chapters.py

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

test/test_youtube_lists.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 # Allow direct execution
@@ -10,10 +9,10 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL
 
+
 from youtube_dl.extractor import (
-    YoutubeIE,
     YoutubePlaylistIE,
-    YoutubeTabIE,
+    YoutubeIE,
 )
 
 
@@ -25,40 +24,47 @@ class TestYoutubeLists(unittest.TestCase):
     def test_youtube_playlist_noplaylist(self):
         dl = FakeYDL()
         dl.params['noplaylist'] = True
-        dl.params['format'] = 'best'
         ie = YoutubePlaylistIE(dl)
         result = ie.extract('https://www.youtube.com/watch?v=FXxLjLQi3Fg&list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re')
         self.assertEqual(result['_type'], 'url')
-        result = dl.extract_info(result['url'], download=False, ie_key=result.get('ie_key'), process=False)
         self.assertEqual(YoutubeIE().extract_id(result['url']), 'FXxLjLQi3Fg')
 
+    def test_youtube_course(self):
+        dl = FakeYDL()
+        ie = YoutubePlaylistIE(dl)
+        # TODO find a > 100 (paginating?) videos course
+        result = ie.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
+        entries = list(result['entries'])
+        self.assertEqual(YoutubeIE().extract_id(entries[0]['url']), 'j9WZyLZCBzs')
+        self.assertEqual(len(entries), 25)
+        self.assertEqual(YoutubeIE().extract_id(entries[-1]['url']), 'rYefUsYuEp0')
+
     def test_youtube_mix(self):
         dl = FakeYDL()
-        dl.params['format'] = 'best'
-        ie = YoutubeTabIE(dl)
-        result = dl.extract_info('https://www.youtube.com/watch?v=tyITL_exICo&list=RDCLAK5uy_kLWIr9gv1XLlPbaDS965-Db4TrBoUTxQ8',
-                                 download=False, ie_key=ie.ie_key(), process=True)
-        entries = (result or {}).get('entries', [{'id': 'not_found', }])
-        self.assertTrue(len(entries) >= 25)
+        ie = YoutubePlaylistIE(dl)
+        result = ie.extract('https://www.youtube.com/watch?v=W01L70IGBgE&index=2&list=RDOQpdSVF_k_w')
+        entries = result['entries']
+        self.assertTrue(len(entries) >= 50)
         original_video = entries[0]
-        self.assertEqual(original_video['id'], 'tyITL_exICo')
+        self.assertEqual(original_video['id'], 'OQpdSVF_k_w')
 
-    def test_youtube_flat_playlist_extraction(self):
+    def test_youtube_toptracks(self):
+        print('Skipping: The playlist page gives error 500')
+        return
+        dl = FakeYDL()
+        ie = YoutubePlaylistIE(dl)
+        result = ie.extract('https://www.youtube.com/playlist?list=MCUS')
+        entries = result['entries']
+        self.assertEqual(len(entries), 100)
+
+    def test_youtube_flat_playlist_titles(self):
         dl = FakeYDL()
         dl.params['extract_flat'] = True
-        ie = YoutubeTabIE(dl)
-        result = ie.extract('https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc')
+        ie = YoutubePlaylistIE(dl)
+        result = ie.extract('https://www.youtube.com/playlist?list=PL-KKIb8rvtMSrAO9YFbeM6UQrAqoFTUWv')
         self.assertIsPlaylist(result)
-        entries = list(result['entries'])
-        self.assertTrue(len(entries) == 1)
-        video = entries[0]
-        self.assertEqual(video['_type'], 'url')
-        self.assertEqual(video['ie_key'], 'Youtube')
-        self.assertEqual(video['id'], 'BaW_jenozKc')
-        self.assertEqual(video['url'], 'BaW_jenozKc')
-        self.assertEqual(video['title'], 'youtube-dl test video "\'/\\ä↭𝕐')
-        self.assertEqual(video['duration'], 10)
-        self.assertEqual(video['uploader'], 'Philipp Hagemeister')
+        for entry in result['entries']:
+            self.assertTrue(entry.get('title'))
 
 
 if __name__ == '__main__':

test/test_youtube_misc.py

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

test/test_youtube_signature.py

@@ -8,172 +8,76 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+import io
 import re
 import string
 
-from youtube_dl.compat import (
-    compat_open as open,
-    compat_str,
-    compat_urlretrieve,
-)
-
 from test.helper import FakeYDL
 from youtube_dl.extractor import YoutubeIE
-from youtube_dl.jsinterp import JSInterpreter
+from youtube_dl.compat import compat_str, compat_urlretrieve
 
-_SIG_TESTS = [
+_TESTS = [
     (
         'https://s.ytimg.com/yts/jsbin/html5player-vflHOr_nV.js',
+        'js',
         86,
         '>=<;:/.-[+*)(\'&%$#"!ZYX0VUTSRQPONMLKJIHGFEDCBA\\yxwvutsrqponmlkjihgfedcba987654321',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-vfldJ8xgI.js',
+        'js',
         85,
         '3456789a0cdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS[UVWXYZ!"#$%&\'()*+,-./:;<=>?@',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-vfle-mVwz.js',
+        'js',
         90,
         ']\\[@?>=<;:/.-,+*)(\'&%$#"hZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjiagfedcb39876',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl0Cbn9e.js',
+        'js',
         84,
         'O1I3456789abcde0ghijklmnopqrstuvwxyzABCDEFGHfJKLMN2PQRSTUVW@YZ!"#$%&\'()*+,-./:;<=',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflXGBaUN.js',
+        'js',
         '2ACFC7A61CA478CD21425E5A57EBD73DDC78E22A.2094302436B2D377D14A3BBA23022D023B8BC25AA',
         'A52CB8B320D22032ABB3A41D773D2B6342034902.A22E87CDD37DBE75A5E52412DC874AC16A7CFCA2',
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflBb0OQx.js',
+        'js',
         84,
         '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl9FYC6l.js',
+        'js',
         83,
         '123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflCGk6yw/html5player.js',
+        'js',
         '4646B5181C6C3020DF1D9C7FCFEA.AD80ABF70C39BD369CCCAE780AFBB98FA6B6CB42766249D9488C288',
         '82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js',
+        'js',
         '312AA52209E3623129A412D56A40F11CB0AF14AE.3EE09501CB14E3BCDC3B2AE808BF3F1D14E7FBF12',
         '112AA5220913623229A412D56A40F11CB0AF14AE.3EE0950FCB14EEBCDC3B2AE808BF331D14E7FBF3',
     )
 ]
 
-_NSIG_TESTS = [
-    (
-        'https://www.youtube.com/s/player/7862ca1f/player_ias.vflset/en_US/base.js',
-        'X_LCxVDjAavgE5t', 'yxJ1dM6iz5ogUg',
-    ),
-    (
-        'https://www.youtube.com/s/player/9216d1f7/player_ias.vflset/en_US/base.js',
-        'SLp9F5bwjAdhE9F-', 'gWnb9IK2DJ8Q1w',
-    ),
-    (
-        'https://www.youtube.com/s/player/f8cb7a3b/player_ias.vflset/en_US/base.js',
-        'oBo2h5euWy6osrUt', 'ivXHpm7qJjJN',
-    ),
-    (
-        'https://www.youtube.com/s/player/2dfe380c/player_ias.vflset/en_US/base.js',
-        'oBo2h5euWy6osrUt', '3DIBbn3qdQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/f1ca6900/player_ias.vflset/en_US/base.js',
-        'cu3wyu6LQn2hse', 'jvxetvmlI9AN9Q',
-    ),
-    (
-        'https://www.youtube.com/s/player/8040e515/player_ias.vflset/en_US/base.js',
-        'wvOFaY-yjgDuIEg5', 'HkfBFDHmgw4rsw',
-    ),
-    (
-        'https://www.youtube.com/s/player/e06dea74/player_ias.vflset/en_US/base.js',
-        'AiuodmaDDYw8d3y4bf', 'ankd8eza2T6Qmw',
-    ),
-    (
-        'https://www.youtube.com/s/player/5dd88d1d/player-plasma-ias-phone-en_US.vflset/base.js',
-        'kSxKFLeqzv_ZyHSAt', 'n8gS8oRlHOxPFA',
-    ),
-    (
-        'https://www.youtube.com/s/player/324f67b9/player_ias.vflset/en_US/base.js',
-        'xdftNy7dh9QGnhW', '22qLGxrmX8F1rA',
-    ),
-    (
-        'https://www.youtube.com/s/player/4c3f79c5/player_ias.vflset/en_US/base.js',
-        'TDCstCG66tEAO5pR9o', 'dbxNtZ14c-yWyw',
-    ),
-    (
-        'https://www.youtube.com/s/player/c81bbb4a/player_ias.vflset/en_US/base.js',
-        'gre3EcLurNY2vqp94', 'Z9DfGxWP115WTg',
-    ),
-    (
-        'https://www.youtube.com/s/player/1f7d5369/player_ias.vflset/en_US/base.js',
-        'batNX7sYqIJdkJ', 'IhOkL_zxbkOZBw',
-    ),
-    (
-        'https://www.youtube.com/s/player/009f1d77/player_ias.vflset/en_US/base.js',
-        '5dwFHw8aFWQUQtffRq', 'audescmLUzI3jw',
-    ),
-    (
-        'https://www.youtube.com/s/player/dc0c6770/player_ias.vflset/en_US/base.js',
-        '5EHDMgYLV6HPGk_Mu-kk', 'n9lUJLHbxUI0GQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/c2199353/player_ias.vflset/en_US/base.js',
-        '5EHDMgYLV6HPGk_Mu-kk', 'AD5rgS85EkrE7',
-    ),
-    (
-        'https://www.youtube.com/s/player/113ca41c/player_ias.vflset/en_US/base.js',
-        'cgYl-tlYkhjT7A', 'hI7BBr2zUgcmMg',
-    ),
-    (
-        'https://www.youtube.com/s/player/c57c113c/player_ias.vflset/en_US/base.js',
-        '-Txvy6bT5R6LqgnQNx', 'dcklJCnRUHbgSg',
-    ),
-    (
-        'https://www.youtube.com/s/player/5a3b6271/player_ias.vflset/en_US/base.js',
-        'B2j7f_UPT4rfje85Lu_e', 'm5DmNymaGQ5RdQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/dac945fd/player_ias.vflset/en_US/base.js',
-        'o8BkRxXhuYsBCWi6RplPdP', '3Lx32v_hmzTm6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/6f20102c/player_ias.vflset/en_US/base.js',
-        'lE8DhoDmKqnmJJ', 'pJTTX6XyJP2BYw',
-    ),
-    (
-        'https://www.youtube.com/s/player/cfa9e7cb/player_ias.vflset/en_US/base.js',
-        'qO0NiMtYQ7TeJnfFG2', 'k9cuJDHNS5O7kQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/b7910ca8/player_ias.vflset/en_US/base.js',
-        '_hXMCwMt9qE310D', 'LoZMgkkofRMCZQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/590f65a6/player_ias.vflset/en_US/base.js',
-        '1tm7-g_A9zsI8_Lay_', 'xI4Vem4Put_rOg',
-    ),
-]
-
 
 class TestPlayerInfo(unittest.TestCase):
     def test_youtube_extract_player_info(self):
         PLAYER_URLS = (
-            ('https://www.youtube.com/s/player/4c3f79c5/player_ias.vflset/en_US/base.js', '4c3f79c5'),
             ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/en_US/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/fr_FR/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-de_DE.vflset/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-tablet-en_US.vflset/base.js', '64dddad9'),
             # obsolete
             ('https://www.youtube.com/yts/jsbin/player_ias-vfle4-e03/en_US/base.js', 'vfle4-e03'),
             ('https://www.youtube.com/yts/jsbin/player_ias-vfl49f_g4/en_US/base.js', 'vfl49f_g4'),
@@ -182,70 +86,59 @@ class TestPlayerInfo(unittest.TestCase):
             ('https://www.youtube.com/yts/jsbin/player-en_US-vflaxXRn1/base.js', 'vflaxXRn1'),
             ('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflXGBaUN.js', 'vflXGBaUN'),
             ('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js', 'vflKjOTVq'),
+            ('http://s.ytimg.com/yt/swfbin/watch_as3-vflrEm9Nq.swf', 'vflrEm9Nq'),
+            ('https://s.ytimg.com/yts/swfbin/player-vflenCdZL/watch_as3.swf', 'vflenCdZL'),
         )
         for player_url, expected_player_id in PLAYER_URLS:
-            player_id = YoutubeIE._extract_player_info(player_url)
+            expected_player_type = player_url.split('.')[-1]
+            player_type, player_id = YoutubeIE._extract_player_info(player_url)
+            self.assertEqual(player_type, expected_player_type)
             self.assertEqual(player_id, expected_player_id)
 
 
 class TestSignature(unittest.TestCase):
     def setUp(self):
         TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-        self.TESTDATA_DIR = os.path.join(TEST_DIR, 'testdata/sigs')
+        self.TESTDATA_DIR = os.path.join(TEST_DIR, 'testdata')
         if not os.path.exists(self.TESTDATA_DIR):
             os.mkdir(self.TESTDATA_DIR)
 
-    def tearDown(self):
-        try:
-            for f in os.listdir(self.TESTDATA_DIR):
-                os.remove(f)
-        except OSError:
-            pass
 
+def make_tfunc(url, stype, sig_input, expected_sig):
+    m = re.match(r'.*-([a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$', url)
+    assert m, '%r should follow URL format' % url
+    test_id = m.group(1)
 
-def t_factory(name, sig_func, url_pattern):
-    def make_tfunc(url, sig_input, expected_sig):
-        m = url_pattern.match(url)
-        assert m, '%r should follow URL format' % url
-        test_id = m.group('id')
+    def test_func(self):
+        basename = 'player-%s.%s' % (test_id, stype)
+        fn = os.path.join(self.TESTDATA_DIR, basename)
 
-        def test_func(self):
-            basename = 'player-{0}-{1}.js'.format(name, test_id)
-            fn = os.path.join(self.TESTDATA_DIR, basename)
+        if not os.path.exists(fn):
+            compat_urlretrieve(url, fn)
 
-            if not os.path.exists(fn):
-                compat_urlretrieve(url, fn)
-            with open(fn, encoding='utf-8') as testf:
+        ydl = FakeYDL()
+        ie = YoutubeIE(ydl)
+        if stype == 'js':
+            with io.open(fn, encoding='utf-8') as testf:
                 jscode = testf.read()
-            self.assertEqual(sig_func(jscode, sig_input), expected_sig)
+            func = ie._parse_sig_js(jscode)
+        else:
+            assert stype == 'swf'
+            with open(fn, 'rb') as testf:
+                swfcode = testf.read()
+            func = ie._parse_sig_swf(swfcode)
+        src_sig = (
+            compat_str(string.printable[:sig_input])
+            if isinstance(sig_input, int) else sig_input)
+        got_sig = func(src_sig)
+        self.assertEqual(got_sig, expected_sig)
 
-        test_func.__name__ = str('test_{0}_js_{1}'.format(name, test_id))
-        setattr(TestSignature, test_func.__name__, test_func)
-    return make_tfunc
+    test_func.__name__ = str('test_signature_' + stype + '_' + test_id)
+    setattr(TestSignature, test_func.__name__, test_func)
 
 
-def signature(jscode, sig_input):
-    func = YoutubeIE(FakeYDL())._parse_sig_js(jscode)
-    src_sig = (
-        compat_str(string.printable[:sig_input])
-        if isinstance(sig_input, int) else sig_input)
-    return func(src_sig)
-
-
-def n_sig(jscode, sig_input):
-    funcname = YoutubeIE(FakeYDL())._extract_n_function_name(jscode)
-    return JSInterpreter(jscode).call_function(funcname, sig_input)
-
-
-make_sig_test = t_factory(
-    'signature', signature, re.compile(r'.*-(?P<id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$'))
-for test_spec in _SIG_TESTS:
-    make_sig_test(*test_spec)
-
-make_nsig_test = t_factory(
-    'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_-]+)/.+.js$'))
-for test_spec in _NSIG_TESTS:
-    make_nsig_test(*test_spec)
+for test_spec in _TESTS:
+    make_tfunc(*test_spec)
 
 
 if __name__ == '__main__':

test/testdata/mpd/range_only.mpd

@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!-- MPD file Generated with GPAC version 1.0.1-revrelease at 2021-11-27T20:53:11.690Z -->
-<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" minBufferTime="PT1.500S" type="static" mediaPresentationDuration="PT0H0M30.196S" maxSegmentDuration="PT0H0M10.027S" profiles="urn:mpeg:dash:profile:full:2011">
- <ProgramInformation moreInformationURL="http://gpac.io">
-  <Title>manifest.mpd generated by GPAC</Title>
- </ProgramInformation>
-
- <Period duration="PT0H0M30.196S">
-  <AdaptationSet segmentAlignment="true" maxWidth="768" maxHeight="432" maxFrameRate="30000/1001" par="16:9" lang="und" startWithSAP="1">
-   <Representation id="1" mimeType="video/mp4" codecs="avc1.4D401E" width="768" height="432" frameRate="30000/1001" sar="1:1" bandwidth="526987">
-    <BaseURL>video_dashinit.mp4</BaseURL>
-    <SegmentList timescale="90000" duration="900000">
-     <Initialization range="0-881"/>
-     <SegmentURL mediaRange="882-876094" indexRange="882-925"/>
-     <SegmentURL mediaRange="876095-1466732" indexRange="876095-876138"/>
-     <SegmentURL mediaRange="1466733-1953615" indexRange="1466733-1466776"/>
-     <SegmentURL mediaRange="1953616-1994211" indexRange="1953616-1953659"/>
-    </SegmentList>
-   </Representation>
-  </AdaptationSet>
-  <AdaptationSet segmentAlignment="true" lang="und" startWithSAP="1">
-   <Representation id="2" mimeType="audio/mp4" codecs="mp4a.40.2" audioSamplingRate="48000" bandwidth="98096">
-    <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
-    <BaseURL>audio_dashinit.mp4</BaseURL>
-    <SegmentList timescale="48000" duration="480000">
-     <Initialization range="0-752"/>
-     <SegmentURL mediaRange="753-124129" indexRange="753-796"/>
-     <SegmentURL mediaRange="124130-250544" indexRange="124130-124173"/>
-     <SegmentURL mediaRange="250545-374929" indexRange="250545-250588"/>
-    </SegmentList>
-   </Representation>
-  </AdaptationSet>
- </Period>
-</MPD>
-

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>

test/testdata/mpd/url_and_range.mpd

@@ -1,32 +0,0 @@
-<?xml version="1.0" ?>
-<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" profiles="urn:mpeg:dash:profile:isoff-live:2011" minBufferTime="PT10.01S" mediaPresentationDuration="PT30.097S" type="static">
-  <!-- Created with Bento4 mp4-dash.py, VERSION=2.0.0-639 -->
-  <Period>
-    <!-- Video -->
-    <AdaptationSet mimeType="video/mp4" segmentAlignment="true" startWithSAP="1" maxWidth="768" maxHeight="432">
-      <Representation id="video-avc1" codecs="avc1.4D401E" width="768" height="432" scanType="progressive" frameRate="30000/1001" bandwidth="699597">
-        <SegmentList timescale="1000" duration="10010">
-          <Initialization sourceURL="video-frag.mp4" range="36-746"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="747-876117"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="876118-1466913"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="1466914-1953954"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="1953955-1994652"/>
-        </SegmentList>
-      </Representation>
-    </AdaptationSet>
-    <!-- Audio -->
-    <AdaptationSet mimeType="audio/mp4" startWithSAP="1" segmentAlignment="true">
-      <Representation id="audio-und-mp4a.40.2" codecs="mp4a.40.2" bandwidth="98808" audioSamplingRate="48000">
-        <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
-        <SegmentList timescale="1000" duration="10010">
-          <Initialization sourceURL="audio-frag.mp4" range="32-623"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="624-124199"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="124200-250303"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="250304-374365"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="374366-374836"/>
-        </SegmentList>
-      </Representation>
-    </AdaptationSet>
-  </Period>
-</MPD>
-

youtube_dl/__init__.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 
 __license__ = 'Public Domain'
 
+import codecs
 import io
 import os
 import random
@@ -16,7 +17,6 @@ from .options import (
 )
 from .compat import (
     compat_getpass,
-    compat_register_utf8,
     compat_shlex_split,
     workaround_optparse_bug9161,
 )
@@ -46,8 +46,10 @@ from .YoutubeDL import YoutubeDL
 
 
 def _real_main(argv=None):
-    # Compatibility fix for Windows
-    compat_register_utf8()
+    # Compatibility fixes for Windows
+    if sys.platform == 'win32':
+        # https://github.com/ytdl-org/youtube-dl/issues/820
+        codecs.register(lambda name: codecs.lookup('utf-8') if name == 'cp65001' else None)
 
     workaround_optparse_bug9161()
 
@@ -338,7 +340,6 @@ def _real_main(argv=None):
         'format': opts.format,
         'listformats': opts.listformats,
         'outtmpl': outtmpl,
-        'outtmpl_na_placeholder': opts.outtmpl_na_placeholder,
         'autonumber_size': opts.autonumber_size,
         'autonumber_start': opts.autonumber_start,
         'restrictfilenames': opts.restrictfilenames,

youtube_dl/aes.py

@@ -8,18 +8,6 @@ from .utils import bytes_to_intlist, intlist_to_bytes
 BLOCK_SIZE_BYTES = 16
 
 
-def pkcs7_padding(data):
-    """
-    PKCS#7 padding
-
-    @param {int[]} data        cleartext
-    @returns {int[]}           padding data
-    """
-
-    remaining_length = BLOCK_SIZE_BYTES - len(data) % BLOCK_SIZE_BYTES
-    return data + [remaining_length] * remaining_length
-
-
 def aes_ctr_decrypt(data, key, counter):
     """
     Decrypt with aes in counter mode
@@ -88,7 +76,8 @@ def aes_cbc_encrypt(data, key, iv):
     previous_cipher_block = iv
     for i in range(block_count):
         block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
-        block = pkcs7_padding(block)
+        remaining_length = BLOCK_SIZE_BYTES - len(block)
+        block += [remaining_length] * remaining_length
         mixed_block = xor(block, previous_cipher_block)
 
         encrypted_block = aes_encrypt(mixed_block, expanded_key)
@@ -99,28 +88,6 @@ def aes_cbc_encrypt(data, key, iv):
     return encrypted_data
 
 
-def aes_ecb_encrypt(data, key):
-    """
-    Encrypt with aes in ECB mode. Using PKCS#7 padding
-
-    @param {int[]} data        cleartext
-    @param {int[]} key         16/24/32-Byte cipher key
-    @returns {int[]}           encrypted data
-    """
-    expanded_key = key_expansion(key)
-    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
-
-    encrypted_data = []
-    for i in range(block_count):
-        block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
-        block = pkcs7_padding(block)
-
-        encrypted_block = aes_encrypt(block, expanded_key)
-        encrypted_data += encrypted_block
-
-    return encrypted_data
-
-
 def key_expansion(data):
     """
     Generate key schedule
@@ -336,7 +303,7 @@ def xor(data1, data2):
 
 
 def rijndael_mul(a, b):
-    if (a == 0 or b == 0):
+    if(a == 0 or b == 0):
         return 0
     return RIJNDAEL_EXP_TABLE[(RIJNDAEL_LOG_TABLE[a] + RIJNDAEL_LOG_TABLE[b]) % 0xFF]
 

youtube_dl/cache.py

@@ -1,32 +1,21 @@
 from __future__ import unicode_literals
 
 import errno
+import io
 import json
 import os
 import re
 import shutil
 import traceback
 
-from .compat import (
-    compat_getenv,
-    compat_open as open,
-)
+from .compat import compat_getenv
 from .utils import (
-    error_to_compat_str,
     expand_path,
-    is_outdated_version,
-    try_get,
     write_json_file,
 )
-from .version import __version__
 
 
 class Cache(object):
-
-    _YTDL_DIR = 'youtube-dl'
-    _VERSION_KEY = _YTDL_DIR + '_version'
-    _DEFAULT_VERSION = '2021.12.17'
-
     def __init__(self, ydl):
         self._ydl = ydl
 
@@ -34,7 +23,7 @@ class Cache(object):
         res = self._ydl.params.get('cachedir')
         if res is None:
             cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache')
-            res = os.path.join(cache_root, self._YTDL_DIR)
+            res = os.path.join(cache_root, 'youtube-dl')
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
@@ -61,22 +50,13 @@ class Cache(object):
             except OSError as ose:
                 if ose.errno != errno.EEXIST:
                     raise
-            write_json_file({self._VERSION_KEY: __version__, 'data': data}, fn)
+            write_json_file(data, fn)
         except Exception:
             tb = traceback.format_exc()
             self._ydl.report_warning(
                 'Writing cache to %r failed: %s' % (fn, tb))
 
-    def _validate(self, data, min_ver):
-        version = try_get(data, lambda x: x[self._VERSION_KEY])
-        if not version:  # Backward compatibility
-            data, version = {'data': data}, self._DEFAULT_VERSION
-        if not is_outdated_version(version, min_ver or '0', assume_new=False):
-            return data['data']
-        self._ydl.to_screen(
-            'Discarding old cache from version {version} (needs {min_ver})'.format(**locals()))
-
-    def load(self, section, key, dtype='json', default=None, min_ver=None):
+    def load(self, section, key, dtype='json', default=None):
         assert dtype in ('json',)
 
         if not self.enabled:
@@ -85,13 +65,13 @@ class Cache(object):
         cache_fn = self._get_cache_fn(section, key, dtype)
         try:
             try:
-                with open(cache_fn, 'r', encoding='utf-8') as cachef:
-                    return self._validate(json.load(cachef), min_ver)
+                with io.open(cache_fn, 'r', encoding='utf-8') as cachef:
+                    return json.load(cachef)
             except ValueError:
                 try:
                     file_size = os.path.getsize(cache_fn)
                 except (OSError, IOError) as oe:
-                    file_size = error_to_compat_str(oe)
+                    file_size = str(oe)
                 self._ydl.report_warning(
                     'Cache retrieval from %s failed (%s)' % (cache_fn, file_size))
         except IOError:

youtube_dl/compat.py

@@ -1,12 +1,10 @@
 # coding: utf-8
 from __future__ import unicode_literals
-from __future__ import division
 
 import base64
 import binascii
 import collections
 import ctypes
-import datetime
 import email
 import getpass
 import io
@@ -21,64 +19,14 @@ import socket
 import struct
 import subprocess
 import sys
-import types
 import xml.etree.ElementTree
 
-# naming convention
-# 'compat_' + Python3_name.replace('.', '_')
-# other aliases exist for convenience and/or legacy
-
-# deal with critical unicode/str things first
-try:
-    # Python 2
-    compat_str, compat_basestring, compat_chr = (
-        unicode, basestring, unichr
-    )
-except NameError:
-    compat_str, compat_basestring, compat_chr = (
-        str, (str, bytes), chr
-    )
-
-# casefold
-try:
-    compat_str.casefold
-    compat_casefold = lambda s: s.casefold()
-except AttributeError:
-    from .casefold import casefold as compat_casefold
-
-try:
-    import collections.abc as compat_collections_abc
-except ImportError:
-    import collections as compat_collections_abc
 
 try:
     import urllib.request as compat_urllib_request
 except ImportError:  # Python 2
     import urllib2 as compat_urllib_request
 
-# Also fix up lack of method arg in old Pythons
-try:
-    type(compat_urllib_request.Request('http://127.0.0.1', method='GET'))
-except TypeError:
-    def _add_init_method_arg(cls):
-
-        init = cls.__init__
-
-        def wrapped_init(self, *args, **kwargs):
-            method = kwargs.pop('method', 'GET')
-            init(self, *args, **kwargs)
-            if any(callable(x.__dict__.get('get_method')) for x in (self.__class__, self) if x != cls):
-                # allow instance or its subclass to override get_method()
-                return
-            if self.has_data() and method == 'GET':
-                method = 'POST'
-            self.get_method = types.MethodType(lambda _: method, self)
-
-        cls.__init__ = wrapped_init
-
-    _add_init_method_arg(compat_urllib_request.Request)
-    del _add_init_method_arg
-
 try:
     import urllib.error as compat_urllib_error
 except ImportError:  # Python 2
@@ -88,32 +36,26 @@ try:
     import urllib.parse as compat_urllib_parse
 except ImportError:  # Python 2
     import urllib as compat_urllib_parse
-    import urlparse as _urlparse
-    for a in dir(_urlparse):
-        if not hasattr(compat_urllib_parse, a):
-            setattr(compat_urllib_parse, a, getattr(_urlparse, a))
-    del _urlparse
 
-# unfavoured aliases
-compat_urlparse = compat_urllib_parse
-compat_urllib_parse_urlparse = compat_urllib_parse.urlparse
+try:
+    from urllib.parse import urlparse as compat_urllib_parse_urlparse
+except ImportError:  # Python 2
+    from urlparse import urlparse as compat_urllib_parse_urlparse
+
+try:
+    import urllib.parse as compat_urlparse
+except ImportError:  # Python 2
+    import urlparse as compat_urlparse
 
 try:
     import urllib.response as compat_urllib_response
 except ImportError:  # Python 2
     import urllib as compat_urllib_response
 
-try:
-    compat_urllib_response.addinfourl.status
-except AttributeError:
-    # .getcode() is deprecated in Py 3.
-    compat_urllib_response.addinfourl.status = property(lambda self: self.getcode())
-
 try:
     import http.cookiejar as compat_cookiejar
 except ImportError:  # Python 2
     import cookielib as compat_cookiejar
-compat_http_cookiejar = compat_cookiejar
 
 if sys.version_info[0] == 2:
     class compat_cookiejar_Cookie(compat_cookiejar.Cookie):
@@ -125,35 +67,11 @@ if sys.version_info[0] == 2:
             compat_cookiejar.Cookie.__init__(self, version, name, value, *args, **kwargs)
 else:
     compat_cookiejar_Cookie = compat_cookiejar.Cookie
-compat_http_cookiejar_Cookie = compat_cookiejar_Cookie
 
 try:
     import http.cookies as compat_cookies
 except ImportError:  # Python 2
     import Cookie as compat_cookies
-compat_http_cookies = compat_cookies
-
-if sys.version_info[0] == 2 or sys.version_info < (3, 3):
-    class compat_cookies_SimpleCookie(compat_cookies.SimpleCookie):
-        def load(self, rawdata):
-            must_have_value = 0
-            if not isinstance(rawdata, dict):
-                if sys.version_info[:2] != (2, 7) or sys.platform.startswith('java'):
-                    # attribute must have value for parsing
-                    rawdata, must_have_value = re.subn(
-                        r'(?i)(;\s*)(secure|httponly)(\s*(?:;|$))', r'\1\2=\2\3', rawdata)
-                if sys.version_info[0] == 2:
-                    if isinstance(rawdata, compat_str):
-                        rawdata = str(rawdata)
-            super(compat_cookies_SimpleCookie, self).load(rawdata)
-            if must_have_value > 0:
-                for morsel in self.values():
-                    for attr in ('secure', 'httponly'):
-                        if morsel.get(attr):
-                            morsel[attr] = True
-else:
-    compat_cookies_SimpleCookie = compat_cookies.SimpleCookie
-compat_http_cookies_SimpleCookie = compat_cookies_SimpleCookie
 
 try:
     import html.entities as compat_html_entities
@@ -2402,45 +2320,39 @@ try:
     import http.client as compat_http_client
 except ImportError:  # Python 2
     import httplib as compat_http_client
-try:
-    compat_http_client.HTTPResponse.getcode
-except AttributeError:
-    # Py < 3.1
-    compat_http_client.HTTPResponse.getcode = lambda self: self.status
 
 try:
     from urllib.error import HTTPError as compat_HTTPError
 except ImportError:  # Python 2
     from urllib2 import HTTPError as compat_HTTPError
-compat_urllib_HTTPError = compat_HTTPError
 
 try:
     from urllib.request import urlretrieve as compat_urlretrieve
 except ImportError:  # Python 2
     from urllib import urlretrieve as compat_urlretrieve
-compat_urllib_request_urlretrieve = compat_urlretrieve
 
 try:
-    from HTMLParser import (
-        HTMLParser as compat_HTMLParser,
-        HTMLParseError as compat_HTMLParseError)
-except ImportError:  # Python 3
     from html.parser import HTMLParser as compat_HTMLParser
+except ImportError:  # Python 2
+    from HTMLParser import HTMLParser as compat_HTMLParser
+
+try:  # Python 2
+    from HTMLParser import HTMLParseError as compat_HTMLParseError
+except ImportError:  # Python <3.4
     try:
         from html.parser import HTMLParseError as compat_HTMLParseError
     except ImportError:  # Python >3.4
-        # HTMLParseError was deprecated in Python 3.3 and removed in
+
+        # HTMLParseError has been deprecated in Python 3.3 and removed in
         # Python 3.5. Introducing dummy exception for Python >3.5 for compatible
         # and uniform cross-version exception handling
         class compat_HTMLParseError(Exception):
             pass
-compat_html_parser_HTMLParser = compat_HTMLParser
-compat_html_parser_HTMLParseError = compat_HTMLParseError
 
 try:
-    _DEVNULL = subprocess.DEVNULL
-    compat_subprocess_get_DEVNULL = lambda: _DEVNULL
-except AttributeError:
+    from subprocess import DEVNULL
+    compat_subprocess_get_DEVNULL = lambda: DEVNULL
+except ImportError:
     compat_subprocess_get_DEVNULL = lambda: open(os.path.devnull, 'w')
 
 try:
@@ -2448,12 +2360,15 @@ try:
 except ImportError:
     import BaseHTTPServer as compat_http_server
 
+try:
+    compat_str = unicode  # Python 2
+except NameError:
+    compat_str = str
+
 try:
     from urllib.parse import unquote_to_bytes as compat_urllib_parse_unquote_to_bytes
     from urllib.parse import unquote as compat_urllib_parse_unquote
     from urllib.parse import unquote_plus as compat_urllib_parse_unquote_plus
-    from urllib.parse import urlencode as compat_urllib_parse_urlencode
-    from urllib.parse import parse_qs as compat_parse_qs
 except ImportError:  # Python 2
     _asciire = (compat_urllib_parse._asciire if hasattr(compat_urllib_parse, '_asciire')
                 else re.compile(r'([\x00-\x7f]+)'))
@@ -2520,6 +2435,9 @@ except ImportError:  # Python 2
         string = string.replace('+', ' ')
         return compat_urllib_parse_unquote(string, encoding, errors)
 
+try:
+    from urllib.parse import urlencode as compat_urllib_parse_urlencode
+except ImportError:  # Python 2
     # Python 2 will choke in urlencode on mixture of byte and unicode strings.
     # Possible solutions are to either port it from python 3 with all
     # the friends or manually ensure input query contains only byte strings.
@@ -2541,62 +2459,7 @@ except ImportError:  # Python 2
         def encode_list(l):
             return [encode_elem(e) for e in l]
 
-        return compat_urllib_parse._urlencode(encode_elem(query), doseq=doseq)
-
-    # HACK: The following is the correct parse_qs implementation from cpython 3's stdlib.
-    # Python 2's version is apparently totally broken
-    def _parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
-                   encoding='utf-8', errors='replace'):
-        qs, _coerce_result = qs, compat_str
-        pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
-        r = []
-        for name_value in pairs:
-            if not name_value and not strict_parsing:
-                continue
-            nv = name_value.split('=', 1)
-            if len(nv) != 2:
-                if strict_parsing:
-                    raise ValueError('bad query field: %r' % (name_value,))
-                # Handle case of a control-name with no equal sign
-                if keep_blank_values:
-                    nv.append('')
-                else:
-                    continue
-            if len(nv[1]) or keep_blank_values:
-                name = nv[0].replace('+', ' ')
-                name = compat_urllib_parse_unquote(
-                    name, encoding=encoding, errors=errors)
-                name = _coerce_result(name)
-                value = nv[1].replace('+', ' ')
-                value = compat_urllib_parse_unquote(
-                    value, encoding=encoding, errors=errors)
-                value = _coerce_result(value)
-                r.append((name, value))
-        return r
-
-    def compat_parse_qs(qs, keep_blank_values=False, strict_parsing=False,
-                        encoding='utf-8', errors='replace'):
-        parsed_result = {}
-        pairs = _parse_qsl(qs, keep_blank_values, strict_parsing,
-                           encoding=encoding, errors=errors)
-        for name, value in pairs:
-            if name in parsed_result:
-                parsed_result[name].append(value)
-            else:
-                parsed_result[name] = [value]
-        return parsed_result
-
-    setattr(compat_urllib_parse, '_urlencode',
-            getattr(compat_urllib_parse, 'urlencode'))
-    for name, fix in (
-            ('unquote_to_bytes', compat_urllib_parse_unquote_to_bytes),
-            ('parse_unquote', compat_urllib_parse_unquote),
-            ('unquote_plus', compat_urllib_parse_unquote_plus),
-            ('urlencode', compat_urllib_parse_urlencode),
-            ('parse_qs', compat_parse_qs)):
-        setattr(compat_urllib_parse, name, fix)
-
-compat_urllib_parse_parse_qs = compat_parse_qs
+        return compat_urllib_parse.urlencode(encode_elem(query), doseq=doseq)
 
 try:
     from urllib.request import DataHandler as compat_urllib_request_DataHandler
@@ -2632,11 +2495,21 @@ except ImportError:  # Python < 3.4
 
             return compat_urllib_response.addinfourl(io.BytesIO(data), headers, url)
 
+try:
+    compat_basestring = basestring  # Python 2
+except NameError:
+    compat_basestring = str
+
+try:
+    compat_chr = unichr  # Python 2
+except NameError:
+    compat_chr = chr
+
 try:
     from xml.etree.ElementTree import ParseError as compat_xml_parse_error
 except ImportError:  # Python 2.6
     from xml.parsers.expat import ExpatError as compat_xml_parse_error
-compat_xml_etree_ElementTree_ParseError = compat_xml_parse_error
+
 
 etree = xml.etree.ElementTree
 
@@ -2650,11 +2523,10 @@ try:
     # xml.etree.ElementTree.Element is a method in Python <=2.6 and
     # the following will crash with:
     #  TypeError: isinstance() arg 2 must be a class, type, or tuple of classes and types
-    isinstance(None, etree.Element)
+    isinstance(None, xml.etree.ElementTree.Element)
     from xml.etree.ElementTree import Element as compat_etree_Element
 except TypeError:  # Python <=2.6
     from xml.etree.ElementTree import _ElementInterface as compat_etree_Element
-compat_xml_etree_ElementTree_Element = compat_etree_Element
 
 if sys.version_info[0] >= 3:
     def compat_etree_fromstring(text):
@@ -2710,7 +2582,6 @@ else:
             if k == uri or v == prefix:
                 del etree._namespace_map[k]
         etree._namespace_map[uri] = prefix
-compat_xml_etree_register_namespace = compat_etree_register_namespace
 
 if sys.version_info < (2, 7):
     # Here comes the crazy part: In 2.6, if the xpath is a unicode,
@@ -2719,222 +2590,55 @@ if sys.version_info < (2, 7):
         if isinstance(xpath, compat_str):
             xpath = xpath.encode('ascii')
         return xpath
-
-    # further code below based on CPython 2.7 source
-    import functools
-
-    _xpath_tokenizer_re = re.compile(r'''(?x)
-        (                                   # (1)
-            '[^']*'|"[^"]*"|                # quoted strings, or
-            ::|//?|\.\.|\(\)|[/.*:[\]()@=]  # navigation specials
-        )|                                  # or (2)
-        ((?:\{[^}]+\})?[^/[\]()@=\s]+)|     # token: optional {ns}, no specials
-        \s+                                 # or white space
-    ''')
-
-    def _xpath_tokenizer(pattern, namespaces=None):
-        for token in _xpath_tokenizer_re.findall(pattern):
-            tag = token[1]
-            if tag and tag[0] != "{" and ":" in tag:
-                try:
-                    if not namespaces:
-                        raise KeyError
-                    prefix, uri = tag.split(":", 1)
-                    yield token[0], "{%s}%s" % (namespaces[prefix], uri)
-                except KeyError:
-                    raise SyntaxError("prefix %r not found in prefix map" % prefix)
-            else:
-                yield token
-
-    def _get_parent_map(context):
-        parent_map = context.parent_map
-        if parent_map is None:
-            context.parent_map = parent_map = {}
-            for p in context.root.getiterator():
-                for e in p:
-                    parent_map[e] = p
-        return parent_map
-
-    def _select(context, result, filter_fn=lambda *_: True):
-        for elem in result:
-            for e in elem:
-                if filter_fn(e, elem):
-                    yield e
-
-    def _prepare_child(next_, token):
-        tag = token[1]
-        return functools.partial(_select, filter_fn=lambda e, _: e.tag == tag)
-
-    def _prepare_star(next_, token):
-        return _select
-
-    def _prepare_self(next_, token):
-        return lambda _, result: (e for e in result)
-
-    def _prepare_descendant(next_, token):
-        token = next(next_)
-        if token[0] == "*":
-            tag = "*"
-        elif not token[0]:
-            tag = token[1]
-        else:
-            raise SyntaxError("invalid descendant")
-
-        def select(context, result):
-            for elem in result:
-                for e in elem.getiterator(tag):
-                    if e is not elem:
-                        yield e
-        return select
-
-    def _prepare_parent(next_, token):
-        def select(context, result):
-            # FIXME: raise error if .. is applied at toplevel?
-            parent_map = _get_parent_map(context)
-            result_map = {}
-            for elem in result:
-                if elem in parent_map:
-                    parent = parent_map[elem]
-                    if parent not in result_map:
-                        result_map[parent] = None
-                        yield parent
-        return select
-
-    def _prepare_predicate(next_, token):
-        signature = []
-        predicate = []
-        for token in next_:
-            if token[0] == "]":
-                break
-            if token[0] and token[0][:1] in "'\"":
-                token = "'", token[0][1:-1]
-            signature.append(token[0] or "-")
-            predicate.append(token[1])
-
-        def select(context, result, filter_fn=lambda _: True):
-            for elem in result:
-                if filter_fn(elem):
-                    yield elem
-
-        signature = "".join(signature)
-        # use signature to determine predicate type
-        if signature == "@-":
-            # [@attribute] predicate
-            key = predicate[1]
-            return functools.partial(
-                select, filter_fn=lambda el: el.get(key) is not None)
-        if signature == "@-='":
-            # [@attribute='value']
-            key = predicate[1]
-            value = predicate[-1]
-            return functools.partial(
-                select, filter_fn=lambda el: el.get(key) == value)
-        if signature == "-" and not re.match(r"\d+$", predicate[0]):
-            # [tag]
-            tag = predicate[0]
-            return functools.partial(
-                select, filter_fn=lambda el: el.find(tag) is not None)
-        if signature == "-='" and not re.match(r"\d+$", predicate[0]):
-            # [tag='value']
-            tag = predicate[0]
-            value = predicate[-1]
-
-            def itertext(el):
-                for e in el.getiterator():
-                    e = e.text
-                    if e:
-                        yield e
-
-            def select(context, result):
-                for elem in result:
-                    for e in elem.findall(tag):
-                        if "".join(itertext(e)) == value:
-                            yield elem
-                            break
-            return select
-        if signature == "-" or signature == "-()" or signature == "-()-":
-            # [index] or [last()] or [last()-index]
-            if signature == "-":
-                index = int(predicate[0]) - 1
-            else:
-                if predicate[0] != "last":
-                    raise SyntaxError("unsupported function")
-                if signature == "-()-":
-                    try:
-                        index = int(predicate[2]) - 1
-                    except ValueError:
-                        raise SyntaxError("unsupported expression")
-                else:
-                    index = -1
-
-            def select(context, result):
-                parent_map = _get_parent_map(context)
-                for elem in result:
-                    try:
-                        parent = parent_map[elem]
-                        # FIXME: what if the selector is "*" ?
-                        elems = list(parent.findall(elem.tag))
-                        if elems[index] is elem:
-                            yield elem
-                    except (IndexError, KeyError):
-                        pass
-            return select
-        raise SyntaxError("invalid predicate")
-
-    ops = {
-        "": _prepare_child,
-        "*": _prepare_star,
-        ".": _prepare_self,
-        "..": _prepare_parent,
-        "//": _prepare_descendant,
-        "[": _prepare_predicate,
-    }
-
-    _cache = {}
-
-    class _SelectorContext:
-        parent_map = None
-
-        def __init__(self, root):
-            self.root = root
-
-    ##
-    # Generate all matching objects.
-
-    def compat_etree_iterfind(elem, path, namespaces=None):
-        # compile selector pattern
-        if path[-1:] == "/":
-            path = path + "*"  # implicit all (FIXME: keep this?)
-        try:
-            selector = _cache[path]
-        except KeyError:
-            if len(_cache) > 100:
-                _cache.clear()
-            if path[:1] == "/":
-                raise SyntaxError("cannot use absolute path on element")
-            tokens = _xpath_tokenizer(path, namespaces)
-            selector = []
-            for token in tokens:
-                if token[0] == "/":
-                    continue
-                try:
-                    selector.append(ops[token[0]](tokens, token))
-                except StopIteration:
-                    raise SyntaxError("invalid path")
-            _cache[path] = selector
-        # execute selector pattern
-        result = [elem]
-        context = _SelectorContext(elem)
-        for select in selector:
-            result = select(context, result)
-        return result
-
-    # end of code based on CPython 2.7 source
-
-
 else:
     compat_xpath = lambda xpath: xpath
-    compat_etree_iterfind = lambda element, match: element.iterfind(match)
+
+try:
+    from urllib.parse import parse_qs as compat_parse_qs
+except ImportError:  # Python 2
+    # HACK: The following is the correct parse_qs implementation from cpython 3's stdlib.
+    # Python 2's version is apparently totally broken
+
+    def _parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
+                   encoding='utf-8', errors='replace'):
+        qs, _coerce_result = qs, compat_str
+        pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
+        r = []
+        for name_value in pairs:
+            if not name_value and not strict_parsing:
+                continue
+            nv = name_value.split('=', 1)
+            if len(nv) != 2:
+                if strict_parsing:
+                    raise ValueError('bad query field: %r' % (name_value,))
+                # Handle case of a control-name with no equal sign
+                if keep_blank_values:
+                    nv.append('')
+                else:
+                    continue
+            if len(nv[1]) or keep_blank_values:
+                name = nv[0].replace('+', ' ')
+                name = compat_urllib_parse_unquote(
+                    name, encoding=encoding, errors=errors)
+                name = _coerce_result(name)
+                value = nv[1].replace('+', ' ')
+                value = compat_urllib_parse_unquote(
+                    value, encoding=encoding, errors=errors)
+                value = _coerce_result(value)
+                r.append((name, value))
+        return r
+
+    def compat_parse_qs(qs, keep_blank_values=False, strict_parsing=False,
+                        encoding='utf-8', errors='replace'):
+        parsed_result = {}
+        pairs = _parse_qsl(qs, keep_blank_values, strict_parsing,
+                           encoding=encoding, errors=errors)
+        for name, value in pairs:
+            if name in parsed_result:
+                parsed_result[name].append(value)
+            else:
+                parsed_result[name] = [value]
+        return parsed_result
 
 
 compat_os_name = os._name if os.name == 'java' else os.name
@@ -2970,7 +2674,7 @@ except (AssertionError, UnicodeEncodeError):
 
 
 def compat_ord(c):
-    if isinstance(c, int):
+    if type(c) is int:
         return c
     else:
         return ord(c)
@@ -3060,8 +2764,6 @@ else:
     else:
         compat_expanduser = os.path.expanduser
 
-compat_os_path_expanduser = compat_expanduser
-
 
 if compat_os_name == 'nt' and sys.version_info < (3, 8):
     # os.path.realpath on Windows does not follow symbolic links
@@ -3073,8 +2775,6 @@ if compat_os_name == 'nt' and sys.version_info < (3, 8):
 else:
     compat_realpath = os.path.realpath
 
-compat_os_path_realpath = compat_realpath
-
 
 if sys.version_info < (3, 0):
     def compat_print(s):
@@ -3095,15 +2795,11 @@ if sys.version_info < (3, 0) and sys.platform == 'win32':
 else:
     compat_getpass = getpass.getpass
 
-compat_getpass_getpass = compat_getpass
-
-
 try:
     compat_input = raw_input
 except NameError:  # Python 3
     compat_input = input
 
-
 # Python < 2.6.5 require kwargs to be bytes
 try:
     def _testfunc(x):
@@ -3154,51 +2850,6 @@ else:
     compat_socket_create_connection = socket.create_connection
 
 
-try:
-    from contextlib import suppress as compat_contextlib_suppress
-except ImportError:
-    class compat_contextlib_suppress(object):
-        _exceptions = None
-
-        def __init__(self, *exceptions):
-            super(compat_contextlib_suppress, self).__init__()
-            # TODO: [Base]ExceptionGroup (3.12+)
-            self._exceptions = exceptions
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, exc_type, exc_val, exc_tb):
-            return exc_type is not None and issubclass(exc_type, self._exceptions or tuple())
-
-
-# subprocess.Popen context manager
-# avoids leaking handles if .communicate() is not called
-try:
-    _Popen = subprocess.Popen
-    # check for required context manager attributes
-    _Popen.__enter__ and _Popen.__exit__
-    compat_subprocess_Popen = _Popen
-except AttributeError:
-    # not a context manager - make one
-    from contextlib import contextmanager
-
-    @contextmanager
-    def compat_subprocess_Popen(*args, **kwargs):
-        popen = None
-        try:
-            popen = _Popen(*args, **kwargs)
-            yield popen
-        finally:
-            if popen:
-                for f in (popen.stdin, popen.stdout, popen.stderr):
-                    if f:
-                        # repeated .close() is OK, but just in case
-                        with compat_contextlib_suppress(EnvironmentError):
-                            f.close()
-                popen.wait()
-
-
 # Fix https://github.com/ytdl-org/youtube-dl/issues/4223
 # See http://bugs.python.org/issue9161 for what is broken
 def workaround_optparse_bug9161():
@@ -3226,7 +2877,6 @@ else:
     _terminal_size = collections.namedtuple('terminal_size', ['columns', 'lines'])
 
     def compat_get_terminal_size(fallback=(80, 24)):
-        from .utils import process_communicate_or_kill
         columns = compat_getenv('COLUMNS')
         if columns:
             columns = int(columns)
@@ -3243,7 +2893,7 @@ else:
                 sp = subprocess.Popen(
                     ['stty', 'size'],
                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                out, err = process_communicate_or_kill(sp)
+                out, err = sp.communicate()
                 _lines, _columns = map(int, out.split())
             except Exception:
                 _columns, _lines = _terminal_size(*fallback)
@@ -3254,16 +2904,15 @@ else:
                 lines = _lines
         return _terminal_size(columns, lines)
 
-
 try:
     itertools.count(start=0, step=1)
     compat_itertools_count = itertools.count
 except TypeError:  # Python 2.6
     def compat_itertools_count(start=0, step=1):
+        n = start
         while True:
-            yield start
-            start += step
-
+            yield n
+            n += step
 
 if sys.version_info >= (3, 0):
     from tokenize import tokenize as compat_tokenize_tokenize
@@ -3304,24 +2953,6 @@ else:
         compat_Struct = struct.Struct
 
 
-# compat_map/filter() returning an iterator, supposedly the
-# same versioning as for zip below
-try:
-    from future_builtins import map as compat_map
-except ImportError:
-    try:
-        from itertools import imap as compat_map
-    except ImportError:
-        compat_map = map
-
-try:
-    from future_builtins import filter as compat_filter
-except ImportError:
-    try:
-        from itertools import ifilter as compat_filter
-    except ImportError:
-        compat_filter = filter
-
 try:
     from future_builtins import zip as compat_zip
 except ImportError:  # not 2.6+ or is 3.x
@@ -3331,82 +2962,6 @@ except ImportError:  # not 2.6+ or is 3.x
         compat_zip = zip
 
 
-# method renamed between Py2/3
-try:
-    from itertools import zip_longest as compat_itertools_zip_longest
-except ImportError:
-    from itertools import izip_longest as compat_itertools_zip_longest
-
-
-# new class in collections
-try:
-    from collections import ChainMap as compat_collections_chain_map
-    # Py3.3's ChainMap is deficient
-    if sys.version_info < (3, 4):
-        raise ImportError
-except ImportError:
-    # Py <= 3.3
-    class compat_collections_chain_map(compat_collections_abc.MutableMapping):
-
-        maps = [{}]
-
-        def __init__(self, *maps):
-            self.maps = list(maps) or [{}]
-
-        def __getitem__(self, k):
-            for m in self.maps:
-                if k in m:
-                    return m[k]
-            raise KeyError(k)
-
-        def __setitem__(self, k, v):
-            self.maps[0].__setitem__(k, v)
-            return
-
-        def __contains__(self, k):
-            return any((k in m) for m in self.maps)
-
-        def __delitem(self, k):
-            if k in self.maps[0]:
-                del self.maps[0][k]
-                return
-            raise KeyError(k)
-
-        def __delitem__(self, k):
-            self.__delitem(k)
-
-        def __iter__(self):
-            return itertools.chain(*reversed(self.maps))
-
-        def __len__(self):
-            return len(iter(self))
-
-        # to match Py3, don't del directly
-        def pop(self, k, *args):
-            if self.__contains__(k):
-                off = self.__getitem__(k)
-                self.__delitem(k)
-                return off
-            elif len(args) > 0:
-                return args[0]
-            raise KeyError(k)
-
-        def new_child(self, m=None, **kwargs):
-            m = m or {}
-            m.update(kwargs)
-            return compat_collections_chain_map(m, *self.maps)
-
-        @property
-        def parents(self):
-            return compat_collections_chain_map(*(self.maps[1:]))
-
-
-# Pythons disagree on the type of a pattern (RegexObject, _sre.SRE_Pattern, Pattern, ...?)
-compat_re_Pattern = type(re.compile(''))
-# and on the type of a match
-compat_re_Match = type(re.match('a', 'a'))
-
-
 if sys.version_info < (3, 3):
     def compat_b64decode(s, *args, **kwargs):
         if isinstance(s, compat_str):
@@ -3415,8 +2970,6 @@ if sys.version_info < (3, 3):
 else:
     compat_b64decode = base64.b64decode
 
-compat_base64_b64decode = compat_b64decode
-
 
 if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
     # PyPy2 prior to version 5.4.0 expects byte strings as Windows function
@@ -3436,97 +2989,25 @@ else:
         return ctypes.WINFUNCTYPE(*args, **kwargs)
 
 
-if sys.version_info < (3, 0):
-    # open(file, mode='r', buffering=- 1, encoding=None, errors=None, newline=None, closefd=True) not: opener=None
-    def compat_open(file_, *args, **kwargs):
-        if len(args) > 6 or 'opener' in kwargs:
-            raise ValueError('open: unsupported argument "opener"')
-        return io.open(file_, *args, **kwargs)
-else:
-    compat_open = open
-
-
-# compat_register_utf8
-def compat_register_utf8():
-    if sys.platform == 'win32':
-        # https://github.com/ytdl-org/youtube-dl/issues/820
-        from codecs import register, lookup
-        register(
-            lambda name: lookup('utf-8') if name == 'cp65001' else None)
-
-
-# compat_datetime_timedelta_total_seconds
-try:
-    compat_datetime_timedelta_total_seconds = datetime.timedelta.total_seconds
-except AttributeError:
-    # Py 2.6
-    def compat_datetime_timedelta_total_seconds(td):
-        return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
-
-# optional decompression packages
-# PyPi brotli package implements 'br' Content-Encoding
-try:
-    import brotli as compat_brotli
-except ImportError:
-    compat_brotli = None
-# PyPi ncompress package implements 'compress' Content-Encoding
-try:
-    import ncompress as compat_ncompress
-except ImportError:
-    compat_ncompress = None
-
-
-legacy = [
+__all__ = [
     'compat_HTMLParseError',
     'compat_HTMLParser',
     'compat_HTTPError',
+    'compat_Struct',
     'compat_b64decode',
+    'compat_basestring',
+    'compat_chr',
     'compat_cookiejar',
     'compat_cookiejar_Cookie',
     'compat_cookies',
-    'compat_cookies_SimpleCookie',
+    'compat_ctypes_WINFUNCTYPE',
     'compat_etree_Element',
+    'compat_etree_fromstring',
     'compat_etree_register_namespace',
     'compat_expanduser',
-    'compat_getpass',
-    'compat_parse_qs',
-    'compat_realpath',
-    'compat_urllib_parse_parse_qs',
-    'compat_urllib_parse_unquote',
-    'compat_urllib_parse_unquote_plus',
-    'compat_urllib_parse_unquote_to_bytes',
-    'compat_urllib_parse_urlencode',
-    'compat_urllib_parse_urlparse',
-    'compat_urlparse',
-    'compat_urlretrieve',
-    'compat_xml_parse_error',
-]
-
-
-__all__ = [
-    'compat_html_parser_HTMLParseError',
-    'compat_html_parser_HTMLParser',
-    'compat_Struct',
-    'compat_base64_b64decode',
-    'compat_basestring',
-    'compat_brotli',
-    'compat_casefold',
-    'compat_chr',
-    'compat_collections_abc',
-    'compat_collections_chain_map',
-    'compat_datetime_timedelta_total_seconds',
-    'compat_http_cookiejar',
-    'compat_http_cookiejar_Cookie',
-    'compat_http_cookies',
-    'compat_http_cookies_SimpleCookie',
-    'compat_contextlib_suppress',
-    'compat_ctypes_WINFUNCTYPE',
-    'compat_etree_fromstring',
-    'compat_etree_iterfind',
-    'compat_filter',
     'compat_get_terminal_size',
     'compat_getenv',
-    'compat_getpass_getpass',
+    'compat_getpass',
     'compat_html_entities',
     'compat_html_entities_html5',
     'compat_http_client',
@@ -3534,20 +3015,13 @@ __all__ = [
     'compat_input',
     'compat_integer_types',
     'compat_itertools_count',
-    'compat_itertools_zip_longest',
     'compat_kwargs',
-    'compat_map',
-    'compat_ncompress',
     'compat_numeric_types',
-    'compat_open',
     'compat_ord',
     'compat_os_name',
-    'compat_os_path_expanduser',
-    'compat_os_path_realpath',
+    'compat_parse_qs',
     'compat_print',
-    'compat_re_Match',
-    'compat_re_Pattern',
-    'compat_register_utf8',
+    'compat_realpath',
     'compat_setenv',
     'compat_shlex_quote',
     'compat_shlex_split',
@@ -3556,18 +3030,20 @@ __all__ = [
     'compat_struct_pack',
     'compat_struct_unpack',
     'compat_subprocess_get_DEVNULL',
-    'compat_subprocess_Popen',
     'compat_tokenize_tokenize',
     'compat_urllib_error',
     'compat_urllib_parse',
+    'compat_urllib_parse_unquote',
+    'compat_urllib_parse_unquote_plus',
+    'compat_urllib_parse_unquote_to_bytes',
+    'compat_urllib_parse_urlencode',
+    'compat_urllib_parse_urlparse',
     'compat_urllib_request',
     'compat_urllib_request_DataHandler',
     'compat_urllib_response',
-    'compat_urllib_request_urlretrieve',
-    'compat_urllib_HTTPError',
-    'compat_xml_etree_ElementTree_Element',
-    'compat_xml_etree_ElementTree_ParseError',
-    'compat_xml_etree_register_namespace',
+    'compat_urlparse',
+    'compat_urlretrieve',
+    'compat_xml_parse_error',
     'compat_xpath',
     'compat_zip',
     'workaround_optparse_bug9161',

youtube_dl/downloader/__init__.py

@@ -1,31 +1,22 @@
 from __future__ import unicode_literals
 
-from ..utils import (
-    determine_protocol,
-)
-
-
-def get_suitable_downloader(info_dict, params={}):
-    info_dict['protocol'] = determine_protocol(info_dict)
-    info_copy = info_dict.copy()
-    return _get_suitable_downloader(info_copy, params)
-
-
-# Some of these require get_suitable_downloader
 from .common import FileDownloader
-from .dash import DashSegmentsFD
 from .f4m import F4mFD
 from .hls import HlsFD
 from .http import HttpFD
 from .rtmp import RtmpFD
+from .dash import DashSegmentsFD
 from .rtsp import RtspFD
 from .ism import IsmFD
-from .niconico import NiconicoDmcFD
 from .external import (
     get_external_downloader,
     FFmpegFD,
 )
 
+from ..utils import (
+    determine_protocol,
+)
+
 PROTOCOL_MAP = {
     'rtmp': RtmpFD,
     'm3u8_native': HlsFD,
@@ -35,12 +26,13 @@ PROTOCOL_MAP = {
     'f4m': F4mFD,
     'http_dash_segments': DashSegmentsFD,
     'ism': IsmFD,
-    'niconico_dmc': NiconicoDmcFD,
 }
 
 
-def _get_suitable_downloader(info_dict, params={}):
+def get_suitable_downloader(info_dict, params={}):
     """Get the downloader class that can handle the info dict."""
+    protocol = determine_protocol(info_dict)
+    info_dict['protocol'] = protocol
 
     # if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict):
     #     return FFmpegFD
@@ -50,11 +42,7 @@ def _get_suitable_downloader(info_dict, params={}):
         ed = get_external_downloader(external_downloader)
         if ed.can_download(info_dict):
             return ed
-        # Avoid using unwanted args since external_downloader was rejected
-        if params.get('external_downloader_args'):
-            params['external_downloader_args'] = None
 
-    protocol = info_dict['protocol']
     if protocol.startswith('m3u8') and info_dict.get('is_live'):
         return FFmpegFD
 

youtube_dl/downloader/common.py

@@ -88,21 +88,17 @@ class FileDownloader(object):
             return '---.-%'
         return '%6s' % ('%3.1f%%' % percent)
 
-    @classmethod
-    def calc_eta(cls, start_or_rate, now_or_remaining, *args):
-        if len(args) < 2:
-            rate, remaining = (start_or_rate, now_or_remaining)
-            if None in (rate, remaining):
-                return None
-            return int(float(remaining) / rate)
-        start, now = (start_or_rate, now_or_remaining)
-        total, current = args[:2]
+    @staticmethod
+    def calc_eta(start, now, total, current):
         if total is None:
             return None
         if now is None:
             now = time.time()
-        rate = cls.calc_speed(start, now, current)
-        return rate and int((float(total) - float(current)) / rate)
+        dif = now - start
+        if current == 0 or dif < 0.001:  # One millisecond
+            return None
+        rate = float(current) / dif
+        return int((float(total) - float(current)) / rate)
 
     @staticmethod
     def format_eta(eta):
@@ -127,12 +123,6 @@ class FileDownloader(object):
     def format_retries(retries):
         return 'inf' if retries == float('inf') else '%.0f' % retries
 
-    @staticmethod
-    def filesize_or_none(unencoded_filename):
-        fn = encodeFilename(unencoded_filename)
-        if os.path.isfile(fn):
-            return os.path.getsize(fn)
-
     @staticmethod
     def best_block_size(elapsed_time, bytes):
         new_min = max(bytes / 2.0, 1.0)
@@ -339,10 +329,6 @@ class FileDownloader(object):
     def download(self, filename, info_dict):
         """Download to a filename using the info from info_dict
         Return True on success and False otherwise
-
-        This method filters the `Cookie` header from the info_dict to prevent leaks.
-        Downloaders have their own way of handling cookies.
-        See: https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-v8mc-9377-rwjj
         """
 
         nooverwrites_and_exists = (

youtube_dl/downloader/dash.py

@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 
-import itertools
-
 from .fragment import FragmentFD
 from ..compat import compat_urllib_error
 from ..utils import (
@@ -32,28 +30,26 @@ class DashSegmentsFD(FragmentFD):
         fragment_retries = self.params.get('fragment_retries', 0)
         skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
 
-        for frag_index, fragment in enumerate(fragments, 1):
+        frag_index = 0
+        for i, fragment in enumerate(fragments):
+            frag_index += 1
             if frag_index <= ctx['fragment_index']:
                 continue
-            success = False
             # In DASH, the first segment contains necessary headers to
             # generate a valid MP4 file, so always abort for the first segment
-            fatal = frag_index == 1 or not skip_unavailable_fragments
-            fragment_url = fragment.get('url')
-            if not fragment_url:
-                assert fragment_base_url
-                fragment_url = urljoin(fragment_base_url, fragment['path'])
-            headers = info_dict.get('http_headers')
-            fragment_range = fragment.get('range')
-            if fragment_range:
-                headers = headers.copy() if headers else {}
-                headers['Range'] = 'bytes=%s' % (fragment_range,)
-            for count in itertools.count():
+            fatal = i == 0 or not skip_unavailable_fragments
+            count = 0
+            while count <= fragment_retries:
                 try:
-                    success, frag_content = self._download_fragment(ctx, fragment_url, info_dict, headers)
+                    fragment_url = fragment.get('url')
+                    if not fragment_url:
+                        assert fragment_base_url
+                        fragment_url = urljoin(fragment_base_url, fragment['path'])
+                    success, frag_content = self._download_fragment(ctx, fragment_url, info_dict)
                     if not success:
                         return False
                     self._append_fragment(ctx, frag_content)
+                    break
                 except compat_urllib_error.HTTPError as err:
                     # YouTube may often return 404 HTTP error for a fragment causing the
                     # whole download to fail. However if the same fragment is immediately
@@ -61,21 +57,22 @@ class DashSegmentsFD(FragmentFD):
                     # is usually enough) thus allowing to download the whole file successfully.
                     # To be future-proof we will retry all fragments that fail with any
                     # HTTP error.
-                    if count < fragment_retries:
-                        self.report_retry_fragment(err, frag_index, count + 1, fragment_retries)
-                        continue
+                    count += 1
+                    if count <= fragment_retries:
+                        self.report_retry_fragment(err, frag_index, count, fragment_retries)
                 except DownloadError:
                     # Don't retry fragment if error occurred during HTTP downloading
-                    # itself since it has its own retry settings
-                    if fatal:
-                        raise
-                break
+                    # itself since it has own retry settings
+                    if not fatal:
+                        self.report_skip_fragment(frag_index)
+                        break
+                    raise
 
-            if not success:
+            if count > fragment_retries:
                 if not fatal:
                     self.report_skip_fragment(frag_index)
                     continue
-                self.report_error('giving up after %s fragment retries' % count)
+                self.report_error('giving up after %s fragment retries' % fragment_retries)
                 return False
 
         self._finish_frag_download(ctx)

youtube_dl/downloader/external.py

@@ -1,24 +1,17 @@
 from __future__ import unicode_literals
 
-import os
+import os.path
 import re
 import subprocess
 import sys
-import tempfile
 import time
 
 from .common import FileDownloader
 from ..compat import (
     compat_setenv,
     compat_str,
-    compat_subprocess_Popen,
 )
-
-try:
-    from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS
-except ImportError:
-    FFmpegPostProcessor = None
-
+from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS
 from ..utils import (
     cli_option,
     cli_valueless_option,
@@ -29,9 +22,6 @@ from ..utils import (
     handle_youtubedl_headers,
     check_executable,
     is_outdated_version,
-    process_communicate_or_kill,
-    T,
-    traverse_obj,
 )
 
 
@@ -39,7 +29,6 @@ class ExternalFD(FileDownloader):
     def real_download(self, filename, info_dict):
         self.report_destination(filename)
         tmpfilename = self.temp_name(filename)
-        self._cookies_tempfile = None
 
         try:
             started = time.time()
@@ -52,13 +41,6 @@ class ExternalFD(FileDownloader):
             # should take place
             retval = 0
             self.to_screen('[%s] Interrupted by user' % self.get_basename())
-        finally:
-            if self._cookies_tempfile and os.path.isfile(self._cookies_tempfile):
-                try:
-                    os.remove(self._cookies_tempfile)
-                except OSError:
-                    self.report_warning(
-                        'Unable to delete temporary cookies file "{0}"'.format(self._cookies_tempfile))
 
         if retval == 0:
             status = {
@@ -114,16 +96,6 @@ class ExternalFD(FileDownloader):
     def _configuration_args(self, default=[]):
         return cli_configuration_args(self.params, 'external_downloader_args', default)
 
-    def _write_cookies(self):
-        if not self.ydl.cookiejar.filename:
-            tmp_cookies = tempfile.NamedTemporaryFile(suffix='.cookies', delete=False)
-            tmp_cookies.close()
-            self._cookies_tempfile = tmp_cookies.name
-            self.to_screen('[download] Writing temporary cookies file to "{0}"'.format(self._cookies_tempfile))
-        # real_download resets _cookies_tempfile; if it's None, save() will write to cookiejar.filename
-        self.ydl.cookiejar.save(self._cookies_tempfile, ignore_discard=True, ignore_expires=True)
-        return self.ydl.cookiejar.filename or self._cookies_tempfile
-
     def _call_downloader(self, tmpfilename, info_dict):
         """ Either overwrite this or implement _make_cmd """
         cmd = [encodeArgument(a) for a in self._make_cmd(tmpfilename, info_dict)]
@@ -132,26 +104,18 @@ class ExternalFD(FileDownloader):
 
         p = subprocess.Popen(
             cmd, stderr=subprocess.PIPE)
-        _, stderr = process_communicate_or_kill(p)
+        _, stderr = p.communicate()
         if p.returncode != 0:
             self.to_stderr(stderr.decode('utf-8', 'replace'))
         return p.returncode
 
-    @staticmethod
-    def _header_items(info_dict):
-        return traverse_obj(
-            info_dict, ('http_headers', T(dict.items), Ellipsis))
-
 
 class CurlFD(ExternalFD):
     AVAILABLE_OPT = '-V'
 
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '--location', '-o', tmpfilename, '--compressed']
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
-        if cookie_header:
-            cmd += ['--cookie', cookie_header]
-        for key, val in self._header_items(info_dict):
+        cmd = [self.exe, '--location', '-o', tmpfilename]
+        for key, val in info_dict['http_headers'].items():
             cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._bool_option('--continue-at', 'continuedl', '-', '0')
         cmd += self._valueless_option('--silent', 'noprogress')
@@ -177,7 +141,7 @@ class CurlFD(ExternalFD):
 
         # curl writes the progress to stderr so don't capture it.
         p = subprocess.Popen(cmd)
-        process_communicate_or_kill(p)
+        p.communicate()
         return p.returncode
 
 
@@ -186,11 +150,8 @@ class AxelFD(ExternalFD):
 
     def _make_cmd(self, tmpfilename, info_dict):
         cmd = [self.exe, '-o', tmpfilename]
-        for key, val in self._header_items(info_dict):
+        for key, val in info_dict['http_headers'].items():
             cmd += ['-H', '%s: %s' % (key, val)]
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
-        if cookie_header:
-            cmd += ['-H', 'Cookie: {0}'.format(cookie_header), '--max-redirect=0']
         cmd += self._configuration_args()
         cmd += ['--', info_dict['url']]
         return cmd
@@ -200,10 +161,8 @@ class WgetFD(ExternalFD):
     AVAILABLE_OPT = '--version'
 
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '-O', tmpfilename, '-nv', '--compression=auto']
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
-            cmd += ['--load-cookies', self._write_cookies()]
-        for key, val in self._header_items(info_dict):
+        cmd = [self.exe, '-O', tmpfilename, '-nv', '--no-cookies']
+        for key, val in info_dict['http_headers'].items():
             cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._option('--limit-rate', 'ratelimit')
         retry = self._option('--tries', 'retries')
@@ -212,10 +171,7 @@ class WgetFD(ExternalFD):
                 retry[1] = '0'
             cmd += retry
         cmd += self._option('--bind-address', 'source_address')
-        proxy = self.params.get('proxy')
-        if proxy:
-            for var in ('http_proxy', 'https_proxy'):
-                cmd += ['--execute', '%s=%s' % (var, proxy)]
+        cmd += self._option('--proxy', 'proxy')
         cmd += self._valueless_option('--no-check-certificate', 'nocheckcertificate')
         cmd += self._configuration_args()
         cmd += ['--', info_dict['url']]
@@ -225,121 +181,24 @@ class WgetFD(ExternalFD):
 class Aria2cFD(ExternalFD):
     AVAILABLE_OPT = '-v'
 
-    @staticmethod
-    def _aria2c_filename(fn):
-        return fn if os.path.isabs(fn) else os.path.join('.', fn)
-
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '-c',
-               '--console-log-level=warn', '--summary-interval=0', '--download-result=hide',
-               '--http-accept-gzip=true', '--file-allocation=none', '-x16', '-j16', '-s16']
-        if 'fragments' in info_dict:
-            cmd += ['--allow-overwrite=true', '--allow-piece-length-change=true']
-        else:
-            cmd += ['--min-split-size', '1M']
-
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
-            cmd += ['--load-cookies={0}'.format(self._write_cookies())]
-        for key, val in self._header_items(info_dict):
-            cmd += ['--header', '%s: %s' % (key, val)]
-        cmd += self._configuration_args(['--max-connection-per-server', '4'])
+        cmd = [self.exe, '-c']
+        cmd += self._configuration_args([
+            '--min-split-size', '1M', '--max-connection-per-server', '4'])
+        dn = os.path.dirname(tmpfilename)
+        if dn:
+            cmd += ['--dir', dn]
         cmd += ['--out', os.path.basename(tmpfilename)]
-        cmd += self._option('--max-overall-download-limit', 'ratelimit')
+        for key, val in info_dict['http_headers'].items():
+            cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._option('--interface', 'source_address')
         cmd += self._option('--all-proxy', 'proxy')
         cmd += self._bool_option('--check-certificate', 'nocheckcertificate', 'false', 'true', '=')
         cmd += self._bool_option('--remote-time', 'updatetime', 'true', 'false', '=')
-        cmd += self._bool_option('--show-console-readout', 'noprogress', 'false', 'true', '=')
-        cmd += self._configuration_args()
-
-        # aria2c strips out spaces from the beginning/end of filenames and paths.
-        # We work around this issue by adding a "./" to the beginning of the
-        # filename and relative path, and adding a "/" at the end of the path.
-        # See: https://github.com/yt-dlp/yt-dlp/issues/276
-        # https://github.com/ytdl-org/youtube-dl/issues/20312
-        # https://github.com/aria2/aria2/issues/1373
-        dn = os.path.dirname(tmpfilename)
-        if dn:
-            cmd += ['--dir', self._aria2c_filename(dn) + os.path.sep]
-        if 'fragments' not in info_dict:
-            cmd += ['--out', self._aria2c_filename(os.path.basename(tmpfilename))]
-        cmd += ['--auto-file-renaming=false']
-        if 'fragments' in info_dict:
-            cmd += ['--file-allocation=none', '--uri-selector=inorder']
-            url_list_file = '%s.frag.urls' % (tmpfilename, )
-            url_list = []
-            for frag_index, fragment in enumerate(info_dict['fragments']):
-                fragment_filename = '%s-Frag%d' % (os.path.basename(tmpfilename), frag_index)
-                url_list.append('%s\n\tout=%s' % (fragment['url'], self._aria2c_filename(fragment_filename)))
-            stream, _ = self.sanitize_open(url_list_file, 'wb')
-            stream.write('\n'.join(url_list).encode())
-            stream.close()
-            cmd += ['-i', self._aria2c_filename(url_list_file)]
-        else:
-            cmd += ['--', info_dict['url']]
+        cmd += ['--', info_dict['url']]
         return cmd
 
 
-class Aria2pFD(ExternalFD):
-    ''' Aria2pFD class
-    This class support to use aria2p as downloader.
-    (Aria2p, a command-line tool and Python library to interact with an aria2c daemon process
-    through JSON-RPC.)
-    It can help you to get download progress more easily.
-    To use aria2p as downloader, you need to install aria2c and aria2p, aria2p can download with pip.
-    Then run aria2c in the background and enable with the --enable-rpc option.
-    '''
-    try:
-        import aria2p
-        __avail = True
-    except ImportError:
-        __avail = False
-
-    @classmethod
-    def available(cls):
-        return cls.__avail
-
-    def _call_downloader(self, tmpfilename, info_dict):
-        aria2 = self.aria2p.API(
-            self.aria2p.Client(
-                host='http://localhost',
-                port=6800,
-                secret=''
-            )
-        )
-
-        options = {
-            'min-split-size': '1M',
-            'max-connection-per-server': 4,
-            'auto-file-renaming': 'false',
-        }
-        options['dir'] = os.path.dirname(tmpfilename) or os.path.abspath('.')
-        options['out'] = os.path.basename(tmpfilename)
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
-            options['load-cookies'] = self._write_cookies()
-        options['header'] = []
-        for key, val in self._header_items(info_dict):
-            options['header'].append('{0}: {1}'.format(key, val))
-        download = aria2.add_uris([info_dict['url']], options)
-        status = {
-            'status': 'downloading',
-            'tmpfilename': tmpfilename,
-        }
-        started = time.time()
-        while download.status in ['active', 'waiting']:
-            download = aria2.get_download(download.gid)
-            status.update({
-                'downloaded_bytes': download.completed_length,
-                'total_bytes': download.total_length,
-                'elapsed': time.time() - started,
-                'eta': download.eta.total_seconds(),
-                'speed': download.download_speed,
-            })
-            self._hook_progress(status)
-            time.sleep(.5)
-        return download.status != 'complete'
-
-
 class HttpieFD(ExternalFD):
     @classmethod
     def available(cls):
@@ -347,34 +206,25 @@ class HttpieFD(ExternalFD):
 
     def _make_cmd(self, tmpfilename, info_dict):
         cmd = ['http', '--download', '--output', tmpfilename, info_dict['url']]
-        for key, val in self._header_items(info_dict):
+        for key, val in info_dict['http_headers'].items():
             cmd += ['%s:%s' % (key, val)]
-
-        # httpie 3.1.0+ removes the Cookie header on redirect, so this should be safe for now. [1]
-        # If we ever need cookie handling for redirects, we can export the cookiejar into a session. [2]
-        # 1: https://github.com/httpie/httpie/security/advisories/GHSA-9w4w-cpc8-h2fq
-        # 2: https://httpie.io/docs/cli/sessions
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
-        if cookie_header:
-            cmd += ['Cookie:%s' % cookie_header]
         return cmd
 
 
 class FFmpegFD(ExternalFD):
     @classmethod
     def supports(cls, info_dict):
-        return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms', 'http_dash_segments')
+        return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms')
 
     @classmethod
     def available(cls):
-        # actual availability can only be confirmed for an instance
-        return bool(FFmpegPostProcessor)
+        return FFmpegPostProcessor().available
 
     def _call_downloader(self, tmpfilename, info_dict):
-        # `downloader` means the parent `YoutubeDL`
-        ffpp = FFmpegPostProcessor(downloader=self.ydl)
+        url = info_dict['url']
+        ffpp = FFmpegPostProcessor(downloader=self)
         if not ffpp.available:
-            self.report_error('ffmpeg required for download but no ffmpeg (nor avconv) executable could be found. Please install one.')
+            self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
             return False
         ffpp.check_version()
 
@@ -403,15 +253,7 @@ class FFmpegFD(ExternalFD):
         # if end_time:
         #     args += ['-t', compat_str(end_time - start_time)]
 
-        url = info_dict['url']
-        cookies = self.ydl.cookiejar.get_cookies_for_url(url)
-        if cookies:
-            args.extend(['-cookies', ''.join(
-                '{0}={1}; path={2}; domain={3};\r\n'.format(
-                    cookie.name, cookie.value, cookie.path, cookie.domain)
-                for cookie in cookies)])
-
-        if info_dict.get('http_headers') and re.match(r'^https?://', url):
+        if info_dict['http_headers'] and re.match(r'^https?://', url):
             # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
             # [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
             headers = handle_youtubedl_headers(info_dict['http_headers'])
@@ -491,25 +333,18 @@ class FFmpegFD(ExternalFD):
 
         self._debug_cmd(args)
 
-        # From [1], a PIPE opened in Popen() should be closed, unless
-        # .communicate() is called. Avoid leaking any PIPEs by using Popen
-        # as a context manager (newer Python 3.x and compat)
-        # Fixes "Resource Warning" in test/test_downloader_external.py
-        # [1] https://devpress.csdn.net/python/62fde12d7e66823466192e48.html
-        with compat_subprocess_Popen(args, stdin=subprocess.PIPE, env=env) as proc:
-            try:
-                retval = proc.wait()
-            except BaseException as e:
-                # subprocess.run would send the SIGKILL signal to ffmpeg and the
-                # mp4 file couldn't be played, but if we ask ffmpeg to quit it
-                # produces a file that is playable (this is mostly useful for live
-                # streams). Note that Windows is not affected and produces playable
-                # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
-                if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32':
-                    process_communicate_or_kill(proc, b'q')
-                else:
-                    proc.kill()
-                raise
+        proc = subprocess.Popen(args, stdin=subprocess.PIPE, env=env)
+        try:
+            retval = proc.wait()
+        except KeyboardInterrupt:
+            # subprocces.run would send the SIGKILL signal to ffmpeg and the
+            # mp4 file couldn't be played, but if we ask ffmpeg to quit it
+            # produces a file that is playable (this is mostly useful for live
+            # streams). Note that Windows is not affected and produces playable
+            # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
+            if sys.platform != 'win32':
+                proc.communicate(b'q')
+            raise
         return retval
 
 

youtube_dl/downloader/fragment.py

@@ -71,7 +71,7 @@ class FragmentFD(FileDownloader):
 
     @staticmethod
     def __do_ytdl_file(ctx):
-        return ctx['live'] is not True and ctx['tmpfilename'] != '-'
+        return not ctx['live'] and not ctx['tmpfilename'] == '-'
 
     def _read_ytdl_file(self, ctx):
         assert 'ytdl_corrupt' not in ctx
@@ -97,22 +97,12 @@ class FragmentFD(FileDownloader):
 
     def _download_fragment(self, ctx, frag_url, info_dict, headers=None):
         fragment_filename = '%s-Frag%d' % (ctx['tmpfilename'], ctx['fragment_index'])
-        fragment_info_dict = {
+        success = ctx['dl'].download(fragment_filename, {
             'url': frag_url,
             'http_headers': headers or info_dict.get('http_headers'),
-        }
-        frag_resume_len = 0
-        if ctx['dl'].params.get('continuedl', True):
-            frag_resume_len = self.filesize_or_none(
-                self.temp_name(fragment_filename))
-        fragment_info_dict['frag_resume_len'] = frag_resume_len
-        ctx['frag_resume_len'] = frag_resume_len or 0
-
-        success = ctx['dl'].download(fragment_filename, fragment_info_dict)
+        })
         if not success:
             return False, None
-        if fragment_info_dict.get('filetime'):
-            ctx['fragment_filetime'] = fragment_info_dict.get('filetime')
         down, frag_sanitized = sanitize_open(fragment_filename, 'rb')
         ctx['fragment_filename_sanitized'] = frag_sanitized
         frag_content = down.read()
@@ -131,7 +121,9 @@ class FragmentFD(FileDownloader):
             del ctx['fragment_filename_sanitized']
 
     def _prepare_frag_download(self, ctx):
-        if not ctx.setdefault('live', False):
+        if 'live' not in ctx:
+            ctx['live'] = False
+        if not ctx['live']:
             total_frags_str = '%d' % ctx['total_frags']
             ad_frags = ctx.get('ad_frags', 0)
             if ad_frags:
@@ -141,11 +133,10 @@ class FragmentFD(FileDownloader):
         self.to_screen(
             '[%s] Total fragments: %s' % (self.FD_NAME, total_frags_str))
         self.report_destination(ctx['filename'])
-        continuedl = self.params.get('continuedl', True)
         dl = HttpQuietDownloader(
             self.ydl,
             {
-                'continuedl': continuedl,
+                'continuedl': True,
                 'quiet': True,
                 'noprogress': True,
                 'ratelimit': self.params.get('ratelimit'),
@@ -156,11 +147,12 @@ class FragmentFD(FileDownloader):
         )
         tmpfilename = self.temp_name(ctx['filename'])
         open_mode = 'wb'
+        resume_len = 0
 
         # Establish possible resume length
-        resume_len = self.filesize_or_none(tmpfilename) or 0
-        if resume_len > 0:
+        if os.path.isfile(encodeFilename(tmpfilename)):
             open_mode = 'ab'
+            resume_len = os.path.getsize(encodeFilename(tmpfilename))
 
         # Should be initialized before ytdl file check
         ctx.update({
@@ -169,8 +161,7 @@ class FragmentFD(FileDownloader):
         })
 
         if self.__do_ytdl_file(ctx):
-            ytdl_file_exists = os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename'])))
-            if continuedl and ytdl_file_exists:
+            if os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename']))):
                 self._read_ytdl_file(ctx)
                 is_corrupt = ctx.get('ytdl_corrupt') is True
                 is_inconsistent = ctx['fragment_index'] > 0 and resume_len == 0
@@ -184,12 +175,7 @@ class FragmentFD(FileDownloader):
                     if 'ytdl_corrupt' in ctx:
                         del ctx['ytdl_corrupt']
                     self._write_ytdl_file(ctx)
-
             else:
-                if not continuedl:
-                    if ytdl_file_exists:
-                        self._read_ytdl_file(ctx)
-                    ctx['fragment_index'] = resume_len = 0
                 self._write_ytdl_file(ctx)
                 assert ctx['fragment_index'] == 0
 
@@ -220,7 +206,6 @@ class FragmentFD(FileDownloader):
         start = time.time()
         ctx.update({
             'started': start,
-            'fragment_started': start,
             # Amount of fragment's bytes downloaded by the time of the previous
             # frag progress hook invocation
             'prev_frag_downloaded_bytes': 0,
@@ -230,9 +215,6 @@ class FragmentFD(FileDownloader):
             if s['status'] not in ('downloading', 'finished'):
                 return
 
-            if not total_frags and ctx.get('fragment_count'):
-                state['fragment_count'] = ctx['fragment_count']
-
             time_now = time.time()
             state['elapsed'] = time_now - start
             frag_total_bytes = s.get('total_bytes') or 0
@@ -247,17 +229,16 @@ class FragmentFD(FileDownloader):
                 ctx['fragment_index'] = state['fragment_index']
                 state['downloaded_bytes'] += frag_total_bytes - ctx['prev_frag_downloaded_bytes']
                 ctx['complete_frags_downloaded_bytes'] = state['downloaded_bytes']
-                ctx['speed'] = state['speed'] = self.calc_speed(
-                    ctx['fragment_started'], time_now, frag_total_bytes)
-                ctx['fragment_started'] = time.time()
                 ctx['prev_frag_downloaded_bytes'] = 0
             else:
                 frag_downloaded_bytes = s['downloaded_bytes']
                 state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
-                ctx['speed'] = state['speed'] = self.calc_speed(
-                    ctx['fragment_started'], time_now, frag_downloaded_bytes - ctx['frag_resume_len'])
                 if not ctx['live']:
-                    state['eta'] = self.calc_eta(state['speed'], estimated_size - state['downloaded_bytes'])
+                    state['eta'] = self.calc_eta(
+                        start, time_now, estimated_size - resume_len,
+                        state['downloaded_bytes'] - resume_len)
+                state['speed'] = s.get('speed') or ctx.get('speed')
+                ctx['speed'] = state['speed']
                 ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
             self._hook_progress(state)
 
@@ -277,14 +258,7 @@ class FragmentFD(FileDownloader):
             downloaded_bytes = ctx['complete_frags_downloaded_bytes']
         else:
             self.try_rename(ctx['tmpfilename'], ctx['filename'])
-            if self.params.get('updatetime', True):
-                filetime = ctx.get('fragment_filetime')
-                if filetime:
-                    try:
-                        os.utime(ctx['filename'], (time.time(), filetime))
-                    except Exception:
-                        pass
-            downloaded_bytes = self.filesize_or_none(ctx['filename']) or 0
+            downloaded_bytes = os.path.getsize(encodeFilename(ctx['filename']))
 
         self._hook_progress({
             'downloaded_bytes': downloaded_bytes,

youtube_dl/downloader/hls.py

@@ -42,13 +42,11 @@ class HlsFD(FragmentFD):
             # no segments will definitely be appended to the end of the playlist.
             # r'#EXT-X-PLAYLIST-TYPE:EVENT',  # media segments may be appended to the end of
             #                                 # event media playlists [4]
-            r'#EXT-X-MAP:',  # media initialization [5]
 
             # 1. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.4
             # 2. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.2
             # 3. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3.2
             # 4. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3.5
-            # 5. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.5
         )
         check_results = [not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES]
         is_aes128_enc = '#EXT-X-KEY:METHOD=AES-128' in manifest
@@ -172,12 +170,8 @@ class HlsFD(FragmentFD):
                         iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', media_sequence)
                         decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(
                             self._prepare_url(info_dict, info_dict.get('_decryption_key_url') or decrypt_info['URI'])).read()
-                        # Don't decrypt the content in tests since the data is explicitly truncated and it's not to a valid block
-                        # size (see https://github.com/ytdl-org/youtube-dl/pull/27660). Tests only care that the correct data downloaded,
-                        # not what it decrypts to.
-                        if not test:
-                            frag_content = AES.new(
-                                decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
+                        frag_content = AES.new(
+                            decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
                     self._append_fragment(ctx, frag_content)
                     # We only download the first fragment during the test
                     if test:

youtube_dl/downloader/http.py

@@ -58,9 +58,9 @@ class HttpFD(FileDownloader):
 
         if self.params.get('continuedl', True):
             # Establish possible resume length
-            ctx.resume_len = info_dict.get('frag_resume_len')
-            if ctx.resume_len is None:
-                ctx.resume_len = self.filesize_or_none(ctx.tmpfilename) or 0
+            if os.path.isfile(encodeFilename(ctx.tmpfilename)):
+                ctx.resume_len = os.path.getsize(
+                    encodeFilename(ctx.tmpfilename))
 
         ctx.is_resume = ctx.resume_len > 0
 
@@ -115,9 +115,9 @@ class HttpFD(FileDownloader):
                         raise RetryDownload(err)
                     raise err
                 # When trying to resume, Content-Range HTTP header of response has to be checked
-                # to match the value of requested Range HTTP header. This is due to webservers
+                # to match the value of requested Range HTTP header. This is due to a webservers
                 # that don't support resuming and serve a whole file with no Content-Range
-                # set in response despite requested Range (see
+                # set in response despite of requested Range (see
                 # https://github.com/ytdl-org/youtube-dl/issues/6057#issuecomment-126129799)
                 if has_range:
                     content_range = ctx.data.headers.get('Content-Range')
@@ -141,8 +141,7 @@ class HttpFD(FileDownloader):
                     # Content-Range is either not present or invalid. Assuming remote webserver is
                     # trying to send the whole file, resume is not possible, so wiping the local file
                     # and performing entire redownload
-                    if range_start > 0:
-                        self.report_unable_to_resume()
+                    self.report_unable_to_resume()
                     ctx.resume_len = 0
                     ctx.open_mode = 'wb'
                 ctx.data_len = int_or_none(ctx.data.info().get('Content-length', None))
@@ -294,7 +293,10 @@ class HttpFD(FileDownloader):
 
                 # Progress message
                 speed = self.calc_speed(start, now, byte_counter - ctx.resume_len)
-                eta = self.calc_eta(speed, ctx.data_len and (ctx.data_len - byte_counter))
+                if ctx.data_len is None:
+                    eta = None
+                else:
+                    eta = self.calc_eta(start, time.time(), ctx.data_len - ctx.resume_len, byte_counter - ctx.resume_len)
 
                 self._hook_progress({
                     'status': 'downloading',

youtube_dl/downloader/niconico.py

@@ -1,66 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-try:
-    import threading
-except ImportError:
-    threading = None
-
-from .common import FileDownloader
-from ..downloader import get_suitable_downloader
-from ..extractor.niconico import NiconicoIE
-from ..utils import sanitized_Request
-
-
-class NiconicoDmcFD(FileDownloader):
-    """ Downloading niconico douga from DMC with heartbeat """
-
-    FD_NAME = 'niconico_dmc'
-
-    def real_download(self, filename, info_dict):
-        self.to_screen('[%s] Downloading from DMC' % self.FD_NAME)
-
-        ie = NiconicoIE(self.ydl)
-        info_dict, heartbeat_info_dict = ie._get_heartbeat_info(info_dict)
-
-        fd = get_suitable_downloader(info_dict, params=self.params)(self.ydl, self.params)
-        for ph in self._progress_hooks:
-            fd.add_progress_hook(ph)
-
-        if not threading:
-            self.to_screen('[%s] Threading for Heartbeat not available' % self.FD_NAME)
-            return fd.real_download(filename, info_dict)
-
-        success = download_complete = False
-        timer = [None]
-        heartbeat_lock = threading.Lock()
-        heartbeat_url = heartbeat_info_dict['url']
-        heartbeat_data = heartbeat_info_dict['data'].encode()
-        heartbeat_interval = heartbeat_info_dict.get('interval', 30)
-
-        request = sanitized_Request(heartbeat_url, heartbeat_data)
-
-        def heartbeat():
-            try:
-                self.ydl.urlopen(request).read()
-            except Exception:
-                self.to_screen('[%s] Heartbeat failed' % self.FD_NAME)
-
-            with heartbeat_lock:
-                if not download_complete:
-                    timer[0] = threading.Timer(heartbeat_interval, heartbeat)
-                    timer[0].start()
-
-        heartbeat_info_dict['ping']()
-        self.to_screen('[%s] Heartbeat with %d second interval ...' % (self.FD_NAME, heartbeat_interval))
-        try:
-            heartbeat()
-            if type(fd).__name__ == 'HlsFD':
-                info_dict.update(ie._extract_m3u8_formats(info_dict['url'], info_dict['id'])[0])
-            success = fd.real_download(filename, info_dict)
-        finally:
-            if heartbeat_lock:
-                with heartbeat_lock:
-                    timer[0].cancel()
-                    download_complete = True
-            return success

youtube_dl/downloader/rtmp.py

@@ -89,13 +89,11 @@ class RtmpFD(FileDownloader):
                                 self.to_screen('')
                             cursor_in_new_line = True
                             self.to_screen('[rtmpdump] ' + line)
-                if not cursor_in_new_line:
-                    self.to_screen('')
-                return proc.wait()
-            except BaseException:  # Including KeyboardInterrupt
-                proc.kill()
+            finally:
                 proc.wait()
-                raise
+            if not cursor_in_new_line:
+                self.to_screen('')
+            return proc.returncode
 
         url = info_dict['url']
         player_url = info_dict.get('player_url')

youtube_dl/extractor/abcnews.py

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

youtube_dl/extractor/acast.py

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

youtube_dl/extractor/adn.py

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

youtube_dl/extractor/aenetworks.py

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

youtube_dl/extractor/aliexpress.py

@@ -18,7 +18,7 @@ class AliExpressLiveIE(InfoExtractor):
             'id': '2800002704436634',
             'ext': 'mp4',
             'title': 'CASIMA7.22',
-            'thumbnail': r're:https?://.*\.jpg',
+            'thumbnail': r're:http://.*\.jpg',
             'uploader': 'CASIMA Official Store',
             'timestamp': 1500717600,
             'upload_date': '20170722',

youtube_dl/extractor/aljazeera.py

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

youtube_dl/extractor/alsace20tv.py

@@ -1,89 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    dict_get,
-    get_element_by_class,
-    int_or_none,
-    unified_strdate,
-    url_or_none,
-)
-
-
-class Alsace20TVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?alsace20\.tv/(?:[\w-]+/)+[\w-]+-(?P<id>[\w]+)'
-    _TESTS = [{
-        'url': 'https://www.alsace20.tv/VOD/Actu/JT/Votre-JT-jeudi-3-fevrier-lyNHCXpYJh.html',
-        # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',
-        'info_dict': {
-            'id': 'lyNHCXpYJh',
-            'ext': 'mp4',
-            'description': 'md5:fc0bc4a0692d3d2dba4524053de4c7b7',
-            'title': 'Votre JT du jeudi 3 février',
-            'upload_date': '20220203',
-            'thumbnail': r're:https?://.+\.jpg',
-            'duration': 1073,
-            'view_count': int,
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    def _extract_video(self, video_id, url=None):
-        info = self._download_json(
-            'https://www.alsace20.tv/visionneuse/visio_v9_js.php?key=%s&habillage=0&mode=html' % (video_id, ),
-            video_id) or {}
-        title = info['titre']
-
-        formats = []
-        for res, fmt_url in (info.get('files') or {}).items():
-            formats.extend(
-                self._extract_smil_formats(fmt_url, video_id, fatal=False)
-                if '/smil:_' in fmt_url
-                else self._extract_mpd_formats(fmt_url, video_id, mpd_id=res, fatal=False))
-        self._sort_formats(formats)
-
-        webpage = (url and self._download_webpage(url, video_id, fatal=False)) or ''
-        thumbnail = url_or_none(dict_get(info, ('image', 'preview', )) or self._og_search_thumbnail(webpage))
-        upload_date = self._search_regex(r'/(\d{6})_', thumbnail, 'upload_date', default=None)
-        upload_date = unified_strdate('20%s-%s-%s' % (upload_date[:2], upload_date[2:4], upload_date[4:])) if upload_date else None
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'description': clean_html(get_element_by_class('wysiwyg', webpage)),
-            'upload_date': upload_date,
-            'thumbnail': thumbnail,
-            'duration': int_or_none(self._og_search_property('video:duration', webpage) if webpage else None),
-            'view_count': int_or_none(info.get('nb_vues')),
-        }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self._extract_video(video_id, url)
-
-
-class Alsace20TVEmbedIE(Alsace20TVIE):
-    _VALID_URL = r'https?://(?:www\.)?alsace20\.tv/emb/(?P<id>[\w]+)'
-    _TESTS = [{
-        'url': 'https://www.alsace20.tv/emb/lyNHCXpYJh',
-        # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',
-        'info_dict': {
-            'id': 'lyNHCXpYJh',
-            'ext': 'mp4',
-            'title': 'Votre JT du jeudi 3 février',
-            'upload_date': '20220203',
-            'thumbnail': r're:https?://.+\.jpg',
-            'view_count': int,
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self._extract_video(video_id)

youtube_dl/extractor/amcnetworks.py

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

youtube_dl/extractor/americastestkitchen.py

@@ -1,68 +1,34 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import json
-import re
-
 from .common import InfoExtractor
 from ..utils import (
     clean_html,
     int_or_none,
+    js_to_json,
     try_get,
     unified_strdate,
-    unified_timestamp,
 )
 
 
 class AmericasTestKitchenIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:americastestkitchen|cooks(?:country|illustrated))\.com/(?:cooks(?:country|illustrated)/)?(?P<resource_type>episode|videos)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?americastestkitchen\.com/(?:episode|videos)/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.americastestkitchen.com/episode/582-weeknight-japanese-suppers',
         'md5': 'b861c3e365ac38ad319cfd509c30577f',
         'info_dict': {
             'id': '5b400b9ee338f922cb06450c',
-            'title': 'Japanese Suppers',
+            'title': 'Weeknight Japanese Suppers',
             'ext': 'mp4',
-            'display_id': 'weeknight-japanese-suppers',
-            'description': 'md5:64e606bfee910627efc4b5f050de92b3',
-            'timestamp': 1523304000,
-            'upload_date': '20180409',
-            'release_date': '20180409',
+            'description': 'md5:3d0c1a44bb3b27607ce82652db25b4a8',
+            'thumbnail': r're:^https?://',
+            'timestamp': 1523664000,
+            'upload_date': '20180414',
+            'release_date': '20180414',
             'series': "America's Test Kitchen",
-            'season': 'Season 18',
             'season_number': 18,
-            'episode': 'Japanese Suppers',
+            'episode': 'Weeknight Japanese Suppers',
             'episode_number': 15,
-            'duration': 1376,
-            'thumbnail': r're:^https?://',
-            'average_rating': 0,
-            'view_count': int,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # Metadata parsing behaves differently for newer episodes (705) as opposed to older episodes (582 above)
-        'url': 'https://www.americastestkitchen.com/episode/705-simple-chicken-dinner',
-        'md5': '06451608c57651e985a498e69cec17e5',
-        'info_dict': {
-            'id': '5fbe8c61bda2010001c6763b',
-            'title': 'Simple Chicken Dinner',
-            'ext': 'mp4',
-            'display_id': 'atktv_2103_simple-chicken-dinner_full-episode_web-mp4',
-            'description': 'md5:eb68737cc2fd4c26ca7db30139d109e7',
-            'timestamp': 1610737200,
-            'upload_date': '20210115',
-            'release_date': '20210115',
-            'series': "America's Test Kitchen",
-            'season': 'Season 21',
-            'season_number': 21,
-            'episode': 'Simple Chicken Dinner',
-            'episode_number': 3,
-            'duration': 1397,
-            'thumbnail': r're:^https?://',
-            'view_count': int,
-            'average_rating': 0,
         },
         'params': {
             'skip_download': True,
@@ -70,151 +36,47 @@ class AmericasTestKitchenIE(InfoExtractor):
     }, {
         'url': 'https://www.americastestkitchen.com/videos/3420-pan-seared-salmon',
         'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cookscountry/episode/564-when-only-chocolate-will-do',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cooksillustrated/videos/4478-beef-wellington',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cookscountry.com/episode/564-when-only-chocolate-will-do',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cooksillustrated.com/videos/4478-beef-wellington',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        resource_type, video_id = re.match(self._VALID_URL, url).groups()
-        is_episode = resource_type == 'episode'
-        if is_episode:
-            resource_type = 'episodes'
+        video_id = self._match_id(url)
 
-        resource = self._download_json(
-            'https://www.americastestkitchen.com/api/v6/%s/%s' % (resource_type, video_id), video_id)
-        video = resource['video'] if is_episode else resource
-        episode = resource if is_episode else resource.get('episode') or {}
+        webpage = self._download_webpage(url, video_id)
+
+        video_data = self._parse_json(
+            self._search_regex(
+                r'window\.__INITIAL_STATE__\s*=\s*({.+?})\s*;\s*</script>',
+                webpage, 'initial context'),
+            video_id, js_to_json)
+
+        ep_data = try_get(
+            video_data,
+            (lambda x: x['episodeDetail']['content']['data'],
+             lambda x: x['videoDetail']['content']['data']), dict)
+        ep_meta = ep_data.get('full_video', {})
+
+        zype_id = ep_data.get('zype_id') or ep_meta['zype_id']
+
+        title = ep_data.get('title') or ep_meta.get('title')
+        description = clean_html(ep_meta.get('episode_description') or ep_data.get(
+            'description') or ep_meta.get('description'))
+        thumbnail = try_get(ep_meta, lambda x: x['photo']['image_url'])
+        release_date = unified_strdate(ep_data.get('aired_at'))
+
+        season_number = int_or_none(ep_meta.get('season_number'))
+        episode = ep_meta.get('title')
+        episode_number = int_or_none(ep_meta.get('episode_number'))
 
         return {
             '_type': 'url_transparent',
-            'url': 'https://player.zype.com/embed/%s.js?api_key=jZ9GUhRmxcPvX7M3SlfejB6Hle9jyHTdk2jVxG7wOHPLODgncEKVdPYBhuz9iWXQ' % video['zypeId'],
+            'url': 'https://player.zype.com/embed/%s.js?api_key=jZ9GUhRmxcPvX7M3SlfejB6Hle9jyHTdk2jVxG7wOHPLODgncEKVdPYBhuz9iWXQ' % zype_id,
             'ie_key': 'Zype',
-            'description': clean_html(video.get('description')),
-            'timestamp': unified_timestamp(video.get('publishDate')),
-            'release_date': unified_strdate(video.get('publishDate')),
-            'episode_number': int_or_none(episode.get('number')),
-            'season_number': int_or_none(episode.get('season')),
-            'series': try_get(episode, lambda x: x['show']['title']),
-            'episode': episode.get('title'),
+            'title': title,
+            'description': description,
+            'thumbnail': thumbnail,
+            'release_date': release_date,
+            'series': "America's Test Kitchen",
+            'season_number': season_number,
+            'episode': episode,
+            'episode_number': episode_number,
         }
-
-
-class AmericasTestKitchenSeasonIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?P<show>americastestkitchen|(?P<cooks>cooks(?:country|illustrated)))\.com(?:(?:/(?P<show2>cooks(?:country|illustrated)))?(?:/?$|(?<!ated)(?<!ated\.com)/episodes/browse/season_(?P<season>\d+)))'
-    _TESTS = [{
-        # ATK Season
-        'url': 'https://www.americastestkitchen.com/episodes/browse/season_1',
-        'info_dict': {
-            'id': 'season_1',
-            'title': 'Season 1',
-        },
-        'playlist_count': 13,
-    }, {
-        # Cooks Country Season
-        'url': 'https://www.americastestkitchen.com/cookscountry/episodes/browse/season_12',
-        'info_dict': {
-            'id': 'season_12',
-            'title': 'Season 12',
-        },
-        'playlist_count': 13,
-    }, {
-        # America's Test Kitchen Series
-        'url': 'https://www.americastestkitchen.com/',
-        'info_dict': {
-            'id': 'americastestkitchen',
-            'title': 'America\'s Test Kitchen',
-        },
-        'playlist_count': 558,
-    }, {
-        # Cooks Country Series
-        'url': 'https://www.americastestkitchen.com/cookscountry',
-        'info_dict': {
-            'id': 'cookscountry',
-            'title': 'Cook\'s Country',
-        },
-        'playlist_count': 199,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cookscountry/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cookscountry.com/episodes/browse/season_12',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cookscountry.com',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cooksillustrated/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cooksillustrated.com',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        match = re.match(self._VALID_URL, url).groupdict()
-        show = match.get('show2')
-        show_path = ('/' + show) if show else ''
-        show = show or match['show']
-        season_number = int_or_none(match.get('season'))
-
-        slug, title = {
-            'americastestkitchen': ('atk', 'America\'s Test Kitchen'),
-            'cookscountry': ('cco', 'Cook\'s Country'),
-            'cooksillustrated': ('cio', 'Cook\'s Illustrated'),
-        }[show]
-
-        facet_filters = [
-            'search_document_klass:episode',
-            'search_show_slug:' + slug,
-        ]
-
-        if season_number:
-            playlist_id = 'season_%d' % season_number
-            playlist_title = 'Season %d' % season_number
-            facet_filters.append('search_season_list:' + playlist_title)
-        else:
-            playlist_id = show
-            playlist_title = title
-
-        season_search = self._download_json(
-            'https://y1fnzxui30-dsn.algolia.net/1/indexes/everest_search_%s_season_desc_production' % slug,
-            playlist_id, headers={
-                'Origin': 'https://www.americastestkitchen.com',
-                'X-Algolia-API-Key': '8d504d0099ed27c1b73708d22871d805',
-                'X-Algolia-Application-Id': 'Y1FNZXUI30',
-            }, query={
-                'facetFilters': json.dumps(facet_filters),
-                'attributesToRetrieve': 'description,search_%s_episode_number,search_document_date,search_url,title,search_atk_episode_season' % slug,
-                'attributesToHighlight': '',
-                'hitsPerPage': 1000,
-            })
-
-        def entries():
-            for episode in (season_search.get('hits') or []):
-                search_url = episode.get('search_url')  # always formatted like '/episode/123-title-of-episode'
-                if not search_url:
-                    continue
-                yield {
-                    '_type': 'url',
-                    'url': 'https://www.americastestkitchen.com%s%s' % (show_path, search_url),
-                    'id': try_get(episode, lambda e: e['objectID'].rsplit('_', 1)[-1]),
-                    'title': episode.get('title'),
-                    'description': episode.get('description'),
-                    'timestamp': unified_timestamp(episode.get('search_document_date')),
-                    'season_number': season_number,
-                    'episode_number': int_or_none(episode.get('search_%s_episode_number' % slug)),
-                    'ie_key': AmericasTestKitchenIE.ie_key(),
-                }
-
-        return self.playlist_result(
-            entries(), playlist_id, playlist_title)

youtube_dl/extractor/amp.py

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

youtube_dl/extractor/animeondemand.py

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

youtube_dl/extractor/anvato.py

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

youtube_dl/extractor/aol.py

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

youtube_dl/extractor/apa.py

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

youtube_dl/extractor/aparat.py

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

youtube_dl/extractor/appleconnect.py

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

youtube_dl/extractor/applepodcasts.py

@@ -1,93 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    clean_podcast_url,
-    get_element_by_class,
-    int_or_none,
-    parse_codecs,
-    parse_iso8601,
-    try_get,
-)
-
-
-class ApplePodcastsIE(InfoExtractor):
-    _VALID_URL = r'https?://podcasts\.apple\.com/(?:[^/]+/)?podcast(?:/[^/]+){1,2}.*?\bi=(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://podcasts.apple.com/us/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
-        'md5': '41dc31cd650143e530d9423b6b5a344f',
-        'info_dict': {
-            'id': '1000482637777',
-            'ext': 'mp3',
-            'title': '207 - Whitney Webb Returns',
-            'description': 'md5:75ef4316031df7b41ced4e7b987f79c6',
-            'upload_date': '20200705',
-            'timestamp': 1593932400,
-            'duration': 6454,
-            'series': 'The Tim Dillon Show',
-            'thumbnail': 're:.+[.](png|jpe?g|webp)',
-        }
-    }, {
-        'url': 'https://podcasts.apple.com/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
-        'only_matching': True,
-    }, {
-        'url': 'https://podcasts.apple.com/podcast/207-whitney-webb-returns?i=1000482637777',
-        'only_matching': True,
-    }, {
-        'url': 'https://podcasts.apple.com/podcast/id1135137367?i=1000482637777',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        episode_id = self._match_id(url)
-        webpage = self._download_webpage(url, episode_id)
-        episode_data = {}
-        ember_data = {}
-        # new page type 2021-11
-        amp_data = self._parse_json(self._search_regex(
-            r'(?s)id="shoebox-media-api-cache-amp-podcasts"[^>]*>\s*({.+?})\s*<',
-            webpage, 'AMP data', default='{}'), episode_id, fatal=False) or {}
-        amp_data = try_get(amp_data,
-                           lambda a: self._parse_json(
-                               next(a[x] for x in iter(a) if episode_id in x),
-                               episode_id),
-                           dict) or {}
-        amp_data = amp_data.get('d') or []
-        episode_data = try_get(
-            amp_data,
-            lambda a: next(x for x in a
-                           if x['type'] == 'podcast-episodes' and x['id'] == episode_id),
-            dict)
-        if not episode_data:
-            # try pre 2021-11 page type: TODO: consider deleting if no longer used
-            ember_data = self._parse_json(self._search_regex(
-                r'(?s)id="shoebox-ember-data-store"[^>]*>\s*({.+?})\s*<',
-                webpage, 'ember data'), episode_id) or {}
-            ember_data = ember_data.get(episode_id) or ember_data
-            episode_data = try_get(ember_data, lambda x: x['data'], dict)
-        episode = episode_data['attributes']
-        description = episode.get('description') or {}
-
-        series = None
-        for inc in (amp_data or ember_data.get('included') or []):
-            if inc.get('type') == 'media/podcast':
-                series = try_get(inc, lambda x: x['attributes']['name'])
-        series = series or clean_html(get_element_by_class('podcast-header__identity', webpage))
-
-        info = [{
-            'id': episode_id,
-            'title': episode['name'],
-            'url': clean_podcast_url(episode['assetUrl']),
-            'description': description.get('standard') or description.get('short'),
-            'timestamp': parse_iso8601(episode.get('releaseDateTime')),
-            'duration': int_or_none(episode.get('durationInMilliseconds'), 1000),
-            'series': series,
-            'thumbnail': self._og_search_thumbnail(webpage),
-        }]
-        self._sort_formats(info)
-        info = info[0]
-        codecs = parse_codecs(info.get('ext', 'mp3'))
-        info.update(codecs)
-        return info

youtube_dl/extractor/archiveorg.py

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

youtube_dl/extractor/arcpublishing.py

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

youtube_dl/extractor/ard.py

@@ -187,13 +187,13 @@ class ARDMediathekIE(ARDMediathekBaseIE):
             if doc.tag == 'rss':
                 return GenericIE()._extract_rss(url, video_id, doc)
 
-        title = self._og_search_title(webpage, default=None) or self._html_search_regex(
+        title = self._html_search_regex(
             [r'<h1(?:\s+class="boxTopHeadline")?>(.*?)</h1>',
              r'<meta name="dcterms\.title" content="(.*?)"/>',
              r'<h4 class="headline">(.*?)</h4>',
              r'<title[^>]*>(.*?)</title>'],
             webpage, 'title')
-        description = self._og_search_description(webpage, default=None) or self._html_search_meta(
+        description = self._html_search_meta(
             'dcterms.abstract', webpage, 'description', default=None)
         if description is None:
             description = self._html_search_meta(
@@ -249,40 +249,31 @@ class ARDMediathekIE(ARDMediathekBaseIE):
 
 
 class ARDIE(InfoExtractor):
-    _VALID_URL = r'(?P<mainurl>https?://(?:www\.)?daserste\.de/(?:[^/?#&]+/)+(?P<id>[^/?#&]+))\.html'
+    _VALID_URL = r'(?P<mainurl>https?://(www\.)?daserste\.de/[^?#]+/videos(?:extern)?/(?P<display_id>[^/?#]+)-(?P<id>[0-9]+))\.html'
     _TESTS = [{
-        # available till 7.01.2022
-        'url': 'https://www.daserste.de/information/talk/maischberger/videos/maischberger-die-woche-video100.html',
-        'md5': '867d8aa39eeaf6d76407c5ad1bb0d4c1',
+        # available till 14.02.2019
+        'url': 'http://www.daserste.de/information/talk/maischberger/videos/das-groko-drama-zerlegen-sich-die-volksparteien-video-102.html',
+        'md5': '8e4ec85f31be7c7fc08a26cdbc5a1f49',
         'info_dict': {
-            'id': 'maischberger-die-woche-video100',
-            'display_id': 'maischberger-die-woche-video100',
+            'display_id': 'das-groko-drama-zerlegen-sich-die-volksparteien-video',
+            'id': '102',
             'ext': 'mp4',
-            'duration': 3687.0,
-            'title': 'maischberger. die woche vom 7. Januar 2021',
-            'upload_date': '20210107',
+            'duration': 4435.0,
+            'title': 'Das GroKo-Drama: Zerlegen sich die Volksparteien?',
+            'upload_date': '20180214',
             'thumbnail': r're:^https?://.*\.jpg$',
         },
     }, {
-        'url': 'https://www.daserste.de/information/politik-weltgeschehen/morgenmagazin/videosextern/dominik-kahun-aus-der-nhl-direkt-zur-weltmeisterschaft-100.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/information/nachrichten-wetter/tagesthemen/videosextern/tagesthemen-17736.html',
+        'url': 'https://www.daserste.de/information/reportage-dokumentation/erlebnis-erde/videosextern/woelfe-und-herdenschutzhunde-ungleiche-brueder-102.html',
         'only_matching': True,
     }, {
         'url': 'http://www.daserste.de/information/reportage-dokumentation/dokus/videos/die-story-im-ersten-mission-unter-falscher-flagge-100.html',
         'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/unterhaltung/serie/in-aller-freundschaft-die-jungen-aerzte/Drehpause-100.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/unterhaltung/film/filmmittwoch-im-ersten/videos/making-ofwendezeit-video-100.html',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        display_id = mobj.group('id')
+        display_id = mobj.group('display_id')
 
         player_url = mobj.group('mainurl') + '~playerXml.xml'
         doc = self._download_xml(player_url, display_id)
@@ -293,63 +284,26 @@ class ARDIE(InfoExtractor):
 
         formats = []
         for a in video_node.findall('.//asset'):
-            file_name = xpath_text(a, './fileName', default=None)
-            if not file_name:
-                continue
-            format_type = a.attrib.get('type')
-            format_url = url_or_none(file_name)
-            if format_url:
-                ext = determine_ext(file_name)
-                if ext == 'm3u8':
-                    formats.extend(self._extract_m3u8_formats(
-                        format_url, display_id, 'mp4', entry_protocol='m3u8_native',
-                        m3u8_id=format_type or 'hls', fatal=False))
-                    continue
-                elif ext == 'f4m':
-                    formats.extend(self._extract_f4m_formats(
-                        update_url_query(format_url, {'hdcore': '3.7.0'}),
-                        display_id, f4m_id=format_type or 'hds', fatal=False))
-                    continue
             f = {
-                'format_id': format_type,
-                'width': int_or_none(xpath_text(a, './frameWidth')),
-                'height': int_or_none(xpath_text(a, './frameHeight')),
-                'vbr': int_or_none(xpath_text(a, './bitrateVideo')),
-                'abr': int_or_none(xpath_text(a, './bitrateAudio')),
-                'vcodec': xpath_text(a, './codecVideo'),
-                'tbr': int_or_none(xpath_text(a, './totalBitrate')),
+                'format_id': a.attrib['type'],
+                'width': int_or_none(a.find('./frameWidth').text),
+                'height': int_or_none(a.find('./frameHeight').text),
+                'vbr': int_or_none(a.find('./bitrateVideo').text),
+                'abr': int_or_none(a.find('./bitrateAudio').text),
+                'vcodec': a.find('./codecVideo').text,
+                'tbr': int_or_none(a.find('./totalBitrate').text),
             }
-            server_prefix = xpath_text(a, './serverPrefix', default=None)
-            if server_prefix:
-                f.update({
-                    'url': server_prefix,
-                    'playpath': file_name,
-                })
+            if a.find('./serverPrefix').text:
+                f['url'] = a.find('./serverPrefix').text
+                f['playpath'] = a.find('./fileName').text
             else:
-                if not format_url:
-                    continue
-                f['url'] = format_url
+                f['url'] = a.find('./fileName').text
             formats.append(f)
         self._sort_formats(formats)
 
-        _SUB_FORMATS = (
-            ('./dataTimedText', 'ttml'),
-            ('./dataTimedTextNoOffset', 'ttml'),
-            ('./dataTimedTextVtt', 'vtt'),
-        )
-
-        subtitles = {}
-        for subsel, subext in _SUB_FORMATS:
-            for node in video_node.findall(subsel):
-                subtitles.setdefault('de', []).append({
-                    'url': node.attrib['url'],
-                    'ext': subext,
-                })
-
         return {
-            'id': xpath_text(video_node, './videoId', default=display_id),
+            'id': mobj.group('id'),
             'formats': formats,
-            'subtitles': subtitles,
             'display_id': display_id,
             'title': video_node.find('./title').text,
             'duration': parse_duration(video_node.find('./duration').text),
@@ -359,19 +313,19 @@ class ARDIE(InfoExtractor):
 
 
 class ARDBetaMediathekIE(ARDMediathekBaseIE):
-    _VALID_URL = r'https://(?:(?:beta|www)\.)?ardmediathek\.de/(?:[^/]+/)?(?:player|live|video)/(?:[^/]+/)*(?P<id>Y3JpZDovL[a-zA-Z0-9]+)'
+    _VALID_URL = r'https://(?:(?:beta|www)\.)?ardmediathek\.de/(?P<client>[^/]+)/(?:player|live|video)/(?P<display_id>(?:[^/]+/)*)(?P<video_id>[a-zA-Z0-9]+)'
     _TESTS = [{
-        'url': 'https://www.ardmediathek.de/mdr/video/die-robuste-roswita/Y3JpZDovL21kci5kZS9iZWl0cmFnL2Ntcy84MWMxN2MzZC0wMjkxLTRmMzUtODk4ZS0wYzhlOWQxODE2NGI/',
-        'md5': 'a1dc75a39c61601b980648f7c9f9f71d',
+        'url': 'https://ardmediathek.de/ard/video/die-robuste-roswita/Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhdG9ydC9mYmM4NGM1NC0xNzU4LTRmZGYtYWFhZS0wYzcyZTIxNGEyMDE',
+        'md5': 'dfdc87d2e7e09d073d5a80770a9ce88f',
         'info_dict': {
             'display_id': 'die-robuste-roswita',
-            'id': '78566716',
+            'id': '70153354',
             'title': 'Die robuste Roswita',
-            'description': r're:^Der Mord.*totgeglaubte Ehefrau Roswita',
+            'description': r're:^Der Mord.*trüber ist als die Ilm.',
             'duration': 5316,
-            'thumbnail': 'https://img.ardmediathek.de/standard/00/78/56/67/84/575672121/16x9/960?mandant=ard',
-            'timestamp': 1596658200,
-            'upload_date': '20200805',
+            'thumbnail': 'https://img.ardmediathek.de/standard/00/70/15/33/90/-1852531467/16x9/960?mandant=ard',
+            'timestamp': 1577047500,
+            'upload_date': '20191222',
             'ext': 'mp4',
         },
     }, {
@@ -389,22 +343,22 @@ class ARDBetaMediathekIE(ARDMediathekBaseIE):
     }, {
         'url': 'https://www.ardmediathek.de/swr/live/Y3JpZDovL3N3ci5kZS8xMzQ4MTA0Mg',
         'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/video/coronavirus-update-ndr-info/astrazeneca-kurz-lockdown-und-pims-syndrom-81/ndr/Y3JpZDovL25kci5kZS84NzE0M2FjNi0wMWEwLTQ5ODEtOTE5NS1mOGZhNzdhOTFmOTI/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/ard/player/Y3JpZDovL3dkci5kZS9CZWl0cmFnLWQ2NDJjYWEzLTMwZWYtNGI4NS1iMTI2LTU1N2UxYTcxOGIzOQ/tatort-duo-koeln-leipzig-ihr-kinderlein-kommet',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group('video_id')
+        display_id = mobj.group('display_id')
+        if display_id:
+            display_id = display_id.rstrip('/')
+        if not display_id:
+            display_id = video_id
 
         player_page = self._download_json(
             'https://api.ardmediathek.de/public-gateway',
-            video_id, data=json.dumps({
+            display_id, data=json.dumps({
                 'query': '''{
-  playerPage(client: "ard", clipId: "%s") {
+  playerPage(client:"%s", clipId: "%s") {
     blockedByFsk
     broadcastedOn
     maturityContentRating
@@ -434,7 +388,7 @@ class ARDBetaMediathekIE(ARDMediathekBaseIE):
       }
     }
   }
-}''' % video_id,
+}''' % (mobj.group('client'), video_id),
             }).encode(), headers={
                 'Content-Type': 'application/json'
             })['data']['playerPage']
@@ -459,6 +413,7 @@ class ARDBetaMediathekIE(ARDMediathekBaseIE):
                 r'\(FSK\s*(\d+)\)\s*$', description, 'age limit', default=None))
         info.update({
             'age_limit': age_limit,
+            'display_id': display_id,
             'title': title,
             'description': description,
             'timestamp': unified_timestamp(player_page.get('broadcastedOn')),

youtube_dl/extractor/arkena.py

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

youtube_dl/extractor/arnes.py

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