Update app.py

app.py

@@ -1,69 +1,41 @@
 import streamlit as st
 import os
 import csv
-
-DATA_DIR = "data/uploadedImages"
-RESOURCES_FILE = "Resources.csv"
+import time
 
 uploaded_images = {'characters': {}, 'terrain': {}}
 
 def get_image_path(img, name, image_type):
-    file_path = os.path.join(DATA_DIR, image_type, name, img.name)
+    file_path = f"data/uploadedImages/{image_type}/{name}/{img.name}"
     os.makedirs(os.path.dirname(file_path), exist_ok=True)
     with open(file_path, "wb") as img_file:
         img_file.write(img.getbuffer())
     return file_path
 
-def update_resources_file(uploaded_file, name, image_type):
-    file_content = (name, uploaded_file.name, image_type)
-    with open(RESOURCES_FILE, mode='a', newline='') as csv_file:
+def update_csv_file(uploaded_file, name, image_type):
+    csv_file_path = "Resources.csv"
+    with open(csv_file_path, mode='a', newline='') as csv_file:
         csv_writer = csv.writer(csv_file)
-        csv_writer.writerow(file_content)
-
-def get_resources():
-    if os.path.exists(RESOURCES_FILE):
-        with open(RESOURCES_FILE, mode='r') as csv_file:
-            csv_reader = csv.reader(csv_file)
-            return [row for row in csv_reader if row]
-    else:
-        return []
-
-def display_images(image_type):
-    for name, files in uploaded_images[image_type].items():
-        for file in files:
-            st.sidebar.image(file, width=100, caption=name, use_column_width=True, output_format='jpg', link_url=file)
-
-def display_terrain():
-    row = []
-    for name, files in uploaded_images['terrain'].items():
-        for file in files:
-            row.append(file)
-            if len(row) == 3:
-                st.image(row, width=100 * 3)
-                row = []
-    if row:
-        st.image(row, width=100 * len(row)) # Last row, if not complete
+        csv_writer.writerow([name, uploaded_file.name, image_type])
 
-def display_uploaded_images(image_type):
-    st.write(f"## Uploaded {image_type.capitalize()}")
-    if image_type == 'characters':
-        display_images('characters')
-    else:
-        display_terrain()
+def get_uploaded_files_info():
+    csv_file_path = "Resources.csv"
+    with open(csv_file_path, mode='r') as csv_file:
+        csv_reader = csv.reader(csv_file)
+        files_info = []
+        for row in csv_reader:
+            files_info.append(row)
+        return files_info
 
-    st.write("## Uploaded Images Table")
-    resources = get_resources()
-    if resources:
-        st.write("| Name | File Name | Image Type | Image |")
-        st.write("| --- | --- | --- | --- |")
-        for name, file_name, image_type in resources:
-            file_name_without_extension = os.path.splitext(file_name)[0]
-            image_url = f"{DATA_DIR}/{image_type}/{name}/{file_name}"
-            image_tag = f"<img src='{image_url}' width='100'/>"
-            download_url = f"[Download]({image_url})"
-            st.write(f"| {name} | {file_name_without_extension} | {image_type} | {image_tag} {download_url} |")
-    else:
-        st.write("No images uploaded yet.")
+def display_images_from_csv():
+    files_info = get_uploaded_files_info()
+    for row in files_info:
+        if row[2] == 'characters':
+            img_path = f"data/uploadedImages/{row[2]}/{row[0]}/{row[1]}"
+            st.sidebar.image(img_path, width=100, caption=row[0])
+        else:
+            img_path = f"data/uploadedImages/{row[2]}/{row[0]}/{row[1]}"
+            st.image(img_path, width=100, caption=row[0])
 
 image_type = st.selectbox('Choose image type:', options=['characters', 'terrain'])
 name = st.text_input('Enter a name for the image:')
@@ -72,15 +44,32 @@ uploaded_files = st.file_uploader('Upload image(s)', type=['png', 'jpg'], accept
 for uploaded_file in uploaded_files:
     if uploaded_file is not None:
         # Get actual image file
-        file_path = get_image_path(uploaded_file, name, image_type)
+        bytes_data = get_image_path(uploaded_file, name, image_type)
         uploaded_images[image_type].setdefault(name, [])
-        uploaded_images[image_type][name].append(file_path)
-        st.image(file_path, use_column_width=True)
-        update_resources_file(uploaded_file, name, image_type)
+        uploaded_images[image_type][name].append(bytes_data)
+        st.image(bytes_data, use_column_width=True)
+        update_csv_file(uploaded_file, name, image_type)
 
-display_uploaded_images(image_type)
+if image_type == 'characters':
+    if uploaded_images['characters']:
+        st.sidebar.write('**Characters**')
+        for name, files in uploaded_images['characters'].items():
+            for file in files:
+                st.sidebar.image(file, width=100, caption=name)
+else:
+    if uploaded_images['terrain']:
+        st.write('**Terrain**')
+        row = []
+        for name, files in uploaded_images['terrain'].items():
+            for file in files:
+                row.append(file)
+                if len(row) == 3:
+                    st.image(row, width=100 * 3)
+                    row = []
+        if row:
+            st.image(row, width=100 * len(row)) # Last row, if not complete
 
-# Add a download link for the Resources.csv file
-csv_url = f"{DATA_DIR}/{RESOURCES_FILE}"
-csv_link = f"[Download {RESOURCES_FILE}]({csv_url})"
-st.markdown(csv_link)
+while True:
+    time.sleep(20)
+    st.empty()
+    display_images_from_csv()