Dealing with #64

Smithsonian · Aug 21, 2024 · 7c2e0ca · 7c2e0ca
1 parent f7d985f
commit 7c2e0ca
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/web_app/app.py b/web_app/app.py
@@ -3269,7 +3269,6 @@ def get_preview(file_id=None, max=None, sensitive=None):
     logger.info(data)
     max = request.args.get('max')
     dl = request.args.get('dl')
-    print(dl)
     if len(data) == 0:
         if max in ["160", "200", "600", "1200"]:
             filename = "static/na_{}.png".format(max)
@@ -3393,23 +3392,34 @@ def get_fullsize(file_id=None):
             filename = "static/image_previews/folder{}/{}.jpg".format(folder_id, file_id)
             img = Image.open(filename)
             wsize, hsize = img.size
+            wsize_o = wsize
+            hsize_o = hsize
         except:
             filename = "static/na.jpg"
             file_name = "NA"
             img = Image.open(filename)
             wsize, hsize = img.size 
+            wsize_o = wsize
+            hsize_o = hsize
     if dpr is not None:
         wsize = int((wsize*1.0)/float(dpr))
         hsize = int((hsize*1.0)/float(dpr))
     if not os.path.isfile(filename):
         filename = "static/na.jpg"
+        file_name = "NA"
+        img = Image.open(filename)
+        wsize, hsize = img.size 
+        wsize_o = wsize
+        hsize_o = hsize
     logger.debug("fullsize_request: {} - {}".format(file_id, filename))
     return render_template('fullsize.html',
                            file_id=file_id,
                            filename=filename,
                            file_title=file_name,
                            wsize=wsize,
-                           hsize=hsize)
+                           hsize=hsize,
+                           wsize_o=wsize_o,
+                           hsize_o=hsize_o)
 
 
 @cache.memoize()

diff --git a/web_app/templates/file.html b/web_app/templates/file.html
@@ -76,9 +76,11 @@ <h2>Image Preview:</h2>
                         {% else %}
 
                             {% if file_details.preview_image_ext == None %}
-                                <a href="{{ url_for('get_preview', file_id=file_details.file_id) }}" rel="noopener noreferrer" title="Preview image of {{ file_details.file_name }}">
-                                    <img src="{{ url_for('get_preview', file_id=file_details.file_id, max=600) }}" alt="Preview image of {{ file_details.file_name }}" class="img-fluid card-img-top">
-                                </a>
+
+                                <img src="{{ url_for('get_preview', file_id=file_details.file_id, max=600) }}" alt="Preview image of {{ file_details.file_name }}" class="img-fluid card-img-top">
+
+                                <p><a href="{{ url_for('get_fullsize', file_id=file_details.file_id) }}" rel="noopener noreferrer" title="Open JPG in full size of {{ file_details.file_name }}">Open JPG in full size</a><br>
+                                <a href="{{ url_for('get_preview', file_id=file_details.file_id, dl=1) }}" rel="noopener noreferrer" title="Download JPG in full size of {{ file_details.file_name }}"><i class="fa-solid fa-download"></i> Download JPG in full size</a></p>
 
                             {% else %}
 

diff --git a/web_app/templates/fullsize.html b/web_app/templates/fullsize.html
@@ -98,6 +98,8 @@
 <body>
 
     <h2>{{ file_title }} - Full Size Image</h2>
+
+    <p>({{ wsize_o }} x {{ hsize_o }})</p>
 
     <p><img src="{{ url_for('get_preview', file_id=file_id) }}" width="{{ wsize }}" height="{{ hsize }}"></p>