nyymix/muistox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add function to build canonical url

Browse source
This commit is contained in:
Nyymix 2025-08-05 20:40:03 +03:00
parent e8d73b9909
commit b59377471a
6 changed files with 87 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

34
gallery/views/album.py
View file

@ -3,13 +3,14 @@ from django.core.cache import cache
from django.core.paginator import Paginator
from django.db.models import Count, F, Q, Sum
from django.http import JsonResponse
from django.shortcuts import get_object_or_404, redirect
from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.views import View
from django.views.generic import DetailView, ListView, TemplateView
from config.cache_durations import *
from gallery.cache import cached_or_set
from gallery.utils import build_canonical_url
from ..models import Album, Photo, Redir
@ -45,11 +46,11 @@ class AlbumsList(ListView):
context = super().get_context_data(**kwargs)
page_obj = context.get('page_obj')
page = self.request.GET.get('page')
if page_obj.number > 1:
canonical_url = f"{self.request.build_absolute_uri(reverse('gallery:albums_url'))}?page={page}"
else:
canonical_url = self.request.build_absolute_uri(reverse('gallery:albums_url'))
canonical_url = build_canonical_url(
self.request,
reverse('gallery:albums_url'),
params={'page': page_obj.number}
)
context.update({
'canonical_url': canonical_url,
@ -75,10 +76,11 @@ class AlbumDetail(DetailView):
page_obj = paginator.get_page(self.request.GET.get('page'))
# Canonical_url
if page_obj.number > 1:
canonical_url = f"{self.request.build_absolute_uri(self.object.get_absolute_url())}?page={page_obj.number}"
else:
canonical_url = self.request.build_absolute_uri(self.object.get_absolute_url())
canonical_url = build_canonical_url(
self.request,
self.object.get_absolute_url(),
params={'page': page_obj.number}
)
context.update({
'photos': page_obj.object_list,
@ -110,12 +112,11 @@ class AlbumSearch(TemplateView):
page_obj = paginator.get_page(self.request.GET.get('page'))
# Canonical URL
page = self.request.GET.get('page')
base_url = self.request.build_absolute_uri(reverse('gallery:search_url'))
if page_obj.number > 1:
canonical_url = f"{base_url}?page={page}"
else:
canonical_url = base_url
canonical_url = build_canonical_url(
self.request,
reverse('gallery:search_url'),
params={'page': page_obj.number, 'q': query}
)
context.update({
'results': page_obj.object_list,
@ -124,4 +125,5 @@ class AlbumSearch(TemplateView):
'is_paginated': page_obj.has_other_pages(),
'canonical_url': canonical_url
})
return context

18
gallery/views/main.py
View file

@ -11,6 +11,8 @@ from django.urls import reverse
from django.views import View
from django.views.generic import DetailView, ListView, TemplateView
from gallery.utils import build_canonical_url
from ..models import Album, Photo, Redir
@ -20,8 +22,14 @@ class Main(TemplateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['canonical_url'] = self.request.build_absolute_uri(reverse('gallery:main_url'))
context['latest_albums'] = Album.objects.filter(is_public=True).order_by('-album_date')[:6]
canonical_url = build_canonical_url(
self.request,
reverse('gallery:main_url')
)
context.update({
'canonical_url': canonical_url,
'latest_albums': Album.objects.filter(is_public=True).order_by('-album_date')[:6],
})
return context
@ -31,7 +39,11 @@ class About(TemplateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['canonical_url'] = self.request.build_absolute_uri(reverse('gallery:about_url'))
canonical_url = build_canonical_url(
self.request,
reverse('gallery:about_url')
)
context['canonical_url'] = canonical_url
return context

29
gallery/views/photo.py
View file

@ -8,6 +8,8 @@ from django.urls import reverse
from django.views import View
from django.views.generic import DetailView, ListView, TemplateView
from gallery.utils import build_canonical_url
from ..models import Album, Photo, Redir
@ -32,11 +34,11 @@ class PhotosList(ListView):
page_obj = context.get('page_obj')
# Canonical_url
page = self.request.GET.get('page')
if page_obj.number > 1:
canonical_url = f"{self.request.build_absolute_uri(reverse('gallery:photos_url'))}?page={page}"
else:
canonical_url = self.request.build_absolute_uri(reverse('gallery:photos_url'))
canonical_url = build_canonical_url(
self.request,
reverse('gallery:photos_url'),
params={'page': page_obj.number, 'order': order}
)
context.update({
'order': self.request.GET.get('order', 'latest'),
@ -54,7 +56,6 @@ class PhotoDetail(DetailView):
def get_object(self, queryset=None):
album_slug = self.kwargs.get('album_slug')
photo_slug = self.kwargs.get('photo_slug')
# photo = get_object_or_404(Photo.objects.select_related('album'), slug=photo_slug, album__slug=album_slug)
photo = get_object_or_404(Photo.objects.select_related('album'), slug=photo_slug, album__slug__iexact=album_slug)
if photo.slug not in self.request.session:
@ -65,10 +66,16 @@ class PhotoDetail(DetailView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
# Canonical_url
canonical_url = build_canonical_url(
self.request,
self.object.get_absolute_url()
)
context.update({
'next': self.object.get_next(),
'prev': self.object.get_prev(),
'canonical_url': self.request.build_absolute_uri(self.object.get_absolute_url()),
'canonical_url': canonical_url,
'liked': self.request.session.get(f"liked_{self.object.slug}", False)
})
return context
@ -131,10 +138,16 @@ class PhotoSlideshow(DetailView):
if not next_photo:
next_photo = Photo.objects.filter(album=current_photo.album).order_by('taken_at').first()
# Canonical_url
canonical_url = build_canonical_url(
self.request,
current_photo.get_slideshow_url()
)
context.update({
'next_photo': next_photo,
'liked': self.request.session.get(f"liked_{current_photo.slug}", False),
'canonical_url': self.request.build_absolute_uri(current_photo.get_slideshow_url()),
'canonical_url': canonical_url,
})
return context