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

[scrobbles] GeoLocations dont need to rebuild charts

Browse Source
This commit is contained in:
Colin Powell
2026-05-21 19:07:12 -04:00
parent c11858810c
commit b9324d6443
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vrobbler/apps/scrobbles/signals.py
View File

@ -5,7 +5,7 @@ from django.dispatch import receiver
from django.utils import timezone from django.utils import timezone
from scrobbles.models import Scrobble from scrobbles.models import Scrobble
from scrobbles.tasks import MEDIA_TYPES, update_charts_for_timestamp from scrobbles.tasks import CHARTABLE_MEDIA_TYPES, SCROBBLES_WITHOUT_CHARTS, update_charts_for_timestamp
from scrobbles.utils import tokenize_title_to_tags from scrobbles.utils import tokenize_title_to_tags
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -19,7 +19,10 @@ def update_charts_on_scrobble_complete(sender, instance, **kwargs):
if instance.timestamp is None: if instance.timestamp is None:
return return
if instance.media_type.lower() not in MEDIA_TYPES: if instance.media_type.lower() in SCROBBLES_WITHOUT_CHARTS:
return
if instance.media_type.lower() not in CHARTABLE_MEDIA_TYPES:
return return
_update_charts_for_timestamp(instance.user, instance.timestamp) _update_charts_for_timestamp(instance.user, instance.timestamp)
@ -30,7 +33,10 @@ def update_charts_on_scrobble_delete(sender, instance, **kwargs):
if instance.timestamp is None: if instance.timestamp is None:
return return
if instance.media_type.lower() not in MEDIA_TYPES: if instance.media_type.lower() in SCROBBLES_WITHOUT_CHARTS:
return
if instance.media_type.lower() not in CHARTABLE_MEDIA_TYPES:
return return
_update_charts_for_timestamp(instance.user, instance.timestamp) _update_charts_for_timestamp(instance.user, instance.timestamp)

20
vrobbler/apps/scrobbles/tasks.py
View File

@ -16,7 +16,7 @@ from django.utils import timezone
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
User = get_user_model() User = get_user_model()
MEDIA_TYPES = [ CHARTABLE_MEDIA_TYPES = [
"artist", "artist",
"album", "album",
"track", "track",
@ -29,6 +29,10 @@ MEDIA_TYPES = [
"book", "book",
] ]
SCROBBLES_WITHOUT_CHARTS = [
"geolocation",
]
@shared_task @shared_task
def check_twitch_channels_for_vods(): def check_twitch_channels_for_vods():
@ -167,7 +171,7 @@ def rebuild_weekly_charts():
now = timezone.now() now = timezone.now()
year, week, _ = now.isocalendar() year, week, _ = now.isocalendar()
for user in User.objects.all(): for user in User.objects.all():
build_weekly_charts(user, year, week, MEDIA_TYPES) build_weekly_charts(user, year, week, CHARTABLE_MEDIA_TYPES)
logger.info(f"Rebuilt weekly charts for week {week}, {year}") logger.info(f"Rebuilt weekly charts for week {week}, {year}")
@ -182,7 +186,7 @@ def rebuild_monthly_charts():
else: else:
month -= 1 month -= 1
for user in User.objects.all(): for user in User.objects.all():
build_monthly_charts(user, year, month, MEDIA_TYPES) build_monthly_charts(user, year, month, CHARTABLE_MEDIA_TYPES)
logger.info(f"Rebuilt monthly charts for {month}/{year}") logger.info(f"Rebuilt monthly charts for {month}/{year}")
@ -192,7 +196,7 @@ def rebuild_yearly_charts():
now = timezone.now() now = timezone.now()
year = now.year - 1 year = now.year - 1
for user in User.objects.all(): for user in User.objects.all():
build_yearly_charts(user, year, MEDIA_TYPES) build_yearly_charts(user, year, CHARTABLE_MEDIA_TYPES)
logger.info(f"Rebuilt yearly charts for {year}") logger.info(f"Rebuilt yearly charts for {year}")
@ -205,10 +209,10 @@ def update_charts_for_timestamp(user_id, year, month, day, week):
return return
try: try:
build_daily_charts(user, year, month, day, MEDIA_TYPES) build_daily_charts(user, year, month, day, CHARTABLE_MEDIA_TYPES)
build_weekly_charts(user, year, week, MEDIA_TYPES) build_weekly_charts(user, year, week, CHARTABLE_MEDIA_TYPES)
build_monthly_charts(user, year, month, MEDIA_TYPES) build_monthly_charts(user, year, month, CHARTABLE_MEDIA_TYPES)
build_yearly_charts(user, year, MEDIA_TYPES) build_yearly_charts(user, year, CHARTABLE_MEDIA_TYPES)
date_str = f"{year}-{month:02d}-{day:02d}" date_str = f"{year}-{month:02d}-{day:02d}"
logger.info(f"[charts] Updated charts for {user} on {date_str}") logger.info(f"[charts] Updated charts for {user} on {date_str}")
except Exception as e: except Exception as e: