danvics/ytptube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

standardize more events.

Browse source
This commit is contained in:
ArabCoders 2025-01-25 22:46:33 +03:00
parent ddc216ccb6
commit dbee7cf2fa
5 changed files with 145 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/library/DownloadQueue.py
View file

@ -326,7 +326,7 @@ class DownloadQueue:
await item.close()
LOG.debug(f"Deleting from queue {itemMessage}")
self.queue.delete(id)
asyncio.create_task(self.emitter.canceled(id=id, dl=item.info.serialize()), name=f"notifier-c-{id}")
asyncio.create_task(self.emitter.canceled(dl=item.info.serialize()), name=f"notifier-c-{id}")
item.info.status = "canceled"
item.info.error = "Canceled by user."
self.done.put(item)
@ -373,7 +373,7 @@ class DownloadQueue:
LOG.error(f"Unable to remove '{itemRef}' local file '{filename}'. {str(e)}")
self.done.delete(id)
asyncio.create_task(self.emitter.cleared(id, dl=item.info.serialize()), name=f"notifier-c-{id}")
asyncio.create_task(self.emitter.cleared(dl=item.info.serialize()), name=f"notifier-c-{id}")
msg = f"Deleted completed download '{itemRef}'."
if fileDeleted and filename:
msg += f" and removed local file '{filename}'."
@ -475,7 +475,7 @@ class DownloadQueue:
self.queue.delete(key=id)
if entry.is_canceled() is True:
asyncio.create_task(self.emitter.canceled(id, dl=entry.info.serialize()), name=f"notifier-c-{id}")
asyncio.create_task(self.emitter.canceled(dl=entry.info.serialize()), name=f"notifier-c-{id}")
entry.info.status = "canceled"
entry.info.error = "Canceled by user."

13
app/library/Emitter.py
View file

@ -29,21 +29,18 @@ class Emitter:
async def completed(self, dl: dict, **kwargs):
await self.emit("completed", dl, **kwargs)
async def canceled(self, id: str, dl: dict | None = None, **kwargs):
await self.emit("canceled", id, **kwargs)
async def canceled(self, dl: dict, **kwargs):
await self.emit("canceled", dl, **kwargs)
async def cleared(self, id: str, dl: dict | None = None, **kwargs):
await self.emit("cleared", id, **kwargs)
async def cleared(self, dl: dict | None = None, **kwargs):
await self.emit("cleared", dl, **kwargs)
async def error(self, message: str, data: dict = {}, **kwargs):
msg = {"status": "error", "message": message, "data": {}}
msg = {"type": "error", "message": message, "data": {}}
if data:
msg.update({"data": data})
await self.emit("error", msg, **kwargs)
async def warning(self, message: str, **kwargs):
await self.emit("error", message, **kwargs)
async def info(self, message: str, data: dict = {}, **kwargs):
msg = {"type": "info", "message": message, "data": {}}
if data:

16
app/library/HttpSocket.py
View file

@ -159,7 +159,7 @@ class HttpSocket(common):
url: str | None = data.get("url")
if not url:
await self.emitter.warning("No URL provided.", to=sid)
await self.emitter.error("No URL provided.", to=sid)
return
preset: str = str(data.get("preset", self.config.default_preset))
@ -172,7 +172,7 @@ class HttpSocket(common):
try:
ytdlp_config = json.loads(ytdlp_config)
except Exception as e:
await self.emitter.warning(f"Failed to parse json yt-dlp config. {str(e)}", to=sid)
await self.emitter.error(f"Failed to parse json yt-dlp config. {str(e)}", to=sid)
return
status = await self.add(
@ -189,7 +189,7 @@ class HttpSocket(common):
@ws_event # type: ignore
async def item_cancel(self, sid: str, id: str):
if not id:
await self.emitter.warning("Invalid request.", to=sid)
await self.emitter.error("Invalid request.", to=sid)
return
status: dict[str, str] = {}
@ -201,12 +201,12 @@ class HttpSocket(common):
@ws_event # type: ignore
async def item_delete(self, sid: str, data: dict):
if not data:
await self.emitter.warning("Invalid request.", to=sid)
await self.emitter.error("Invalid request.", to=sid)
return
id: str | None = data.get("id")
if not id:
await self.emitter.warning("Invalid request.", to=sid)
await self.emitter.error("Invalid request.", to=sid)
return
status: dict[str, str] = {}
@ -280,13 +280,13 @@ class HttpSocket(common):
@ws_event
async def ytdlp_convert(self, sid: str, data: dict):
if not isinstance(data, dict) or "args" not in data:
await self.emitter.warning("Invalid request or no options were given.", to=sid)
await self.emitter.error("Invalid request or no options were given.", to=sid)
return
args: str | None = data.get("args")
if not args:
await self.emitter.warning("no options were given.", to=sid)
await self.emitter.error("no options were given.", to=sid)
return
try:
@ -296,4 +296,4 @@ class HttpSocket(common):
err = str(e).strip()
err = err.split("\n")[-1] if "\n" in err else err
LOG.error(f"Failed to convert args. '{err}'.")
await self.emitter.error(f"Failed to convert options. '{e}'.", to=sid)
await self.emitter.error(f"Failed to convert options. '{err}'.", to=sid)

240
ui/components/NewDownload.vue
View file

@ -1,133 +1,135 @@
<template>
<main class="columns mt-2">
<div class="column">
<div class="box">
<div class="columns is-multiline is-mobile">
<div class="column is-12">
<div class="control has-icons-left">
<input type="url" class="input" id="url" placeholder="Video or playlist link"
:disabled="!socket.isConnected || addInProgress" v-model="url">
<span class="icon is-small is-left">
<i class="fa-solid fa-link" />
</span>
<form @submit.prevent="addDownload">
<div class="box">
<div class="columns is-multiline is-mobile">
<div class="column is-12">
<div class="control has-icons-left">
<input type="text" class="input" id="url" placeholder="Video or playlist link"
:disabled="!socket.isConnected || addInProgress" v-model="url">
<span class="icon is-small is-left">
<i class="fa-solid fa-link" />
</span>
</div>
</div>
<div class="column is-4-tablet is-12-mobile" v-if="!config.app.basic_mode">
<div class="field has-addons">
<div class="control">
<a href="#" class="button is-static">Preset</a>
</div>
<div class="control is-expanded">
<div class="select is-fullwidth">
<select id="preset" class="is-fullwidth" :disabled="!socket.isConnected" v-model="selectedPreset">
<option v-for="item in config.presets" :key="item.name" :value="item.name">
{{ item.name }}
</option>
</select>
</div>
</div>
</div>
</div>
<div class="column is-6-tablet is-12-mobile" v-if="!config.app.basic_mode">
<div class="field has-addons" v-tooltip="'Folder relative to ' + config.app.download_path">
<div class="control">
<a href="#" class="button is-static">Save in</a>
</div>
<div class="control is-expanded">
<input type="text" class="input is-fullwidth" id="path" v-model="downloadPath" placeholder="Default"
:disabled="!socket.isConnected" list="folders">
</div>
</div>
</div>
<div class="column">
<button type="submit" class="button is-primary"
:class="{ 'is-loading': !socket.isConnected || addInProgress }"
:disabled="!socket.isConnected || addInProgress || !url">
<span class="icon"><i class="fa-solid fa-plus" /></span>
<span>Add</span>
</button>
</div>
<div class="column" v-if="!config.app.basic_mode">
<button type="button" class="button is-info" @click="showAdvanced = !showAdvanced"
:class="{ 'is-loading': !socket.isConnected }" :disabled="!socket.isConnected">
<span class="icon"><i class="fa-solid fa-cog" /></span>
<span>Opts</span>
</button>
</div>
</div>
<div class="column is-4-tablet is-12-mobile" v-if="!config.app.basic_mode">
<div class="field has-addons">
<div class="control">
<a href="#" class="button is-static">Preset</a>
<div class="columns is-multiline is-mobile" v-if="showAdvanced && !config.app.basic_mode">
<div class="column is-12">
<div class="field">
<label class="label is-inline" for="output_format"
v-tooltip="'Default Format: ' + config.app.output_template">
Output Template
</label>
<div class="control">
<input type="text" class="input" v-model="output_template" id="output_format"
placeholder="Uses default output template naming if empty.">
</div>
<span class="help">
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>
</div>
<div class="control is-expanded">
<div class="select is-fullwidth">
<select id="preset" class="is-fullwidth" :disabled="!socket.isConnected" v-model="selectedPreset">
<option v-for="item in config.presets" :key="item.name" :value="item.name">
{{ item.name }}
</option>
</select>
</div>
<div class="column is-6-tablet is-12-mobile">
<div class="field">
<label class="label is-inline" for="ytdlpConfig"
v-tooltip="'Extends current global yt-dlp config. (JSON)'">
JSON yt-dlp config or CLI options.
</label>
<div class="control">
<textarea class="textarea" id="ytdlpConfig" v-model="ytdlpConfig" :disabled="!socket.isConnected"
placeholder="--no-embed-metadata --no-embed-thumbnail"></textarea>
</div>
<span class="help">
Some config fields are ignored like cookiefile, path, and output_format etc.
Available option can be found at <NuxtLink target="_blank"
to="https://github.com/yt-dlp/yt-dlp/blob/a0b19d319a6ce8b7059318fa17a34b144fde1785/yt_dlp/YoutubeDL.py#L194">
this page</NuxtLink>. Warning: Use with caution some of those options can break yt-dlp or the
frontend.
</span>
</div>
</div>
<div class="column is-6-tablet is-12-mobile">
<div class="field">
<label class="label is-inline" for="ytdlpCookies" v-tooltip="'JSON exported cookies for downloading.'">
yt-dlp Cookies
</label>
<div class="control">
<textarea class="textarea" id="ytdlpCookies" v-model="ytdlpCookies"
:disabled="!socket.isConnected"></textarea>
</div>
<span class="help">
Use <NuxtLink target="_blank" to="https://github.com/jrie/flagCookies">
flagCookies</NuxtLink> to extract cookies as JSON string.
</span>
</div>
</div>
<div class="column is-6-tablet is-4-mobile has-text-left">
<button type="button" class="button is-info" @click="emitter('getInfo', url)"
:class="{ 'is-loading': !socket.isConnected }" :disabled="!socket.isConnected || addInProgress || !url">
<span class="icon"><i class="fa-solid fa-info" /></span>
<span>Information</span>
</button>
</div>
<div class="column is-6-tablet is-6-mobile has-text-right">
<div class="field">
<div class="control">
<button type="button" class="button is-danger" @click="resetConfig" :disabled="!socket.isConnected"
v-tooltip="'This configuration are stored locally in your browser.'">
<span class="icon">
<i class="fa-solid fa-trash" />
</span>
<span>Reset Local Configuration</span>
</button>
</div>
</div>
</div>
</div>
<div class="column is-6-tablet is-12-mobile" v-if="!config.app.basic_mode">
<div class="field has-addons" v-tooltip="'Folder relative to ' + config.app.download_path">
<div class="control">
<a href="#" class="button is-static">Save in</a>
</div>
<div class="control is-expanded">
<input type="text" class="input is-fullwidth" id="path" v-model="downloadPath" placeholder="Default"
:disabled="!socket.isConnected" list="folders">
</div>
</div>
</div>
<div class="column">
<button type="submit" class="button is-primary" @click="addDownload"
:class="{ 'is-loading': !socket.isConnected || addInProgress }"
:disabled="!socket.isConnected || addInProgress || !url">
<span class="icon"><i class="fa-solid fa-plus" /></span>
<span>Add</span>
</button>
</div>
<div class="column" v-if="!config.app.basic_mode">
<button type="submit" class="button is-info" @click="showAdvanced = !showAdvanced"
:class="{ 'is-loading': !socket.isConnected }" :disabled="!socket.isConnected">
<span class="icon"><i class="fa-solid fa-cog" /></span>
<span>Opts</span>
</button>
</div>
</div>
<div class="columns is-multiline is-mobile" v-if="showAdvanced && !config.app.basic_mode">
<div class="column is-12">
<div class="field">
<label class="label is-inline" for="output_format"
v-tooltip="'Default Format: ' + config.app.output_template">
Output Template
</label>
<div class="control">
<input type="text" class="input" v-model="output_template" id="output_format"
placeholder="Uses default output template naming if empty.">
</div>
<span class="help">
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>
</div>
</div>
<div class="column is-6-tablet is-12-mobile">
<div class="field">
<label class="label is-inline" for="ytdlpConfig"
v-tooltip="'Extends current global yt-dlp config. (JSON)'">
JSON yt-dlp config or CLI options.
</label>
<div class="control">
<textarea class="textarea" id="ytdlpConfig" v-model="ytdlpConfig" :disabled="!socket.isConnected"
placeholder="--no-embed-metadata --no-embed-thumbnail"></textarea>
</div>
<span class="help">
Some config fields are ignored like cookiefile, path, and output_format etc.
Available option can be found at <NuxtLink target="_blank"
to="https://github.com/yt-dlp/yt-dlp/blob/a0b19d319a6ce8b7059318fa17a34b144fde1785/yt_dlp/YoutubeDL.py#L194">
this page</NuxtLink>. Warning: Use with caution some of those options can break yt-dlp or the
frontend.
</span>
</div>
</div>
<div class="column is-6-tablet is-12-mobile">
<div class="field">
<label class="label is-inline" for="ytdlpCookies" v-tooltip="'JSON exported cookies for downloading.'">
yt-dlp Cookies
</label>
<div class="control">
<textarea class="textarea" id="ytdlpCookies" v-model="ytdlpCookies"
:disabled="!socket.isConnected"></textarea>
</div>
<span class="help">
Use <NuxtLink target="_blank" to="https://github.com/jrie/flagCookies">
flagCookies</NuxtLink> to extract cookies as JSON string.
</span>
</div>
</div>
<div class="column is-6-tablet is-4-mobile has-text-left">
<button type="submit" class="button is-info" @click="emitter('getInfo', url)"
:class="{ 'is-loading': !socket.isConnected }" :disabled="!socket.isConnected || addInProgress || !url">
<span class="icon"><i class="fa-solid fa-info" /></span>
<span>Information</span>
</button>
</div>
<div class="column is-6-tablet is-6-mobile has-text-right">
<div class="field">
<div class="control">
<button type="submit" class="button is-danger" @click="resetConfig" :disabled="!socket.isConnected"
v-tooltip="'This configuration are stored locally in your browser.'">
<span class="icon">
<i class="fa-solid fa-trash" />
</span>
<span>Reset Local Configuration</span>
</button>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
<datalist id="folders" v-if="config?.folders">
<option v-for="dir in config.folders" :key="dir" :value="dir" />

12
ui/stores/SocketStore.js
View file

@ -39,7 +39,7 @@ export const useSocketStore = defineStore('socket', () => {
socket.value.on('error', stream => {
const json = JSON.parse(stream);
toast.error(`${json.data?.id ?? json?.status}: ${json?.message}`);
toast.error(`${json.data?.id ?? json?.type}: ${json?.message}`);
});
socket.value.on('log_info', stream => {
@ -63,13 +63,14 @@ export const useSocketStore = defineStore('socket', () => {
});
socket.value.on('canceled', stream => {
const id = JSON.parse(stream);
const item = JSON.parse(stream);
const id = item._id
if (true !== stateStore.has('queue', id)) {
return
}
toast.info(`Download canceled: ${ag(stateStore.get('queue', id, {}), 'title')}`);
toast.info(`Download canceled: ${ag(stateStore.get('queue', id, {}), id)}`);
if (true === stateStore.has('queue', id)) {
stateStore.remove('queue', id);
@ -77,7 +78,8 @@ export const useSocketStore = defineStore('socket', () => {
});
socket.value.on('cleared', stream => {
const id = JSON.parse(stream);
const item = JSON.parse(stream);
const id = item._id
if (true !== stateStore.has('history', id)) {
return
@ -132,5 +134,7 @@ export const useSocketStore = defineStore('socket', () => {
connect();
}
window.ws = socket.value;
return { connect, on, off, emit, socket, isConnected };
});