Update app.py

app.py

@@ -10,8 +10,7 @@ DOWNLOAD_FOLDER = './output'
 COOKIES_PATH = './cookies.txt'
 
 # Ensure the download folder exists
-if not os.path.exists(DOWNLOAD_FOLDER):
-    os.makedirs(DOWNLOAD_FOLDER)
+os.makedirs(DOWNLOAD_FOLDER, exist_ok=True)
 
 def create_readme():
     readme_path = os.path.join(DOWNLOAD_FOLDER, 'readme.txt')
@@ -25,88 +24,86 @@ def create_readme():
     except Exception as e:
         return f"Failed to create readme.txt: {str(e)}"
 
+def get_video_filename():
+    for file in os.listdir(DOWNLOAD_FOLDER):
+        if file.endswith(".mp4"):
+            return os.path.join(DOWNLOAD_FOLDER, file)
+    return None
+
 def download_video(url):
     try:
-        output_path = os.path.join(DOWNLOAD_FOLDER, '%(title)s.mp4')
-        command = ['yt-dlp', '-f', 'mp4', '-o', output_path, url]
+        output_template = os.path.join(DOWNLOAD_FOLDER, '%(title)s.%(ext)s')
+        command = ['yt-dlp', '-f', 'mp4', '-o', output_template, url]
 
         if os.path.exists(COOKIES_PATH):
-            command.extend(['--cookies', COOKIES_PATH])
+            command += ['--cookies', COOKIES_PATH]
         else:
             return f"Error: Cookies file {COOKIES_PATH} not found."
 
         logging.info(f"Running command: {' '.join(command)}")
-
         process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = process.communicate()
 
-        logging.info(f"STDOUT: {stdout.decode()}")
-        logging.error(f"STDERR: {stderr.decode()}")
-
-        if process.returncode == 0:
-            video_filename = get_video_filename(output_path)
-            if video_filename:
-                return f"Video downloaded: {video_filename}\n" + create_readme()
-            else:
-                return "Error: Video file not found."
-        else:
+        logging.info(stdout.decode())
+        if process.returncode != 0:
             return f"Error downloading video: {stderr.decode()}"
+
+        video_filename = get_video_filename()
+        if not video_filename:
+            return "Error: Downloaded video file not found."
+
+        return f"Video downloaded: {video_filename}\n" + create_readme()
+
     except Exception as e:
-        return f"Failed to download video: {str(e)}"
+        return f"Exception during video download: {str(e)}"
 
 def android_download():
     try:
-        video_filename = get_video_filename(f'{DOWNLOAD_FOLDER}/%(title)s.mp4')
-        if video_filename:
-            android_path = f'{DOWNLOAD_FOLDER}/AndroidRingtone.mp3'
-            command = ['ffmpeg', '-i', video_filename, '-t', '20', '-q:a', '0', '-map', 'a', android_path]
-            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            process.communicate()
-
-            if process.returncode == 0:
-                return "Android ringtone created successfully", android_path
-            else:
-                return f"Error creating Android ringtone: {process.stderr.read().decode()}", None
-        else:
+        video_filename = get_video_filename()
+        if not video_filename:
             return "Error: Video file not found for Android ringtone.", None
+
+        android_path = os.path.join(DOWNLOAD_FOLDER, 'AndroidRingtone.mp3')
+        command = ['ffmpeg', '-y', '-i', video_filename, '-t', '20', '-q:a', '0', '-map', 'a', android_path]
+        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        _, stderr = process.communicate()
+
+        if process.returncode == 0 and os.path.exists(android_path):
+            return "Android ringtone created successfully.", android_path
+        else:
+            return f"Error creating Android ringtone: {stderr.decode()}", None
     except Exception as e:
-        return f"Failed to create Android ringtone: {str(e)}", None
+        return f"Exception during Android ringtone creation: {str(e)}", None
 
 def iphone_download():
     try:
-        iphone_path = f'{DOWNLOAD_FOLDER}/iPhoneRingtone.m4r'
+        android_path = os.path.join(DOWNLOAD_FOLDER, 'AndroidRingtone.mp3')
+        iphone_path = os.path.join(DOWNLOAD_FOLDER, 'iPhoneRingtone.m4r')
+
+        if not os.path.exists(android_path):
+            return "Error: Android ringtone not found. Create it first.", None
+
         command = [
-            'ffmpeg',
-            '-i', f'{DOWNLOAD_FOLDER}/AndroidRingtone.mp3',
-            '-t', '20',
-            '-acodec', 'aac',
-            '-b:a', '128k',
-            '-f', 'mp4',
-            iphone_path
+            'ffmpeg', '-y', '-i', android_path, '-t', '20',
+            '-acodec', 'aac', '-b:a', '128k', '-f', 'ipod', iphone_path
         ]
         process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        process.communicate()
+        _, stderr = process.communicate()
 
-        if process.returncode == 0:
-            return "iPhone ringtone created successfully", iphone_path
+        if process.returncode == 0 and os.path.exists(iphone_path):
+            return "iPhone ringtone created successfully.", iphone_path
         else:
-            return f"Error creating iPhone ringtone: {process.stderr.read().decode()}", None
+            return f"Error creating iPhone ringtone: {stderr.decode()}", None
     except Exception as e:
-        return f"Failed to create iPhone ringtone: {str(e)}", None
-
-def get_video_filename(output_path):
-    """Finds and returns the actual downloaded filename"""
-    for file in os.listdir(DOWNLOAD_FOLDER):
-        if file.endswith(".mp4"):
-            return os.path.join(DOWNLOAD_FOLDER, file)
-    return None
+        return f"Exception during iPhone ringtone creation: {str(e)}", None
 
 def paste_from_clipboard():
-    """Get URL from clipboard"""
-    return pyperclip.paste()
+    try:
+        return pyperclip.paste()
+    except Exception as e:
+        return f"Clipboard error: {str(e)}"
 
 def clear_input():
-    """Clear the input and output"""
     return "", ""
 
 # Gradio UI
@@ -115,20 +112,20 @@ with gr.Blocks() as iface:
     url_input = gr.Textbox(label="Enter YouTube URL", placeholder="Paste URL here")
     status_output = gr.Textbox(label="Status", interactive=False)
 
-    android_download_link = gr.File(label="Download Android Ringtone", interactive=False)
-    iphone_download_link = gr.File(label="Download iPhone Ringtone", interactive=False)
+    android_download_link = gr.File(label="Android Ringtone", interactive=False)
+    iphone_download_link = gr.File(label="iPhone Ringtone", interactive=False)
 
-    download_button = gr.Button("Download Video")
-    android_button = gr.Button("Create Android Ringtone")
-    iphone_button = gr.Button("Create iPhone Ringtone")
-    paste_button = gr.Button("Paste URL from Clipboard")
-    clear_button = gr.Button("Clear")
+    download_button = gr.Button("📥 Download Video")
+    android_button = gr.Button("🎶 Create Android Ringtone")
+    iphone_button = gr.Button("📱 Create iPhone Ringtone")
+    paste_button = gr.Button("📋 Paste URL from Clipboard")
+    clear_button = gr.Button("🧹 Clear")
 
-    download_button.click(download_video, inputs=url_input, outputs=status_output)
-    android_button.click(android_download, outputs=[status_output, android_download_link])
-    iphone_button.click(iphone_download, outputs=[status_output, iphone_download_link])
-    paste_button.click(paste_from_clipboard, outputs=url_input)
-    clear_button.click(clear_input, outputs=[url_input, status_output])
+    download_button.click(fn=download_video, inputs=url_input, outputs=status_output)
+    android_button.click(fn=android_download, outputs=[status_output, android_download_link])
+    iphone_button.click(fn=iphone_download, outputs=[status_output, iphone_download_link])
+    paste_button.click(fn=paste_from_clipboard, outputs=url_input)
+    clear_button.click(fn=clear_input, outputs=[url_input, status_output])
 
 iface.launch(share=True)
 
@@ -137,6 +134,7 @@ iface.launch(share=True)
 
 
 
+