[server] minor refactors

server/app/lib/albumslib.py

@@ -51,7 +51,7 @@ def get_album_image(album: list) -> str:
 def get_album_tracks(album: str, artist: str) -> List:
     return [
         track
-        for track in api.DB_TRACKS
+        for track in api.PRE_TRACKS
         if track["album"] == album and track["albumartist"] == artist
     ]
 

server/app/lib/folderslib.py

@@ -17,7 +17,6 @@ def get_folder_track_count(foldername: str) -> int:
     return len(track_list)
 
 
-
 def create_folder(foldername: str) -> models.Folder:
     """Create a single Folder object"""
     folder = {
@@ -55,7 +54,6 @@ def get_subdirs(foldername: str) -> List[models.Folder]:
         if str1 != "":
             subdirs.add(foldername + str1)
 
-
     return [create_folder(dir) for dir in subdirs]
 
 
@@ -65,16 +63,11 @@ def run_scandir():
     Initiates the creation of all folder objects for each folder with a track in it.
 
     Runs in a background thread after every 5 minutes.
-    It calls the 
+    It calls the
     """
-    flag = False
+    get_valid_folders()
+    folders_ = create_all_folders()
+    """Create all the folder objects before clearing api.FOLDERS"""
 
-    while flag is False:
-        get_valid_folders()
-        folders_ = create_all_folders()
-        """Create all the folder objects before clearing api.FOLDERS"""
-
-        api.FOLDERS.clear()
-        api.FOLDERS.extend(folders_)
-
-        time.sleep(300)
+    api.FOLDERS.clear()
+    api.FOLDERS.extend(folders_)

server/app/lib/trackslib.py

@@ -7,7 +7,7 @@ from typing import List
 from app import models, instances
 from app.lib import albumslib
 from app.helpers import remove_duplicates
-from app import api, helpers
+from app import api
 from progress.bar import Bar
 
 
@@ -17,10 +17,9 @@ def create_all_tracks() -> List[models.Track]:
     """
     tracks: list[models.Track] = []
 
-    timer = helpers.Timer()
-
-    _bar = Bar("Creating tracks", max=len(api.DB_TRACKS))
-    for track in api.DB_TRACKS:
+    _bar = Bar("Creating tracks", max=len(api.PRE_TRACKS))
+    
+    for track in api.PRE_TRACKS:
         try:
             os.chmod(track["filepath"], 0o755)
         except FileNotFoundError:
@@ -33,10 +32,10 @@ def create_all_tracks() -> List[models.Track]:
         tracks.append(models.Track(track))
         _bar.next()
 
+    _bar.finish()
+
     api.TRACKS.clear()
     api.TRACKS.extend(tracks)
-    _bar.finish()
-    print(f"Created all songs in {timer.stop()}")
 
 
 def get_album_tracks(albumname, artist):
@@ -53,5 +52,5 @@ def get_album_tracks(albumname, artist):
 def get_track_by_id(trackid: str) -> models.Track:
     """Returns api track matching an id"""
     for track in api.TRACKS:
-        if track.id == trackid:
+        if track.trackid == trackid:
             return track