Update app.py

app.py

@@ -3,7 +3,8 @@ import instaloader
 import os
 from dotenv import load_dotenv
 import re
-from urllib.parse import urlparse, unquote
+import requests
+import shutil
 
 # Load environment variables
 load_dotenv()
@@ -29,43 +30,46 @@ def clean_url(url):
             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 segments[-1]
                 
         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 = os.path.join('reels', shortcode)
-    
-    # Check if directory exists
-    if not os.path.exists(download_path):
-        return False, "Download directory not found"
-    
-    # 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:
-        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"
+def download_file(url, path):
+    """Download file from URL with progress bar"""
+    try:
+        response = requests.get(url, stream=True)
+        response.raise_for_status()
+        
+        # Get file size for progress bar
+        file_size = int(response.headers.get('content-length', 0))
+        
+        # Create progress bar
+        progress_bar = st.progress(0)
+        
+        # Download with progress updates
+        with open(path, 'wb') as f:
+            if file_size == 0:
+                f.write(response.content)
+            else:
+                downloaded = 0
+                for chunk in response.iter_content(chunk_size=8192):
+                    if chunk:
+                        f.write(chunk)
+                        downloaded += len(chunk)
+                        progress = int((downloaded / file_size) * 100)
+                        progress_bar.progress(progress)
+        
+        return True
+    except Exception as e:
+        st.error(f"Download error: {str(e)}")
+        return False
 
 def download_reel(url):
     """Download Instagram reel"""
@@ -79,7 +83,7 @@ def download_reel(url):
     
     st.info(f"Extracted shortcode: {shortcode}")
     
-    # Initialize loader
+    # Initialize loader with debugging
     loader = instaloader.Instaloader(
         download_videos=True,
         download_video_thumbnails=False,
@@ -98,29 +102,49 @@ def download_reel(url):
         else:
             return "Missing Instagram credentials"
         
-        # Create clean download directory
+        # Create 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)}")
+        st.info(f"Download directory created: {os.path.abspath(download_path)}")
         
-        # Download post
+        # Get post metadata
         st.info("Fetching post metadata...")
         post = instaloader.Post.from_shortcode(loader.context, shortcode)
         
-        st.info("Starting download...")
-        loader.download_post(post, target=download_path)
+        # Debug post information
+        st.info(f"Post type: {post.typename}")
+        st.info(f"Is video: {post.is_video}")
         
-        # Verify download
-        success, result = verify_download(shortcode)
-        if success:
-            return f"Download successful!\nFile: {result['path']}\nSize: {result['size']}"
+        if post.is_video:
+            # Get video URL
+            video_url = post.video_url
+            st.info("Video URL obtained")
+            
+            # Download video file
+            video_path = os.path.join(download_path, f"{shortcode}.mp4")
+            st.info("Starting direct video download...")
+            
+            if download_file(video_url, video_path):
+                # Verify file exists and has size
+                if os.path.exists(video_path):
+                    size = os.path.getsize(video_path)
+                    if size > 0:
+                        return f"""Download successful!
+                        Location: {video_path}
+                        Size: {size/1024/1024:.2f} MB"""
+                    else:
+                        return "Download failed: File is empty"
+                else:
+                    return "Download failed: File not created"
+            else:
+                return "Failed to download video file"
         else:
-            return f"Download verification failed: {result}"
+            return "Post is not a video"
             
     except instaloader.exceptions.InstaloaderException as e:
         return f"Instagram error: {str(e)}"
     except Exception as e:
-        return f"Unexpected error: {str(e)}"
+        return f"Unexpected error: {str(e)}\nType: {type(e)}"
 
 def main():
     st.set_page_config(
@@ -130,17 +154,15 @@ def main():
     
     st.title('📱 Instagram Reel Downloader')
     
+    # Show current working directory and permissions
+    st.info(f"Working directory: {os.getcwd()}")
+    if os.path.exists("reels"):
+        st.info(f"Reels directory permissions: {oct(os.stat('reels').st_mode)[-3:]}")
+    
     # Input for Reel URL
     url = st.text_input('Enter the Instagram Reel URL', 
                        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:
@@ -150,9 +172,14 @@ def main():
                 
                 # Show directory contents
                 if os.path.exists("reels"):
-                    st.write("Contents of reels directory:")
-                    for item in os.listdir("reels"):
-                        st.write(f"- {item}")
+                    st.write("\nContents of reels directory:")
+                    for root, dirs, files in os.walk("reels"):
+                        level = root.replace("reels", "").count(os.sep)
+                        indent = " " * 4 * level
+                        st.write(f"{indent}{os.path.basename(root)}/")
+                        subindent = " " * 4 * (level + 1)
+                        for f in files:
+                            st.write(f"{subindent}{f}")
         else:
             st.warning('Please enter a URL.')