diff options
| -rw-r--r-- | fietsboek/util.py | 18 | ||||
| -rw-r--r-- | fietsboek/views/browse.py | 12 | ||||
| -rw-r--r-- | fietsboek/views/climb.py | 17 |
3 files changed, 33 insertions, 14 deletions
diff --git a/fietsboek/util.py b/fietsboek/util.py index 9514315..bc7885f 100644 --- a/fietsboek/util.py +++ b/fietsboek/util.py @@ -6,6 +6,7 @@ import os import re import secrets import unicodedata +import urllib.parse from pathlib import Path from typing import Optional, TypeVar @@ -343,6 +344,23 @@ def get_date(request: Request, name: str) -> datetime.date: raise HTTPBadRequest(f"Invalid date in {name!r}") from exc +def qs_replace(url: str, **kwargs: dict[str, str]) -> str: + """Construct a new url based on the given one, with the query parameters replaced as given by + kwargs. + + :param url: The original url. + :parma kwargs: The query string items to replace. + :return: The new URL. + """ + parsed = urllib.parse.urlparse(url) + query = urllib.parse.parse_qs(parsed.query) + for k, v in kwargs.items(): + query[k] = [v] + query.update(kwargs) + new_qs = urllib.parse.urlencode(query, doseq=True) + return urllib.parse.urlunparse(parsed._replace(query=new_qs)) + + def check_password_constraints(password: str, repeat_password: Optional[str] = None): """Verifies that the password constraints match for the given password. diff --git a/fietsboek/views/browse.py b/fietsboek/views/browse.py index 331ee0d..15480d6 100644 --- a/fietsboek/views/browse.py +++ b/fietsboek/views/browse.py @@ -51,14 +51,6 @@ class Stream(RawIOBase): return b"".join(buf) -def _with_page(url: str, num: int) -> str: - parsed = urllib.parse.urlparse(url) - query = urllib.parse.parse_qs(parsed.query) - query["page"] = [str(num)] - new_qs = urllib.parse.urlencode(query, doseq=True) - return urllib.parse.urlunparse(parsed._replace(query=new_qs)) - - class ResultOrder(Enum): """Enum representing the different ways in which the tracks can be sorted in the result.""" @@ -533,8 +525,8 @@ def browse(request: Request) -> Response: "tracks": tracks[:TRACKS_PER_PAGE], "mps_to_kph": util.mps_to_kph, "used_filters": bool(filters), - "page_previous": None if page == 1 else _with_page(request.url, page - 1), - "page_next": None if len(tracks) <= TRACKS_PER_PAGE else _with_page(request.url, page + 1), + "page_previous": None if page == 1 else util.qs_replace(request.url, page=str(page - 1)), + "page_next": None if len(tracks) <= TRACKS_PER_PAGE else util.qs_replace(request.url, page=str(page + 1)), } diff --git a/fietsboek/views/climb.py b/fietsboek/views/climb.py index e4d6c49..03f3484 100644 --- a/fietsboek/views/climb.py +++ b/fietsboek/views/climb.py @@ -1,6 +1,7 @@ """Climb related endpoints.""" import gzip +import itertools import logging from enum import Enum @@ -17,6 +18,8 @@ from .. import models, util LOGGER = logging.getLogger(__name__) +CLIMBS_PER_PAGE = 40 + class ResultOrder(Enum): """Enum representing the different ways in which the climbs can be sorted @@ -115,11 +118,17 @@ def climb_browse(request: Request): climbs_qry = _apply_filters(climbs_qry, request) - climbs = list(request.dbsession.execute(climbs_qry).scalars()) + page = 1 + if request.params.get("page"): + page = util.get_int(request, "page") + + start = (page - 1) * CLIMBS_PER_PAGE + stop = start + CLIMBS_PER_PAGE + 1 + climbs = list(itertools.islice(request.dbsession.execute(climbs_qry).scalars(), start, stop)) return { - "climbs": climbs, - "page_previous": None, - "page_next": None, + "climbs": climbs[:CLIMBS_PER_PAGE], + "page_previous": None if page <= 1 else util.qs_replace(request.url, page=str(page - 1)), + "page_next": None if len(climbs) <= CLIMBS_PER_PAGE else util.qs_replace(request.url, page=str(page + 1)), } |
