From 45401639ad77a90055572532864b9b7cca0487db Mon Sep 17 00:00:00 2001
From: arabcoders <admin@arabcoders.org>
Date: Thu, 7 Aug 2025 22:08:59 +0300
Subject: [PATCH] Update download form to use the custom input

---
 ui/app/components/DLInput.vue     |  47 ++++++++++
 ui/app/components/NewDownload.vue | 143 ++++++++++++++----------------
 ui/app/stores/SocketStore.ts      |   4 +-
 ui/app/types/config.d.ts          |   1 +
 4 files changed, 116 insertions(+), 79 deletions(-)
 create mode 100644 ui/app/components/DLInput.vue

diff --git a/ui/app/components/DLInput.vue b/ui/app/components/DLInput.vue
new file mode 100644
index 00000000..5781a3fb
--- /dev/null
+++ b/ui/app/components/DLInput.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="field">
+    <label :for="`dlf-${id}`" class="label is-unselectable" :title="field">
+      <span v-if="icon" class="icon"><i :class="icon" /></span>
+      <span :class="{ 'has-tooltip': field }">{{ label }}</span>
+    </label>
+    <div class="control is-expanded" v-if="'string' === type">
+      <input :id="`dlf-${id}`" :type="type" class="input" v-model="model" :placeholder="placeholder"
+        :disabled="disabled" />
+    </div>
+    <div class="control is-expanded" v-if="'text' === type">
+      <textarea class="textarea is-pre" :id="`dlf-${id}`" v-model="model" :placeholder="placeholder"
+        :disabled="disabled"></textarea>
+    </div>
+    <div class="control is-expanded" v-if="'bool' === type">
+      <input type="checkbox" :id="`dlf-${id}`" v-model="model" class="switch is-success" :disabled="disabled" />
+      <label :for="`dlf-${id}`" class="label is-unselectable">
+        {{ model ? 'Yes' : 'No' }}
+      </label>
+    </div>
+    <span class="help is-bold is-unselectable">
+      <template v-if="description">
+        <span class="icon"><i class="fa-solid fa-info" /></span>
+        <span v-text="description" />
+      </template>
+      <template v-if="$slots.help">
+        <slot name="help"></slot>
+      </template>
+    </span>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { ModelRef } from 'vue';
+import type { DLFieldType } from '~/types/dl_fields';
+defineProps<{
+  id: string,
+  label: string,
+  field?: string,
+  type: DLFieldType,
+  description?: string
+  icon?: string
+  placeholder?: string
+  disabled?: boolean
+}>()
+const model = defineModel() as ModelRef<string>
+</script>
diff --git a/ui/app/components/NewDownload.vue b/ui/app/components/NewDownload.vue
index dd8b23a1..4c1aa9cf 100644
--- a/ui/app/components/NewDownload.vue
+++ b/ui/app/components/NewDownload.vue
@@ -88,96 +88,81 @@
           </div>
 
           <div class="columns is-multiline is-mobile" v-if="showAdvanced && !config.app.basic_mode">
-            <div class="column is-3-tablet is-12-mobile" v-if="!config.app.basic_mode">
-              <div class="field">
-                <input id="force_download" type="checkbox" class="switch is-danger" :checked="forceDownload"
-                  @change="forceDownload = !forceDownload" :disabled="addInProgress" />
-                <label for="force_download" class="is-unselectable">Force download</label>
-              </div>
-              <span class="help">
-                <span class="icon"><i class="fa-solid fa-info" /></span>
-                <span class="is-bold">Ignore archive and re-download.</span>
-              </span>
+            <div class="column is-3-tablet is-12-mobile">
+              <DLInput id="force_download" type="bool" label="Force download" v-model="forceDownload"
+                icon="fa-solid fa-download" :disabled="!socket.isConnected || addInProgress"
+                description="Ignore archive and re-download." />
             </div>
 
-            <div class="column is-3-tablet is-12-mobile" v-if="!config.app.basic_mode">
-              <div class="field">
-                <input id="auto_start" type="checkbox" v-model="auto_start" :disabled="addInProgress"
-                  class="switch is-success" />
-                <label for="auto_start" class="is-unselectable">Auto start</label>
-              </div>
-              <span class="help">
-                <span class="icon"><i class="fa-solid fa-info" /></span>
-                <span class="is-bold">Whether to start the download automatically.</span>
-              </span>
+            <div class="column is-3-tablet is-12-mobile">
+              <DLInput id="auto_start" type="bool" label="Auto start" v-model="auto_start" icon="fa-solid fa-play"
+                :disabled="!socket.isConnected || addInProgress"
+                description="Whether to start the download automatically." />
             </div>
 
             <div class="column is-6-tablet is-12-mobile">
-              <div class="field has-addons">
-                <div class="control">
-                  <label for="output_format" class="button is-static is-unselectable">
-                    <span class="icon"><i class="fa-solid fa-file" /></span>
-                    <span>Template</span>
-                  </label>
-                </div>
-                <div class="control is-expanded">
-                  <input type="text" class="input" v-model="form.template" id="output_format"
-                    :disabled="!socket.isConnected || addInProgress" :placeholder="get_output_template()">
-                </div>
-              </div>
-              <span class="help is-bold is-unselectable">
-                <span class="icon"><i class="fa-solid fa-info" /></span>
-                <span>All output template naming options can be found at <NuxtLink target="_blank"
-                    to="https://github.com/yt-dlp/yt-dlp#output-template">this page</NuxtLink>.</span>
-              </span>
-            </div>
 
-            <div class="column is-6-tablet is-12-mobile">
-              <div class="field">
-                <label class="label is-inline is-unselectable" for="cli_options">
-                  <span class="icon"><i class="fa-solid fa-terminal" /></span>
-                  Command options for yt-dlp
-                </label>
-                <div class="control">
-                  <textarea class="textarea is-pre" v-model="form.cli" id="cli_options"
-                    :disabled="!socket.isConnected || addInProgress"
-                    placeholder="command options to use, e.g. --no-embed-metadata --no-embed-thumbnail" />
-                </div>
-
-                <span class="help is-bold">
-                  <span class="icon"><i class="fa-solid fa-info" /></span>
-                  <span>Check <NuxtLink target="_blank" to="https://github.com/yt-dlp/yt-dlp#general-options">this page
-                    </NuxtLink> for more info. <span class="has-text-danger">Not all options are supported <NuxtLink
-                        target="_blank"
-                        to="https://github.com/arabcoders/ytptube/blob/master/app/library/Utils.py#L26-L48">some are
-                        ignored</NuxtLink>. Use with caution these options can break yt-dlp or the frontend.</span>
+              <DLInput id="output_template" type="string" label="Output template" v-model="form.template"
+                icon="fa-solid fa-file" :disabled="!socket.isConnected || addInProgress"
+                :placeholder="get_output_template()">
+                <template #help>
+                  <span class="help is-bold is-unselectable">
+                    <span class="icon"><i class="fa-solid fa-info" /></span>
+                    <span>All output template naming options can be found at <NuxtLink target="_blank"
+                        to="https://github.com/yt-dlp/yt-dlp#output-template">this page</NuxtLink>.</span>
                   </span>
-                </span>
-              </div>
+                </template>
+              </DLInput>
             </div>
 
             <div class="column is-6-tablet is-12-mobile">
-              <div class="field">
-                <label class="label is-inline is-unselectable" for="ytdlpCookies">
-                  <span class="icon"><i class="fa-solid fa-cookie" /></span>
-                  Cookies
-                </label>
-                <div class="control">
-                  <textarea class="textarea is-pre" id="ytdlpCookies" v-model="form.cookies"
-                    :disabled="!socket.isConnected || addInProgress" />
-                </div>
-                <span class="help is-bold">
-                  <span class="icon"><i class="fa-solid fa-info" /></span>
-                  <span>Use the <NuxtLink target="_blank"
-                      to="https://github.com/yt-dlp/yt-dlp/wiki/FAQ#how-do-i-pass-cookies-to-yt-dlp">
-                      Recommended addon</NuxtLink> by yt-dlp to export cookies. <span class="has-text-danger">The
-                      cookies MUST be in Netscape HTTP Cookie format.</span>
+              <DLInput id="cli_options" type="text" label="Command options for yt-dlp" v-model="form.cli"
+                icon="fa-solid fa-terminal" :disabled="!socket.isConnected || addInProgress">
+                <template #help>
+                  <span class="help is-bold">
+                    <span class="icon"><i class="fa-solid fa-info" /></span>
+                    <span>Check <NuxtLink target="_blank" to="https://github.com/yt-dlp/yt-dlp#general-options">this
+                        page</NuxtLink> for more info. <span class="has-text-danger">Not all options are supported
+                        <NuxtLink target="_blank"
+                          to="https://github.com/arabcoders/ytptube/blob/master/app/library/Utils.py#L26-L48">some are
+                          ignored</NuxtLink>. Use with caution these options can break yt-dlp or the frontend.
+                      </span>
+                    </span>
                   </span>
-                </span>
-              </div>
+                </template>
+              </DLInput>
             </div>
+
+            <div class="column is-6-tablet is-12-mobile">
+              <DLInput id="ytdlpCookies" type="text" label="Cookies for yt-dlp" v-model="form.cookies"
+                icon="fa-solid fa-cookie" :disabled="!socket.isConnected || addInProgress">
+                <template #help>
+                  <span class="help is-bold">
+                    <span class="icon"><i class="fa-solid fa-info" /></span>
+                    <span>Use the <NuxtLink target="_blank"
+                        to="https://github.com/yt-dlp/yt-dlp/wiki/FAQ#how-do-i-pass-cookies-to-yt-dlp">
+                        Recommended addon</NuxtLink> by yt-dlp to export cookies. <span class="has-text-danger">The
+                        cookies MUST be in Netscape HTTP Cookie format.</span>
+                    </span>
+                  </span>
+                </template>
+              </DLInput>
+            </div>
+            <template v-if="config.dl_fields.length > 0">
+              <div class="column is-6-tablet is-12-mobile" v-for="(fi, index) in config.dl_fields"
+                :key="fi.id || `dlf-${index}`">
+                <DLInput :id="fi?.id || `dlf-${index}`" :type="fi.kind" :description="fi.description" :label="fi.name"
+                  v-model="dlFields[fi.field]" :field="fi.field" />
+              </div>
+            </template>
             <div class="column is-12 is-hidden-tablet">
               <Dropdown icons="fa-solid fa-cogs" label="Actions">
+                <NuxtLink class="dropdown-item" @click="() => showFields = true">
+                  <span class="icon has-text-purple"><i class="fa-solid fa-plus" /></span>
+                  <span>Custom Fields</span>
+                </NuxtLink>
+                <hr class="dropdown-divider" />
+
                 <NuxtLink class="dropdown-item" @click="emitter('getInfo', form.url, form.preset)">
                   <span class="icon has-text-info"><i class="fa-solid fa-info" /></span>
                   <span>yt-dlp Information</span>
@@ -204,7 +189,7 @@
                     <span>Custom Fields</span>
                   </button>
                 </div>
-                   <div class="control">
+                <div class="control">
                   <button type="button" class="button is-info" @click="emitter('getInfo', form.url, form.preset)"
                     :class="{ 'is-loading': !socket.isConnected }"
                     :disabled="!socket.isConnected || addInProgress || !form?.url">
@@ -268,7 +253,8 @@ const auto_start = useStorage<boolean>('auto_start', true)
 const show_description = useStorage<boolean>('show_description', true)
 
 const addInProgress = ref<boolean>(false)
-const showFields = ref<boolean>(true)
+const showFields = ref<boolean>(false)
+const dlFields: Record<string, any> = ref({})
 
 const form = useStorage<item_request>('local_config_v1', {
   id: null,
@@ -281,6 +267,7 @@ const form = useStorage<item_request>('local_config_v1', {
   extras: {},
 }) as Ref<item_request>
 
+
 const dialog_confirm = ref({
   visible: false,
   title: 'Confirm Action',
diff --git a/ui/app/stores/SocketStore.ts b/ui/app/stores/SocketStore.ts
index 2a73391d..9221dd10 100644
--- a/ui/app/stores/SocketStore.ts
+++ b/ui/app/stores/SocketStore.ts
@@ -1,6 +1,7 @@
 import { io } from "socket.io-client";
 import type { Socket as IOSocket, SocketOptions } from "socket.io-client"
 import type { ManagerOptions } from "socket.io-client";
+import type { ConfigState } from "~/types/config";
 import type { StoreItem } from "~/types/store";
 
 export const useSocketStore = defineStore('socket', () => {
@@ -55,8 +56,9 @@ export const useSocketStore = defineStore('socket', () => {
         tasks: json.data.tasks,
         folders: json.data.folders,
         presets: json.data.presets,
+        dl_fields: json.data.dl_fields,
         paused: Boolean(json.data.paused)
-      })
+      } as Partial<ConfigState>)
 
       stateStore.addAll('queue', json.data.queue || {})
       stateStore.addAll('history', json.data.done || {})
diff --git a/ui/app/types/config.d.ts b/ui/app/types/config.d.ts
index 81f3b591..1f8b0570 100644
--- a/ui/app/types/config.d.ts
+++ b/ui/app/types/config.d.ts
@@ -1,3 +1,4 @@
+import type { DLField } from "./dl_fields"
 
 type AppConfig = {
   /** Path where downloaded files will be saved */