Update app.py

app.py

@@ -1,13 +1,12 @@
 import streamlit as st
 import yt_dlp
 import os
-from moviepy.editor import VideoFileClip, AudioFileClip, concatenate_videoclips
 
 # Streamlit 제목
 st.title('YouTube Video Downloader')
-st.write("<br>", unsafe_allow_html=True)  # 1줄 띄어쓰기
+st.write("<br>", unsafe_allow_html=True) # 1줄 띄어쓰기
 st.write("사용방법")
-st.write("<br>", unsafe_allow_html=True)  # 1줄 띄어쓰기
+st.write("<br>", unsafe_allow_html=True) # 1줄 띄어쓰기
 st.write("1. 다운받고자하는 유튜브 영상의 링크를 입력해주세요")
 st.write("2. 링크를 입력하고 확인버튼을 누르면 해당 영상의 썸네일이 등장합니다")
 st.write("3. 썸네일 밑의 선택란을 통해 해상도와 영상 용량을 확인한 후 원하는 해상도를 선택하고 추출 버튼을 눌러주세요")
@@ -25,18 +24,15 @@ def fetch_video_info(youtube_url):
         info_dict = ydl.extract_info(youtube_url, download=False)
         return info_dict
 
-def get_specific_formats(info_dict):
-    target_heights = [1080, 720, 144]
-    formats = {height: None for height in target_heights}
-
+def get_available_formats(info_dict):
+    formats = []
     for fmt in info_dict['formats']:
-        if fmt.get('height') in target_heights and fmt.get('ext') == 'mp4':
+        if fmt.get('height') and fmt.get('ext') == 'mp4':
             filesize = fmt.get('filesize', 0)
             if filesize:
                 filesize_mb = round(filesize / (1024 * 1024), 2)
-                formats[fmt['height']] = f"{fmt['format_id']} - {fmt['height']}p - {filesize_mb} MB"
-    
-    return [fmt for fmt in formats.values() if fmt is not None]
+                formats.append(f"{fmt['height']}p - {filesize_mb} MB")
+    return formats
 
 if st.button('확인'):
     if youtube_url:
@@ -53,7 +49,7 @@ if st.button('확인'):
             info_dict = fetch_video_info(youtube_url)
             st.session_state.info_dict = info_dict
             st.session_state.thumbnail_url = info_dict.get('thumbnail')
-            st.session_state.formats = get_specific_formats(info_dict)
+            st.session_state.formats = get_available_formats(info_dict)
             st.session_state.confirmed = True
         except Exception as e:
             st.error(f"An error occurred: {e}")
@@ -66,46 +62,32 @@ if st.session_state.confirmed:
     # 해상도 선택
     format_selection = st.selectbox('Select resolution', st.session_state.formats)
 
-    def download_video_audio(youtube_url, format_id):
-        video_opts = {
-            'format': format_id,
+    def download_video(youtube_url, format_id):
+        ydl_opts = {
+            'format': f"{format_id}+bestaudio/best",
+            'merge_output_format': 'mp4',
             'outtmpl': 'downloaded_video.%(ext)s',
-            'nocheckcertificate': True,
-        }
-        audio_opts = {
-            'format': 'bestaudio',
-            'outtmpl': 'downloaded_audio.%(ext)s',
-            'nocheckcertificate': True,
+            'nocache': True,  # 캐시 비활성화
+            'force_generic_extractor': True  # 항상 새로운 URL 사용
         }
-        
-        with yt_dlp.YoutubeDL(video_opts) as ydl:
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
             ydl.download([youtube_url])
-        
-        with yt_dlp.YoutubeDL(audio_opts) as ydl:
-            ydl.download([youtube_url])
-
-    def combine_video_audio(video_path, audio_path, output_path):
-        video_clip = VideoFileClip(video_path)
-        audio_clip = AudioFileClip(audio_path)
-        final_clip = video_clip.set_audio(audio_clip)
-        final_clip.write_videofile(output_path, codec="libx264")
 
     # "추출" 버튼 추가
     if st.button('추출'):
-        format_id = format_selection.split(' - ')[0]
+        format_id = format_selection.split('p')[0]
         try:
             # 세션 상태의 youtube_url 사용
-            download_video_audio(st.session_state.youtube_url, format_id)
-            combine_video_audio('downloaded_video.mp4', 'downloaded_audio.webm', 'final_video.mp4')
-            st.success('Video downloaded and combined successfully!')
-            st.video('final_video.mp4')
+            download_video(st.session_state.youtube_url, format_id)
+            st.success('Video downloaded successfully!')
+            st.video('downloaded_video.mp4')
 
             # 다운로드된 파일 제공 (optional)
-            with open('final_video.mp4', 'rb') as file:
+            with open('downloaded_video.mp4', 'rb') as file:
                 st.download_button(
                     label="Download Video File",
                     data=file,
-                    file_name='final_video.mp4',
+                    file_name='downloaded_video.mp4',
                     mime='video/mp4'
                 )
         except Exception as e: