refactor references

server/app/api/__init__.py

@@ -1,12 +1,14 @@
 from typing import List
 
 from app import models, instances
-from app import functions, helpers, albumslib, prep
+from app import functions, helpers, prep
+from app.lib import albumslib
 
 
 DB_TRACKS = instances.songs_instance.get_all_songs()
 ALBUMS: List[models.Album] = []
 TRACKS: List[models.Track] = []
+PLAYLISTS: List[models.Playlist] = []
 
 
 @helpers.background

server/app/api/album.py

@@ -1,8 +1,8 @@
 from flask import Blueprint, request
 from app import api
 from app import helpers, cache
-from app import albumslib, functions, trackslib
-
+from app import functions
+from app.lib import albumslib, trackslib
 album_bp = Blueprint("album", __name__, url_prefix="")
 
 

server/app/api/all.py

@@ -3,9 +3,7 @@ import urllib
 from typing import List
 from flask import request, send_file
 
-from app import functions, instances, helpers, cache, models, prep
-from app import albumslib, searchlib
-from app import trackslib
+from app import functions, instances, helpers, cache, db, prep
 from app import api
 
 

server/app/api/folder.py

@@ -2,13 +2,13 @@ import os
 from flask import Blueprint
 
 from app import api
+from app import settings
 
 folder_bp = Blueprint("folder", __name__, url_prefix="/")
 from app import helpers
 
 
 @folder_bp.route("/f/<folder>")
-# @cache.cached()
 def get_folder_tree(folder: str):
     """
     Returns a list of all the folders and tracks in the given folder.
@@ -16,9 +16,9 @@ def get_folder_tree(folder: str):
     req_dir = folder.replace("|", "/")
 
     if folder == "home":
-        req_dir = helpers.home_dir
+        req_dir = settings.HOME_DIR
 
-    dir_content = os.scandir(os.path.join(helpers.home_dir, req_dir))
+    dir_content = os.scandir(os.path.join(settings.HOME_DIR, req_dir))
 
     folders = []
     files = []
@@ -31,7 +31,7 @@ def get_folder_tree(folder: str):
                 _dir = {
                     "name": entry.name,
                     "count": len(files_in_dir),
-                    "path": entry.path.replace(helpers.home_dir, ""),
+                    "path": entry.path.replace(settings.HOME_DIR, ""),
                 }
 
                 folders.append(_dir)

server/app/api/playlist.py

@@ -1,35 +1,36 @@
 from flask import Blueprint, request
-from app import instances
+from app import instances, api
+from app.lib import playlistlib
 
 playlist_bp = Blueprint("playlist", __name__, url_prefix="/")
 
 
+@playlist_bp.route("/playlists", methods=["GET"])
+def get_all_playlists():
+    playlists = []
+    for playlist in api.PLAYLISTS:
+        del playlist.tracks
+        playlists.append(playlist)
+
+    return playlists
+
+
 @playlist_bp.route("/playlist/new")
 def create_playlist():
     data = request.get_json()
 
-    playlist = {
-        "name": data["name"],
-        "description": data["description"],
-    }
+    playlist = {"name": data["name"], "description": data["description"], "tracks": []}
 
     instances.playlist_instance.insert_playlist(playlist)
     return 200
 
-@playlist_bp.route("/playlist/<playlist_id>")
-def get_playlist(playlist_id):
-    pass
 
-@playlist_bp.route("/playlist/tracks/get", methods=["POST"])
-def add_tracks_to_playlist():
-    pass
+@playlist_bp.route("/playlist/<playlist_id>/add", methods=["POST"])
+def add_track_to_playlist(playlist_id):
+    data = request.get_json()
 
-@playlist_bp.route("/playlist/tracks/remove", methods=["POST"])
-def remove_single_track():
-    pass
-
-
-@playlist_bp.route("/playlist/<playlist_id>/update/desc", methods=["POST"])
-def update_playlist():
-    pass
+    pid = data["playlist"]
+    trackid = data["track"]
 
+    playlistlib.add_track(pid, trackid)
+    return 200

server/app/api/search.py

@@ -1,6 +1,6 @@
 from flask import Blueprint, request
 
-from app import searchlib
+from app.lib import searchlib
 from app import helpers
 
 search_bp = Blueprint("search", __name__, url_prefix="/")