From ca17bd2cabfcc1289b5857d8717b71643c371e72 Mon Sep 17 00:00:00 2001 From: starnakin Date: Wed, 16 Apr 2025 14:05:48 +0200 Subject: [PATCH] add: use path url --- src/page.py | 24 ++++++------------------ src/templates/album.jinja | 2 +- src/templates/page.jinja | 24 ++++++++++++------------ 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/src/page.py b/src/page.py index e7c7e69..65d1cb9 100644 --- a/src/page.py +++ b/src/page.py @@ -34,21 +34,6 @@ class Page(): def get_pictures(self) -> list[Picture]: return self._pictures - def _render_raw(self): - if not self._raw.exist(): - return None - return self._raw.get_name() - - def _render_prev(self): - if self.prev is None: - return None - return f"../{self.prev.name}/page.html" - - def _render_next(self): - if self.next is None: - return None - return f"../{self.next.name}/page.html" - def _to_html(self) -> str|None: html_rendered = page_template.render(page=self) return html_rendered @@ -57,7 +42,7 @@ class Page(): with open(self.html.get_absolute_path(), "w") as f: f.write(self._to_html()) - def _render_readme(self) -> str|None: + def render_readme(self) -> str|None: if not self._readme.exist(): return None with open(self._readme.get_absolute_path(), 'r') as f: @@ -72,8 +57,11 @@ class Page(): os.remove(self._exif.get_absolute_path()) return 1 - def _render_exif(self) -> Path | None: + def get_exif(self) -> Path | None: if not self._exif.exist(): if (self._gen_exif()): return None - return self._exif.get_name() + return self._exif + + def get_raw(self): + return self._raw \ No newline at end of file diff --git a/src/templates/album.jinja b/src/templates/album.jinja index aa972fc..a8b47a1 100644 --- a/src/templates/album.jinja +++ b/src/templates/album.jinja @@ -10,7 +10,7 @@
{% for picture in album._pictures %} - + {% endfor %}
diff --git a/src/templates/page.jinja b/src/templates/page.jinja index 9388258..e357e98 100644 --- a/src/templates/page.jinja +++ b/src/templates/page.jinja @@ -2,46 +2,46 @@ - +
{% if page.prev %} - Prev + Prev {% endif %} {% if page.next %} - + {% endif %}
{% if page._readme.exist() %}
- {{page._render_readme()}} + {{page.render_readme()}}
{% endif %} {% for picture in page._pictures %}
- +
- Large + Large {% if picture._export_file.exist() %} - export file + export file {% endif %}
{% endfor %} - {% if raw or exif %} + {% if page.get_raw().exist() or page.get_exif() %}

Download

- {% if raw %} - RAW + {% if page.get_raw().exist() %} + RAW {% endif %} - {% if exif %} - Exif + {% if page.get_exif() %} + Exif {% endif %}
{% endif %}