Compare commits

...

2 Commits

Author SHA1 Message Date
56e5728245 Bump version to 0.11.2 2023-02-27 10:30:44 -05:00
6ff170e169 Quite a few bugs 2023-02-27 10:30:20 -05:00
4 changed files with 16 additions and 18 deletions

View File

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "vrobbler" name = "vrobbler"
version = "0.11.1" version = "0.11.2"
description = "" description = ""
authors = ["Colin Powell <colin@unbl.ink>"] authors = ["Colin Powell <colin@unbl.ink>"]

View File

@ -6,7 +6,7 @@ from uuid import uuid4
import musicbrainzngs import musicbrainzngs
from django.conf import settings from django.conf import settings
from django.core.files.base import File from django.core.files.base import ContentFile, File
from django.db import models from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _

View File

@ -6,14 +6,12 @@ from scrobbles.models import Scrobble
def now_playing(request): def now_playing(request):
user = request.user user = request.user
now = timezone.now() now = timezone.now()
if user.is_authenticated: if not user.is_authenticated:
if user.profile: return {}
timezone.activate(pytz.timezone(user.profile.timezone)) return {
now = timezone.localtime(timezone.now()) 'now_playing_list': Scrobble.objects.filter(
return { in_progress=True,
'now_playing_list': Scrobble.objects.filter( is_paused=False,
in_progress=True, user=user,
is_paused=False, )
user=user, }
)
}

View File

@ -87,17 +87,17 @@ class RecentScrobbleList(ListView):
data['sport_scrobble_list'] = completed_for_user.filter( data['sport_scrobble_list'] = completed_for_user.filter(
sport_event__isnull=False sport_event__isnull=False
).order_by('-timestamp')[:15] ).order_by('-timestamp')[:15]
data['active_imports'] = AudioScrobblerTSVImport.objects.filter(
processing_started__isnull=False,
processed_finished__isnull=True,
user=self.request.user,
)
data["weekly_data"] = week_of_scrobbles(user=user) data["weekly_data"] = week_of_scrobbles(user=user)
data['counts'] = scrobble_counts(user) data['counts'] = scrobble_counts(user)
data['imdb_form'] = ScrobbleForm data['imdb_form'] = ScrobbleForm
data['export_form'] = ExportScrobbleForm data['export_form'] = ExportScrobbleForm
data['active_imports'] = AudioScrobblerTSVImport.objects.filter(
processing_started__isnull=False,
processed_finished__isnull=True,
user=self.request.user,
)
return data return data
def get_queryset(self): def get_queryset(self):