Update presets to use safe url base64 for exported string.

This commit is contained in:
ArabCoders 2025-03-13 21:47:01 +03:00
parent cc96879a1d
commit ada7b5db97
8 changed files with 983 additions and 854 deletions

View file

@ -34,6 +34,7 @@
"preferredquality", "preferredquality",
"quicktime", "quicktime",
"tmpfilename", "tmpfilename",
"urandom",
"vcodec", "vcodec",
"vconvert", "vconvert",
"writedescription", "writedescription",

View file

@ -608,3 +608,83 @@ def decrypt_data(data: str, key: bytes) -> str:
return plaintext.decode() return plaintext.decode()
except Exception: except Exception:
return None return None
def get(
data: dict | list,
path: str | list | None = None,
default: any = None,
separator=".",
):
"""
Access data in a nested dictionary or list using a path string or list of keys.
Args:
data (dict | list): The data to traverse.
path (str | list, optional): The path to the desired data. Defaults to None.
default (any, optional): The default value to return if the path is not found. Defaults to None.
separator (str, optional): The separator used to split the path string. Defaults to ".".
Returns:
any: The value at the specified path, or the default value if not found.
"""
# If path is empty, return the entire data.
if not path:
return data
# If data is not a dict or list, attempt to convert it (similar to PHP's get_object_vars).
if not isinstance(data, dict | list):
try:
data = vars(data)
except Exception:
pass
# If path is a list, try each key in order.
if isinstance(path, list):
for key in path:
val = get(data, key, "__not_set", separator)
if val != "__not_set":
return val
return default() if callable(default) else default
# For non-list path, attempt a direct lookup.
if isinstance(data, dict):
if path in data and data[path] is not None:
return data[path]
elif isinstance(data, list):
# If path is an integer index.
if isinstance(path, int):
if 0 <= path < len(data) and data[path] is not None:
return data[path]
# If path is a numeric string, convert it.
elif isinstance(path, str) and path.isdigit():
idx = int(path)
if 0 <= idx < len(data) and data[idx] is not None:
return data[idx]
# If path doesn't contain the separator, return the default.
if not (isinstance(path, str) and separator in path):
return default() if callable(default) else default
# Split the path by the separator and traverse the data structure.
segments = path.split(separator)
for segment in segments:
if isinstance(data, dict):
if segment in data:
data = data[segment]
else:
return default() if callable(default) else default
elif isinstance(data, list):
try:
idx = int(segment)
except ValueError:
return default() if callable(default) else default
if 0 <= idx < len(data):
data = data[idx]
else:
return default() if callable(default) else default
else:
return default() if callable(default) else default
return data

View file

@ -1,7 +1,7 @@
<template> <template>
<main class="columns mt-2"> <main class="columns mt-2">
<div class="column"> <div class="column">
<form @submit.prevent="addDownload"> <form autocomplete="off" @submit.prevent="addDownload">
<div class="box"> <div class="box">
<div class="columns is-multiline is-mobile"> <div class="columns is-multiline is-mobile">
<div class="column is-12"> <div class="column is-12">
@ -82,7 +82,8 @@
<label class="label is-inline" for="ytdlpConfig" <label class="label is-inline" for="ytdlpConfig"
v-tooltip="'Extends current global yt-dlp config. (JSON)'"> v-tooltip="'Extends current global yt-dlp config. (JSON)'">
JSON yt-dlp config or CLI options. JSON yt-dlp config or CLI options.
<NuxtLink v-if="ytdlpConfig && ytdlpConfig.trim() && !ytdlpConfig.trim().startsWith('{')" @click="convertOptions()"> <NuxtLink v-if="ytdlpConfig && ytdlpConfig.trim() && !ytdlpConfig.trim().startsWith('{')"
@click="convertOptions()">
Convert to JSON Convert to JSON
</NuxtLink> </NuxtLink>
</label> </label>

View file

@ -4,21 +4,21 @@
<h1 class="is-pointer is-unselectable title is-5" @click="importExpanded = !importExpanded"> <h1 class="is-pointer is-unselectable title is-5" @click="importExpanded = !importExpanded">
<span class="icon-text"> <span class="icon-text">
<span class="icon"><i class="fa-solid" :class="importExpanded ? 'fa-arrow-up' : 'fa-arrow-down'" /></span> <span class="icon"><i class="fa-solid" :class="importExpanded ? 'fa-arrow-up' : 'fa-arrow-down'" /></span>
<span>Import preset from JSON string.</span> <span>Import preset.</span>
</span> </span>
</h1> </h1>
<form id="importForm" @submit.prevent="importPreset()" v-if="importExpanded"> <form id="importForm" @submit.prevent="importPreset()" v-if="importExpanded">
<div class="box"> <div class="box">
<label class="label" for="json_preset"> <label class="label" for="json_preset">
JSON encoded preset. Base64 encoded JSON string.
</label> </label>
<div class="field has-addons"> <div class="field has-addons">
<div class="control has-icons-left is-expanded"> <div class="control has-icons-left is-expanded">
<input type="text" class="input" id="json_preset" v-model="json_preset"> <input type="text" class="input" id="json_preset" v-model="json_preset" autocomplete="off">
<span class="icon is-small is-left"><i class="fa-solid fa-j" /></span> <span class="icon is-small is-left"><i class="fa-solid fa-t" /></span>
</div> </div>
<div class="control"> <div class="control">
@ -41,7 +41,7 @@
</span> </span>
</h1> </h1>
<form id="convertOpts" @submit.prevent="convertOptions()" v-if="convertExpanded"> <form autocomplete="off" id="convertOpts" @submit.prevent="convertOptions()" v-if="convertExpanded">
<div class="box"> <div class="box">
<label class="label" for="opts"> <label class="label" for="opts">
@ -111,8 +111,9 @@
<span class="icon"><i class="fa-solid fa-info" /></span> <span class="icon"><i class="fa-solid fa-info" /></span>
<span>The yt-dlp <code>[--format, -f]</code> video format code. see <NuxtLink <span>The yt-dlp <code>[--format, -f]</code> video format code. see <NuxtLink
href="https://github.com/yt-dlp/yt-dlp?tab=readme-ov-file#format-selection" target="blank">this href="https://github.com/yt-dlp/yt-dlp?tab=readme-ov-file#format-selection" target="blank">this
url</NuxtLink> for more info.</span>. Note, as this key is required, you can set the value to <code>not_set</code> url</NuxtLink> for more info.</span>. Note, as this key is required, you can set the value to
to use the default yt-dlp format. <code>not_set</code>
to use the default yt-dlp format.
</span> </span>
</div> </div>
</div> </div>
@ -395,18 +396,29 @@ const convertOptions = async () => {
} }
const importPreset = async () => { const importPreset = async () => {
if (!json_preset) { let val = json_preset.value.trim()
if (!val) {
toast.error('The preset import string is required.')
return return
} }
if (form.format || form.args || form.postprocessors) { if (false === val.startsWith('{')) {
if (false === confirm('This will overwrite the current form fields. Are you sure?')) { try {
val = base64UrlDecode(val)
} catch (e) {
toast.error('Invalid base64 string.', e)
return return
} }
} }
try { try {
const preset = JSON.parse(json_preset.value) const preset = JSON.parse(val)
if (form.format || form.args || form.postprocessors) {
if (false === confirm('This will overwrite the current form fields. Are you sure?')) {
return
}
}
if (preset.name) { if (preset.name) {
form.name = preset.name form.name = preset.name
@ -425,16 +437,17 @@ const importPreset = async () => {
} }
if (preset.output_template) { if (preset.output_template) {
form.template = response.output_template form.template = preset.output_template
} }
if (preset.folder) { if (preset.folder) {
form.folder = response.folder form.folder = preset.folder
} }
json_preset.value = '' json_preset.value = ''
importExpanded.value = false
} catch (e) { } catch (e) {
console.error(e)
toast.error(`Failed to import preset. ${e.message}`) toast.error(`Failed to import preset. ${e.message}`)
} }
} }

View file

@ -22,10 +22,10 @@
"floating-vue": "^5.2.2", "floating-vue": "^5.2.2",
"hls.js": "^1.4.12", "hls.js": "^1.4.12",
"moment": "^2.30.1", "moment": "^2.30.1",
"nuxt": "^3.11.2", "nuxt": "^3.16",
"pinia": "^2.1.7", "pinia": "^2.1.7",
"socket.io-client": "^4.7.2", "socket.io-client": "^4.7.2",
"vue": "^3.4.21", "vue": "^3.4",
"vue-router": "^4.3.0", "vue-router": "^4.3.0",
"vue-toastification": "^2.0.0-rc.5" "vue-toastification": "^2.0.0-rc.5"
}, },

View file

@ -25,7 +25,10 @@ div.is-centered {
<div class="is-pulled-right"> <div class="is-pulled-right">
<div class="field is-grouped"> <div class="field is-grouped">
<p class="control"> <p class="control">
<button class="button is-primary" @click="resetForm(false); toggleForm = !toggleForm"> <button class="button is-primary" @click="
resetForm(false);
toggleForm = !toggleForm;
">
<span class="icon"><i class="fas fa-add"></i></span> <span class="icon"><i class="fas fa-add"></i></span>
</button> </button>
</p> </p>
@ -38,13 +41,13 @@ div.is-centered {
</div> </div>
</div> </div>
<div class="is-hidden-mobile"> <div class="is-hidden-mobile">
<span class="subtitle">Custom presets. The presets are simply pre-defined yt-dlp settings that you want to <span class="subtitle">Custom presets. The presets are simply pre-defined yt-dlp settings
apply to given download.</span> that you want to apply to given download.</span>
</div> </div>
</div> </div>
<div class="column is-12" v-if="toggleForm"> <div class="column is-12" v-if="toggleForm">
<PresetForm :addInProgress="addInProgress" :reference="presetRef" :preset="preset" @cancel="resetForm(true);" <PresetForm :addInProgress="addInProgress" :reference="presetRef" :preset="preset" @cancel="resetForm(true)"
@submit="updateItem" :presets="presets" /> @submit="updateItem" :presets="presets" />
</div> </div>
@ -55,12 +58,14 @@ div.is-centered {
<header class="card-header"> <header class="card-header">
<div class="card-header-title is-text-overflow is-block" v-text="item.name" /> <div class="card-header-title is-text-overflow is-block" v-text="item.name" />
<div class="card-header-icon"> <div class="card-header-icon">
<a class="has-text-primary" v-tooltip="'Copy preset.'" @click.prevent="copyItem(item)"> <a class="has-text-primary" v-tooltip="'Export preset.'" @click.prevent="copyItem(item)">
<span class="icon"><i class="fa-solid fa-copy" /></span> <span class="icon"><i class="fa-solid fa-copy" /></span>
</a> </a>
<button @click="item.raw = !item.raw"> <button @click="item.raw = !item.raw">
<span class="icon"><i class="fa-solid" <span class="icon"><i class="fa-solid" :class="{
:class="{ 'fa-arrow-down': !item?.raw, 'fa-arrow-up': item?.raw }" /></span> 'fa-arrow-down': !item?.raw,
'fa-arrow-up': item?.raw,
}" /></span>
</button> </button>
</div> </div>
</header> </header>
@ -91,7 +96,7 @@ div.is-centered {
</div> </div>
<div class="card-footer"> <div class="card-footer">
<div class="card-footer-item"> <div class="card-footer-item">
<button class="button is-warning is-fullwidth" @click="editItem(item);"> <button class="button is-warning is-fullwidth" @click="editItem(item)">
<span class="icon"><i class="fa-solid fa-cog" /></span> <span class="icon"><i class="fa-solid fa-cog" /></span>
<span>Edit</span> <span>Edit</span>
</button> </button>
@ -111,184 +116,211 @@ div.is-centered {
v-if="!presets || presets.length < 1" /> v-if="!presets || presets.length < 1" />
</div> </div>
</div> </div>
<div class="column is-12">
<Message message_class="has-background-info-90 has-text-dark" title="Tips" icon="fas fa-info-circle">
<ul>
<li>
When you export the preset, it doesn't include <code>Cookies</code> field for security reasons. The exported
string is URL safe base64 encoded JSON string.
</li>
</ul>
</Message>
</div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { request } from '~/utils/index' import { request } from "~/utils/index";
const toast = useToast() const toast = useToast();
const config = useConfigStore() const config = useConfigStore();
const socket = useSocketStore() const socket = useSocketStore();
const presets = ref([]) const presets = ref([]);
const preset = ref({}) const preset = ref({});
const presetRef = ref('') const presetRef = ref("");
const toggleForm = ref(false) const toggleForm = ref(false);
const isLoading = ref(false) const isLoading = ref(false);
const initialLoad = ref(true) const initialLoad = ref(true);
const addInProgress = ref(false) const addInProgress = ref(false);
const presetsNoDefault = computed(() => presets.value.filter(t => !t.default)) const presetsNoDefault = computed(() =>
presets.value.filter((t) => !t.default),
);
watch(() => config.app.basic_mode, async () => { watch(
if (!config.app.basic_mode) { () => config.app.basic_mode,
return async () => {
} if (!config.app.basic_mode) {
await navigateTo('/') return;
}) }
await navigateTo("/");
},
);
watch(() => socket.isConnected, async () => { watch(
if (socket.isConnected && initialLoad.value) { () => socket.isConnected,
await reloadContent(true) async () => {
initialLoad.value = false if (socket.isConnected && initialLoad.value) {
} await reloadContent(true);
}) initialLoad.value = false;
}
},
);
const reloadContent = async (fromMounted = false) => { const reloadContent = async (fromMounted = false) => {
try { try {
isLoading.value = true isLoading.value = true;
const response = await request('/api/presets') const response = await request("/api/presets");
if (fromMounted && !response.ok) { if (fromMounted && !response.ok) {
return return;
} }
const data = await response.json() const data = await response.json();
if (data.length < 1) { if (data.length < 1) {
return return;
} }
presets.value = data presets.value = data;
} catch (e) { } catch (e) {
if (fromMounted) { if (fromMounted) {
return return;
} }
console.error(e) console.error(e);
toast.error('Failed to fetch tasks.') toast.error("Failed to fetch tasks.");
} finally { } finally {
isLoading.value = false isLoading.value = false;
} }
} };
const resetForm = (closeForm = false) => { const resetForm = (closeForm = false) => {
preset.value = {} preset.value = {};
presetRef.value = null presetRef.value = null;
addInProgress.value = false addInProgress.value = false;
if (closeForm) { if (closeForm) {
toggleForm.value = false toggleForm.value = false;
} }
} };
const updatePresets = async items => { const updatePresets = async (items) => {
let data; let data;
try { try {
addInProgress.value = true addInProgress.value = true;
const response = await request('/api/presets', { const response = await request("/api/presets", {
method: 'PUT', method: "PUT",
headers: { 'Content-Type': 'application/json' }, headers: { "Content-Type": "application/json" },
body: JSON.stringify(items.filter(t => !t.default)), body: JSON.stringify(items.filter((t) => !t.default)),
}) });
data = await response.json() data = await response.json();
if (200 !== response.status) { if (200 !== response.status) {
toast.error(`Failed to update presets. ${data.error}`); toast.error(`Failed to update presets. ${data.error}`);
return false return false;
} }
presets.value = data presets.value = data;
resetForm(true) resetForm(true);
return true return true;
} catch (e) { } catch (e) {
toast.error(`Failed to update presets. ${data?.error}. ${e.message}`); toast.error(`Failed to update presets. ${data?.error}. ${e.message}`);
} finally { } finally {
addInProgress.value = false addInProgress.value = false;
} }
} };
const deleteItem = async item => { const deleteItem = async (item) => {
if (true !== confirm(`Delete preset '${item.name}'?`)) { if (true !== confirm(`Delete preset '${item.name}'?`)) {
return return;
} }
const index = presets.value.findIndex(t => t?.id === item.id) const index = presets.value.findIndex((t) => t?.id === item.id);
if (index > -1) { if (index > -1) {
presets.value.splice(index, 1) presets.value.splice(index, 1);
} else { } else {
toast.error('Preset not found.') toast.error("Preset not found.");
return return;
} }
const status = await updatePresets(presets.value) const status = await updatePresets(presets.value);
if (!status) { if (!status) {
return return;
} }
toast.success('Preset deleted.') toast.success("Preset deleted.");
} };
const updateItem = async ({ reference, preset }) => { const updateItem = async ({ reference, preset }) => {
if (reference) { if (reference) {
const index = presets.value.findIndex((t) => t?.id === reference) const index = presets.value.findIndex((t) => t?.id === reference);
if (index > -1) { if (index > -1) {
presets.value[index] = preset presets.value[index] = preset;
} }
} else { } else {
presets.value.push(preset) presets.value.push(preset);
} }
const status = await updatePresets(presets.value) const status = await updatePresets(presets.value);
if (!status) { if (!status) {
return return;
} }
toast.success(`Preset ${reference ? 'updated' : 'added'}.`) toast.success(`Preset ${reference ? "updated" : "added"}.`);
resetForm(true) resetForm(true);
} };
const filterItem = item => { const filterItem = (item) => {
const { raw, ...rest } = item const { raw, ...rest } = item;
return JSON.stringify(rest, null, 2) return JSON.stringify(rest, null, 2);
} };
const editItem = item => { const editItem = (item) => {
preset.value = item preset.value = item;
presetRef.value = item.id presetRef.value = item.id;
toggleForm.value = true toggleForm.value = true;
} };
onMounted(async () => socket.isConnected ? await reloadContent(true) : '') onMounted(async () => (socket.isConnected ? await reloadContent(true) : ""));
const copyItem = item => { const copyItem = (item) => {
let data = JSON.parse(JSON.stringify(item)) let data = JSON.parse(JSON.stringify(item));
const keys = ['id', 'default', 'raw', 'cookies'] const keys = ["id", "default", "raw", "cookies"];
keys.forEach(key => { keys.forEach((key) => {
if (key in data) { if (key in data) {
delete data[key] delete data[key];
} }
}) });
if (data.args && (typeof data.args === 'string')) { if (data.args && typeof data.args === "string") {
data.args = JSON.parse(data.args) data.args = JSON.parse(data.args);
} }
if (data.postprocessors && (typeof data.postprocessors === 'string')) { if (data.postprocessors && typeof data.postprocessors === "string") {
data.postprocessors = JSON.parse(data.postprocessors) data.postprocessors = JSON.parse(data.postprocessors);
} }
return copyText(JSON.stringify(data)) let userData = {};
}
const calcPath = path => { for (const key of Object.keys(data)) {
const loc = config.app.download_path || '/downloads' if (!data[key]) {
continue;
}
userData[key] = data[key];
}
return copyText(base64UrlEncode(JSON.stringify(userData)));
};
const calcPath = (path) => {
const loc = config.app.download_path || "/downloads";
if (path) { if (path) {
return loc + '/' + sTrim(path, '/') return loc + "/" + sTrim(path, "/");
} }
return loc return loc;
} };
</script> </script>

View file

@ -402,6 +402,32 @@ const convertCliOptions = async opts => {
return data return data
} }
/**
* URL Safe Base64 Encode.
*
* @param {String} data The data to encode
*
* @returns {String} The encoded data
*/
const base64UrlEncode = data => btoa(data).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
/**
* URL Safe Base64 Decode.
*
* @param {String} input The input string to decode
*
* @returns {String} The decoded data
*/
const base64UrlDecode = input => {
let base64 = input.replace(/-/g, '+').replace(/_/g, '/');
const pad = base64.length % 4;
if (pad) {
base64 += '='.repeat(4 - pad);
}
return atob(base64);
}
export { export {
ag_set, ag_set,
ag, ag,
@ -424,4 +450,6 @@ export {
makeDownload, makeDownload,
formatBytes, formatBytes,
convertCliOptions, convertCliOptions,
base64UrlEncode,
base64UrlDecode,
} }

File diff suppressed because it is too large Load diff