add timestamp to favorite entries

+ convert useBisection into a function

app/api/artist.py

@@ -183,7 +183,7 @@ def get_all_artist_tracks(path: ArtistHashSchema):
     """
     tracks = TrackStore.get_tracks_by_artisthash(path.artisthash)
 
-    return {"tracks": serialize_tracks(tracks)}
+    return serialize_tracks(tracks)
 
 
 @api.get("/<artisthash>/similar")
@@ -208,7 +208,7 @@ def get_similar_artists(path: ArtistHashSchema, query: ArtistLimitSchema):
     if len(similar) > limit:
         similar = random.sample(similar, limit)
 
-    return {"artists": similar[:limit]}
+    return similar[:limit]
 
 
 # TODO: Rewrite this file using generators where possible

app/api/favorites.py

@@ -1,21 +1,26 @@
+from typing import List, TypeVar
 from flask import Blueprint, request
 
-from app.db.sqlite.favorite import SQLiteFavoriteMethods as favdb
 from app.models import FavType
-from app.serializers.album import serialize_for_card, serialize_for_card_many
-from app.serializers.artist import serialize_for_card as serialize_artist
+from app.utils.bisection import use_bisection
+from app.db.sqlite.favorite import SQLiteFavoriteMethods as favdb
 from app.serializers.track import serialize_track, serialize_tracks
-from app.utils.bisection import UseBisection
+from app.serializers.artist import serialize_for_card as serialize_artist
+from app.serializers.album import serialize_for_card, serialize_for_card_many
 
-from app.store.artists import ArtistStore
 from app.store.albums import AlbumStore
 from app.store.tracks import TrackStore
+from app.store.artists import ArtistStore
+from app.utils.dates import timestamp_to_time_passed
 
 
 api = Blueprint("favorite", __name__, url_prefix="/")
 
 
-def remove_none(items: list):
+T = TypeVar("T")
+
+
+def remove_none(items: List[T]) -> List[T]:
     return [i for i in items if i is not None]
 
 
@@ -76,7 +81,7 @@ def get_favorite_albums():
 
     src_albums = sorted(AlbumStore.albums, key=lambda x: x.albumhash)
 
-    fav_albums = UseBisection(src_albums, "albumhash", albumhashes)()
+    fav_albums = use_bisection(src_albums, "albumhash", albumhashes)
     fav_albums = remove_none(fav_albums)
 
     if limit == 0:
@@ -99,7 +104,7 @@ def get_favorite_tracks():
     trackhashes.reverse()
     src_tracks = sorted(TrackStore.tracks, key=lambda x: x.trackhash)
 
-    tracks = UseBisection(src_tracks, "trackhash", trackhashes)()
+    tracks = use_bisection(src_tracks, "trackhash", trackhashes)
     tracks = remove_none(tracks)
 
     if limit == 0:
@@ -123,7 +128,7 @@ def get_favorite_artists():
 
     src_artists = sorted(ArtistStore.artists, key=lambda x: x.artisthash)
 
-    artists = UseBisection(src_artists, "artisthash", artisthashes)()
+    artists = use_bisection(src_artists, "artisthash", artisthashes)
     artists = remove_none(artists)
 
     if limit == 0:
@@ -169,6 +174,7 @@ def get_all_favorites():
     artist_master_hash = set(a.artisthash for a in ArtistStore.artists)
 
     for fav in favs:
+        # INFO: hash is [1], type is [2], timestamp is [3]
         hash = fav[1]
         if fav[2] == FavType.track:
             tracks.append(hash) if hash in track_master_hash else None
@@ -189,9 +195,9 @@ def get_all_favorites():
     src_albums = sorted(AlbumStore.albums, key=lambda x: x.albumhash)
     src_artists = sorted(ArtistStore.artists, key=lambda x: x.artisthash)
 
-    tracks = UseBisection(src_tracks, "trackhash", tracks, limit=track_limit)()
-    albums = UseBisection(src_albums, "albumhash", albums, limit=album_limit)()
-    artists = UseBisection(src_artists, "artisthash", artists, limit=artist_limit)()
+    tracks = use_bisection(src_tracks, "trackhash", tracks, limit=track_limit)
+    albums = use_bisection(src_albums, "albumhash", albums, limit=album_limit)
+    artists = use_bisection(src_artists, "artisthash", artists, limit=artist_limit)
 
     tracks = remove_none(tracks)
     albums = remove_none(albums)
@@ -201,6 +207,7 @@ def get_all_favorites():
     # first_n = favs
 
     for fav in favs:
+        # INFO: hash is [1], type is [2], timestamp is [3]
         if len(recents) >= largest:
             break
 
@@ -212,6 +219,7 @@ def get_all_favorites():
 
             album = serialize_for_card(album)
             album["help_text"] = "album"
+            album["time"] = timestamp_to_time_passed(fav[3])
 
             recents.append(
                 {
@@ -228,6 +236,7 @@ def get_all_favorites():
 
             artist = serialize_artist(artist)
             artist["help_text"] = "artist"
+            artist["time"] = timestamp_to_time_passed(fav[3])
 
             recents.append(
                 {
@@ -244,6 +253,7 @@ def get_all_favorites():
 
             track = serialize_track(track)
             track["help_text"] = "track"
+            track["time"] = timestamp_to_time_passed(fav[3])
 
             recents.append({"type": "track", "item": track})