Commit 7f5871ef authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

IIIF upscaling prefix off by default

parent ef3b2e3b

jama/settings.py

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ MEDIA_FILES_DIR = os.getenv("JAMA_FILES_DIR") or "{}/{}".format( 
)

JAMA_SITE = os.getenv("JAMA_SITE") or "http://localhost:8000/"



JAMA_IIIF_UPSCALING_PREFIX = os.getenv("JAMA_IIIF_UPSCALING_PREFIX") or ""



IIIF_DIR = os.getenv("JAMA_IIIF_DIR") or "{}/{}".format(BASE_DIR, "iiif")

IIIF_PATH_SEPARATOR = os.getenv("JAMA_IIIF_PATH_SEPARATOR") or os.path.sep

# Quick-start development settings - unsuitable for production

resources/models.py

+2 −1
Original line number Diff line number Diff line
@@ -241,9 +241,10 @@ class File(Resource): 


    def iiif_thumbnail_url(self, width: int = None, height: int = None) -> str:

        if self.should_have_iiif():

            return "{}{}/full/^{},{}/0/default.jpg".format(

            return "{}{}/full/{}{},{}/0/default.jpg".format(

                settings.JAMA_IIIF_ENDPOINT,

                hash_to_iiif_path(self.hash, settings.IIIF_PATH_SEPARATOR),

                settings.JAMA_IIIF_UPSCALING_PREFIX,

                width or "",

                height or "",

            )

rpc/serializers.py

+6 −6
Original line number Diff line number Diff line
@@ -177,14 +177,14 @@ def file( 
            file_instance.hash, settings.IIIF_PATH_SEPARATOR

        )

        urls["iiif"] = "{}{}/info.json".format(settings.JAMA_IIIF_ENDPOINT, iiif_path)

        urls["s"] = "{}{}/full/^100,/0/default.jpg".format(

            settings.JAMA_IIIF_ENDPOINT, iiif_path

        urls["s"] = "{}{}/full/{}100,/0/default.jpg".format(

            settings.JAMA_IIIF_ENDPOINT, iiif_path, settings.JAMA_IIIF_UPSCALING_PREFIX

        )

        urls["m"] = "{}{}/full/^300,/0/default.jpg".format(

            settings.JAMA_IIIF_ENDPOINT, iiif_path

        urls["m"] = "{}{}/full/{}300,/0/default.jpg".format(

            settings.JAMA_IIIF_ENDPOINT, iiif_path, settings.JAMA_IIIF_UPSCALING_PREFIX

        )

        urls["l"] = "{}{}/full/^1000,/0/default.jpg".format(

            settings.JAMA_IIIF_ENDPOINT, iiif_path

        urls["l"] = "{}{}/full/1000,/0/default.jpg".format(

            settings.JAMA_IIIF_ENDPOINT, iiif_path, settings.JAMA_IIIF_UPSCALING_PREFIX

        )

    if include_metas:

        for prop in file_instance.metadataresourcevalue_set.filter(