From 49c1b0bf25e4a77c9646efa5f6976da16800b356 Mon Sep 17 00:00:00 2001
From: Kristy Fournier <124598538+kristy-fournier@users.noreply.github.com>
Date: Fri, 7 Mar 2025 21:33:05 -0500
Subject: [PATCH 1/3] trying to fix deleteymode, work in progress

---
 Server/databaseGenerator.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Server/databaseGenerator.py b/Server/databaseGenerator.py
index 109ffbe..b04682c 100644
--- a/Server/databaseGenerator.py
+++ b/Server/databaseGenerator.py
@@ -30,11 +30,15 @@ if args.mode == "update":
         songDatabaseList={"songDirectory":soundLocation,'songData':{}}
 
     for i in songDatabaseList["songData"]:
+        deleteySongs = []
         try:
             songFiles.index(i) != -1
         except:
-            print("deleted: " + i + " from database")
-            songDatabaseList.remove(i)
+            deleteySongs.append(i)
+    if deleteySongs:
+        print("deleted: " + ", ".join(deleteySongs)+ " from database")
+    for i in deleteySongs:
+        songDatabaseList["songData"].pop(i)
     for i in songDatabaseList["songData"]:
         songFiles.remove(i)
     print("new songs: " + str(songFiles))

From 247c684b58dbcdb81fb80f331a5560c3ade121fe Mon Sep 17 00:00:00 2001
From: Kristy Fournier <124598538+kristy-fournier@users.noreply.github.com>
Date: Mon, 10 Mar 2025 10:01:40 -0400
Subject: [PATCH 2/3] bleh

---
 Server/databaseGenerator.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Server/databaseGenerator.py b/Server/databaseGenerator.py
index b04682c..465b96d 100644
--- a/Server/databaseGenerator.py
+++ b/Server/databaseGenerator.py
@@ -44,6 +44,7 @@ if args.mode == "update":
     print("new songs: " + str(songFiles))
 elif args.mode=="new":
     songDatabaseList={"songDirectory":soundLocation,'songData':{}}
+
 if args.art.lower() == "true":
     x = len(songFiles)*0.25
     if x > 60:

From 83fbdc7658ea5bd2a4bea6e43844f81ec8251750 Mon Sep 17 00:00:00 2001
From: Kristy Fournier <124598538+kristy-fournier@users.noreply.github.com>
Date: Mon, 10 Mar 2025 10:32:27 -0400
Subject: [PATCH 3/3] Update mode back to working, non mp3's are not added to
 the database

---
 Server/databaseGenerator.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Server/databaseGenerator.py b/Server/databaseGenerator.py
index 465b96d..5494c3f 100644
--- a/Server/databaseGenerator.py
+++ b/Server/databaseGenerator.py
@@ -22,17 +22,17 @@ else:
 # apikeylastfm = "KeyHere"
 # soundLocation = "directoryHere"
 songFiles = os.listdir(soundLocation)
-if args.mode == "update":
+if args.mode.lower() == "update":
     try:   
         with open('songDatabase.json', 'r') as handle:
             songDatabaseList = json.load(handle)
     except:
         songDatabaseList={"songDirectory":soundLocation,'songData':{}}
-
+    deleteySongs = []
     for i in songDatabaseList["songData"]:
-        deleteySongs = []
         try:
-            songFiles.index(i) != -1
+            if songFiles.index(i) == -1:
+                deleteySongs.append(i)
         except:
             deleteySongs.append(i)
     if deleteySongs:
@@ -41,11 +41,12 @@ if args.mode == "update":
         songDatabaseList["songData"].pop(i)
     for i in songDatabaseList["songData"]:
         songFiles.remove(i)
-    print("new songs: " + str(songFiles))
-elif args.mode=="new":
+    print("new songs: " + ", ".join(songFiles))
+elif args.mode.lower()=="new":
     songDatabaseList={"songDirectory":soundLocation,'songData':{}}
-
-if args.art.lower() == "true":
+else:
+    raise ValueError("Must be \"new\" or \"update\"")
+if args.art.lower() == "true" and not(args.apikey == ""):
     x = len(songFiles)*0.25
     if x > 60:
         print("ETA "+ str(x/60) + " minutes")
@@ -53,6 +54,9 @@ if args.art.lower() == "true":
         print("ETA "+ str(x) + " seconds")
 
 for i in songFiles:
+    if i[-4].lower() != ".mp3":
+        # skip any non-mp3's (like directories or cover art)
+        continue
     try:
         # get the metadata
         song = EasyID3(soundLocation+i)