secstate/vrobbler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[black] Apparently we didn't get it all
Some checks failed
build & deploy / test (push) Successful in 1m41s
Details
build & deploy / deploy (push) Failing after 2m2s
Details

Browse Source
This commit is contained in:
Colin Powell
2026-03-13 17:57:39 -04:00
parent 14e32dae12
commit 8ac6ed542f
5 changed files with 150 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
vrobbler/apps/music/aggregators.py
View File

@ -16,7 +16,9 @@ def scrobble_counts(user=None):
now = now_user_timezone(user.profile)
user_filter = Q(user=user)
start_of_today = datetime.combine(now.date(), datetime.min.time(), now.tzinfo)
start_of_today = datetime.combine(
now.date(), datetime.min.time(), now.tzinfo
)
starting_day_of_current_week = now.date() - timedelta(
days=now.today().isoweekday() % 7
)
@ -29,7 +31,9 @@ def scrobble_counts(user=None):
media_type=Scrobble.MediaType.TRACK,
)
data = {}
data["today"] = finished_scrobbles_qs.filter(timestamp__gte=start_of_today).count()
data["today"] = finished_scrobbles_qs.filter(
timestamp__gte=start_of_today
).count()
data["week"] = finished_scrobbles_qs.filter(
timestamp__gte=starting_day_of_current_week
).count()
@ -43,7 +47,9 @@ def scrobble_counts(user=None):
return data
def week_of_scrobbles(user=None, start=None, media: str = "tracks") -> dict[str, int]:
def week_of_scrobbles(
user=None, start=None, media: str = "tracks"
) -> dict[str, int]:
now = timezone.now()
user_filter = Q()
@ -95,7 +101,9 @@ def live_charts(
seven_days_ago = now - timedelta(days=7)
thirty_days_ago = now - timedelta(days=30)
start_of_today = datetime.combine(now, datetime.min.time(), tzinfo)
start_day_of_week = start_of_today - timedelta(days=now.today().isoweekday() % 7)
start_day_of_week = start_of_today - timedelta(
days=now.today().isoweekday() % 7
)
start_day_of_month = now.replace(day=1)
start_day_of_year = now.replace(month=1, day=1)
@ -112,13 +120,17 @@ def live_charts(
}
time_filter = Q()
completion_filter = Q(scrobble__user=user, scrobble__played_to_completion=True)
completion_filter = Q(
scrobble__user=user, scrobble__played_to_completion=True
)
user_filter = Q(scrobble__user=user)
count_field = "scrobble"
if media_type == "Artist":
for period, query_dict in period_queries.items():
period_queries[period] = {"track__" + k: v for k, v in query_dict.items()}
period_queries[period] = {
"track__" + k: v for k, v in query_dict.items()
}
completion_filter = Q(
track__scrobble__user=user,
track__scrobble__played_to_completion=True,
@ -163,7 +175,9 @@ def live_tv_charts(
seven_days_ago = now - timedelta(days=7)
thirty_days_ago = now - timedelta(days=30)
start_of_today = datetime.combine(now, datetime.min.time(), tzinfo)
start_day_of_week = start_of_today - timedelta(days=now.today().isoweekday() % 7)
start_day_of_week = start_of_today - timedelta(
days=now.today().isoweekday() % 7
)
start_day_of_month = now.replace(day=1)
start_day_of_year = now.replace(month=1, day=1)
@ -218,7 +232,9 @@ def live_youtube_channel_charts(
seven_days_ago = now - timedelta(days=7)
thirty_days_ago = now - timedelta(days=30)
start_of_today = datetime.combine(now, datetime.min.time(), tzinfo)
start_day_of_week = start_of_today - timedelta(days=now.today().isoweekday() % 7)
start_day_of_week = start_of_today - timedelta(
days=now.today().isoweekday() % 7
)
start_day_of_year = now.replace(month=1, day=1)
period_queries = {