add recently played playlist

app/lib/home/recentlyadded.py

@@ -1,6 +1,7 @@
-import os
+from datetime import datetime
 
-from flask import g
+from app.lib.playlistlib import get_first_4_images
+from app.models.playlist import Playlist
 from app.models.track import Track
 from app.store.tracks import TrackStore
 from app.store.albums import AlbumStore
@@ -12,7 +13,7 @@ from app.serializers.artist import serialize_for_card
 
 from itertools import groupby
 
-from app.utils.dates import timestamp_to_time_passed
+from app.utils.dates import create_new_date, date_string_to_time_passed, timestamp_to_time_passed
 
 older_albums = set()
 older_artists = set()
@@ -191,7 +192,7 @@ def group_track_by_folders(tracks: Track):
     return sorted(groups, key=lambda group: group["time"], reverse=True)
 
 
-def get_recent_items(limit: int = 7):
+def get_recently_added_items(limit: int = 7):
     tracks = sorted(TrackStore.tracks, key=lambda t: t.created_date)
     groups = group_track_by_folders(tracks)
 
@@ -216,6 +217,33 @@ def get_recent_items(limit: int = 7):
     return recent_items
 
 
-def get_recent_tracks(limit: int):
+
+def get_recently_added_playlist(limit: int = 100):
+    playlist = Playlist(
+        id="recentlyadded",
+        name="Recently Added",
+        image=None,
+        last_updated="Now",
+        settings={},
+        trackhashes=[],
+    )
+
+    tracks = get_recently_added_tracks(limit=limit)
+
+    try:
+        # Create date to show as last updated
+        date = datetime.fromtimestamp(tracks[0].created_date)
+    except IndexError:
+        return playlist, []
+
+    playlist.last_updated = date_string_to_time_passed(create_new_date(date))
+
+    images = get_first_4_images(tracks=tracks)
+    playlist.images = images
+    playlist.set_count(len(tracks))
+
+    return playlist, tracks
+
+def get_recently_added_tracks(limit: int):
     tracks = sorted(TrackStore.tracks, key=lambda t: t.created_date, reverse=True)
     return tracks[:limit]

app/lib/home/recentlyplayed.py

@@ -1,27 +1,37 @@
+from datetime import datetime
 import os
-from app.models.logger import Track as TrackLog
+from app.models.logger import TrackLog
 
 from app.db.sqlite.logger.tracks import SQLiteTrackLogger as db
 from app.db.sqlite.playlists import SQLitePlaylistMethods as pdb
 from app.db.sqlite.favorite import SQLiteFavoriteMethods as fdb
 
+from app.models.playlist import Playlist
 from app.serializers.track import serialize_track
 from app.serializers.album import album_serializer
-from app.utils.dates import timestamp_to_time_passed
+from app.lib.playlistlib import get_first_4_images
+from app.utils.dates import create_new_date, date_string_to_time_passed, timestamp_to_time_passed
 from app.serializers.artist import serialize_for_card
 from app.serializers.playlist import serialize_for_card as serialize_playlist
-from app.lib.playlistlib import get_first_4_images, get_recently_added_playlist
+from app.lib.home.recentlyadded import get_recently_added_playlist
 
 from app.store.albums import AlbumStore
 from app.store.tracks import TrackStore
 from app.store.artists import ArtistStore
 
 
+
 def get_recently_played(limit=7):
+    # TODO: Paginate this
     entries = db.get_all()
     items = []
     added = set()
 
+    custom_playlists = [
+        {"name": "recentlyadded", "handler": get_recently_added_playlist},
+        {"name": "recentlyplayed", "handler": get_recently_played_playlist},
+    ]
+
     for entry in entries:
         if len(items) >= limit:
             break
@@ -112,10 +122,13 @@ def get_recently_played(limit=7):
             continue
 
         if entry.type == "playlist":
-            is_recently_added = entry.type_src == "recentlyadded"
+            is_custom = entry.type_src in [i["name"] for i in custom_playlists]
+            # is_recently_added = entry.type_src == "recentlyadded"
 
-            if is_recently_added:
-                playlist, _ = get_recently_added_playlist()
+            if is_custom:
+                playlist, _ = next(
+                    i["handler"]() for i in custom_playlists if i["name"] == entry.type_src
+                )
                 playlist.images = [i["image"] for i in playlist.images]
 
                 playlist = serialize_playlist(
@@ -186,3 +199,31 @@ def get_recently_played(limit=7):
         )
 
     return items
+
+
+def get_recently_played_tracks(limit: int):
+    records = db.get_recently_played(start=0, limit=limit)
+    last_updated = records[0].timestamp
+    tracks = TrackStore.get_tracks_by_trackhashes([r.trackhash for r in records])
+    return tracks, last_updated
+
+def get_recently_played_playlist(limit: int = 100):
+    playlist = Playlist(
+        id="recentlyplayed",
+        name="Recently Played",
+        image=None,
+        last_updated="Now",
+        settings={},
+        trackhashes=[],
+    )
+
+    tracks, timestamp = get_recently_played_tracks(limit)
+
+    date = datetime.fromtimestamp(timestamp)
+    playlist.last_updated = date_string_to_time_passed(create_new_date(date))
+
+    images = get_first_4_images(tracks=tracks)
+    playlist.images = images
+    playlist.set_count(len(tracks))
+
+    return playlist, tracks

app/lib/playlistlib.py

@@ -5,18 +5,14 @@ This library contains all the functions related to playlists.
 import os
 import random
 import string
-from datetime import datetime
 from typing import Any
 
 from PIL import Image, ImageSequence
 
 from app import settings
-from app.lib.home.recentlyadded import get_recent_tracks
-from app.models.playlist import Playlist
 from app.models.track import Track
 from app.store.albums import AlbumStore
 from app.store.tracks import TrackStore
-from app.utils.dates import create_new_date, date_string_to_time_passed
 
 
 def create_thumbnail(image: Any, img_path: str) -> str:
@@ -133,30 +129,3 @@ def get_first_4_images(
         return images
 
     return duplicate_images(images)
-
-
-def get_recently_added_playlist(limit: int = 100):
-    playlist = Playlist(
-        id="recentlyadded",
-        name="Recently Added",
-        image=None,
-        last_updated="Now",
-        settings={},
-        trackhashes=[],
-    )
-
-    tracks = get_recent_tracks(limit=limit)
-
-    try:
-        # Create date to show as last updated
-        date = datetime.fromtimestamp(tracks[0].created_date)
-    except IndexError:
-        return playlist, []
-
-    playlist.last_updated = date_string_to_time_passed(create_new_date(date))
-
-    images = get_first_4_images(tracks=tracks)
-    playlist.images = images
-    playlist.set_count(len(tracks))
-
-    return playlist, tracks