From: Clifton Palmer Date: Sat, 4 May 2024 17:28:46 +0000 (-0500) Subject: Updated version to 1.3.0 X-Git-Tag: 1.3.0 X-Git-Url: http://git.purplebirdman.com/web-gallery.git/commitdiff_plain/b894dfe273580816b8c0b931e311351b5a026ea9?hp=c66e7f961af675839a45702079e23a5f1c615bdb Updated version to 1.3.0 * Added gallery descriptions with HTML tagging * Removed test page --- diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 562597b..57792bc 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.2.0 + image: cjpalmer/gallery-navigator:1.3.0 volumes: - gallery_data:/app/gallery networks: - backend server: - image: cjpalmer/gallery-server:1.1.0 + image: cjpalmer/gallery-server:1.3.0 volumes: - gallery_data:/data/images depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 985fbf4..84260b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,24 +2,24 @@ version: '3' services: navigator: build: ./navigator - image: cjpalmer/gallery-navigator:1.2.0 + image: cjpalmer/gallery-navigator:1.3.0 volumes: - - gallery_data:/app/gallery + - gallery_data_dev:/app/gallery environment: FLASK_DEBUG: 1 server: build: ./server - image: cjpalmer/gallery-server:1.1.0 + image: cjpalmer/gallery-server:1.3.0 volumes: - - gallery_data:/data/images + - gallery_data_dev:/data/images ports: - 80:80 depends_on: - navigator volumes: - gallery_data: + gallery_data_dev: driver: local driver_opts: o: bind type: none - device: /mnt/gallery_data + device: /mnt/gallery_data_dev diff --git a/navigator/app/app.py b/navigator/app/app.py index 33aac3d..526d9b5 100644 --- a/navigator/app/app.py +++ b/navigator/app/app.py @@ -4,6 +4,7 @@ import re app = Flask(__name__) gallery_root = "/app/gallery" +gallery_desc_filename = "description.html" get_num_regex = re.compile(r'\d+') @app.route('/') @@ -25,8 +26,11 @@ def get_page_number_from_name(name): @app.route('/') def render_pages(gallery=None): + gallery_dir = gallery_root + "/" + gallery + + # get list of available pages in gallery template_pages = [] - with os.scandir(gallery_root + "/" + gallery) as pages: + with os.scandir(gallery_dir) as pages: for page in pages: if page.is_file() and page.name.endswith('.png') or page.name.endswith('.jpg'): template_pages.append({ @@ -34,7 +38,22 @@ def render_pages(gallery=None): 'number': get_page_number_from_name(page.name) }) template_pages = sorted(template_pages, key=lambda page: page['number']) - return render_template( 'pages.html', gallery=gallery, pages=template_pages ) + + # 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) + + # render! + return render_template( 'pages.html', + gallery=gallery, + description=description, + pages=template_pages + ) @app.route('//') def render_page(gallery=None, page_num=None): diff --git a/navigator/app/templates/hello.html b/navigator/app/templates/hello.html deleted file mode 100644 index ce4191f..0000000 --- a/navigator/app/templates/hello.html +++ /dev/null @@ -1,5 +0,0 @@ - - -

Hello, world!

- - diff --git a/navigator/app/templates/pages.html b/navigator/app/templates/pages.html index c1204c9..f74770a 100644 --- a/navigator/app/templates/pages.html +++ b/navigator/app/templates/pages.html @@ -6,6 +6,14 @@

Pages

+ {% if description %} +

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

+ {% endif %} +