From: Clifton Palmer Date: Fri, 19 Jul 2024 08:08:42 +0000 (-0500) Subject: Updated to version 1.5.0 X-Git-Tag: 1.5.0 X-Git-Url: http://git.purplebirdman.com/web-gallery.git/commitdiff_plain/refs/tags/1.5.0 Updated to version 1.5.0 * Refactored to put everything in header.html --- diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 29c1032..73cde4a 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -6,13 +6,13 @@ networks: driver: overlay services: navigator: - image: cjpalmer/gallery-navigator:1.4.0 + image: cjpalmer/gallery-navigator:1.5.0 volumes: - gallery_data:/app/gallery networks: - backend server: - image: cjpalmer/gallery-server:1.4.0 + image: cjpalmer/gallery-server:1.5.0 volumes: - gallery_data:/data/images depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 8f126f3..6610960 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,15 +2,15 @@ version: '3' services: navigator: build: ./navigator - image: cjpalmer/gallery-navigator:1.4.0 + image: cjpalmer/gallery-navigator:1.5.0 volumes: -# - ./navigator/app:/app # dev testing + - ./navigator/app:/app # dev testing - gallery_data_dev:/app/gallery environment: FLASK_DEBUG: 1 server: build: ./server - image: cjpalmer/gallery-server:1.4.0 + image: cjpalmer/gallery-server:1.5.0 volumes: - gallery_data_dev:/data/images ports: diff --git a/navigator/app/app.py b/navigator/app/app.py index e6bc9b2..50d8cf7 100644 --- a/navigator/app/app.py +++ b/navigator/app/app.py @@ -4,9 +4,28 @@ import re app = Flask(__name__) gallery_root = "/app/gallery" -gallery_desc_filename = "description.html" get_num_regex = re.compile(r'\d+') +### helper functions ### + +def get_page_number_from_name(name): + try: + return int(get_num_regex.findall(name)[-1]) + except IndexError: + print ("Index error on name " + name, flush=True) + return -1 + +def get_file_text(filename): + file_text = None + try: + with open(filename, 'r') as file: + file_text = file.read() + except: + print("File not found:" + filename) + return file_text + +### routes ### + @app.route('/') def render_gallery(): gallery_names = [] @@ -20,13 +39,6 @@ def render_gallery(): galleries=gallery_names ) -def get_page_number_from_name(name): - try: - return int(get_num_regex.findall(name)[-1]) - except IndexError: - print ("Index error on name " + name, flush=True) - return -1 - @app.route('/') def render_pages(gallery=None): gallery_dir = gallery_root + "/" + gallery @@ -42,20 +54,14 @@ def render_pages(gallery=None): }) template_pages = sorted(template_pages, key=lambda page: page['number']) - # get description for gallery (if available) - desc_filename = gallery_dir + "/" + gallery_desc_filename - description = None - try: - with open(desc_filename, 'r') as file: - description = file.read() - except: - print("Description file not found at " + desc_filename) + # get header for gallery (if available) + header_html = get_file_text(gallery_dir + "/header.html") # render! return render_template( 'pages.html', title=gallery, gallery=gallery, - description=description, + header=header_html, pages=template_pages ) diff --git a/navigator/app/templates/pages.html b/navigator/app/templates/pages.html index dee0c85..27e0280 100644 --- a/navigator/app/templates/pages.html +++ b/navigator/app/templates/pages.html @@ -7,14 +7,13 @@

- {% if description %} -

+ {% if header %} +

{% autoescape false %} - {{ description }} + {{ header }} {% endautoescape %} -

{% endif %}

{{ title }}