KristyF/PartyJukebox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Completely redid database layout #2

Merged
kristy-fournier merged 6 commits from dev into main 2025-03-05 15:50:36 -05:00
Conversation 0 Commits 6 Files changed 4 +8 -9
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 968d30897e - Show all commits

17
Server/databaseGenerator.py
View file

@ -27,20 +27,19 @@ if args.mode == "update":
with open('songDatabase.json', 'r') as handle: with open('songDatabase.json', 'r') as handle:
songDatabaseList = json.load(handle) songDatabaseList = json.load(handle)
except: except:
songDatabaseList=[] songDatabaseList={"songDirectory":soundLocation,'songData':{}}
for i in songDatabaseList: for i in songDatabaseList["songData"]:
try: try:
songFiles.index(i["file"]) != -1 songFiles.index(i) != -1
except: except:
print("deleted: " + i["file"] + " from database") print("deleted: " + i + " from database")
songDatabaseList.remove(i) songDatabaseList.remove(i)
for i in songDatabaseList: for i in songDatabaseList["songData"]:
songFiles.pop(songFiles.index(i["file"])) songFiles.remove(i)
print("new songs: " + str(songFiles)) print("new songs: " + str(songFiles))
elif args.mode=="new": elif args.mode=="new":
songDatabaseList = [] songDatabaseList={"songDirectory":soundLocation,'songData':{}}
if args.art.lower() == "true": if args.art.lower() == "true":
x = len(songFiles)*0.25 x = len(songFiles)*0.25
if x > 60: if x > 60:
@ -85,7 +84,7 @@ for i in songFiles:
index = (songFiles.index(i))%4 index = (songFiles.index(i))%4
print("\r" + str(loading[index] + str(math.floor((songFiles.index(i)/(len(songFiles)-1))*100))+ "%"), end='', flush=True) 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 # 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: with open('songDatabase.json', 'w') as handle:
json.dump(songDatabaseList, handle) json.dump(songDatabaseList, handle)