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 562597b8a5675f31f5997ae2a1414542070038f2..57792bc3b9e45a120da3f9d8baaf376594a123e7 100644 (file)
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -6,13 +6,13 @@ networks:
         driver: overlay
 services:
     navigator:
         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:
         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:
         volumes:
         - gallery_data:/data/images
         depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
index 985fbf411d06ef42e53c444bca2c89758c681c94..84260b2de2ba3c16b0738d00a8f09468b0e33aed 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,24 +2,24 @@ version: '3'
 services:
     navigator:
         build: ./navigator
 services:
     navigator:
         build: ./navigator

-        image: cjpalmer/gallery-navigator:1.2.0
+        image: cjpalmer/gallery-navigator:1.3.0

         volumes:
         volumes:

-        - gallery_data:/app/gallery
+        - gallery_data_dev:/app/gallery

         environment:
             FLASK_DEBUG: 1
     server:
         build: ./server
         environment:
             FLASK_DEBUG: 1
     server:
         build: ./server

-        image: cjpalmer/gallery-server:1.1.0
+        image: cjpalmer/gallery-server:1.3.0

         volumes:
         volumes:

-        - gallery_data:/data/images
+        - gallery_data_dev:/data/images

         ports:
         - 80:80
         depends_on:
         - navigator
 volumes:
         ports:
         - 80:80
         depends_on:
         - navigator
 volumes:

-    gallery_data:
+    gallery_data_dev:

         driver: local
         driver_opts:
             o: bind
             type: none
         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 33aac3d28c2a627db29b320485ed697d3537fe65..526d9b5e65b9ad96aa382b0278c49579e56e1b66 100644 (file)
--- a/navigator/app/app.py
+++ b/navigator/app/app.py
@@ -4,6 +4,7 @@ import re
 
 app = Flask(__name__)
 gallery_root = "/app/gallery"
 
 app = Flask(__name__)
 gallery_root = "/app/gallery"

+gallery_desc_filename = "description.html"

 get_num_regex = re.compile(r'\d+')
 
 @app.route('/')
 get_num_regex = re.compile(r'\d+')
 
 @app.route('/')


@@ -25,8 +26,11 @@ def get_page_number_from_name(name):
 
 @app.route('/<gallery>')
 def render_pages(gallery=None):
 
 @app.route('/<gallery>')
 def render_pages(gallery=None):

+    gallery_dir = gallery_root + "/" + gallery
+
+    # get list of available pages in gallery

     template_pages = []
     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({
         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'])
                     '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('/<gallery>/<int:page_num>')
 def render_page(gallery=None, page_num=None):
 
 @app.route('/<gallery>/<int:page_num>')
 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 (file)
index ce4191f..0000000
--- a/navigator/app/templates/hello.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<p>Hello, world!</p>
-</body>
-</html>

diff --git a/navigator/app/templates/pages.html b/navigator/app/templates/pages.html
index c1204c9e3496669b178d3ffd2cbdcb0ae8ab76c1..f74770a1d353814b700caa398534de6e63d7abfe 100644 (file)
--- a/navigator/app/templates/pages.html
+++ b/navigator/app/templates/pages.html
@@ -6,6 +6,14 @@
 <body>
     <h1>Pages</h1>
 
 <body>
     <h1>Pages</h1>
 

+    {% if description %}
+    <p>
+    {% autoescape false %}
+    {{ description }}
+    {% endautoescape %}
+    </p>
+    {% endif %}
+

     <ul id="navigation">
     {% for page in pages %}
         <li><a href="{{ gallery }}/{{ page.number }}">{{ page.number }}</a></li>
     <ul id="navigation">
     {% for page in pages %}
         <li><a href="{{ gallery }}/{{ page.number }}">{{ page.number }}</a></li>