Skip to content

Commit

Permalink
[db] Fix recent track query
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonVanAssche committed Nov 28, 2024
1 parent d66d326 commit fe4fe53
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 49 deletions.
1 change: 0 additions & 1 deletion src/jamjar/cli/add.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from jamjar.core.managers.add import AddManager
from jamjar.core.managers.auth import Auth
from jamjar.core.spotify import SpotifyAPI
from jamjar.utils import extract_playlist_id

CONFIG = Config()

Expand Down
2 changes: 2 additions & 0 deletions src/jamjar/cli/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
logging in, refreshing the access token, and storing the token.
"""

from datetime import datetime

import click

from jamjar.config import Config
Expand Down
2 changes: 0 additions & 2 deletions src/jamjar/cli/diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@

from jamjar.config import Config
from jamjar.core.database import Database
from jamjar.core.dataclasses import Playlist, Track
from jamjar.core.managers.auth import Auth
from jamjar.core.managers.diff import DiffManager
from jamjar.core.spotify import SpotifyAPI
from jamjar.utils import extract_playlist_id

CONFIG = Config()

Expand Down
2 changes: 0 additions & 2 deletions src/jamjar/cli/dump.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
from a database to a structured JSON file.
"""

import json

import click

from jamjar.config import Config
Expand Down
1 change: 0 additions & 1 deletion src/jamjar/cli/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from jamjar.config import Config
from jamjar.core.database import Database
from jamjar.core.managers.list import ListManager
from jamjar.utils import extract_playlist_id

CONFIG = Config()

Expand Down
6 changes: 0 additions & 6 deletions src/jamjar/cli/pull.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,8 @@

from jamjar.config import Config
from jamjar.core.database import Database
from jamjar.core.managers.add import AddManager
from jamjar.core.managers.auth import Auth
from jamjar.core.managers.pull import PullManager
from jamjar.core.managers.rm import RemoveManager
from jamjar.core.spotify import SpotifyAPI
from jamjar.utils import extract_playlist_id

CONFIG = Config()


# pylint: disable=line-too-long
Expand Down
2 changes: 1 addition & 1 deletion src/jamjar/cli/push.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from jamjar.config import Config
from jamjar.core.database import Database
from jamjar.core.managers.auth import Auth
from jamjar.core.managers.pull import PullManager
from jamjar.core.managers.push import PushManager
from jamjar.core.spotify import SpotifyAPI

CONFIG = Config()
Expand Down
4 changes: 2 additions & 2 deletions src/jamjar/core/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,9 @@ def fetch_recent_tracks(self, limit: int = 10) -> List[dict]:
with self.connection:
rows = self.connection.execute(
"""
SELECT p.name, t.name, t.artist, t.user_added, t.time_added
SELECT p.playlist_name, t.track_name, t.artist_name, t.user_added, t.time_added
FROM spotify_tracks t
JOIN playlists p ON t.playlist_id = p.id
JOIN spotify_playlist p ON t.playlist_id = p.playlist_id
ORDER BY t.time_added DESC
LIMIT ?
""",
Expand Down
4 changes: 0 additions & 4 deletions src/jamjar/core/managers/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@

import requests

from jamjar.config import Config

CONFIG = Config()


class Auth:
"""
Expand Down
22 changes: 0 additions & 22 deletions src/jamjar/core/managers/diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,25 +178,3 @@ def diff_playlist(self, playlist_identifier: str, detailed: bool = False) -> dic
generated_diff.update(metadata_diff)

return generated_diff


# pylint: disable=line-too-long
@click.command()
@click.help_option("--help", "-h")
@click.option("--details", "-d", is_flag=True, help="Show detailed differences, including metadata changes.")
@click.argument("playlist")
def diff(playlist, details):
"""
Compare a playlist with its current state on Spotify.
:param playlist: The Spotify playlist URL or ID to compare.
:param details: Flag to indicate whether detailed metadata differences should be shown.
"""

access_token = Auth(CONFIG).get_access_token()
db = Database(CONFIG)
spotify_api = SpotifyAPI(access_token)
diff_manager = DiffManager(db, spotify_api)

diff_data = diff_manager.diff_playlist(playlist, details)
print(json.dumps(diff_data, indent=2))
3 changes: 0 additions & 3 deletions src/jamjar/core/managers/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@

import json

from jamjar.config import Config
from jamjar.core.database import Database
from jamjar.utils import extract_playlist_id

CONFIG = Config()


# pylint: disable=too-few-public-methods
class ListManager:
Expand Down
3 changes: 0 additions & 3 deletions src/jamjar/core/managers/push.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@

from jamjar.config import Config
from jamjar.core.database import Database
from jamjar.core.managers.auth import Auth
from jamjar.core.spotify import SpotifyAPI

CONFIG = Config()


# pylint: disable=too-few-public-methods
class PushManager:
Expand Down
2 changes: 0 additions & 2 deletions src/jamjar/core/managers/stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
users are displayed.
"""

import json

from jamjar.config import Config
from jamjar.core.database import Database

Expand Down

0 comments on commit fe4fe53

Please sign in to comment.