data/python.video_converter_v3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FrontEnd angepasst

Browse source
This commit is contained in:
Eduard Wisch 2025-05-19 21:37:02 +02:00
parent 545996d501
commit 96674ccf62
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/class_file_convert.py
View file

@ -30,9 +30,9 @@ class Convert:
if len(self.active_tasks) >= self.yaml["task_max"]: if len(self.active_tasks) >= self.yaml["task_max"]:
break break
if len(self.active_tasks) >= 0: if len(self.active_tasks) > 0:
logging.info(f"{len(self.active_tasks)} is active.") logging.info(f"{len(self.active_tasks)} is active.")
await asyncio.sleep(600) await asyncio.sleep(500)
continue continue
if self.obj_path.count_paths(None) == 0 and len(self.active_tasks) == 0: if self.obj_path.count_paths(None) == 0 and len(self.active_tasks) == 0:

2
app/class_file_path.py
View file

@ -93,6 +93,8 @@ class Path:
:param var_paths: String or List of a single or more Media Paths :param var_paths: String or List of a single or more Media Paths
:return: True or False :return: True or False
""" """
logging.info(f"Empfangen{var_paths}")
if isinstance(var_paths, str): if isinstance(var_paths, str):
pattern = r"(?<=\.mkv\s|\.mp4\s|\.avi\s)|(?<=\.webm\s)" pattern = r"(?<=\.mkv\s|\.mp4\s|\.avi\s)|(?<=\.webm\s)"
paths = re.split(pattern, var_paths) paths = re.split(pattern, var_paths)

16
app/main_server.py
View file

@ -30,11 +30,14 @@ class Server:
async def start_convert(self): async def start_convert(self):
global var_convert_active global var_convert_active
if var_convert_active == False and self.yaml['autostart']: try:
await self.obj_convert.snake_waiting() if not var_convert_active and self.yaml['autostart']:
var_convert_active = True await self.obj_convert.snake_waiting()
else: var_convert_active = True
self.obj_convert.snake_update() else:
self.obj_convert.snake_update()
finally:
self.set_var_convert_active(False)
async def send_websocket(self, message): async def send_websocket(self, message):
message_json = json.dumps(message) message_json = json.dumps(message)
@ -87,9 +90,8 @@ class Server:
var_convert_active = value var_convert_active = value
async def server_websocket(self): async def server_websocket(self):
# Bei Server Start einmal ausführen
self.obj_path.read_paths() self.obj_path.read_paths()
await self.start_convert() asyncio.create_task(self.start_convert())
server = await websockets.serve(self.handle_client, self.yaml['server_ip'], self.yaml['websocket_port']) server = await websockets.serve(self.handle_client, self.yaml['server_ip'], self.yaml['websocket_port'])
logging.info(f"Websocket Server läuft auf IP: {self.yaml['server_ip']} Port: {self.yaml['websocket_port']}") logging.info(f"Websocket Server läuft auf IP: {self.yaml['server_ip']} Port: {self.yaml['websocket_port']}")

4
client/media_conversion.js
View file

@ -125,7 +125,7 @@ function createVideoElement(packet){
} }
function deepEqual(dict1, dict2) { function deepEqual(dict1, dict2) {
return JSON.stringify(dict2) === JSON.stringify(dict2); return JSON.stringify(dict1) === JSON.stringify(dict2);
} }
function createWaitingSnake(packet){ function createWaitingSnake(packet){
@ -134,7 +134,7 @@ function createWaitingSnake(packet){
Object.keys(packet.data_queue).forEach(key => { Object.keys(packet.data_queue).forEach(key => {
const video = packet.data_queue[key]; const video = packet.data_queue[key];
if(!deepEqual(videoActive[key], video)){ if(videoActive[key] && videoActive[key].status !== video.status){
const elem = document.getElementById(key); const elem = document.getElementById(key);
if(elem){ if(elem){
elem.remove(); elem.remove();