simple_gallery

commit 48946088a18e4e9cc650ad504bef8e750aa9e2b3
parent 110b13c61a47d9066850958a7d0646c828d9b60b
Author: sej <sej@sejdt.localhost>
Date:   Mon, 30 Sep 2024 19:59:48 +0200

Streamlined rendering of exif strings.

Diffstat:
M
jinjarender.py
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/jinjarender.py b/jinjarender.py
@@ -6,6 +6,9 @@ import csv
 import json
 import argparse
 
+def exifstring( exifinfo ):
+    return "{} || {}s | f/{} | {} | ISO{} || {} + {} | {}".format( exifinfo[2], exifinfo[3], exifinfo[4][1:], exifinfo[5], exifinfo[6], exifinfo[7], exifinfo[8], exifinfo[9] ) 
+
 if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(
@@ -73,11 +76,10 @@ if __name__ == "__main__":
         for i in range( n ):
             img = json["imgs"][i]
             exif = m[img]
-            exifstring = "{} || {}s | f/{} | {} | ISO{} || {} + {} | {}".format( exif[2], exif[3], exif[4][1:], exif[5], exif[6], exif[7], exif[8], exif[9] ) 
             nexti = f"{ str( json['imgs'][ (i+1)%n ] ) }.html"
             previ = f"{ str( json['imgs'][ (i-1)%n ] ) }.html"
             with open( f"{ args.output_path }/img/viewer/{ json['name'] }/{ img }.html", "x" ) as f:
-                f.write( viewer.render( navbar = True, fullrespath = "/img/fullres/", previewpath = "/img/preview/" , img = img, exif = exifstring, nexti = nexti, previ = previ ) )
+                f.write( viewer.render( navbar = True, fullrespath = "/img/fullres/", previewpath = "/img/preview/", albumpath = f"/{ json['name'] }.html", img = img, exif = exifstring( exif ), nexti = nexti, previ = previ ) )
 
     #generate index file
     albums = []
@@ -96,8 +98,7 @@ if __name__ == "__main__":
     for i in range( n ):
         img = allimgs[i]
         exif = m[img]
-        exifstring = "{} || {}s | f/{} | {} | ISO{} || {} + {} | {}".format( exif[2], exif[3], exif[4][1:], exif[5], exif[6], exif[7], exif[8], exif[9] ) 
         nexti = f"{ str( allimgs[ (i+1)%n ] ) }.html"
         previ = f"{ str( allimgs[ (i-1)%n ] ) }.html"
         with open( f"{ args.output_path}/img/viewer/{ img }.html", "x" ) as f:
-            f.write( viewer.render( navbar = True, fullrespath = "/img/fullres/", previewpath = "/img/preview/", img = img, exif = exifstring, path = "/img/", nexti = nexti, previ = previ) )
+            f.write( viewer.render( navbar = True, fullrespath = "/img/fullres/", previewpath = "/img/preview/", img = img, exif = exifstring( exif ), path = "/img/", nexti = nexti, previ = previ) )