Update app.py

app.py

@@ -2,8 +2,8 @@ import streamlit as st
 import instaloader
 import os
 from dotenv import load_dotenv
-import time
-import glob
+import re
+from urllib.parse import urlparse, unquote
 
 # Load environment variables
 load_dotenv()
@@ -12,116 +12,147 @@ load_dotenv()
 INSTAGRAM_USERNAME = os.getenv('INSTAGRAM_USERNAME')
 INSTAGRAM_PASSWORD = os.getenv('INSTAGRAM_PASSWORD')
 
+def clean_url(url):
+    """Clean Instagram URL and extract shortcode"""
+    try:
+        # Remove query parameters and fragments
+        cleaned_url = url.split('?')[0].split('#')[0].strip('/')
+        
+        # Extract shortcode using regex
+        patterns = [
+            r'instagram.com/reel/([A-Za-z0-9_-]+)',
+            r'instagram.com/p/([A-Za-z0-9_-]+)',
+            r'/([A-Za-z0-9_-]{11})[/]?$'
+        ]
+        
+        for pattern in patterns:
+            match = re.search(pattern, cleaned_url)
+            if match:
+                return match.group(1)
+                
+        # If patterns don't match, try getting the last segment
+        segments = cleaned_url.split('/')
+        if segments:
+            last_segment = segments[-1]
+            if len(last_segment) >= 11:  # Instagram shortcodes are usually 11 chars or longer
+                return last_segment
+                
+        return None
+    except Exception as e:
+        st.error(f"Error cleaning URL: {str(e)}")
+        return None
+
 def verify_download(shortcode):
     """Verify that files were actually downloaded"""
-    download_path = f"reels/{shortcode}"
+    download_path = os.path.join('reels', shortcode)
     
     # Check if directory exists
     if not os.path.exists(download_path):
         return False, "Download directory not found"
     
-    # Look for video files (mp4)
-    video_files = glob.glob(f"{download_path}/*.mp4")
+    # List all files in directory
+    files = os.listdir(download_path)
+    st.info(f"Files in download directory: {files}")
+    
+    # Look for video files
+    video_files = [f for f in files if f.endswith('.mp4')]
     
     if video_files:
-        # Get the full path of the first video file
-        video_path = video_files[0]
+        video_path = os.path.join(download_path, video_files[0])
         file_size = os.path.getsize(video_path)
         return True, {
             'path': video_path,
             'size': f"{file_size / (1024*1024):.2f} MB",
             'exists': os.path.exists(video_path)
         }
-    return False, "No video files found in download directory"
+    return False, "No video files found"
 
 def download_reel(url):
     """Download Instagram reel"""
     if not url:
         return "Please enter a URL"
     
-    # Initialize loader with debug message
-    st.info("Initializing downloader...")
+    # Clean URL and extract shortcode
+    shortcode = clean_url(url)
+    if not shortcode:
+        return "Could not extract valid shortcode from URL"
+    
+    st.info(f"Extracted shortcode: {shortcode}")
+    
+    # Initialize loader
     loader = instaloader.Instaloader(
         download_videos=True,
         download_video_thumbnails=False,
         download_geotags=False,
         download_comments=False,
         save_metadata=False,
-        compress_json=False,
-        max_connection_attempts=3,
-        dirname_pattern="reels/{target}"  # Explicitly set download directory
+        compress_json=False
     )
     
     try:
+        # Login
         if INSTAGRAM_USERNAME and INSTAGRAM_PASSWORD:
-            st.info(f"Attempting to login as {INSTAGRAM_USERNAME}...")
+            st.info(f"Logging in as {INSTAGRAM_USERNAME}...")
             loader.login(INSTAGRAM_USERNAME, INSTAGRAM_PASSWORD)
             st.success("Login successful!")
         else:
-            st.error("Instagram credentials not found")
-            return "Missing credentials"
-            
-        # Extract shortcode
-        shortcode = url.strip('/').split('/')[-1]
-        if not shortcode:
-            shortcode = url.strip('/').split('/')[-2]
-            
-        st.info(f"Attempting to download reel with shortcode: {shortcode}")
-        
-        # Create download directory
-        os.makedirs(f"reels/{shortcode}", exist_ok=True)
+            return "Missing Instagram credentials"
         
-        # Get absolute path
-        abs_download_path = os.path.abspath(f"reels/{shortcode}")
-        st.info(f"Download directory: {abs_download_path}")
+        # Create clean download directory
+        download_path = os.path.join('reels', shortcode)
+        os.makedirs(download_path, exist_ok=True)
+        st.info(f"Download directory: {os.path.abspath(download_path)}")
         
-        # Download the post
+        # Download post
         st.info("Fetching post metadata...")
         post = instaloader.Post.from_shortcode(loader.context, shortcode)
         
-        st.info(f"Starting download of post type: {post.typename}")
-        loader.download_post(post, target=shortcode)
+        st.info("Starting download...")
+        loader.download_post(post, target=download_path)
         
-        # Verify the download
+        # Verify download
         success, result = verify_download(shortcode)
-        
         if success:
-            return f"""Download completed:
-            - File: {result['path']}
-            - Size: {result['size']}
-            - File exists: {result['exists']}"""
+            return f"Download successful!\nFile: {result['path']}\nSize: {result['size']}"
         else:
-            return f"Download failed: {result}"
-        
+            return f"Download verification failed: {result}"
+            
     except instaloader.exceptions.InstaloaderException as e:
-        return f"Instagram error: {str(e)}\nCurrent working directory: {os.getcwd()}"
+        return f"Instagram error: {str(e)}"
     except Exception as e:
-        return f"An unexpected error occurred: {str(e)}"
+        return f"Unexpected error: {str(e)}"
 
 def main():
-    st.set_page_config(page_title="Instagram Reel Downloader", page_icon="📱")
+    st.set_page_config(
+        page_title="Instagram Reel Downloader",
+        page_icon="📱"
+    )
     
     st.title('📱 Instagram Reel Downloader')
     
-    # Show current working directory
-    st.text(f"Working directory: {os.getcwd()}")
-    
     # Input for Reel URL
     url = st.text_input('Enter the Instagram Reel URL', 
-                       placeholder='https://www.instagram.com/reel/...')
+                       placeholder='https://www.instagram.com/reel/XXXXXXXXXXXX')
+    
+    if url:
+        shortcode = clean_url(url)
+        if shortcode:
+            st.info(f"Detected shortcode: {shortcode}")
+        else:
+            st.warning("Could not detect valid shortcode from URL")
     
     # Download button
     if st.button('Download Reel', type='primary'):
         if url:
             with st.spinner('Downloading reel...'):
                 result = download_reel(url)
-                st.text(result)  # Show detailed result
+                st.write(result)
                 
-                # List contents of download directory
-                if "reels" in os.listdir():
-                    st.text("Contents of reels directory:")
+                # Show directory contents
+                if os.path.exists("reels"):
+                    st.write("Contents of reels directory:")
                     for item in os.listdir("reels"):
-                        st.text(f"- {item}")
+                        st.write(f"- {item}")
         else:
             st.warning('Please enter a URL.')