From 551ff956602527b94adbe2d6e4d114a71f086aa8 Mon Sep 17 00:00:00 2001
From: marcobaobao <marco.piovanello@gmail.com>
Date: Tue, 4 Jan 2022 15:51:44 +0100
Subject: [PATCH] monthly update: fixes

---
 lib/db.js         | 18 +++++++++++-------
 lib/downloader.js |  3 +--
 server.js         |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/db.js b/lib/db.js
index b9b9456..d80481b 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -27,13 +27,17 @@ async function get_db() {
 
 async function insertDownload(url, title, thumbnail, size, PID) {
     const uid = uuid.v1()
-    db
-        .prepare(`
-            INSERT INTO downloads 
-                (uid, url, title, thumbnail, size, process_pid) 
-                VALUES (?, ?, ?, ?, ?, ?)`
-        )
-        .run(uid, url, title, thumbnail, size, PID)
+    try {
+        db
+            .prepare(`
+                INSERT INTO downloads 
+                    (uid, url, title, thumbnail, size, process_pid) 
+                    VALUES (?, ?, ?, ?, ?, ?)`
+            )
+            .run(uid, url, title, thumbnail, size, PID)
+    } catch (error) {
+        logger('db', 'some error occourred')
+    }
 
     return uid
 }
diff --git a/lib/downloader.js b/lib/downloader.js
index e4b3be3..7da80fe 100644
--- a/lib/downloader.js
+++ b/lib/downloader.js
@@ -62,11 +62,10 @@ async function download(socket, payload) {
 
 async function retriveDownload(socket) {
     const downloads = await pruneDownloads();
-
     if (downloads.length > 0) {
         for (const _download of downloads) {
             await killProcess(_download.process_pid);
-            await download(socket, _download.url);
+            await download(socket, _download);
         }
     }
 }
diff --git a/server.js b/server.js
index 7331729..3875380 100644
--- a/server.js
+++ b/server.js
@@ -22,7 +22,7 @@ io.on('connection', socket => {
     logger('ws', `${socket.handshake.address} connected!`)
     // message listeners
     socket.on('send-url', args => {
-        logger('ws', args)
+        logger('ws', args?.url)
         download(socket, args)
     })
     socket.on('abort', () => {
@@ -32,7 +32,7 @@ io.on('connection', socket => {
         ytdlpUpdater(socket)
     })
     socket.on('fetch-jobs', async () => {
-        socket.emit('pending-jobs', await db.pruneDownloads())
+        socket.emit('pending-jobs', await db.retrieveAll())
     })
     socket.on('retrieve-jobs', async () => {
         retriveDownload(socket)