diff --git a/server/app/db/__init__.py b/server/app/db/__init__.py index fd406360..79a76d25 100644 --- a/server/app/db/__init__.py +++ b/server/app/db/__init__.py @@ -207,7 +207,7 @@ class TrackMethods: """ pass - def find_tracks_inside_path_regex(): + def get_dir_t_count(): """ Returns a list of all the tracks matching the path in the query params. """ diff --git a/server/app/db/mongodb/tracks.py b/server/app/db/mongodb/tracks.py index afa5fc0c..20df0f44 100644 --- a/server/app/db/mongodb/tracks.py +++ b/server/app/db/mongodb/tracks.py @@ -2,10 +2,9 @@ This file contains the AllSongs class for interacting with track documents in MongoDB. """ import re + import pymongo -from app.db.mongodb import convert_many -from app.db.mongodb import convert_one -from app.db.mongodb import MongoTracks +from app.db.mongodb import MongoTracks, convert_many, convert_one from bson import ObjectId @@ -100,7 +99,7 @@ class Tracks(MongoTracks): songs = self.collection.find({"folder": query}) return convert_many(songs) - def find_tracks_inside_path_regex(self, path: str) -> int: + def get_dir_t_count(self, path: str) -> int: """ Returns a list of all the tracks matching the path in the query params. """ diff --git a/server/app/lib/folderslib.py b/server/app/lib/folderslib.py index 5c878781..795b2ed0 100644 --- a/server/app/lib/folderslib.py +++ b/server/app/lib/folderslib.py @@ -19,7 +19,7 @@ def get_folder_track_count(path: str) -> int: """ Returns the number of files associated with a folder. """ - tracks = instances.tracks_instance.find_tracks_inside_path_regex(path) + tracks = instances.tracks_instance.get_dir_t_count(path) return len(tracks) @@ -29,7 +29,7 @@ def create_folder(dir: Dir) -> Folder: "name": dir.path.split("/")[-1], "path": dir.path, "is_sym": dir.is_sym, - "trackcount": instances.tracks_instance.find_tracks_inside_path_regex(dir.path), + "trackcount": instances.tracks_instance.get_dir_t_count(dir.path), } return Folder(folder)