diff --git a/client/media_conversion.js b/client/media_conversion.js index ee1eab1..ef1d8ae 100755 --- a/client/media_conversion.js +++ b/client/media_conversion.js @@ -2,8 +2,8 @@ * @returns {Promise<{server_ip: string, server_port: number}>} */ -let videoActive = [] -let videoQueue = [] +let videoActive = {}; +let videoQueue = {}; let ws = null async function getServerConfig() { @@ -86,7 +86,7 @@ function deleteVideoElement(packet) { delete videoActive[key]; } } - } +} function createVideoElement(packet){ const active_Conversions = document.getElementById('active-conversions'); @@ -124,17 +124,22 @@ function createVideoElement(packet){ }); } -function deepEqual(dict1, dict2) { - return JSON.stringify(dict1) === JSON.stringify(dict2); -} - function createWaitingSnake(packet){ const queue = document.getElementById('queue'); + for (let key in videoQueue){ + if (!(key in packet.data_queue)){ + const elem = document.getElementById(key); + if(elem){ + elem.remove(); + } + } + } + Object.keys(packet.data_queue).forEach(key => { const video = packet.data_queue[key]; - if(videoActive[key] && videoActive[key].status !== video.status){ + if(videoQueue[key] && videoQueue[key].status !== video.status){ const elem = document.getElementById(key); if(elem){ elem.remove();