Java Script Element Löschen auf Listen und ID begrenzt vorher nur auf die Element ID
This commit is contained in:
parent
63eb6f94f6
commit
ec40897b6b
2 changed files with 8 additions and 9 deletions
|
|
@ -27,6 +27,8 @@ class Convert:
|
||||||
self.active_tasks.add(obj)
|
self.active_tasks.add(obj)
|
||||||
logging.info(f"Warteschlange started Auftrag - {obj.task}")
|
logging.info(f"Warteschlange started Auftrag - {obj.task}")
|
||||||
obj.status = 3
|
obj.status = 3
|
||||||
|
await self.obj_websocket.send_websocket(self.obj_path.active_path_to_dict())
|
||||||
|
await self.obj_websocket.send_websocket(self.obj_path.queue_path_to_dict())
|
||||||
|
|
||||||
if len(self.active_tasks) >= self.yaml["task_max"]:
|
if len(self.active_tasks) >= self.yaml["task_max"]:
|
||||||
break
|
break
|
||||||
|
|
@ -43,7 +45,6 @@ class Convert:
|
||||||
|
|
||||||
async def convert_video(self, obj):
|
async def convert_video(self, obj):
|
||||||
"""Startet die Videokonvertierung asynchron."""
|
"""Startet die Videokonvertierung asynchron."""
|
||||||
|
|
||||||
obj_process = Process(self.obj_websocket)
|
obj_process = Process(self.obj_websocket)
|
||||||
obj_stat = Stat()
|
obj_stat = Stat()
|
||||||
|
|
||||||
|
|
@ -63,13 +64,11 @@ class Convert:
|
||||||
|
|
||||||
self.active_process.add(obj)
|
self.active_process.add(obj)
|
||||||
obj.process_start = time.time()
|
obj.process_start = time.time()
|
||||||
await self.obj_websocket.send_websocket(self.obj_path.active_path_to_dict())
|
|
||||||
await self.obj_websocket.send_websocket(self.obj_path.queue_path_to_dict())
|
|
||||||
|
|
||||||
await obj_process.read_out(obj)
|
await obj_process.read_out(obj)
|
||||||
await obj.process.wait()
|
await obj.process.wait()
|
||||||
|
|
||||||
# Prself.obj_websocket.send_websocket(self.obj_path.active_path_to_dict())ozess beendet, Status auswerten
|
# Prozess beendet, Status auswerten
|
||||||
if obj.process.returncode == 0:
|
if obj.process.returncode == 0:
|
||||||
obj.status = 0
|
obj.status = 0
|
||||||
result = "Finished"
|
result = "Finished"
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ function sendCommand(command, id){
|
||||||
function deleteVideoElement(packet) {
|
function deleteVideoElement(packet) {
|
||||||
for (let key in videoActive){
|
for (let key in videoActive){
|
||||||
if (!(key in packet.data_convert)){
|
if (!(key in packet.data_convert)){
|
||||||
const elem = document.getElementById(key);
|
const elem = document.getElementById(`convert_${key}`);
|
||||||
if(elem){
|
if(elem){
|
||||||
elem.remove();
|
elem.remove();
|
||||||
}
|
}
|
||||||
|
|
@ -97,7 +97,7 @@ function createVideoElement(packet){
|
||||||
if(!videoActive[key]){
|
if(!videoActive[key]){
|
||||||
const card = document.createElement('div');
|
const card = document.createElement('div');
|
||||||
card.className = 'video-card';
|
card.className = 'video-card';
|
||||||
card.id = key
|
card.id = `convert_${key}`
|
||||||
|
|
||||||
card.innerHTML = `
|
card.innerHTML = `
|
||||||
<h3 title="${video.source_path}" align="center">${video.source_file_name} - ${video.target_file_name}</h3>
|
<h3 title="${video.source_path}" align="center">${video.source_file_name} - ${video.target_file_name}</h3>
|
||||||
|
|
@ -129,7 +129,7 @@ function createWaitingSnake(packet){
|
||||||
|
|
||||||
for (let key in videoQueue) {
|
for (let key in videoQueue) {
|
||||||
if (!(key in packet.data_queue) || (videoQueue[key] && videoQueue[key].status !== packet.data_queue[key]?.status)) {
|
if (!(key in packet.data_queue) || (videoQueue[key] && videoQueue[key].status !== packet.data_queue[key]?.status)) {
|
||||||
const elem = document.getElementById(key);
|
const elem = document.getElementById(`queue_${key}`);
|
||||||
if (elem) {
|
if (elem) {
|
||||||
elem.remove();
|
elem.remove();
|
||||||
delete videoQueue[key];
|
delete videoQueue[key];
|
||||||
|
|
@ -143,7 +143,7 @@ function createWaitingSnake(packet){
|
||||||
if(!videoQueue[key]){
|
if(!videoQueue[key]){
|
||||||
const card = document.createElement('div');
|
const card = document.createElement('div');
|
||||||
card.className = 'queue_wait-card';
|
card.className = 'queue_wait-card';
|
||||||
card.id = key
|
card.id = `queue_${key}`
|
||||||
|
|
||||||
if(video.status === 1 || video.status === 2){
|
if(video.status === 1 || video.status === 2){
|
||||||
status_img = `<img src="/client/icons/fehler-96.png" class="status_icons">`
|
status_img = `<img src="/client/icons/fehler-96.png" class="status_icons">`
|
||||||
|
|
@ -172,7 +172,7 @@ function createWaitingSnake(packet){
|
||||||
|
|
||||||
function updateVideoElement(packet){
|
function updateVideoElement(packet){
|
||||||
let video = packet.data_flow;
|
let video = packet.data_flow;
|
||||||
let container = document.getElementById(video.id);
|
let container = document.getElementById(`convert_${video.id}`);
|
||||||
|
|
||||||
container.querySelector(".frames").textContent = video.frames ?? 0;
|
container.querySelector(".frames").textContent = video.frames ?? 0;
|
||||||
container.querySelector(".size").textContent = video.size[0] || 0;
|
container.querySelector(".size").textContent = video.size[0] || 0;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue