Update app.py

app.py

@@ -29,42 +29,29 @@ 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):
+def zip_subdirs(start_dir, history):
     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):
-    # Count number of files in the zip
-    with zipfile.ZipFile(zip_file, 'r') as zipf:
-        num_files = len(zipf.namelist())
-    # Get the size of the zip file
-    zip_size = os.path.getsize(zip_file)
-    # Convert size to a more readable format (e.g., KB, MB)
-    if zip_size < 1024:
-        size_str = f"{zip_size} B"
-    elif zip_size < 1024**2:
-        size_str = f"{zip_size / 1024:.2f} KB"
-    else:
-        size_str = f"{zip_size / 1024**2:.2f} MB"
-
+            # 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
     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}">{link_name} - {num_files} files, {size_str}</a>'
+    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>'
     return href
     
 @st.cache_resource
@@ -251,12 +238,20 @@ def main():
                 os.remove(file)
             st.experimental_rerun()
                         
+
         if st.sidebar.button("⬇️ Download All"):
             start_directory = '.'  # Current directory
-            for zip_file in zip_subdirs(start_directory):
-                # Display enhanced download link with file count and size
-                st.sidebar.markdown(get_zip_download_link(zip_file), unsafe_allow_html=True)
-            
+            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)
+
         # Expander for showing URL history and download links
         with st.expander("URL History and Downloaded Files"):
             try: