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

Prep for dev release

Browse source
This commit is contained in:
ArabCoders 2024-12-18 21:15:15 +03:00
parent 2782ee568d
commit 0b4216c0b0
6 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.vscode/launch.json vendored
View file

@ -19,7 +19,8 @@
"cwd": "${workspaceFolder}/ui", "cwd": "${workspaceFolder}/ui",
"env": { "env": {
"NUXT_PUBLIC_WSS": ":8081/", "NUXT_PUBLIC_WSS": ":8081/",
} },
"console": "internalConsole"
}, },
{ {
"name": "Python: main.py", "name": "Python: main.py",
@ -34,8 +35,8 @@
"YTP_TEMP_PATH": "${workspaceFolder}/var/tmp", "YTP_TEMP_PATH": "${workspaceFolder}/var/tmp",
"YTP_URL_HOST": "http://localhost:8081", "YTP_URL_HOST": "http://localhost:8081",
"YTP_LOG_LEVEL": "DEBUG", "YTP_LOG_LEVEL": "DEBUG",
"YTP_DEBUG": "true", "YTP_DEBUG": "false",
"YTP_YTDL_DEBUG": "true", "YTP_YTDL_DEBUG": "false",
} }
}, },
{ {

2
app/library/Download.py
View file

@ -347,7 +347,7 @@ class Download:
if self.info.status == 'error' and 'error' in status: if self.info.status == 'error' and 'error' in status:
self.info.error = status.get('error') self.info.error = status.get('error')
asyncio.create_task( asyncio.create_task(
self.emitter.error(dl=self.info, message=self.info.error), self.emitter.error(message=self.info.error, data=self.info),
name=f"emitter-e-{self.id}") name=f"emitter-e-{self.id}")
if 'downloaded_bytes' in status: if 'downloaded_bytes' in status:

7
app/library/Emitter.py
View file

@ -35,8 +35,11 @@ class Emitter:
async def cleared(self, id: str, dl: dict = None, **kwargs): async def cleared(self, id: str, dl: dict = None, **kwargs):
await self.emit('cleared', id, **kwargs) await self.emit('cleared', id, **kwargs)
async def error(self, dl: dict, message: str, **kwargs): async def error(self, message: str, data: dict = {}, **kwargs):
await self.emit('error', (dl, message), **kwargs) msg = {'status': 'error', 'message': message, 'data': {}}
if data:
msg.update({'data': data})
await self.emit('error', msg, **kwargs)
async def warning(self, message: str, **kwargs): async def warning(self, message: str, **kwargs):
await self.emit('error', message, **kwargs) await self.emit('error', message, **kwargs)

3
app/library/M3u8.py
View file

@ -4,9 +4,10 @@ from urllib.parse import quote
from .Utils import calcDownloadPath from .Utils import calcDownloadPath
from .ffprobe import FFProbe from .ffprobe import FFProbe
class M3u8: class M3u8:
ok_vcodecs: tuple = ('h264', 'x264', 'avc',) ok_vcodecs: tuple = ('h264', 'x264', 'avc',)
ok_acodecs: tuple = ('aac', 'mp3',) ok_acodecs: tuple = ('aac', 'm4a', 'mp3',)
url: str = None url: str = None
duration: float = 6.000000 duration: float = 6.000000

2
pyproject.toml Normal file
View file

@ -0,0 +1,2 @@
[tool.autopep8]
--max-line-length = 120

6
ui/stores/SocketStore.js
View file

@ -33,12 +33,12 @@ export const useSocketStore = defineStore('socket', () => {
socket.value.on('added', stream => { socket.value.on('added', stream => {
const item = JSON.parse(stream); const item = JSON.parse(stream);
stateStore.add('queue', item._id, item); stateStore.add('queue', item._id, item);
toast.success(`Item queued successfully: ${ag(stateStore.get('queue', item._id, {}), 'title')}`); toast.success(`Item queued: ${ag(stateStore.get('queue', item._id, {}), 'title')}`);
}); });
socket.value.on('error', stream => { socket.value.on('error', stream => {
const [item, error] = JSON.parse(stream); const json = JSON.parse(stream);
toast.error(`${item?.id}: Error: ${error}`); toast.error(`${json.data?.id ?? json?.status}: ${json?.message}`);
}); });
socket.value.on('completed', stream => { socket.value.on('completed', stream => {