Update app.py

app.py

@@ -29,31 +29,31 @@ if not os.path.exists("history.json"):
     with open("history.json", "w") as f:
         json.dump({}, f)
 
-def zip_subdirs(start_dir, history):
+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
-            # Find the URL associated with the subdir in history
-            url_key = next((url for url, path in history.items() if path == subdir), None)
-            if url_key:
-                # Use a sanitized version of the URL as the zip filename
-                sanitized_url = hashlib.md5(url_key.encode()).hexdigest()
-                zip_filename = os.path.join(start_dir, sanitized_url + '.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, url_key
-
-def get_zip_download_link(zip_file, url, num_files, size_str):
-    # Create the download link
+            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(url)  # Use URL as the link name
-    href = f'<a href="data:file/zip;base64,{b64}" download="{link_name}.zip">{link_name} - {num_files} files, {size_str}</a>'
+    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
-    
+
+  
 @st.cache_resource
 def create_zip_of_files(files):
     zip_name = "all_files.zip"
@@ -238,20 +238,11 @@ def main():
                 os.remove(file)
             st.experimental_rerun()
                         
-
         if st.sidebar.button("⬇️ Download All"):
             start_directory = '.'  # Current directory
-            with open("history.json", "r") as f:
-                history = json.load(f)
-            for zip_file, url in zip_subdirs(start_directory, history):
-                # Get file count and size info
-                with zipfile.ZipFile(zip_file, 'r') as zipf:
-                    num_files = len(zipf.namelist())
-                zip_size = os.path.getsize(zip_file)
-                size_str = f"{zip_size / 1024**2:.2f} MB" if zip_size >= 1024**2 else f"{zip_size / 1024:.2f} KB"
-                # Display enhanced download link with URL, file count, and size
-                st.sidebar.markdown(get_zip_download_link(zip_file, url, num_files, size_str), unsafe_allow_html=True)
-
+            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:
@@ -264,4 +255,4 @@ def main():
         for subdir in history.values():
             show_download_links(subdir)
 if __name__ == "__main__":
-    main()
+    main()