Merge 04417e89de into ac817bc83e

Authored by: Grub4K, bashonly

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>

.github/workflows/build.yml

@@ -12,6 +12,9 @@ on:
       unix:
         default: true
         type: boolean
+      linux_static:
+        default: true
+        type: boolean
       linux_arm:
         default: true
         type: boolean
@@ -27,9 +30,6 @@ on:
       windows32:
         default: true
         type: boolean
-      meta_files:
-        default: true
-        type: boolean
       origin:
         required: false
         default: ''
@@ -52,7 +52,11 @@ on:
         default: stable
         type: string
       unix:
-        description: yt-dlp, yt-dlp.tar.gz, yt-dlp_linux, yt-dlp_linux.zip
+        description: yt-dlp, yt-dlp.tar.gz
+        default: true
+        type: boolean
+      linux_static:
+        description: yt-dlp_linux
         default: true
         type: boolean
       linux_arm:
@@ -75,10 +79,6 @@ on:
         description: yt-dlp_x86.exe
         default: true
         type: boolean
-      meta_files:
-        description: SHA2-256SUMS, SHA2-512SUMS, _update_spec
-        default: true
-        type: boolean
       origin:
         description: Origin
         required: false
@@ -112,27 +112,9 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-      - uses: conda-incubator/setup-miniconda@v3
-        with:
-          miniforge-variant: Mambaforge
-          use-mamba: true
-          channels: conda-forge
-          auto-update-conda: true
-          activate-environment: ""
-          auto-activate-base: false
       - name: Install Requirements
         run: |
           sudo apt -y install zip pandoc man sed
-          cat > ./requirements.txt << EOF
-          python=3.10.*
-          pyinstaller
-          brotli-python
-          EOF
-          python devscripts/install_deps.py --print \
-            --exclude brotli --exclude brotlicffi \
-            --include secretstorage >> ./requirements.txt
-          mamba create -n build --file ./requirements.txt
-
       - name: Prepare
         run: |
           python devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
@@ -141,30 +123,15 @@ jobs:
       - name: Build Unix platform-independent binary
         run: |
           make all tar
-      - name: Build Unix standalone binary
-        shell: bash -l {0}
-        run: |
-          unset LD_LIBRARY_PATH  # Harmful; set by setup-python
-          conda activate build
-          python -m bundle.pyinstaller --onedir
-          (cd ./dist/yt-dlp_linux && zip -r ../yt-dlp_linux.zip .)
-          python -m bundle.pyinstaller
-          mv ./dist/yt-dlp_linux ./yt-dlp_linux
-          mv ./dist/yt-dlp_linux.zip ./yt-dlp_linux.zip
-
       - name: Verify --update-to
         if: vars.UPDATE_TO_VERIFICATION
         run: |
-          binaries=("yt-dlp" "yt-dlp_linux")
-          for binary in "${binaries[@]}"; do
-            chmod +x ./${binary}
-            cp ./${binary} ./${binary}_downgraded
-            version="$(./${binary} --version)"
-            ./${binary}_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
-            downgraded_version="$(./${binary}_downgraded --version)"
-            [[ "$version" != "$downgraded_version" ]]
-          done
-
+          chmod +x ./yt-dlp
+          cp ./yt-dlp ./yt-dlp_downgraded
+          version="$(./yt-dlp --version)"
+          ./yt-dlp_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
+          downgraded_version="$(./yt-dlp_downgraded --version)"
+          [[ "$version" != "$downgraded_version" ]]
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -172,8 +139,39 @@ jobs:
           path: |
             yt-dlp
             yt-dlp.tar.gz
-            yt-dlp_linux
-            yt-dlp_linux.zip
+          compression-level: 0
+
+  linux_static:
+    needs: process
+    if: inputs.linux_static
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build static executable
+        env:
+          channel: ${{ inputs.channel }}
+          origin: ${{ needs.process.outputs.origin }}
+          version: ${{ inputs.version }}
+        run: |
+          mkdir ~/build
+          cd bundle/docker
+          docker compose up --build static
+          sudo chown "${USER}:docker" ~/build/yt-dlp_linux
+      - name: Verify --update-to
+        if: vars.UPDATE_TO_VERIFICATION
+        run: |
+          chmod +x ~/build/yt-dlp_linux
+          cp ~/build/yt-dlp_linux ~/build/yt-dlp_linux_downgraded
+          version="$(~/build/yt-dlp_linux --version)"
+          ~/build/yt-dlp_linux_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
+          downgraded_version="$(~/build/yt-dlp_linux_downgraded --version)"
+          [[ "$version" != "$downgraded_version" ]]
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-bin-${{ github.job }}
+          path: |
+            ~/build/yt-dlp_linux
           compression-level: 0
 
   linux_arm:
@@ -300,7 +298,7 @@ jobs:
   macos_legacy:
     needs: process
     if: inputs.macos_legacy
-    runs-on: macos-latest
+    runs-on: macos-12
 
     steps:
       - uses: actions/checkout@v4
@@ -447,10 +445,11 @@ jobs:
           compression-level: 0
 
   meta_files:
-    if: inputs.meta_files && always() && !cancelled()
+    if: always() && !cancelled()
     needs:
       - process
       - unix
+      - linux_static
       - linux_arm
       - macos
       - macos_legacy

bundle/docker/compose.yml

@@ -0,0 +1,10 @@
+services:
+  static:
+    build: static
+    environment:
+      channel: ${channel}
+      origin: ${origin}
+      version: ${version}
+    volumes:
+      - ~/build:/build
+      - ../..:/yt-dlp

bundle/docker/static/Dockerfile

@@ -0,0 +1,21 @@
+FROM alpine:3.19 as base
+
+RUN apk --update add --no-cache \
+        build-base \
+        python3 \
+        pipx \
+    ;
+
+RUN pipx install pyinstaller
+# Requires above step to prepare the shared venv
+RUN ~/.local/share/pipx/shared/bin/python -m pip install -U wheel
+RUN apk --update add --no-cache \
+        scons \
+        patchelf \
+        binutils \
+    ;
+RUN pipx install staticx
+
+WORKDIR /yt-dlp
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT /entrypoint.sh

bundle/docker/static/entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/ash
+set -e
+
+source ~/.local/share/pipx/venvs/pyinstaller/bin/activate
+python -m devscripts.install_deps --include secretstorage
+python -m devscripts.make_lazy_extractors
+python devscripts/update-version.py -c "${channel}" -r "${origin}" "${version}"
+python -m bundle.pyinstaller
+deactivate
+
+source ~/.local/share/pipx/venvs/staticx/bin/activate
+staticx /yt-dlp/dist/yt-dlp_linux /build/yt-dlp_linux
+deactivate

test/test_utils.py

@@ -2090,10 +2090,7 @@ Line 1
 
             args = [sys.executable, '-c', 'import sys; print(end=sys.argv[1])', argument, 'end']
             assert run_shell(args) == expected
-
-            escaped = shell_quote(argument, shell=True)
-            args = f'{sys.executable} -c "import sys; print(end=sys.argv[1])" {escaped} end'
-            assert run_shell(args) == expected
+            assert run_shell(shell_quote(args, shell=True)) == expected
 
 
 if __name__ == '__main__':

yt_dlp/extractor/_extractors.py

@@ -1630,6 +1630,7 @@ from .rinsefm import (
     RinseFMArtistPlaylistIE,
 )
 from .rmcdecouverte import RMCDecouverteIE
+from .roblox import RobloxIE
 from .rockstargames import RockstarGamesIE
 from .rokfin import (
     RokfinIE,

yt_dlp/extractor/roblox.py

@@ -0,0 +1,129 @@
+from .common import InfoExtractor
+from ..postprocessor.ffmpeg import FFmpegPostProcessor
+from ..utils import (
+    ExtractorError,
+    extract_attributes,
+    float_or_none,
+    get_element_by_id,
+    get_element_by_class,
+    get_element_html_by_class,
+    get_element_html_by_id,
+    int_or_none,
+    PostProcessingError,
+    strip_or_none,
+    str_or_none,
+    str_to_int,
+    traverse_obj,
+    try_call,
+    unified_timestamp,
+)
+
+
+class RobloxIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?roblox\.com/library/(?P<id>\d+)'
+    _TESTS = [{
+        # UGC Audio
+        'url': 'https://www.roblox.com/library/7910582982/Backrooms-Ambiance-High-Quality',
+        'md5': '',
+        'info_dict': {
+            'id': '7910582982',
+            'ext': 'ogg',
+            'title': 'Backrooms Ambiance (High Quality)',
+            'description': 'Found an actual higher quality of the sound.',
+            'uploader': 'ChaseDJ549',
+            'uploader_id': '412014916',
+            'categories': ['Horror'],
+            'like_count': int,
+            'timestamp': 1636142127,
+            'modified_timestamp': 1656694893
+        },
+    }]
+
+    def _real_extract(self, url):
+        asset_id = self._match_id(url)
+        webpage = self._download_webpage(url, asset_id)
+
+        item_container_div = get_element_html_by_id('item-container', webpage)
+        item_container_attrs = extract_attributes(item_container_div[:item_container_div.find('>')+1])
+        asset_type = item_container_attrs.get('data-asset-type')
+        if asset_type and (asset_type not in ('Audio', 'Video')):
+            raise ExtractorError('This asset is not an audio/video', expected=True)
+        asset_uploader_id, asset_uploader_name = self._search_regex(
+            r'>By <a.+href=["\']https?://(?:www\.)?roblox\.com/users/(?P<id>\d+)[^"\']*["\'][^>]*>@?(?P<name>\w+)</a',
+            webpage, 'asset creator', fatal=False, group=('id', 'name'))
+
+        is_logged_out = not self._get_cookies('https://roblox.com').get('.ROBLOSECURITY')
+        toolbox_result = traverse_obj(
+            self._download_json(f'https://apis.roblox.com/toolbox-service/v1/items/details', asset_id, query={'assetIds': asset_id},
+                                note='Downloading extra metadata JSON', errnote=False if is_logged_out else 'Unable to download extra metadata JSON',
+                                fatal=False),
+            ('data', ...), default={}, expected_type=dict, get_all=False)
+        toolbox_asset_data = toolbox_result.get('asset') or {}
+        toolbox_creator_data = toolbox_result.get('creator') or {}
+        toolbox_audio_data = toolbox_asset_data.get('audioDetails') or {}
+
+        info_dict = {
+            'id': asset_id,
+            'title': toolbox_asset_data.get('name') or item_container_attrs.get('data-item-name'),
+            'uploader': toolbox_creator_data.get('name') or asset_uploader_name,
+            'uploader_id': str_or_none(toolbox_creator_data.get('id')) or asset_uploader_id,
+            # TODO: Sound effects have separate kinds of categories 
+            'categories': toolbox_asset_data.get('assetGenres') or [strip_or_none(get_element_by_class('item-genre', webpage))],
+            'like_count': str_to_int(extract_attributes(get_element_html_by_class('favoriteCount', webpage)).get('title')),
+            'timestamp': unified_timestamp(toolbox_asset_data.get('createdUtc')),
+            'modified_timestamp': unified_timestamp(toolbox_asset_data.get('updatedUtc')),  # TODO: Extract from webpage
+            'track': toolbox_audio_data.get('title'),
+            'artist': toolbox_audio_data.get('artist'),
+            'genre': try_call(lambda: toolbox_audio_data['musicGenre'].capitalize())
+        }
+
+        cdn_result = self._download_json(
+            f'https://assetdelivery.roblox.com/v1/assetId/{asset_id}',
+            asset_id, note='Downloading file data JSON', headers={
+                'Accept': 'application/json',
+                'roblox-browser-asset-request': 'true'
+            })
+        asset_file_url = cdn_result.get('location')
+        if not asset_file_url:
+            if asset_type == 'Audio':
+                media_play_icon_div = get_element_html_by_class('MediaPlayerIcon')
+                if not media_play_icon_div:
+                    self.raise_no_formats('This audio is unavailable', expected=True, video_id=asset_id)
+                asset_file_url = self._search_regex(r'data-mediathumb-url=["\']https?://[^"\']+["\']', media_play_icon_div, 'audio preview URL')
+            elif is_logged_out:  # assetdelivery API randomly requires auth cookies
+                self.raise_login_required(metadata_available=True)
+            else:
+                self.raise_no_formats(
+                    traverse_obj(cdn_result, ('errors', ..., 'message'), default='Unable to fetch asset', expected_type=str, get_all=False),
+                    video_id=asset_id)
+
+        if asset_file_url:
+            # Assets have no file extension and use binary/octet-stream as Content-Type
+            pp = FFmpegPostProcessor(self._downloader)
+            self.to_screen(f'{asset_id}: Checking file format with ffprobe')
+            try:
+                metadata = pp.get_metadata_object(asset_file_url)
+            except PostProcessingError as err:
+                raise ExtractorError(err.msg, expected=True)
+
+            v_stream = a_stream = {}
+            for stream in metadata['streams']:
+                if stream['codec_type'] == 'video':
+                    v_stream = stream
+                elif stream['codec_type'] == 'audio':
+                    a_stream = stream
+
+            info_dict['formats'] = [{
+                'url': asset_file_url,
+                'ext': 'mp4' if 'mp4' in metadata['format']['format_name'] else metadata['format']['format_name'].split(',')[-1],
+                'vcodec': v_stream.get('codec_name'),
+                'acodec': a_stream.get('codec_name'),
+                'tbr': int_or_none(metadata['format'].get('bit_rate'), scale=1000),
+                'vbr': int_or_none(v_stream.get('bit_rate'), scale=1000),
+                'abr': int_or_none(a_stream.get('bit_rate'), scale=1000),
+                'height': int_or_none(v_stream.get('height')),
+                'width': int_or_none(v_stream.get('width')),
+                'filesize': float_or_none(metadata['format'].get('size'))
+            }]
+
+        return info_dict

yt_dlp/update.py

@@ -69,6 +69,10 @@ def _get_variant_and_executable_path():
             # Ref: https://en.wikipedia.org/wiki/Uname#Examples
             if machine[1:] in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
                 machine = '_x86' if platform.architecture()[0][:2] == '32' else ''
+            # sys.executable returns a /tmp/ path for staticx builds (linux_static)
+            # Ref: https://staticx.readthedocs.io/en/latest/usage.html#run-time-information
+            if static_exe_path := os.getenv('STATICX_PROG_PATH'):
+                path = static_exe_path
         return f'{remove_end(sys.platform, "32")}{machine}_exe', path
 
     path = os.path.dirname(__file__)