V2 Completed with all new features.

Author: DevHanza

.gitignore

@@ -163,4 +163,4 @@ cython_debug/
 .mp3
 test.py
 /vids
-/outputs
+/outputs

downloader.py

@@ -1,55 +1,78 @@
-from pytube import YouTube
-import os
+import pytube
+import os , sys
 from tabulate import tabulate
 
 # Custom Modules
-from modules import vidmerge
+from modules import vidmerge, progressBar, banner
 
+# print Welcome Banner
+banner.WelcomeBanner()
+videoURL = str(input("Enter Video Link : "))
 
-print(f"===============================\n Python YouTube Downloader v2.0\n===============================\n")
+os.system('cls')
+banner.WelcomeBanner()
+print("Looking for Available Qualities..")
 
-# videoURL = str(input("Enter Video Link : "))
-print("\nLooking for Available Qualities..")
-videoURL = 'https://www.youtube.com/watch?v=mDTMBdYAjHI'
+# Only Enable for dev. purposes.
+# videoURL = 'https://www.youtube.com/watch?v=mDTMBdYAjHI' 
 
-yt = YouTube(videoURL)
-
-mediaPath = f"{os.getcwd()}/vids"
+yt = pytube.YouTube(videoURL, on_progress_callback=progressBar.progress_hook)
 
+streams = yt.streams.filter(only_video=True, mime_type="video/mp4")
 streamsData = []
 
+mediaPath = f"{os.getcwd()}/vids"
+
 # print("-------VIDEOS-------")
-for count, stream in enumerate(yt.streams.filter(only_video=True, mime_type="video/mp4"), start=1):
+
+for count, stream in enumerate(streams, start=1):
     # print(f"{count}.  Res: {stream.resolution}  |  Size:{stream.filesize_mb} mb")
     # print(stream)
     streamsData.append([count, stream.resolution, stream.filesize_mb])
 
 streamsDataTable = tabulate(streamsData, headers=["No", "Resolution", "Size (MB)"], tablefmt='rounded_outline')
+
+# Clear the terminal
+os.system('cls')
+
 # Print the Table of Stream Data
 print(streamsDataTable)
 
-userInput = input(str("Enter the Res Number: "))
+try:
+    userInput = int(input("Enter the Res Number: ")) - 1
+    streams[userInput].download(filename=f"{yt.title}.mp4", output_path=mediaPath)
+    print("Video Downloaded. ✔")
 
-for stream in yt.streams.filter(only_video=True, mime_type="video/mp4", res=userInput):
-    stream.download(filename=f"{yt.title}.mp4", output_path=mediaPath)
-    print(userInput, ": MP4 Downloaded.✔")
+except:
+    print("Wrong Input! Try Again!")
+    sys.exit()
+
+# for stream in streams:
+#     stream.download(filename=f"{yt.title}.mp4", output_path=mediaPath)
+#     print("Resolution_code : MP4 Downloaded.✔")
 
 
 
 # print("-------AUDIOS-------")
 for stream in yt.streams.filter(only_audio=True, abr="128kbps"):
     stream.download(filename=f"{yt.title}.mp3", output_path=mediaPath)
-    print(stream.abr,": MP3 Downloaded. ✔")
+    print("Audio Downloaded. ✔")
+
 
+videoID = pytube.extract.video_id(videoURL)
+videoFileName = f"{yt.title}_{videoID}"
 
 # Merge the Audio & Video File 
-vidmerge.merge(title=yt.title)
+vidmerge.merge(title=f"{yt.title}", outVidTitle=f"{videoFileName}_{videoID}")
 
 # Remove Seperate Media Files
 os.remove(f"{mediaPath}/{yt.title}.mp4")
 os.remove(f"{mediaPath}/{yt.title}.mp3")
 
+os.system('cls')
+banner.WelcomeBanner()
 print("Download Completed! ✔")
+print(f"\nCheck the 'vid' Folder for your files!\n")
 
 
 

modules/banner.py

@@ -0,0 +1,18 @@
+
+def WelcomeBanner():
+    print(f"""
+ __   __       _____     _         
+ \ \ / /__ _  |_   _|  _| |__  ___ 
+  \ V / _ \ || || || || | '_ \/ -_)
+   |_|\___/\_,_||_| \_,_|_.__/\___|
+  
+    D  O  W  N  L  O  A  D  E  R          
+                                          
+  -------------------------------         
+    Version: V2.0
+    Credits: PyTube 
+    Dev: @HansanaD
+  -------------------------------      
+""")
+
+# WelcomeBanner()

modules/progressBar.py

@@ -0,0 +1,15 @@
+
+def progress_hook(stream, chunk, bytes_remaining):
+    total_size = stream.filesize
+    bytes_downloaded = total_size - bytes_remaining
+
+    percentage_of_completion = bytes_downloaded / total_size * 100
+    num_chars = int(percentage_of_completion) // 2  # Scale to 0-50 for simplicity
+
+    # Create a string of '#' characters to represent the portion of the video that's been downloaded
+    progress_bar = '█' * num_chars
+
+    # Create a string of ' ' characters to represent the portion of the video that hasn't been downloaded yet
+    remaining_bar = ' ' * (50 - num_chars)
+
+    print(f'[{progress_bar}{remaining_bar}] {percentage_of_completion:.2f}% downloaded')

modules/vidmerge.py

@@ -2,7 +2,7 @@
 import os
 from moviepy.editor import VideoFileClip, AudioFileClip
 
-def merge(title):
+def merge(title, outVidTitle):
 
     input_video = os.path.join(os.getcwd(), "vids",f"{title}.mp4")  
     input_audio = os.path.join(os.getcwd(), "vids",f"{title}.mp3")  
@@ -15,7 +15,7 @@ def merge(title):
     final_clip = video_clip.set_audio(audio_clip)
 
     # Write the final clip to a new file
-    final_clip.write_videofile(f"vids/{title} output.mp4", codec="libx264")
+    final_clip.write_videofile(f"vids/{outVidTitle}.mp4", codec="libx264")