Skip to content

Fix: manifest-proxy URL trailing slash redirect #935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kyrieb-ekat wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Fix: manifest-proxy URL trailing slash redirect #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8228ef
Fix: manifest-proxy URL trailing slash redirect
kyrieb-ekat Jan 20, 2026
8fd9d63
fix: formatted according to guidelines, changing 11 relevant files i…
kyrieb-ekat Jan 20, 2026
db1d082
fix: updated volpiano font version from 51 to 601
kyrieb-ekat Jan 20, 2026
2f93195
fix: all volpiano version 51 refs updated to 601
kyrieb-ekat Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/public/cantusdata/admin/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,8 @@ class ManuscriptAdmin(ModelAdmin): # type: ignore[type-arg]
)
list_display = ("name", "siglum", "public", "chants_loaded", "is_mapped")

@admin.action(
description="Imports the chants associated \
with the selected manuscript(s)"
)
@admin.action(description="Imports the chants associated \
with the selected manuscript(s)")
def load_chants(self, request: HttpRequest, queryset: QuerySet[Manuscript]) -> None:
for ms in queryset:
chant_import_task.apply_async(kwargs={"manuscript_ids": [ms.pk]})
Expand Down
8 changes: 2 additions & 6 deletions app/public/cantusdata/helpers/gamera_xml2mei/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,10 @@ def dumpZoneVisualization(self, clusters, averageGap, initialClusters):
width = max(max(zone.endX for zone in cluster.zones) for cluster in clusters)

with open(dumpFile, "w") as f:
f.write(
"""\
f.write("""\
<?xml version="1.0" standalone="yes"?>
<svg viewBox="0 0 {width} {height}" version="1.1"
xmlns="http://www.w3.org/2000/svg">""".format(
height=height, width=width
)
)
xmlns="http://www.w3.org/2000/svg">""".format(height=height, width=width))

f.write("<!-- Clusters -->\n")

Expand Down
2 changes: 1 addition & 1 deletion app/public/cantusdata/helpers/mei_processing/bounding_box_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Module containing utilities for the manipulation of bounding boxes
Module containing utilities for the manipulation of bounding boxes
obtained from MEI files.
"""

Expand Down
5 changes: 2 additions & 3 deletions app/public/cantusdata/helpers/mei_processing/mei_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""
Defines a class, MEIParser, that converts the contents of an MEI file into
python types for ease of subsequent processing.
Defines a class, MEIParser, that converts the contents of an MEI file into
python types for ease of subsequent processing.

Also defines some additional functions useful for analyzing contents of an MEI
file:
Expand All @@ -27,7 +27,6 @@
)
from .bounding_box_utils import combine_bounding_boxes_single_system


# Mapping from pitch names to integer pitch class where C = 0
PITCH_CLASS = {"c": 0, "d": 2, "e": 4, "f": 5, "g": 7, "a": 9, "b": 11}

Expand Down
2 changes: 1 addition & 1 deletion app/public/cantusdata/helpers/mei_processing/mei_tokenizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Defines a class MEITokenizer that extends MEIParser with functionaliy
used to create json documents from an MEI file. These json documents
can then be indexed by a search engine (i.e. for this project, Solr).
can then be indexed by a search engine (i.e. for this project, Solr).
"""

import uuid
Expand Down
1 change: 0 additions & 1 deletion app/public/cantusdata/management/commands/convert_gamera_xml2mei.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
main,
)


BASE_NAME = os.path.basename(os.path.splitext(__file__)[0])


Expand Down
1 change: 0 additions & 1 deletion app/public/cantusdata/management/commands/normalize_chant_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

from django.core.management.base import BaseCommand


W_REGEX = re.compile(r"^(\d+)w$")


Expand Down
1 change: 0 additions & 1 deletion app/public/cantusdata/test/core/management/commands/test_index_manuscript_mei.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

from solr.core import SolrConnection # type: ignore


TEST_MEI_FILES_PATH = settings.TEST_MEI_FILES_PATH


Expand Down
28 changes: 15 additions & 13 deletions app/public/cantusdata/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
# from django.conf.urls import patterns, include, url
from django.contrib import admin
from django.conf import settings
from django.contrib import admin
from django.contrib.admin.views.decorators import staff_member_required
from django.urls import path
from rest_framework.urlpatterns import format_suffix_patterns

from cantusdata.views import staticpages
from cantusdata.views.browse import browse_view
from cantusdata.views.manuscript import ManuscriptList, ManuscriptDetail
from cantusdata.views.chant import ChantList, ChantDetail
from cantusdata.views.folio import FolioList, FolioDetail
from cantusdata.views.search import SearchView
from cantusdata.views.suggestion import SuggestionView
from cantusdata.views.search_notation import SearchNotationView
from cantusdata.views.chant import ChantDetail, ChantList
from cantusdata.views.chant_set import (
FolioChantSetView,
ManuscriptChantSetView,
)
from cantusdata.views.folio import FolioDetail, FolioList
from cantusdata.views.folio_set import ManuscriptFolioSetView
from cantusdata.views.manuscript_glyph_set import ManuscriptGlyphSetView
from cantusdata.views.map_folios import MapFoliosView
from cantusdata.views.load_chants import LoadChantsView
from cantusdata.views.manifest_proxy import ManifestProxyView
from cantusdata.views.manuscript import ManuscriptDetail, ManuscriptList
from cantusdata.views.manuscript_glyph_set import ManuscriptGlyphSetView
from cantusdata.views.map_folios import MapFoliosView
from cantusdata.views.neume_exemplars import (
NeumeExemplarsAPIView,
NeumeSetAPIView,
PickNeumeExemplarsView,
NeumeExemplarsAPIView,
)
from cantusdata.views import staticpages
from django.contrib.admin.views.decorators import staff_member_required
from cantusdata.views.search import SearchView
from cantusdata.views.search_notation import SearchNotationView
from cantusdata.views.suggestion import SuggestionView

urlpatterns = [
# Admin pages
Expand Down Expand Up @@ -117,7 +118,8 @@
path("suggest/", SuggestionView.as_view(), name="suggestion-view"),
# Work around Mixed Content errors in third-party manifest files
path(
"manifest-proxy/<path:manifest_url>/",
"manifest-proxy/<path:manifest_url>",
# previously <str:manifest_url>/ which forced a trailing slash in Django; removal will allow Django to accept without redirection, which was breaking some IIIF manifests. See #933.
ManifestProxyView.as_view(),
name="retrieve-manifest",
),
Expand Down
1 change: 0 additions & 1 deletion app/public/cantusdata/views/chant_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from cantusdata.serializers.search import SearchSerializer
import solr


CHANT_FIELDS = [
"type",
"item_id",
Expand Down
1 change: 0 additions & 1 deletion app/public/cantusdata/views/folio_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from cantusdata.renderers.csv_renderer import CSVRenderer
import solr


FOLIO_FIELDS = [
"type",
"number",
Expand Down
1 change: 1 addition & 0 deletions app/public/manage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""

import os
import sys

Expand Down
8 changes: 4 additions & 4 deletions nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ WORKDIR /code/frontend

# Download and unzip volpiano fonts file
RUN mkdir -p ../static/fonts
RUN wget http://www.fawe.de/volpiano/volpiano51_web.zip
RUN unzip volpiano51_web.zip
RUN rm volpiano51_web.zip
RUN mv volpiano51_web/volpiano.woff ../static/fonts/volpiano.woff
RUN wget http://www.fawe.de/volpiano/volpiano601_web.zip
RUN unzip volpiano601_web.zip
RUN rm volpiano601_web.zip
RUN mv volpiano601_web/volpiano.woff ../static/fonts/volpiano.woff

# Install front-end dependencies
RUN npm install
Expand Down
Loading