chore: Add ffmpeg-python to requirements.txt and update video cleanup logic

requirements.txt

@@ -1,2 +1,3 @@
 streamlit==1.27.2
-yt-dlp==2024.4.9
+yt-dlp==2024.4.9
+ffmpeg-python==0.2.0

streamlit_app.py

@@ -1,7 +1,9 @@
 import os
-from glob import glob
+import uuid
 import yt_dlp
 import string
+import ffmpeg
+from glob import glob
 import streamlit as st
 
 # Config
@@ -23,10 +25,13 @@ def _remove_video():
 
 
 def _remove_all_videos():
-    videos = glob(os.path.join(".", "data", "*.mp4")) \
-             + glob(os.path.join(".", "data", "*.webm")) \
-             + glob(os.path.join(".", "data", "*.mov")) \
-             + glob(os.path.join(".", "data", "*.m4a"))
+    videos = (
+        glob(os.path.join(".", "data", "*.mp4"))
+        + glob(os.path.join(".", "data", "*.webm"))
+        + glob(os.path.join(".", "data", "*.mov"))
+        + glob(os.path.join(".", "data", "*.m4a"))
+        + glob(os.path.join(".", "data", "*.mkv"))
+    )
     for video in videos:
         try:
             os.remove(video)
@@ -34,7 +39,7 @@ def _remove_all_videos():
             print("Couldn't delete file:", video)
 
 
-# Main function
+# --- Main Functions ---
 def download_video(url: str, save_path: str, **kwargs):
     video_id = url.split("/")[-1]
 
@@ -42,26 +47,37 @@ def download_video(url: str, save_path: str, **kwargs):
         video_id = url.split("/")[-2]
 
     ydl_opts = {
-        'outtmpl': f'{save_path}/{video_id}.%(ext)s',
+        "outtmpl": f"{save_path}/{video_id}.%(ext)s",
     }
 
     if st.session_state["ig_cookie"]:
-        ydl_opts['cookies'] = st.session_state["ig_cookie"]
+        ydl_opts["cookies"] = st.session_state["ig_cookie"]
 
     with yt_dlp.YoutubeDL(ydl_opts) as ydl:
         ydl.download(url)
 
-    videos = glob(os.path.join(".", "data", "*.mp4")) \
-             + glob(os.path.join(".", "data", "*.webm")) \
-             + glob(os.path.join(".", "data", "*.mov")) \
-             + glob(os.path.join(".", "data", "*.m4a"))
+    videos = glob(os.path.join(".", "data", f"{video_id}.*"))
 
     print("videos found:", videos)
     for video in videos:
         if video_id in video:
             video_path = video
-            return video_path
+            converted_video_path = convert_video_to_mp4(video_path)
+            return converted_video_path
+
+
+def convert_video_to_mp4(video_path):
+    target_path = f"{os.path.splitext(video_path)[0]}.mp4"
+    if not os.path.exists(target_path):  # Convert only if target doesn't exist
+        (ffmpeg.input(video_path).output(target_path).run(overwrite_output=True))
+        try:
+            os.remove(video_path)
+        except FileNotFoundError:
+            print("Couldn't delete file:", video_path)
+    return target_path
+
 
+# --- Streamlit App ---
 
 st.title("Download Any* Video")
 
@@ -69,20 +85,41 @@ st.title("Download Any* Video")
 with st.sidebar:
     st.subheader("Cookies! :cookie:")
     st.write(
-        "For some websites that have a more strict bot control it's necessary to upload a cookie file to download content from them")
-    st.file_uploader(label="**Upload Instagram Cookie** :cookie:", type=["txt", "json"],
-                     accept_multiple_files=False, key="ig_cookie")
-    st.file_uploader(label="**Upload TikTok Cookie** :cookie:", type=["txt", "json"],
-                     accept_multiple_files=False, key="tt_cookie")
-    st.button("Clear Videos", on_click=_remove_all_videos, type="secondary", help="Clear all downloaded videos")
+        "For some websites that have a more strict bot control it's necessary to upload a cookie file to download content from them"
+    )
+    st.file_uploader(
+        label="**Upload Instagram Cookie** :cookie:",
+        type=["txt", "json"],
+        accept_multiple_files=False,
+        key="ig_cookie",
+    )
+    st.file_uploader(
+        label="**Upload TikTok Cookie** :cookie:",
+        type=["txt", "json"],
+        accept_multiple_files=False,
+        key="tt_cookie",
+    )
+    st.button(
+        "Clear Videos",
+        on_click=_remove_all_videos,
+        type="secondary",
+        help="Clear all downloaded videos",
+    )
 
 # Main content
-st.text_input("Video URL", key="url", placeholder="Enter Video URL and Hit Enter", on_change=_remove_video)
+st.text_input(
+    "Video URL",
+    key="url",
+    placeholder="Enter Video URL and Hit Enter",
+    on_change=_remove_video,
+)
 
 if st.session_state["url"]:
     download = st.button("Load Video")
     if download:
-        video_path = download_video(st.session_state["url"], save_path=os.path.join(".", "data"))
+        video_path = download_video(
+            st.session_state["url"], save_path=os.path.join(".", "data")
+        )
         st.session_state["videos"] = video_path
 
 if st.session_state["videos"]:
@@ -95,10 +132,12 @@ if st.session_state["videos"]:
 
     try:
         video_file = open(st.session_state["videos"], "rb")
-        st.download_button("**Download Video 📁**",
-                           data=video_file,
-                           file_name=f"{st.session_state['videos'].lower().translate(str.maketrans('', '', string.punctuation)).replace(' ', '_')}.mp4",
-                           mime="video/mp4",
-                           type="primary")
+        st.download_button(
+            "**Download Video 📁**",
+            data=video_file,
+            file_name=f"{st.session_state['videos'].lower().translate(str.maketrans('', '', string.punctuation)).replace(' ', '_')}.mp4",
+            mime="video/mp4",
+            type="primary",
+        )
     except Exception as e:
         st.error("Failed downloading the video", icon="😔")