From 968d30897eb5d704d91d5a69a4df6e10439ac453 Mon Sep 17 00:00:00 2001
From: Kristy Fournier <124598538+kristy-fournier@users.noreply.github.com>
Date: Wed, 5 Mar 2025 11:07:55 -0500
Subject: [PATCH] New JSON layout

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

diff --git a/Server/databaseGenerator.py b/Server/databaseGenerator.py
index a504848..109ffbe 100644
--- a/Server/databaseGenerator.py
+++ b/Server/databaseGenerator.py
@@ -27,20 +27,19 @@ if args.mode == "update":
         with open('songDatabase.json', 'r') as handle:
             songDatabaseList = json.load(handle)
     except:
-        songDatabaseList=[]
+        songDatabaseList={"songDirectory":soundLocation,'songData':{}}
 
-    for i in songDatabaseList:
+    for i in songDatabaseList["songData"]:
         try:
-            songFiles.index(i["file"]) != -1
+            songFiles.index(i) != -1
         except:
-            print("deleted: " + i["file"] + " from database")
+            print("deleted: " + i + " from database")
             songDatabaseList.remove(i)
-    for i in songDatabaseList:
-        songFiles.pop(songFiles.index(i["file"]))
+    for i in songDatabaseList["songData"]:
+        songFiles.remove(i)
     print("new songs: " + str(songFiles))
 elif args.mode=="new":
-    songDatabaseList = []
-
+    songDatabaseList={"songDirectory":soundLocation,'songData':{}}
 if args.art.lower() == "true":
     x = len(songFiles)*0.25
     if x > 60:
@@ -85,7 +84,7 @@ for i in songFiles:
         index = (songFiles.index(i))%4
         print("\r" + str(loading[index] + str(math.floor((songFiles.index(i)/(len(songFiles)-1))*100))+ "%"), end='', flush=True)
     # each "song" is stored as a dictionary containing the below stuff, and each dictionary is put into a list
-    songDatabaseList.append({"file":i,"title":title,"artist":artist,"art":image,"length":length})
+    songDatabaseList["songData"][i] = ({"title":title,"artist":artist,"art":image,"length":length})
     
 with open('songDatabase.json', 'w') as handle:
     json.dump(songDatabaseList, handle)