[scrobbles] Use IDs not UUIDs in URLs
All checks were successful
build / test (push) Successful in 1m59s
All checks were successful
build / test (push) Successful in 1m59s
This commit is contained in:
@ -839,10 +839,10 @@ def import_audioscrobbler_file(request):
|
||||
|
||||
@api_view(["GET"])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def scrobble_start(request, uuid):
|
||||
def scrobble_start(request, media_uuid):
|
||||
logger.info(
|
||||
"[scrobble_start] called",
|
||||
extra={"request": request, "uuid": uuid},
|
||||
extra={"request": request, "media_uuid": media_uuid},
|
||||
)
|
||||
user = request.user
|
||||
success_url = request.META.get("HTTP_REFERER")
|
||||
@ -853,14 +853,14 @@ def scrobble_start(request, uuid):
|
||||
media_obj = None
|
||||
for app, model in PLAY_AGAIN_MEDIA.items():
|
||||
media_model = apps.get_model(app_label=app, model_name=model)
|
||||
media_obj = media_model.objects.filter(uuid=uuid).first()
|
||||
media_obj = media_model.objects.filter(uuid=media_uuid).first()
|
||||
if media_obj:
|
||||
break
|
||||
|
||||
if not media_obj:
|
||||
logger.info(
|
||||
"[scrobble_start] media object not found",
|
||||
extra={"uuid": uuid, "user_id": user.id},
|
||||
extra={"media_uuid": media_uuid, "user_id": user.id},
|
||||
)
|
||||
raise Exception("No media object provided to scrobble")
|
||||
|
||||
@ -897,7 +897,7 @@ def scrobble_start(request, uuid):
|
||||
)
|
||||
else:
|
||||
messages.add_message(
|
||||
request, messages.ERROR, f"Media with uuid {uuid} not found."
|
||||
request, messages.ERROR, f"Media with uuid {media_uuid} not found."
|
||||
)
|
||||
|
||||
if (
|
||||
@ -915,7 +915,7 @@ def scrobble_start(request, uuid):
|
||||
|
||||
|
||||
@api_view(["GET"])
|
||||
def scrobble_longplay_finish(request, uuid):
|
||||
def scrobble_longplay_finish(request, media_uuid):
|
||||
user = request.user
|
||||
success_url = request.META.get("HTTP_REFERER")
|
||||
|
||||
@ -923,7 +923,7 @@ def scrobble_longplay_finish(request, uuid):
|
||||
return HttpResponseRedirect(success_url)
|
||||
|
||||
# Try scrobble UUID first
|
||||
scrobble = Scrobble.objects.filter(uuid=uuid, user=user).first()
|
||||
scrobble = Scrobble.objects.filter(uuid=media_uuid, user=user).first()
|
||||
if scrobble:
|
||||
if scrobble.long_play_complete == True:
|
||||
scrobble.long_play_complete = None
|
||||
@ -947,13 +947,13 @@ def scrobble_longplay_finish(request, uuid):
|
||||
media_obj = None
|
||||
for app, model in LONG_PLAY_MEDIA.items():
|
||||
media_model = apps.get_model(app_label=app, model_name=model)
|
||||
media_obj = media_model.objects.filter(uuid=uuid).first()
|
||||
media_obj = media_model.objects.filter(uuid=media_uuid).first()
|
||||
if media_obj:
|
||||
break
|
||||
|
||||
if not media_obj:
|
||||
messages.add_message(
|
||||
request, messages.ERROR, f"Media with uuid {uuid} not found."
|
||||
request, messages.ERROR, f"Media with uuid {media_uuid} not found."
|
||||
)
|
||||
return HttpResponseRedirect(success_url)
|
||||
|
||||
@ -976,14 +976,14 @@ def scrobble_longplay_finish(request, uuid):
|
||||
)
|
||||
else:
|
||||
messages.add_message(
|
||||
request, messages.ERROR, f"Media with uuid {uuid} not found."
|
||||
request, messages.ERROR, f"Media with uuid {media_uuid} not found."
|
||||
)
|
||||
return HttpResponseRedirect(success_url)
|
||||
|
||||
|
||||
@api_view(["GET"])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def scrobble_finish(request, uuid):
|
||||
def scrobble_finish(request, pk):
|
||||
user = request.user
|
||||
success_url = request.META.get("HTTP_REFERER")
|
||||
if not success_url:
|
||||
@ -992,7 +992,7 @@ def scrobble_finish(request, uuid):
|
||||
if not user.is_authenticated:
|
||||
return HttpResponseRedirect(success_url)
|
||||
|
||||
scrobble = Scrobble.objects.filter(user=user, uuid=uuid).first()
|
||||
scrobble = Scrobble.objects.filter(user=user, pk=pk).first()
|
||||
if scrobble:
|
||||
scrobble.stop(force_finish=True)
|
||||
messages.add_message(
|
||||
@ -1007,14 +1007,14 @@ def scrobble_finish(request, uuid):
|
||||
|
||||
@api_view(["GET"])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def scrobble_cancel(request, uuid):
|
||||
def scrobble_cancel(request, pk):
|
||||
user = request.user
|
||||
success_url = reverse_lazy("vrobbler-home")
|
||||
|
||||
if not user.is_authenticated:
|
||||
return HttpResponseRedirect(success_url)
|
||||
|
||||
scrobble = Scrobble.objects.filter(user=user, uuid=uuid).first()
|
||||
scrobble = Scrobble.objects.filter(user=user, pk=pk).first()
|
||||
if scrobble:
|
||||
scrobble.cancel()
|
||||
messages.add_message(
|
||||
@ -1028,11 +1028,11 @@ def scrobble_cancel(request, uuid):
|
||||
|
||||
|
||||
@require_POST
|
||||
def add_to_mopidy_queue(request, uuid):
|
||||
def add_to_mopidy_queue(request, pk):
|
||||
if not request.user.is_authenticated:
|
||||
return redirect("scrobbles:detail", uuid=uuid)
|
||||
return redirect("scrobbles:detail", pk=pk)
|
||||
|
||||
scrobble = get_object_or_404(Scrobble, uuid=uuid, user=request.user)
|
||||
scrobble = get_object_or_404(Scrobble, pk=pk, user=request.user)
|
||||
mopidy_url = request.user.profile.mopidy_api_url
|
||||
|
||||
if not mopidy_url:
|
||||
@ -1041,22 +1041,22 @@ def add_to_mopidy_queue(request, uuid):
|
||||
messages.ERROR,
|
||||
"Mopidy API URL not configured in your profile settings.",
|
||||
)
|
||||
return redirect("scrobbles:detail", uuid=uuid)
|
||||
return redirect("scrobbles:detail", pk=pk)
|
||||
|
||||
from scrobbles.tasks import add_scrobble_to_mopidy_queue as task
|
||||
|
||||
task.delay(scrobble.id)
|
||||
msg = f'Adding "{scrobble.media_obj}" to Mopidy queue.'
|
||||
messages.add_message(request, messages.SUCCESS, msg)
|
||||
return redirect("scrobbles:detail", uuid=uuid)
|
||||
return redirect("scrobbles:detail", pk=pk)
|
||||
|
||||
|
||||
@require_POST
|
||||
def add_to_mopidy_monthly_playlist(request, uuid):
|
||||
def add_to_mopidy_monthly_playlist(request, pk):
|
||||
if not request.user.is_authenticated:
|
||||
return redirect("scrobbles:detail", uuid=uuid)
|
||||
return redirect("scrobbles:detail", pk=pk)
|
||||
|
||||
scrobble = get_object_or_404(Scrobble, uuid=uuid, user=request.user)
|
||||
scrobble = get_object_or_404(Scrobble, pk=pk, user=request.user)
|
||||
profile = request.user.profile
|
||||
pattern = profile.monthly_mopidy_playlist_pattern
|
||||
|
||||
@ -1066,7 +1066,7 @@ def add_to_mopidy_monthly_playlist(request, uuid):
|
||||
messages.ERROR,
|
||||
"Monthly playlist pattern or Mopidy API URL not configured in your profile.",
|
||||
)
|
||||
return redirect("scrobbles:detail", uuid=uuid)
|
||||
return redirect("scrobbles:detail", pk=pk)
|
||||
|
||||
now = now_user_timezone(profile)
|
||||
playlist_name = DateFormat(now).format(pattern)
|
||||
@ -1079,7 +1079,7 @@ def add_to_mopidy_monthly_playlist(request, uuid):
|
||||
messages.SUCCESS,
|
||||
f'Adding "{scrobble.media_obj}" to monthly playlist "{playlist_name}".',
|
||||
)
|
||||
return redirect("scrobbles:detail", uuid=uuid)
|
||||
return redirect("scrobbles:detail", pk=pk)
|
||||
|
||||
|
||||
@require_POST
|
||||
@ -1184,8 +1184,6 @@ class ScrobbleStatusView(LoginRequiredMixin, TemplateView):
|
||||
|
||||
class ScrobbleDetailView(DetailView):
|
||||
model = Scrobble
|
||||
slug_field = "uuid"
|
||||
slug_url_kwarg = "uuid"
|
||||
paginate_by = 100
|
||||
|
||||
def get_object(self, queryset=None):
|
||||
@ -1385,15 +1383,15 @@ class ScrobbleExploreView(ListView):
|
||||
|
||||
|
||||
class RegenerateShareTokenView(LoginRequiredMixin, View):
|
||||
def post(self, request, uuid):
|
||||
scrobble = get_object_or_404(Scrobble, uuid=uuid, user=request.user)
|
||||
def post(self, request, pk):
|
||||
scrobble = get_object_or_404(Scrobble, pk=pk, user=request.user)
|
||||
scrobble.regenerate_share_token()
|
||||
return redirect(scrobble.get_absolute_url())
|
||||
|
||||
|
||||
class ChangeVisibilityView(LoginRequiredMixin, View):
|
||||
def post(self, request, uuid):
|
||||
scrobble = get_object_or_404(Scrobble, uuid=uuid, user=request.user)
|
||||
def post(self, request, pk):
|
||||
scrobble = get_object_or_404(Scrobble, pk=pk, user=request.user)
|
||||
visibility = request.POST.get("visibility")
|
||||
if visibility not in (Visibility.PUBLIC, Visibility.SHARED, Visibility.PRIVATE):
|
||||
return redirect(scrobble.get_absolute_url())
|
||||
@ -1404,8 +1402,6 @@ class ChangeVisibilityView(LoginRequiredMixin, View):
|
||||
|
||||
class ScrobbleShareAnalyticsView(LoginRequiredMixin, DetailView):
|
||||
model = Scrobble
|
||||
slug_field = "uuid"
|
||||
slug_url_kwarg = "uuid"
|
||||
template_name = "scrobbles/scrobble_share_analytics.html"
|
||||
|
||||
def get_queryset(self):
|
||||
|
||||
Reference in New Issue
Block a user