Update app.py

app.py

@@ -29,6 +29,36 @@ if not os.path.exists("history.json"):
     with open("history.json", "w") as f:
         json.dump({}, f)
 
+import os
+import base64
+import zipfile
+import streamlit as st
+
+def zip_subdirs(start_dir):
+    for subdir, dirs, files in os.walk(start_dir):
+        if subdir != start_dir:  # Skip the root directory
+            zip_filename = os.path.join(start_dir, subdir.split(os.sep)[-1] + '.zip')
+            with zipfile.ZipFile(zip_filename, 'w') as zipf:
+                for file in files:
+                    file_path = os.path.join(subdir, file)
+                    zipf.write(file_path, os.path.relpath(file_path, start_dir))
+                    st.write(f"Added: {file_path}")
+            yield zip_filename
+
+def get_zip_download_link(zip_file):
+    with open(zip_file, 'rb') as f:
+        bytes = f.read()
+    b64 = base64.b64encode(bytes).decode()
+    link_name = os.path.basename(zip_file)
+    href = f'<a href="data:file/zip;base64,{b64}" download="{link_name}">Download: {link_name}</a>'
+    return href
+
+if st.sidebar.button("⬇️ Download All"):
+    start_directory = '.'  # Current directory
+    for zip_file in zip_subdirs(start_directory):
+        st.sidebar.markdown(get_zip_download_link(zip_file), unsafe_allow_html=True)
+
+
   
 @st.cache_resource
 def create_zip_of_files(files):
@@ -213,34 +243,12 @@ def main():
             for file in all_files:
                 os.remove(file)
             st.experimental_rerun()
-            
+                        
         if st.sidebar.button("⬇️ Download All"):
-            # Compose all_files
-            #all_files = glob.glob("*.*")
-            #all_files = [file for file in all_files if len(os.path.splitext(file)[0]) >= 10]  # exclude files with short names
-            #all_files.sort(key=lambda x: (os.path.splitext(x)[1], x), reverse=True)  # sort by file type and file name in descending order
-            for subdir in history.values(): # go through each download directory
-                #show_download_links(subdir)
-                global file_sequence_numbers
-                for file in list_files(subdir): # go through each file that was downloaded
-                    file_path = os.path.join(subdir, file)
-                    if file_path not in file_sequence_numbers:
-                        file_sequence_numbers[file_path] = 1
-                    else:
-                        file_sequence_numbers[file_path] += 1
-                    sequence_number = file_sequence_numbers[file_path]
-                    if os.path.isfile(file_path):
-                        st.markdown(get_download_link(file_path), unsafe_allow_html=True)
-                        show_file_operations(file_path, sequence_number)
-                    else:
-                        st.write(f"File not found: {file}")
-                zip_file = create_zip_of_files(list_files(subdir))
-                #with open(file, "rb") as f:
-                #    bytes = f.read()
-                #    b64 = base64.b64encode(bytes).decode()
-                #    href = f'<a href="data:file/octet-stream;base64,{b64}" download=\'{os.path.basename(file)}\'>Download: {os.path.basename(file)}</a>'
+            start_directory = '.'  # Current directory
+            for zip_file in zip_subdirs(start_directory):
                 st.sidebar.markdown(get_zip_download_link(zip_file), unsafe_allow_html=True)
-    
+            
         # Expander for showing URL history and download links
         with st.expander("URL History and Downloaded Files"):
             try: