Dantenerosas/video_downloader_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
nikili0n 2023-10-30 22:06:42 +03:00 committed by Dantenerosas
parent aad25c98d9
commit 29bffb6e53
3 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/master_service.py
View File

@ -1,5 +1,6 @@
import asyncio import asyncio
import concurrent.futures as pool import concurrent.futures as pool
import json
import subprocess import subprocess
import traceback import traceback
@ -35,7 +36,16 @@ class MasterService:
"for pid in $(ps -ef | grep video_downloader_executor_process | awk '{print $2}'); do kill -9 $pid; done", "for pid in $(ps -ef | grep video_downloader_executor_process | awk '{print $2}'); do kill -9 $pid; done",
shell=True, capture_output=True shell=True, capture_output=True
) )
# TODO Возможно бросать ошибку если упал мастер сервис.
redis = RedisClient()
messages = await redis.get_all_tasks_from_queue(redis.TASKS_NAME)
if messages:
messages = {k.decode("utf-8"): json.loads(v.decode("utf-8")) for k, v in
messages.items()}
for params in list(messages.values()):
await self.queue.put(params)
await redis.del_tasks_queue()
tasks = [self.loop.create_task(self.create_workers()) for i in range(self.MAX_EXECUTOR_WORKERS + 1)] tasks = [self.loop.create_task(self.create_workers()) for i in range(self.MAX_EXECUTOR_WORKERS + 1)]
await asyncio.gather(self.rabbit_consumer(self.queue), *tasks) await asyncio.gather(self.rabbit_consumer(self.queue), *tasks)
@ -49,7 +59,6 @@ class MasterService:
while True: while True:
video_params = await self.queue.get() video_params = await self.queue.get()
redis = RedisClient() redis = RedisClient()
await redis.del_tasks_queue()
await redis.del_task_from_queue_and_add_to_tasks(link=video_params["link"], task=video_params) await redis.del_task_from_queue_and_add_to_tasks(link=video_params["link"], task=video_params)
self.currently_underway[video_params['link']] = video_params self.currently_underway[video_params['link']] = video_params

6
src/parsers/Telegram/telegram_media_downloader/config.yaml
View File

@ -1,9 +1,9 @@
api_hash: cb06da2bf01e15627434223242b6446d api_hash: cb06da2bf01e15627434223242b6446d
api_id: 21648766 api_id: 21648766
chat: chat:
- chat_id: landigos - chat_id: dvachannel
download_filter: id == 6986 download_filter: id == 125493
last_read_message_id: 6986 last_read_message_id: 125493
file_formats: file_formats:
video: video:
- all - all

55
src/web/templates/index.html
View File

@ -72,10 +72,51 @@
<body> <body>
<form method="post" action="/submit" id="download"> <form method="post" action="/submit" id="download">
<input type="text" name="link" id="link" placeholder="link"> <input type="text" name="link" id="link" placeholder="link">
<input type="text" name="video_format" placeholder="video_format"> <p>Формат видео
<input type="text" name="audio_format" placeholder="audio_format"> <select id="video_format" name="video_format">
<input type="text" name="resolution" placeholder="resolution"> <option hidden>Выбор формата видео</option>
<input type="text" name="merge_output_format" placeholder="merge_output_format"> <option value="3gp">3gp</option>
<option value="flv">flv</option>
<option value="mp4">mp4</option>
<option value="mov">mov</option>
<option value="webm" selected>webm</option>
</select >
</p>
<p>Формат аудио
<select id="audio_format" name="audio_format">
<option hidden>Выбор формата аудио</option>
<option value="mp3">mp3</option>
<option value="ogg">ogg</option>
<option value="m4a">m4a</option>
<option value="opus">opus</option>
<option value="webm" selected>webm</option>
<option value="wav">wav</option>
<option value="aac">aac</option>
</select >
</p>
<p>Качество видео
<select id="resolution" name="resolution">
<option hidden>Выбор формата аудио</option>
<option value="240">240</option>
<option value="360">360</option>
<option value="480" >480</option>
<option value="720">720</option>
<option value="1080" selected>1080</option>
<option value="2048">2048</option>
<option value="3840">3840</option>
</select >
</p>
<p>Выходной формат видео
<select id="merge_output_format" name="merge_output_format">
<option hidden>Выбор формата аудио</option>
<option value="avi">avi</option>
<option value="flv">flv</option>
<option value="mp4">mp4</option>
<option value="mkv" selected>mkv</option>
<option value="mov">mov</option>
<option value="webm">webm</option>
</select>
</p>
<button type="submit" class="custom-btn btn-1"><span class="submit-spinner submit-spinner_hide"></span> Download</button> <button type="submit" class="custom-btn btn-1"><span class="submit-spinner submit-spinner_hide"></span> Download</button>
</form> </form>
<div id="linksList" class="col"> <div id="linksList" class="col">
@ -170,7 +211,11 @@
document.forms.download.querySelector('.submit-spinner').classList.add('submit-spinner_hide'); document.forms.download.querySelector('.submit-spinner').classList.add('submit-spinner_hide');
console.log(xhr.status); console.log(xhr.status);
if (xhr.status !== 200 && xhr.status !== 201) { if (xhr.status !== 200 && xhr.status !== 201) {
return; if ('response' in xhr && xhr.response !== null) {
sendReq()
} else {
return;
};
}; };
const response = xhr.response; const response = xhr.response;