Update app.py

app.py

@@ -1,9 +1,8 @@
 import io
 import os
-import math
 import re
-from collections import Counter
 from datetime import datetime
+from collections import Counter
 
 import pandas as pd
 import streamlit as st
@@ -20,7 +19,7 @@ st.set_page_config(
 
 st.title("🖼️ Image → PDF • Full-Page & Custom Layout Generator")
 st.markdown(
-    "Upload images, filter by orientation, reorder visually, and generate PDFs with various layouts."
+    "Upload images, filter by orientation, reorder visually, and generate a captioned PDF where each page matches its image's dimensions."
 )
 
 # --- Sidebar: Page Settings -----------------------------
@@ -45,7 +44,7 @@ BASE_WIDTH_PT = st.sidebar.slider(
 )
 page_width = BASE_WIDTH_PT
 page_height = int(BASE_WIDTH_PT * (rh / rw))
-st.sidebar.markdown(f"**Page size:** {page_width}×{page_height} pt")
+st.sidebar.markdown(f"**Preview page size:** {page_width}×{page_height} pt")
 
 # --- Main: Upload, Filter & Reorder -------------------
 st.header("2️⃣ Upload, Filter & Reorder Images")
@@ -66,7 +65,7 @@ if uploaded:
             "height": h,
             "aspect_ratio": ar,
             "orientation": orient,
-            "order": idx
+            "order": idx,
         })
     df = pd.DataFrame(records)
     dims = st.sidebar.multiselect(
@@ -74,9 +73,10 @@ if uploaded:
         default=["Landscape","Portrait","Square"]
     )
     df = df[df["orientation"].isin(dims)].reset_index(drop=True)
-    st.markdown("#### Image Metadata")
+
+    st.markdown("#### Image Metadata & Order")
     st.dataframe(df.style.format({"aspect_ratio": "{:.2f}"}), use_container_width=True)
-    st.markdown("#### Reorder Panels")
+    st.markdown("*Drag rows or edit the `order` column to set PDF page sequence.*")
     try:
         edited = st.experimental_data_editor(df, num_rows="fixed", use_container_width=True)
         ordered_df = edited
@@ -92,116 +92,67 @@ if uploaded:
             use_container_width=True,
         )
         ordered_df = edited.sort_values("order").reset_index(drop=True)
+
     name2file = {f.name: f for f in uploaded}
     ordered_files = [name2file[n] for n in ordered_df["filename"] if n in name2file]
 
-# --- Utility: Word extraction --------------------------
-def top_n_words(names, n=5):
-    words = []
-    for fn in names:
-        stem = os.path.splitext(fn)[0]
-        words += re.findall(r"\w+", stem.lower())
-    return [w for w,_ in Counter(words).most_common(n)]
-
-def first_n_words_ordered(names, n=5):
-    words = []
-    for fn in names:
-        stem = os.path.splitext(fn)[0]
-        tokens = re.findall(r"\w+", stem)
-        for t in tokens:
-            if len(words) < n:
-                words.append(t)
-            else:
-                break
-        if len(words) >= n:
-            break
-    return words
-
-# --- PDF Creation: Full Page ----------------------------
-def make_fullpage_pdf(images, w_pt, h_pt):
-    buf = io.BytesIO()
-    c = canvas.Canvas(buf, pagesize=(w_pt, h_pt))
-    for f in images:
-        im = Image.open(f)
-        iw, ih = im.size
-        scale = min(w_pt/iw, h_pt/ih)
-        new_w, new_h = iw*scale, ih*scale
-        x = (w_pt - new_w)/2
-        y = (h_pt - new_h)/2
-        im = im.resize((int(new_w), int(new_h)), Image.LANCZOS)
-        c.drawImage(ImageReader(im), x, y, new_w, new_h, preserveAspectRatio=False, mask='auto')
-        c.showPage()
-    c.save(); buf.seek(0)
-    return buf.getvalue()
+# --- Utility: Clean stems -------------------------------
+def clean_stem(fn: str) -> str:
+    stem = os.path.splitext(fn)[0]
+    return stem.replace("-", " ").replace("_", " ")
 
 # --- PDF Creation: Image-sized + Captions --------------
 def make_image_sized_pdf(images):
-    buf = io.BytesIO()
-    c = canvas.Canvas(buf)
-    for f in images:
+    buffer = io.BytesIO()
+    c = canvas.Canvas(buffer)
+    for idx, f in enumerate(images, start=1):
         im = Image.open(f)
         iw, ih = im.size
-        # set page to image dims + caption space
+        # Caption height
         cap_h = 20
         page_w, page_h = iw, ih + cap_h
         c.setPageSize((page_w, page_h))
-        # draw image
+        # Draw image
         c.drawImage(ImageReader(im), 0, cap_h, iw, ih, preserveAspectRatio=True, mask='auto')
-        # caption
-        caption = os.path.splitext(f.name)[0]
+        # Draw caption
+        caption = clean_stem(f.name)
         c.setFont("Helvetica", 12)
         c.drawCentredString(page_w/2, cap_h/2, caption)
+        # Page number
+        c.setFont("Helvetica", 8)
+        c.drawRightString(page_w - 10, 10, str(idx))
         c.showPage()
-    c.save(); buf.seek(0)
-    return buf.getvalue()
+    c.save()
+    buffer.seek(0)
+    return buffer.getvalue()
 
 # --- Generate & Download -------------------------------
-st.header("3️⃣ Generate & Download PDF")
-# Full-page button
-def build_timestamp(prefix_time=False):
-    fmt = "%Y-%m%d-%I%M%p" if prefix_time else "%Y-%m%d"
-    return datetime.now().strftime(fmt)
-
-if st.button("🎉 Generate Full-Page PDF"):
+st.header("3️⃣ Generate & Download PDF with Captions")
+if st.button("🖋️ Generate Captioned PDF"):
     if not ordered_files:
         st.warning("Upload and reorder at least one image.")
     else:
-        date_s = build_timestamp()
-        words = top_n_words([f.name for f in ordered_files])
-        slug = "-".join(words)
-        fname = f"{date_s}-{slug}.pdf"
-        pdf = make_fullpage_pdf(ordered_files, page_width, page_height)
+        # Timestamp + weekday
+        now = datetime.now()
+        prefix = now.strftime("%Y-%m%d-%I%M%p") + "-" + now.strftime("%a").upper()
+        # Build filename from ordered stems
+        stems = [clean_stem(f.name) for f in ordered_files]
+        basename = " - ".join(stems)
+        fname = f"{prefix}-{basename}.pdf"
+        pdf_bytes = make_image_sized_pdf(ordered_files)
         st.success(f"✅ PDF ready: **{fname}**")
-        st.download_button("⬇️ Download PDF", data=pdf, file_name=fname, mime="application/pdf")
-        st.markdown("#### Preview")
-        try:
-            import fitz
-            doc = fitz.open(stream=pdf, filetype="pdf")
-            pix = doc[0].get_pixmap(matrix=fitz.Matrix(1.5,1.5))
-            st.image(pix.tobytes(), use_container_width=True)
-        except:
-            st.info("Install `pymupdf` for preview.")
-
-# Custom-sized + captions button
-if st.button("🖋️ Generate Image-Sized PDF with Captions"):
-    if not ordered_files:
-        st.warning("Upload and reorder at least one image.")
-    else:
-        date_s = build_timestamp(prefix_time=True)
-        words = first_n_words_ordered([f.name for f in ordered_files])
-        slug = "-".join(words)
-        fname = f"{date_s}-{slug}.pdf"
-        pdf = make_image_sized_pdf(ordered_files)
-        st.success(f"✅ PDF ready: **{fname}**")
-        st.download_button("⬇️ Download PDF", data=pdf, file_name=fname, mime="application/pdf")
-        st.markdown("#### Preview")
+        st.download_button(
+            "⬇️ Download PDF", data=pdf_bytes,
+            file_name=fname, mime="application/pdf"
+        )
+        st.markdown("#### Preview of Page 1")
         try:
             import fitz
-            doc = fitz.open(stream=pdf, filetype="pdf")
-            pix = doc[0].get_pixmap(matrix=fitz.Matrix(1.5,1.5))
+            doc = fitz.open(stream=pdf_bytes, filetype="pdf")
+            pix = doc.load_page(0).get_pixmap(matrix=fitz.Matrix(1.5,1.5))
             st.image(pix.tobytes(), use_container_width=True)
-        except:
-            st.info("Install `pymupdf` for preview.")
+        except Exception:
+            st.info("Install `pymupdf` (`fitz`) for preview.")
 
 # --- Footer ------------------------------------------------
 st.sidebar.markdown("---")