' + f' ({g.types[link_.type.id].name} ' + _('at') + \ + f' {link(link_.domain)})
' return html @@ -127,17 +128,12 @@ def format_entity_date( return html + (f" ({comment})" if comment else '') -def profile_image_table_link( - entity: Entity, - file: Entity, - extension: str) -> str: +def profile_image_table_link(entity: Entity, file: Entity, ext: str) -> str: if file.id == entity.image_id: return link( _('unset'), url_for('file_remove_profile_image', entity_id=entity.id)) - if extension in app.config['DISPLAY_FILE_EXTENSIONS'] or ( - g.settings['image_processing'] - and extension in app.config['ALLOWED_IMAGE_EXT']): + if ext in g.display_file_ext: return link( _('set'), url_for('set_profile_image', id_=file.id, origin_id=entity.id)) @@ -231,40 +227,45 @@ def display_menu(entity: Optional[Entity], origin: Optional[Entity]) -> str: def profile_image(entity: Entity) -> str: if not entity.image_id: return '' - path = get_file_path(entity.image_id) - if not path: + if not (path := get_file_path(entity.image_id)): return '' # pragma: no cover - resized = None - size = app.config['IMAGE_SIZE']['thumbnail'] - if g.settings['image_processing'] and check_processed_image(path.name): - if path_ := get_file_path(entity.image_id, size): - resized = url_for('display_file', filename=path_.name, size=size) - url = url_for('display_file', filename=path.name) - src = resized or url - style = f'max-width:{g.settings["profile_image_width"]}px;' - ext = app.config["DISPLAY_FILE_EXTENSIONS"] - if resized: - style = f'max-width:{app.config["IMAGE_SIZE"]["thumbnail"]}px;' - ext = app.config["ALLOWED_IMAGE_EXT"] + + src = url_for('display_file', filename=path.name) + url = src + width = g.settings["profile_image_width"] + if app.config['IIIF']['enabled'] and check_iiif_file_exist(entity.id): + url = url_for('view_iiif', id_=entity.id) + iiif_ext = '.tiff' if app.config['IIIF']['conversion'] \ + else g.files[entity.id].suffix + src = \ + f"{app.config['IIIF']['url']}{entity.id}{iiif_ext}" \ + f"/full/!{width},{width}/0/default.jpg" + elif g.settings['image_processing'] and check_processed_image(path.name): + if path_ := get_file_path( + entity.image_id, + app.config['IMAGE_SIZE']['thumbnail']): + src = url_for( + 'display_file', + size=app.config['IMAGE_SIZE']['thumbnail'], + filename=path_.name) + external = False if entity.class_.view == 'file': - html = \ - '
' + _('no preview available') + '
' - if path.suffix.lower() in ext: - html = link( - f'' + _('no preview available') + '
' else: - html = link( - f'' + _('directory not writable') + - f" {str(path).replace(app.root_path, '')}
") + if app.config['IIIF']['enabled']: + if path := app.config['IIIF']['path']: + check_write_access(path, warnings) + for path in g.writable_paths: + check_write_access(path, warnings) if is_authorized('admin'): from openatlas.models.user import User user = User.get_by_username('OpenAtlas') @@ -448,6 +449,14 @@ def system_warnings(_context: str, _unneeded_string: str) -> str: f'{"".join(warnings)}' if warnings else '' +def check_write_access(path: Path, warnings: list[str]) -> list[str]: + if not os.access(path, os.W_OK): + warnings.append( + '
' + _('directory not writable') + + f" {str(path).replace(app.root_path, '')}
") + return warnings + + @app.template_filter() def tooltip(text: str) -> str: if not text: @@ -466,7 +475,7 @@ def get_file_path( return None ext = g.files[id_].suffix if size: - if ext in app.config['NONE_DISPLAY_EXT']: + if ext in app.config['PROCESSABLE_EXT']: ext = app.config['PROCESSED_EXT'] # pragma: no cover path = app.config['RESIZED_IMAGES'] / size / f"{id_}{ext}" return path if os.path.exists(path) else None @@ -639,8 +648,9 @@ def manual(site: str) -> str: return '' return \ '' + f'href="/static/manual/{site}.html" class="manual" ' \ + f'target="_blank" rel="noopener noreferrer">' \ + f'' @app.template_filter() @@ -740,3 +750,37 @@ def get_entities_linked_to_type_recursive( for sub_id in g.types[id_].subs: get_entities_linked_to_type_recursive(sub_id, data) return data + + +def check_iiif_activation() -> bool: + iiif = app.config['IIIF'] + return bool(iiif['enabled'] and os.access(Path(iiif['path']), os.W_OK)) + + +def check_iiif_file_exist(id_: int) -> bool: + if app.config['IIIF']['conversion']: + return get_iiif_file_path(id_).is_file() + return bool(get_file_path(id_)) + + +def get_iiif_file_path(id_: int) -> Path: + ext = '.tiff' if app.config['IIIF']['conversion'] \ + else g.files[id_].suffix + return Path(app.config['IIIF']['path']) / f'{id_}{ext}' + + +def convert_image_to_iiif(id_: int) -> None: + compression = app.config['IIIF']['compression'] \ + if app.config['IIIF']['compression'] in ['deflate', 'jpeg'] \ + else 'deflate' + vips = "vips" if os.name == 'posix' else "vips.exe" + command = \ + (f"{vips} tiffsave {get_file_path(id_)} {get_iiif_file_path(id_)} " + f"--tile --pyramid --compression {compression} " + f"--tile-width 128 --tile-height 128") + try: + process = subprocess.Popen(command, shell=True) + process.wait() + flash(_('IIIF converted'), 'info') + except Exception as e: # pragma: no cover + flash(f"{_('failed to convert image')}: {e}", 'error') diff --git a/openatlas/models/entity.py b/openatlas/models/entity.py index 286358b9b..443735154 100644 --- a/openatlas/models/entity.py +++ b/openatlas/models/entity.py @@ -335,7 +335,7 @@ def get_file_size(self) -> str: return convert_size(g.files[self.id].stat().st_size) \ if self.id in g.files else 'N/A' - def get_file_extension(self) -> str: + def get_file_ext(self) -> str: return g.files[self.id].suffix if self.id in g.files else 'N/A' @staticmethod @@ -379,9 +379,8 @@ def get_by_view( def get_display_files() -> list[Entity]: entities = [] for row in Db.get_by_class('file', types=True): - ext = g.files[row['id']].suffix \ - if row['id'] in g.files else 'N/A' - if ext in app.config['DISPLAY_FILE_EXTENSIONS']: + ext = g.files[row['id']].suffix if row['id'] in g.files else 'N/A' + if ext in app.config['DISPLAY_FILE_EXT']: entities.append(Entity(row)) return entities diff --git a/openatlas/static/setup.py b/openatlas/static/setup.py index 608106bff..58e2f2ab1 100644 --- a/openatlas/static/setup.py +++ b/openatlas/static/setup.py @@ -26,6 +26,7 @@ "leaflet.fullscreen": "2.2.0", "leaflet.markercluster": "^1.5.3", "leaflet": "^1.7.1", + "mirador": "^3.3.0", "save-svg-as-png": "^1.4.17", "tinymce": "^5.10.3", } diff --git a/openatlas/templates/iiif.html b/openatlas/templates/iiif.html new file mode 100644 index 000000000..0d8a46be5 --- /dev/null +++ b/openatlas/templates/iiif.html @@ -0,0 +1,31 @@ +
+
+
+
+
\ No newline at end of file
diff --git a/openatlas/views/admin.py b/openatlas/views/admin.py
index dc6d9ac75..8571b33b4 100644
--- a/openatlas/views/admin.py
+++ b/openatlas/views/admin.py
@@ -25,7 +25,7 @@
from openatlas.display.util import (
button, convert_size, display_form, display_info, format_date,
get_file_path, is_authorized, link, manual, required_group, sanitize,
- send_mail, uc_first)
+ send_mail, uc_first, convert_image_to_iiif)
from openatlas.forms.field import SubmitField
from openatlas.forms.setting import (
ApiForm, ContentForm, FilesForm, GeneralForm, LogForm, MailForm, MapForm,
@@ -616,7 +616,7 @@ def admin_logo(id_: Optional[int] = None) -> Union[str, Response]:
entity.name,
link(entity.standard_type),
entity.get_file_size(),
- entity.get_file_extension(),
+ entity.get_file_ext(),
entity.description,
date])
return render_template(
diff --git a/openatlas/views/entity.py b/openatlas/views/entity.py
index 518346168..778a96304 100644
--- a/openatlas/views/entity.py
+++ b/openatlas/views/entity.py
@@ -15,7 +15,7 @@
from openatlas.display.image_processing import resize_image
from openatlas.display.util import (
button, get_base_table_data, get_file_path, is_authorized, link,
- required_group)
+ required_group, get_iiif_file_path, check_iiif_file_exist)
from openatlas.forms.base_manager import BaseManager
from openatlas.forms.form import get_manager
from openatlas.forms.util import was_modified
@@ -123,11 +123,11 @@ def update(id_: int, copy: Optional[str] = None) -> Union[str, Response]:
if entity.class_.view in ['artifact', 'place']:
manager.entity.image_id = manager.entity.get_profile_image_id()
if not manager.entity.image_id:
- for l in manager.entity.get_links('P67', inverse=True):
- if l.domain.class_.view == 'file' \
- and get_base_table_data(l.domain)[3] \
- in app.config['DISPLAY_FILE_EXTENSIONS']:
- manager.entity.image_id = l.domain.id
+ for link_ in manager.entity.get_links('P67', inverse=True):
+ if link_.domain.class_.view == 'file' \
+ and get_base_table_data(link_.domain)[3] \
+ in g.display_file_ext:
+ manager.entity.image_id = link_.domain.id
break
return render_template(
'entity/update.html',
@@ -211,7 +211,7 @@ def insert_files(manager: BaseManager) -> Union[str, Response]:
ext = secure_filename(file.filename).rsplit('.', 1)[1].lower()
path = app.config['UPLOAD_PATH'] / name
file.save(str(path))
- if f'.{ext}' in app.config['DISPLAY_FILE_EXTENSIONS']:
+ if f'.{ext}' in g.display_file_ext:
call(f'exiftran -ai {path}', shell=True) # Fix rotation
filenames.append(name)
if g.settings['image_processing']:
@@ -331,3 +331,6 @@ def delete_files(id_: int) -> None:
path.unlink()
for resized_path in app.config['RESIZED_IMAGES'].glob(f'**/{id_}.*'):
resized_path.unlink()
+ if app.config['IIIF']['enabled'] and check_iiif_file_exist(id_):
+ if path := get_iiif_file_path(id_):
+ path.unlink()
diff --git a/openatlas/views/entity_index.py b/openatlas/views/entity_index.py
index 6ca2cf84f..d24df5b7b 100644
--- a/openatlas/views/entity_index.py
+++ b/openatlas/views/entity_index.py
@@ -10,7 +10,7 @@
from openatlas.display.table import Table
from openatlas.display.util import (
button, format_date, get_base_table_data, get_file_path, is_authorized,
- link, manual, required_group)
+ link, manual, required_group, check_iiif_file_exist)
from openatlas.models.entity import Entity
from openatlas.models.gis import Gis
@@ -42,7 +42,7 @@ def get_table(view: str) -> Table:
if view == 'file':
table.order = [[0, 'desc']]
table.header = ['date'] + table.header
- if g.settings['image_processing'] \
+ if (g.settings['image_processing'] or app.config['IIIF']['enabled']) \
and current_user.settings['table_show_icons']:
table.header.insert(1, _('icon'))
for entity in Entity.get_by_class('file', types=True):
@@ -51,9 +51,10 @@ def get_table(view: str) -> Table:
link(entity),
link(entity.standard_type),
entity.get_file_size(),
- entity.get_file_extension(),
+ entity.get_file_ext(),
entity.description]
- if g.settings['image_processing'] \
+ if (g.settings['image_processing']
+ or app.config['IIIF']['enabled']) \
and current_user.settings['table_show_icons']:
data.insert(1, file_preview(entity.id))
table.rows.append(data)
@@ -77,15 +78,22 @@ def get_table(view: str) -> Table:
def file_preview(entity_id: int) -> str:
size = app.config['IMAGE_SIZE']['table']
- parameter = f"loading='lazy' alt='image' width='{size}'"
+ param = f"loading='lazy' alt='image' max-width='100px' max-height='100px'"
+ if app.config['IIIF']['enabled'] and check_iiif_file_exist(entity_id):
+ ext = '.tiff' if app.config['IIIF']['conversion'] \
+ else g.files[entity_id].suffix
+ url = (f"{app.config['IIIF']['url']}{entity_id}{ext}"
+ f"/full/!100,100/0/default.jpg")
+ return f"