use cached index.html if exists, changed tab name for thumbnails

Author: keighrim

app.py

@@ -85,6 +85,7 @@ def render_mmif(mmif_str, viz_id):
     mmif = Mmif(mmif_str)
     media = documents_to_htmls(mmif, viz_id)
     annotations = prep_annotations(mmif, viz_id)
+    app.logger.debug(f"Prepared Annotations: {annotations.keys()}")
     return render_template('player.html',
                            media=media, annotations=annotations)
 
@@ -94,19 +95,24 @@ def upload_file(in_mmif):
     in_mmif_bytes = in_mmif.read()
     in_mmif_str = in_mmif_bytes.decode('utf-8')
     viz_id = hashlib.sha1(in_mmif_bytes).hexdigest()
-    app.logger.debug(viz_id)
+    app.logger.debug(f"Visualization ID: {viz_id}")
     path = cache.get_cache_path() / viz_id
-    os.makedirs(path, exist_ok=True)
-    set_last_access(path)
-    with open(path / 'file.mmif', 'w') as in_mmif_file:
-        in_mmif_file.write(in_mmif_str)
-    html_page = render_mmif(in_mmif_str, viz_id)
-    with open(os.path.join(path, "index.html"), "w") as f:
-        f.write(html_page)
-    # Perform cleanup
-    t = Thread(target=cleanup)
-    t.daemon = True
-    t.run()
+    app.logger.debug(f"Visualization Directory: {path}")
+    try:
+        os.makedirs(path)
+        set_last_access(path)
+        with open(path / 'file.mmif', 'w') as in_mmif_file:
+            in_mmif_file.write(in_mmif_str)
+        html_page = render_mmif(in_mmif_str, viz_id)
+        with open(os.path.join(path, "index.html"), "w") as f:
+            f.write(html_page)
+    except FileExistsError:
+        app.logger.debug("Visualization already cached")
+    finally:
+        # Perform cleanup
+        t = Thread(target=cleanup)
+        t.daemon = True
+        t.run()
 
     agent = request.headers.get('User-Agent')
     if 'curl' in agent.lower():

ocr.py

@@ -130,9 +130,9 @@ def render_ocr(mmif_id, vid_path, view_id, page_number):
     """Iterate through frames and display the contents/alignments."""
     # Path for storing temporary images generated by cv2
     cv2_vid = cv2.VideoCapture(vid_path)
-    f = open(cache.get_cache_path() / mmif_id / f"{view_id}-pages.json")
-    frames_pages = json.load(f)
-    page = frames_pages[str(page_number)]
+    tn_data_fname = cache.get_cache_path() / mmif_id / f"{view_id}-pages.json"
+    thumbnail_pages = json.load(open(tn_data_fname))
+    page = thumbnail_pages[str(page_number)]
     prev_frame_cap = None
     path = make_image_directory(mmif_id)
     for frame_num, frame in page:
@@ -154,13 +154,10 @@ def render_ocr(mmif_id, vid_path, view_id, page_number):
             frame["id"] = pathlib.Path(tf.name).name
         prev_frame_cap = frame_cap
 
-    return render_template('ocr.html',
-                           vid_path=vid_path,
-                           view_id=view_id,
-                           page=page,
-                           n_pages=len(frames_pages),
-                           page_number=str(page_number),
-                           mmif_id=mmif_id)
+    tn_page_html = render_template(
+        'ocr.html', vid_path=vid_path, view_id=view_id, page=page,
+        n_pages=len(thumbnail_pages), page_number=str(page_number), mmif_id=mmif_id)
+    return tn_page_html
 
 
 def make_image_directory(mmif_id):

templates/ocr.html

@@ -130,10 +130,10 @@ <h4>
             "page_number": parseInt("{{page_number}}"),
             "mmif_id": "{{mmif_id}}"
         }
-        if (page == BACKWARD) {
+        if (page === BACKWARD) {
             data["page_number"] -= 1
         }
-        else if (page == FORWARD) {
+        else if (page === FORWARD) {
             data["page_number"] += 1
         }
         else {

utils.py

@@ -146,7 +146,7 @@ def prep_annotations(mmif, viz_id):
     for ocr_view in ocr_views:
         if not ocr_view.annotations:
             continue
-        tabname = "Frames-%s" % ocr_view.id
+        tabname = "Thumbnails-%s" % ocr_view.id
         visualization = render_template("pre-ocr.html", view_id=ocr_view.id, tabname=tabname, mmif_id=viz_id)
         tabs.append((tabname, visualization))
     return tabs