Enabled custom yt-dlp arguments in settings.json

.github/workflows/docker-image.yml

@@ -13,14 +13,47 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+      - name: Checkout
-    - name: Login to Docker Hub
+        uses: actions/checkout@v2
-      env:
+      - name: Set up QEMU
-        DOCKER_USER: ${{secrets.DOCKER_HUB_USERNAME}}
+        uses: docker/setup-qemu-action@v1
-        DOCKER_PASSWORD: ${{secrets.DOCKER_HUB_PASSWORD}}
+      - name: Set up Docker Buildx
-      run: |
+        id: buildx
-        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+        uses: docker/setup-buildx-action@v1
-    - name: Build the Docker image
+      - name: Login to GHCR
-      run: docker build . --file Dockerfile --tag ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest
+        if: github.event_name != 'pull_request'
-    - name: Publish the Docker image
+        uses: docker/login-action@v1
-      run: docker push ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Docker meta
+        id: yt-dlp-web-ui # you'll use this in the next step
+        uses: docker/metadata-action@v3
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            <specify the image name>
+          # Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+        - name: Build and push
+          uses: docker/build-push-action@v2
+          with:
+            context: .
+            platforms: linux/amd64,linux/arm/v7,linux/arm/64
+            push: ${{ github.event_name != 'pull_request' }}
+            tags: ${{ steps.yt-dlp-web-ui.outputs.tags }}
+            labels: ${{ steps.yt-dlp-web-ui.outputs.labels }}

.github/workflows/docker-publish.yml

@@ -1,93 +1,93 @@
-name: Docker
+# name: Docker
 
-# This workflow uses actions that are not certified by GitHub.
+# # This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
+# # They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
+# # separate terms of service, privacy policy, and support
-# documentation.
+# # documentation.
 
-on:
+# on:
-#  schedule:
+# #  schedule:
-#    - cron: '39 13 * * *'
+# #    - cron: '39 13 * * *'
-  push:
+#   push:
-    branches: [ master ]
+#     branches: [ master ]
-    # Publish semver tags as releases.
+#     # Publish semver tags as releases.
-    tags: [ 'v*.*.*' ]
+#     tags: [ 'v*.*.*' ]
-  pull_request:
+#   pull_request:
-    branches: [ master ]
+#     branches: [ master ]
 
-env:
+# env:
-  # Use docker.io for Docker Hub if empty
+#   # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
+#   REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
+#   # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
+#   IMAGE_NAME: ${{ github.repository }}
 
 
-jobs:
+# jobs:
-  build:
+#   build:
 
-    runs-on: ubuntu-latest
+#     runs-on: ubuntu-latest
-    permissions:
+#     permissions:
-      contents: read
+#       contents: read
-      packages: write
+#       packages: write
-      # This is used to complete the identity challenge
+#       # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
+#       # with sigstore/fulcio when running outside of PRs.
-      id-token: write
+#       id-token: write
 
-    steps:
+#     steps:
-      - name: Checkout repository
+#       - name: Checkout repository
-        uses: actions/checkout@v2
+#         uses: actions/checkout@v2
 
-      # Install the cosign tool except on PR
+#       # Install the cosign tool except on PR
-      # https://github.com/sigstore/cosign-installer
+#       # https://github.com/sigstore/cosign-installer
-      - name: Install cosign
+#       - name: Install cosign
-        if: github.event_name != 'pull_request'
+#         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@1e95c1de343b5b0c23352d6417ee3e48d5bcd422
+#         uses: sigstore/cosign-installer@1e95c1de343b5b0c23352d6417ee3e48d5bcd422
-        with:
+#         with:
-          cosign-release: 'v1.4.0'
+#           cosign-release: 'v1.4.0'
 
 
-      # Workaround: https://github.com/docker/build-push-action/issues/461
+#       # Workaround: https://github.com/docker/build-push-action/issues/461
-      - name: Setup Docker buildx
+#       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+#         uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
 
-      # Login against a Docker registry except on PR
+#       # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
+#       # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
+#       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
+#         if: github.event_name != 'pull_request'
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+#         uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
-        with:
+#         with:
-          registry: ${{ env.REGISTRY }}
+#           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+#           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+#           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Extract metadata (tags, labels) for Docker
+#       # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
+#       # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
+#       - name: Extract Docker metadata
-        id: meta
+#         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+#         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
+#         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+#           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-      # Build and push Docker image with Buildx (don't push on PR)
+#       # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
+#       # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
+#       - name: Build and push Docker image
-        id: build-and-push
+#         id: build-and-push
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+#         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-        with:
+#         with:
-          context: .
+#           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+#           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+#           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+#           labels: ${{ steps.meta.outputs.labels }}
 
-      # Sign the resulting Docker image digest except on PRs.
+#       # Sign the resulting Docker image digest except on PRs.
-      # This will only write to the public Rekor transparency log when the Docker
+#       # This will only write to the public Rekor transparency log when the Docker
-      # repository is public to avoid leaking data.  If you would like to publish
+#       # repository is public to avoid leaking data.  If you would like to publish
-      # transparency data even for private images, pass --force to cosign below.
+#       # transparency data even for private images, pass --force to cosign below.
-      # https://github.com/sigstore/cosign
+#       # https://github.com/sigstore/cosign
-      - name: Sign the published Docker image
+#       - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
+#         if: ${{ github.event_name != 'pull_request' }}
-        env:
+#         env:
-          COSIGN_EXPERIMENTAL: "true"
+#           COSIGN_EXPERIMENTAL: "true"
-        # This step uses the identity token to provision an ephemeral certificate
+#         # This step uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance.
+#         # against the sigstore community Fulcio instance.
-        run: cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
+#         run: cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}

server/src/core/Process.ts

@@ -2,8 +2,8 @@ import { spawn } from 'child_process';
 import { join } from 'path';
 import { Readable } from 'stream';
 import { ISettings } from '../interfaces/ISettings';
-import Logger from '../utils/BetterLogger';
 import { availableParams } from '../utils/params';
+import Logger from '../utils/BetterLogger';
 
 const log = new Logger();
 
@@ -45,6 +45,7 @@ class Process {
         const ytldp = spawn(this.exePath,
             ['-o', `${this.settings?.download_path || 'downloads/'}%(title)s.%(ext)s`]
                 .concat(sanitizedParams)
+                .concat((this.settings?.cliArgs ?? []).map(arg => arg.split(' ')).flat())
                 .concat([this.url])
         );
 

server/src/core/downloader.ts

@@ -17,7 +17,7 @@ const log = new Logger();
 const pool = new ProcessPool();
 
 try {
-    settings = require('../settings.json');
+    settings = require('../../settings.json');
 }
 catch (e) {
     new Promise(resolve => setTimeout(resolve, 500))

server/src/interfaces/ISettings.ts

@@ -1,3 +1,4 @@
 export interface ISettings {
-    download_path: string
+    download_path: string,
+    cliArgs?: string[],
 }

server/src/utils/params.ts

@@ -1,4 +1,4 @@
 export const availableParams = [
     '--no-mtime',
-    '-x'
+    '-x',
 ]

settings.json

@@ -1,3 +1,4 @@
 {
-    "download_path": ""
+    "download_path": "",
+    "cliArgs": []
 }