(chore): bumped up to 1.0.3

README.md

@@ -3,7 +3,7 @@
 ### A Simple CLI Tool to Download Your Favourite YouTube Videos Effortlessly!
 
 [![status](https://img.shields.io/badge/status-active-brightgreen.svg?style=flat)](https://github.com/neosubhamoy/pytubepp/)
-[![verion](https://img.shields.io/badge/version-v1.0.2_stable-yellow.svg?style=flat)](https://github.com/neosubhamoy/pytubepp/)
+[![verion](https://img.shields.io/badge/version-v1.0.3_stable-yellow.svg?style=flat)](https://github.com/neosubhamoy/pytubepp/)
 [![python](https://img.shields.io/badge/python-v3.12.x-blue?logo=python&style=flat)](https://www.python.org/downloads/)
 [![builds](https://img.shields.io/badge/builds-passing-brightgreen.svg?style=flat)](https://github.com/neosubhamoy/pytubepp/)
 [![PRs](https://img.shields.io/badge/PRs-welcome-blue.svg?style=flat)](https://github.com/neosubhamoy/pytubepp/)
@@ -37,7 +37,7 @@ pip install pytubepp
 **>> Install FFmpeg (If you haven't already!)**
 
 Linux (Ubuntu): `apt install ffmpeg`<br>
-Windows (using Chocolatey): `choco install ffmpeg`<br>
+Windows (10/11): `winget install ffmpeg`<br>
 MacOS (using Homebrew): `brew install ffmpeg`<br>
 Android (using Termux): `pkg install ffmpeg`
 
@@ -56,13 +56,14 @@ pytubepp "https://youtube.com/watch?v=2lAe1cqCOXo" -s 480p
 ```terminal
 pytubepp "https://youtube.com/watch?v=2lAe1cqCOXo" -s mp3
 ```
+* To cancel/stop an ongoing download press `CTRL` + `C` on keyboard.
 * List of all available flags are given below:
 
 | Flag | Usage | Requires Parameter | Requires URL | Parameters | Default |
 | :--- | :---  | :---               | :---         | :---       | :---    |
-| -s | Choose preferred download stream | YES | YES | `144` `144p` `240` `240p` `360` `360p` `480` `480p` `720` `720p` `hd` `1080` `1080p` `fhd` `1440` `1440p` `2k` `2160` `2160p` `4k` `mp3` (Pass any one of them) | Your chosen Default Stream via `-ds` flag |
+| -s | Choose preferred download stream | YES | YES | `144` `144p` `240` `240p` `360` `360p` `480` `480p` `720` `720p` `hd` `1080` `1080p` `fhd` `1440` `1440p` `2k` `2160` `2160p` `4k` `4320` `4320p` `8k` `mp3` (Pass any one of them) | Your chosen Default Stream via `-ds` flag |
 | -i | Shows the video information like: Title, Author, Views, Available Download Streams | NO | YES | No parameters | No default |
-| -ds | Set default download stream | YES | NO | `144p` `240p` `360p` `480p` `720p` `1080p` `1440p` `2160p` `mp3` `max` (Pass any one of them) | `max` |
+| -ds | Set default download stream | YES | NO | `144p` `240p` `360p` `480p` `720p` `1080p` `1440p` `2160p` `4320p` `mp3` `max` (Pass any one of them) | `max` |
 | -df | Set custom download folder path | YES | NO | Use the full path excluding the last trailing slash within double quotes eg(in Linux): `"/path/to/folder"` (Make sure the folder path you enterted is already created and accessable) | Within `Pytube Downloads` folder in your System's `Downloads` folder |
 | -r | Reset to default configuration (Download Folder, Default Stream) | NO | NO | No parameters | No default |
 | -sc | Show all current user configurations | NO | NO | No parameters | No default |

pytubepp/main.py

@@ -137,10 +137,10 @@ def convert_to_mp3(title, thumbnail_url, random_filename, mp3_artist='Unknown',
     print('Done! 🎉')
 
 def download_progressive(stream, itag, title, resolution, file_extention, tempDIR=tempDIR, downloadDIR=downloadDIR):
-    global vdo_filesize, progress_bar
+    global total_filesize, progress_bar
     selected_vdo = stream.get_by_itag(itag)
-    vdo_filesize = selected_vdo.filesize
+    total_filesize = selected_vdo.filesize
-    progress_bar = tqdm(total=vdo_filesize, unit='B', unit_scale=True, desc="Downloading")
+    progress_bar = tqdm(total=total_filesize, unit='B', unit_scale=True, desc="Downloading Video+Audio")
     random_filename = str(random.randint(1000000000, 9999999999))
     filename = random_filename + '_vdo.' + file_extention
     output_temp_file = os.path.join(tempDIR, filename)
@@ -151,21 +151,23 @@ def download_progressive(stream, itag, title, resolution, file_extention, tempDI
     print('Done! 🎉')
 
 def download_nonprogressive(stream, itag_vdo, itag_ado, file_extention, output_path):
-    global vdo_filesize, progress_bar
+    global total_filesize, progress_bar
     selected_vdo = stream.get_by_itag(itag_vdo)
     selected_ado = stream.get_by_itag(itag_ado)
-    vdo_filesize = selected_vdo.filesize
-    progress_bar = tqdm(total=vdo_filesize, unit='B', unit_scale=True, desc="Downloading")
     random_filename = str(random.randint(1000000000, 9999999999))
+    total_filesize = selected_vdo.filesize
+    progress_bar = tqdm(total=total_filesize, unit='B', unit_scale=True, desc="Downloading Video")
     selected_vdo.download(output_path=output_path, filename=random_filename + '_vdo.' + file_extention)
+    total_filesize = selected_ado.filesize
+    progress_bar = tqdm(total=total_filesize, unit='B', unit_scale=True, desc="Downloading Audio")
     selected_ado.download(output_path=output_path, filename=random_filename + '_ado.' + file_extention)
     return random_filename
 
 def download_audio(stream, itag, output_path):
-    global vdo_filesize, progress_bar
+    global total_filesize, progress_bar
     selected_ado = stream.get_by_itag(itag)
-    vdo_filesize = selected_ado.filesize
+    total_filesize = selected_ado.filesize
-    progress_bar = tqdm(total=vdo_filesize, unit='B', unit_scale=True, desc="Downloading")
+    progress_bar = tqdm(total=total_filesize, unit='B', unit_scale=True, desc="Downloading Audio")
     random_filename = str(random.randint(1000000000, 9999999999))
     selected_ado.download(output_path=output_path, filename=random_filename + '_ado.mp4')
     return random_filename
@@ -188,7 +190,7 @@ def download_thumbnail(url, file_path):
         sys.exit()
 
 def progress(chunk, file_handle, bytes_remaining):
-    chunk_size = vdo_filesize - bytes_remaining
+    chunk_size = total_filesize - bytes_remaining
     progress_bar.update(chunk_size - progress_bar.n)
 
     if bytes_remaining == 0:
@@ -239,41 +241,45 @@ def set_global_video_info(link):
         views = str(video.views)
         stream = video.streams
         stream_resolutions = {
+            '4320p': {
+                'allowed_streams': ['8k', '4320', '4320p'],
+                'message': ['4320p', '[8k, 4320, 4320p]']
+            },
             '2160p': {
                 'allowed_streams': ['4k', '2160', '2160p'],
-                'message': ['2160p', 'webm', 'vp90', 'opus', '[4k, 2160, 2160p]']
+                'message': ['2160p', '[4k, 2160, 2160p]']
             },
             '1440p': {
                 'allowed_streams': ['2k', '1440', '1440p'],
-                'message': ['1440p', 'webm', 'vp90', 'opus', '[2k, 1440, 1440p]']
+                'message': ['1440p', '[2k, 1440, 1440p]']
             },
             '1080p': {
                 'allowed_streams': ['fhd', '1080', '1080p'],
-                'message': ['1080p', 'mp4', 'avc1', 'aac', '[fhd, 1080, 1080p]']
+                'message': ['1080p', '[fhd, 1080, 1080p]']
             },
             '720p': {
                 'allowed_streams': ['hd', '720', '720p'],
-                'message': ['720p', 'mp4', 'avc1', 'aac', '[hd, 720, 720p]']
+                'message': ['720p', '[hd, 720, 720p]']
             },
             '480p': {
                 'allowed_streams': ['480', '480p'],
-                'message': ['480p', 'mp4', 'avc1', 'aac', '[480, 480p]']
+                'message': ['480p', '[480, 480p]']
             },
             '360p': {
                 'allowed_streams': ['360', '360p'],
-                'message': ['360p', 'mp4', 'avc1', 'aac', '[360, 360p]']
+                'message': ['360p', '[360, 360p]']
             },
             '240p': {
                 'allowed_streams': ['240', '240p'],
-                'message': ['240p', 'mp4', 'avc1', 'aac', '[240, 240p]']
+                'message': ['240p', '[240, 240p]']
             },
             '144p': {
                 'allowed_streams': ['144', '144p'],
-                'message': ['144p', 'mp4', 'avc1', 'aac', '[144, 144p]']
+                'message': ['144p', '[144, 144p]']
             },
             'mp3': {
                 'allowed_streams': ['mp3'],
-                'message': ['mp3', 'mp3', 'none', 'mp3', '[mp3]']
+                'message': ['mp3', '[mp3]']
             }
         }
         for res in stream_resolutions.keys():
@@ -297,10 +303,58 @@ def show_video_info(link):
                 else:
                     matching_stream = next((s for s in stream if s.resolution == res), None)
                 if matching_stream is not None:
-                    filesize = f"{matching_stream.filesize / (1024 * 1024):.2f} MB"
+                    if res == '4320p':
+                        type = matching_stream.mime_type
+                        filesize = f"{(matching_stream.filesize + stream.get_by_itag(140).filesize) / (1024 * 1024):.2f} MB"
+                        fps = f"{matching_stream.fps}fps"
+                        vdo_codec = matching_stream.video_codec
+                        ado_codec = stream.get_by_itag(140).audio_codec
+                        vdo_bitrate = f"{matching_stream.bitrate / 1024:.0f}kbps"
+                        ado_bitrate = stream.get_by_itag(140).abr
+                    if res in ['2160p', '1440p']:
+                        type = matching_stream.mime_type
+                        filesize = f"{(matching_stream.filesize + stream.get_by_itag(251).filesize) / (1024 * 1024):.2f} MB"
+                        fps = f"{matching_stream.fps}fps"
+                        vdo_codec = matching_stream.video_codec
+                        ado_codec = stream.get_by_itag(251).audio_codec
+                        vdo_bitrate = f"{matching_stream.bitrate / 1024:.0f}kbps"
+                        ado_bitrate = stream.get_by_itag(251).abr
+                    elif res in ['1080p', '720p', '480p']:
+                        type = matching_stream.mime_type
+                        filesize = f"{(matching_stream.filesize + stream.get_by_itag(140).filesize) / (1024 * 1024):.2f} MB"
+                        fps = f"{matching_stream.fps}fps"
+                        vdo_codec = matching_stream.video_codec
+                        ado_codec = stream.get_by_itag(140).audio_codec
+                        vdo_bitrate = f"{matching_stream.bitrate / 1024:.0f}kbps"
+                        ado_bitrate = stream.get_by_itag(140).abr
+                    elif res == '360p':
+                        type = matching_stream.mime_type
+                        filesize = f"{matching_stream.filesize / (1024 * 1024):.2f} MB"
+                        fps = f"{matching_stream.fps}fps"
+                        vdo_codec = matching_stream.video_codec
+                        ado_codec = matching_stream.audio_codec
+                        vdo_bitrate = f"{matching_stream.bitrate / 1024:.0f}kbps"
+                        ado_bitrate = matching_stream.abr
+                    elif res in ['240p', '144p']:
+                        type = matching_stream.mime_type
+                        filesize = f"{(matching_stream.filesize + stream.get_by_itag(139).filesize) / (1024 * 1024):.2f} MB"
+                        fps = f"{matching_stream.fps}fps"
+                        vdo_codec = matching_stream.video_codec
+                        ado_codec = stream.get_by_itag(139).audio_codec
+                        vdo_bitrate = f"{matching_stream.bitrate / 1024:.0f}kbps"
+                        ado_bitrate = stream.get_by_itag(139).abr
+                    elif res == 'mp3':
+                        type = "audio/mp3"
+                        filesize = f"{matching_stream.filesize / (1024 * 1024):.2f} MB"
+                        fps = "none"
+                        vdo_codec = "none"
+                        ado_codec = matching_stream.audio_codec
+                        vdo_bitrate = "none"
+                        ado_bitrate = matching_stream.abr
+
                 else:
                     filesize = "N/A"
-                message = stream_resolutions[res]['message'] + [filesize]
+                message = stream_resolutions[res]['message'] + [type] + [filesize] + [fps] + [vdo_codec] + [ado_codec] + [vdo_bitrate] + [ado_bitrate]
                 table.append(message)
 
         if not found:
@@ -308,7 +362,7 @@ def show_video_info(link):
             sys.exit()
 
         print(f'\nTitle: {video.title}\nAuthor: {author}\nViews: {views}\n')
-        print(tabulate(table, headers=['Streams', 'Format', 'Video Codec', 'Audio Codec', 'Aliases', 'Size']))
+        print(tabulate(table, headers=['Stream', 'Alias', 'Format', 'Size', 'FrameRate', 'V-Codec', 'A-Codec', 'V-BitRate', 'A-BitRate']))
         print('\n')
     else:
         print('\nInvalid video link! Please enter a valid video url...!!')
@@ -328,23 +382,25 @@ def get_allowed_streams(link):
     
 def print_short_info(chosen_stream):
     if chosen_stream in ['720', '720p', 'hd']:
-        print(f'\nVideo: {title}\nSelected Stream: 720p (HD) [mp4 - avc1 - aac]\n')
+        print(f'\nVideo: {title}\nSelected Stream: 720p (HD)\n')
     elif chosen_stream in ['360', '360p']:
-        print(f'\nVideo: {title}\nSelected Stream: 360p (SD) [mp4 - avc1 - aac]\n')
+        print(f'\nVideo: {title}\nSelected Stream: 360p (SD)\n')
     elif chosen_stream in ['1080', '1080p', 'fhd']:
-        print(f'\nVideo: {title}\nSelected Stream: 1080p (FHD) [mp4 - avc1 - aac]\n')
+        print(f'\nVideo: {title}\nSelected Stream: 1080p (FHD)\n')
     elif chosen_stream in ['480', '480p']:
-        print(f'\nVideo: {title}\nSelected Stream: 480p (SD) [mp4 - avc1 - aac]\n')
+        print(f'\nVideo: {title}\nSelected Stream: 480p (SD)\n')
     elif chosen_stream in ['240', '240p']:
-        print(f'\nVideo: {title}\nSelected Stream: 240p (LD) [mp4 - avc1 - aac]\n')
+        print(f'\nVideo: {title}\nSelected Stream: 240p (LD)\n')
     elif chosen_stream in ['144', '144p']:
-        print(f'\nVideo: {title}\nSelected Stream: 144p (LD) [mp4 - avc1 - aac]\n')
+        print(f'\nVideo: {title}\nSelected Stream: 144p (LD)\n')
+    elif chosen_stream in ['4320', '4320p', '8k']:
+        print(f'\nVideo: {title}\nSelected Stream: 4320p (8K)\n')
     elif chosen_stream in ['2160', '2160p', '4k']:
-        print(f'\nVideo: {title}\nSelected Stream: 2160p (4K) [webm - vp90 - opus]\n')
+        print(f'\nVideo: {title}\nSelected Stream: 2160p (4K)\n')
     elif chosen_stream in ['1440', '1440p', '2k']:
-        print(f'\nVideo: {title}\nSelected Stream: 1440p (2K) [webm - vp90 - opus]\n')
+        print(f'\nVideo: {title}\nSelected Stream: 1440p (2K)\n')
     elif chosen_stream == 'mp3':
-        print(f'\nVideo: {title}\nSelected Stream: mp3 (Audio) [mp3 - dynamic - 44.1khz]\n')
+        print(f'\nVideo: {title}\nSelected Stream: mp3 (Audio)\n')
 
 def download_stream(link, chosen_stream):
     if set_global_video_info(link):
@@ -355,25 +411,40 @@ def download_stream(link, chosen_stream):
                 download_progressive(stream, 18, title, '360p', 'mp4')
 
             elif chosen_stream in ['1080', '1080p', 'fhd']:
-                merge_audio_video(title, '1080p', 'mp4', download_nonprogressive(stream, 137, 140, 'mp4', tempDIR))
+                if stream.get_by_itag(299):
+                    merge_audio_video(title, '1080p', 'mp4', download_nonprogressive(stream, 299, 140, 'mp4', tempDIR))
+                elif stream.get_by_itag(137):
+                    merge_audio_video(title, '1080p', 'mp4', download_nonprogressive(stream, 137, 140, 'mp4', tempDIR))
 
             elif chosen_stream in ['720', '720p', 'hd']:
-                merge_audio_video(title, '720p', 'mp4', download_nonprogressive(stream, 136, 140, 'mp4', tempDIR))
+                if stream.get_by_itag(298):
+                    merge_audio_video(title, '720p', 'mp4', download_nonprogressive(stream, 298, 140, 'mp4', tempDIR))
+                elif stream.get_by_itag(136):
+                    merge_audio_video(title, '720p', 'mp4', download_nonprogressive(stream, 136, 140, 'mp4', tempDIR))
 
             elif chosen_stream in ['480', '480p']:
                 merge_audio_video(title, '480p', 'mp4', download_nonprogressive(stream, 135, 140, 'mp4', tempDIR))
 
             elif chosen_stream in ['240', '240p']:
-                merge_audio_video(title, '240p', 'mp4', download_nonprogressive(stream, 133, 140, 'mp4', tempDIR))
+                merge_audio_video(title, '240p', 'mp4', download_nonprogressive(stream, 133, 139, 'mp4', tempDIR))
 
             elif chosen_stream in ['144', '144p']:
-                merge_audio_video(title, '144p', 'mp4', download_nonprogressive(stream, 160, 140, 'mp4', tempDIR))
+                merge_audio_video(title, '144p', 'mp4', download_nonprogressive(stream, 160, 139, 'mp4', tempDIR))
+
+            elif chosen_stream in ['4320', '4320p', '8k']:
+                merge_audio_video(title, '8k', 'mp4', download_nonprogressive(stream, 571, 140, 'mp4', tempDIR))
 
             elif chosen_stream in ['2160', '2160p', '4k']:
-                merge_audio_video(title, '4k', 'webm', download_nonprogressive(stream, 313, 251, 'webm', tempDIR))
+                if stream.get_by_itag(315):
+                    merge_audio_video(title, '4k', 'webm', download_nonprogressive(stream, 315, 251, 'webm', tempDIR))
+                elif stream.get_by_itag(313):
+                    merge_audio_video(title, '4k', 'webm', download_nonprogressive(stream, 313, 251, 'webm', tempDIR))
 
             elif chosen_stream in ['1440', '1440p', '2k']:
-                merge_audio_video(title, '2k', 'webm', download_nonprogressive(stream, 271, 251, 'webm', tempDIR))
+                if stream.get_by_itag(308):
+                    merge_audio_video(title, '2k', 'webm', download_nonprogressive(stream, 308, 251, 'webm', tempDIR))
+                elif stream.get_by_itag(271):
+                    merge_audio_video(title, '2k', 'webm', download_nonprogressive(stream, 271, 251, 'webm', tempDIR))
 
             elif chosen_stream == 'mp3':
                 convert_to_mp3(title, thumbnail, download_audio(stream, 140, tempDIR), author, video.title, author)
@@ -387,8 +458,8 @@ def main():
     parser = argparse.ArgumentParser(description=f'pytubePP (Pytube Post Processor) v{version} - A Simple CLI Tool to Download Your Favorite YouTube Videos Effortlessly!')
     parser.add_argument('url', nargs='?', default=None, help='url of the youtube video')
     parser.add_argument('-df', '--download-folder', default=argparse.SUPPRESS, help='set custom download folder path (default: ~/Downloads/Pytube Downloads) [arg eg: "/path/to/folder"]')
-    parser.add_argument('-ds', '--default-stream', default=argparse.SUPPRESS, help='set default download stream (default: max) [available arguments: 144p, 240p, 360p, 480p, 720p, 1080p, 1440p, 2160p, mp3, max]')
+    parser.add_argument('-ds', '--default-stream', default=argparse.SUPPRESS, help='set default download stream (default: max) [available arguments: 144p, 240p, 360p, 480p, 720p, 1080p, 1440p, 2160p, 4320p, mp3, max]')
-    parser.add_argument('-s', '--stream', default=argparse.SUPPRESS, help='choose download stream for the current video (default: your chosen --default-stream) [available arguments: 144p, 240p, 360p, 480p, 720p, 1080p, 1440p, 2160p, 144, 240, 360, 480, 720, 1080, 1440, 2160, mp3, hd, fhd, 2k, 4k]')
+    parser.add_argument('-s', '--stream', default=argparse.SUPPRESS, help='choose download stream for the current video (default: your chosen --default-stream) [available arguments: 144p, 240p, 360p, 480p, 720p, 1080p, 1440p, 2160p, 4320p, 144, 240, 360, 480, 720, 1080, 1440, 2160, 4320, mp3, hd, fhd, 2k, 4k, 8k]')
     parser.add_argument('-i', '--show-info', action='store_true', help='show video info (title, author, views and available_streams)')
     parser.add_argument('-sc', '--show-config', action='store_true', help='show all current user config settings')
     parser.add_argument('-r', '--reset-default', action='store_true', help='reset to default settings (download_folder and default_stream)')
@@ -460,7 +531,7 @@ def main():
 
         if 'default_stream' in args:
             if args.default_stream != defaultStream:
-                if args.default_stream in ['144p', '240p', '360p', '480p', '720p', '1080p', '1440p', '2160p', 'mp3', 'max']:
+                if args.default_stream in ['144p', '240p', '360p', '480p', '720p', '1080p', '1440p', '2160p', '4320p', 'mp3', 'max']:
                     update_config('defaultStream', args.default_stream)
                     print(f'\nDefault stream updated to: {args.default_stream}')
                 else:

setup.py

@@ -6,7 +6,7 @@ with open('README.md', 'r', encoding='utf8') as file:
 
 setup(
     name='pytubepp',
-    version='1.0.2',
+    version='1.0.3',
     description='A Simple CLI Tool to Download Your Favorite YouTube Videos Effortlessly!',
     long_description=readme,
     long_description_content_type='text/markdown',
@@ -42,6 +42,7 @@ setup(
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python",
         "Topic :: Internet",
         "Topic :: Multimedia :: Video",