(chore): bumped up to 1.1.8

README.md

@@ -9,10 +9,16 @@
 [![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/)
 
-😀 GOOD NEWS: If you are not a power user and don't want to bother remembering PytubePP Commands! (You are not familier with Command Line Tools). We recently released a Browser Extension that can auto detect YouTube Videos and You can download the Video in one click directly from the browser using PytubePP CLI. Install [PytubePP Helper](https://github.com/neosubhamoy/pytubepp-helper) app in your System and add [PytubePP Extension](https://github.com/neosubhamoy/pytubepp-extension) in your Browser to get started.
+😀 NEWS: If you are not a power user and don't want to bother remembering PytubePP Commands! (You are not familier with Command Line Tools). We recently released a Browser Extension that can auto detect YouTube Videos and You can download the Video in one click directly from the browser using PytubePP CLI. Install [PytubePP Helper](https://github.com/neosubhamoy/pytubepp-helper) app in your System and add [PytubePP Extension](https://github.com/neosubhamoy/pytubepp-extension) in your Browser to get started.
 
 > **🥰 Liked this project? Please consider giving it a Star (🌟) on github to show us your appreciation and help the algorythm recommend this project to even more awesome people like you!**
 
+### **💻 Supported Platforms**
+- Windows
+- Linux
+- MacOS
+- Android (Termux)
+
 ### **🏷️ Features**
 * Auto Post-Process & Merge YouTube DASH Streams
 * Supports upto 8K 60fps HDR Stream Download
@@ -24,7 +30,7 @@
 ### **📎 Pre-Requirements**
 * [Python](https://www.python.org/downloads/) (>=3.8)
 * [FFmpeg](https://ffmpeg.org/)
-* [Node.js](https://nodejs.org/en/download/) (required for auto YT poToken genration which is currently not possible in Python environment)
+* [Node.js](https://nodejs.org/en/download/)
 
 ### **🧩 Python Dependencies**
 * [pytubefix](https://pypi.org/project/pytubefix/)
@@ -37,6 +43,11 @@
 * [setuptools](https://pypi.org/project/setuptools/)
 
 ### **🛠️ Installation**
+
+Open a Terminal/CMD (CLI) window and run the following commands one after one step by step (based on your OS) to install 'PytubePP' in your system!
+
+> If you want to follow along make sure [WinGet](https://learn.microsoft.com/en-us/windows/package-manager/winget/#install-winget) is enabled if you are on Windows (verify using `winget --version`), install [Homebrew](https://brew.sh/) if you are on MacOS and install [Termux](https://termux.dev/) if you are on Android
+
 1. Install Python and PIP
     - Linux (Debian): Python is pre-installed install PIP using `sudo apt install python3-pip`<br>
     - Linux (Fedora): Python is pre-installed install PIP using `sudo dnf install python3-pip`<br>
@@ -44,18 +55,21 @@
     - Windows (10/11): `winget install Python.Python.3.13`<br>
     - MacOS (using Homebrew): `brew install python`<br>
     - Android (using Termux): `pkg install python`
+
+> You can skip step 2, 3 and auto install them later using the command `pytubepp --postinstall` post installation (works in: Windows, Linux - debian fedora arch, MacOS)
+
 2. Install FFmpeg 
     - Linux (Debian): `sudo apt install ffmpeg`<br>
-    - Linux (Fedora): `sudo dnf install ffmpeg-free`<br>
+    - Linux (Fedora) ([enable](https://docs.fedoraproject.org/en-US/quick-docs/rpmfusion-setup/#_enabling_the_rpm_fusion_repositories_using_command_line_utilities) rpmfusion free+nonfree repos before installing): `sudo dnf install ffmpeg`<br>
     - Linux (Arch): `sudo pacman -S ffmpeg`<br>
     - Windows (10/11): `winget install ffmpeg`<br>
     - MacOS (using Homebrew): `brew install ffmpeg`<br>
     - Android (using Termux): `pkg install ffmpeg`
 3. Install Node.js
-    - Linux (Debian): `curl -o- https://fnm.vercel.app/install | bash && fnm install --lts && fnm use lts`<br>
+    - Linux (Debian): `sudo apt install nodejs`<br>
-    - Linux (Fedora): `curl -o- https://fnm.vercel.app/install | bash && fnm install --lts && fnm use lts`<br>
+    - Linux (Fedora): `sudo dnf install nodejs`<br>
-    - Linux (Arch): `curl -o- https://fnm.vercel.app/install | bash && fnm install --lts && fnm use lts`<br>
+    - Linux (Arch): `sudo pacman -S nodejs-lts-iron npm`<br>
-    - Windows (10/11): `winget install Schniz.fnm;fnm install --lts;fnm use lts`<br>
+    - Windows (10/11): `winget install OpenJS.NodeJS.LTS`<br>
     - MacOS (using Homebrew): `brew install node`<br>
     - Android (using Termux): `pkg install nodejs`
 4. Install PytubePP (using PIP)
@@ -68,14 +82,16 @@
 pip install pytubepp
 ```
 
-**NOTE: Always make sure 'PytubePP' and 'Pytubefix' is on the latest version to avoid issues (update them at least once a week) (Use the command below to update)**
+**UPDATE: Always make sure 'PytubePP' and 'Pytubefix' is on the latest version to avoid issues (update them at least once a week) (Use the command below to update)**
 
-```
+```terminal
 pip install pytubefix pytubepp --upgrade
 ```
 
+> It is highly recommended to run the post install script once after updating 'PytubePP' using: `pytubepp --postinstall` command
+
 **UNINSTALL: If you want to uninstall PytubePP (Use the command below to uninstall) NOTE: it will only remove the 'PytubePP' python package**
-```
+```terminal
 pip uninstall pytubepp -y
 ```
 
@@ -105,23 +121,31 @@ pytubepp "https://youtube.com/watch?v=2lAe1cqCOXo" -s mp3
 ```terminal
 pytubepp "https://youtube.com/watch?v=2lAe1cqCOXo" -i
 ```
-* To cancel/stop an ongoing download press `CTRL` + `C` on keyboard (it is recommended to run the `-ct` flag once after canceling an ongoing download).
+* To cancel/stop an ongoing download press `CTRL` + `C` on keyboard (it is highly recommended to run the `pytubepp -ct` command once after canceling an ongoing download).
+
+* To set default stream (suppose 1080p) use: `pytubepp -ds 1080p` command (This is useful when you always preffer to download this stream even if higher resolution stream is available. If You set default stream then next time when you download, You don't need to pass the `-s 1080p` flag, just pass the video url and it will auto select the `1080p` stream by default).
+
+* To set default caption (suppose en - English) use: `pytubepp -dc en` command (Useful when you always preffer to embed caption in videos and in a specific language, If You set default caption, You don't need to pass `-c en` flag in next downloads just pass the video url).
+
+* You can also view all these current configurations using: `pytubepp -sc` command and reset them using: `pytubepp -r` if needed.
+
 * List of all available flags are given below:
 
-| Flag | Usage | Requires Parameter | Requires URL | Parameters | Default |
+| Short Flag | 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` `4320` `4320p` `8k` `mp3` (Pass any one of them) | Your chosen Default Stream via `-ds` flag |
+| -s | --stream | 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 |
-| -c | Choose preferred caption | YES | YES | All [ISO 639-1 Language Codes](https://www.w3schools.com/tags/ref_language_codes.asp) + some others (Pass any one of them) + `none` for No Caption eg: `en` for English | Your chosen Default Caption via `-dc` flag |
+| -c | --caption | Choose preferred caption | YES | YES | All [ISO 639-1 Language Codes](https://www.w3schools.com/tags/ref_language_codes.asp) + auto generated ones + `none` for No Caption (Pass any one of them) eg: `en` for English | Your chosen Default Caption via `-dc` flag |
-| -i | Shows the video information like: Title, Author, Views, Publication Date, Duration, Available Download Streams | NO | YES | No parameters | No default |
+| -i | --show-info | Shows the video information like: Title, Author, Views, Publication Date, Duration, Available Download Streams and Captions | NO | YES | No parameters | No default |
-| -ls | Lists all available streams (video, audio, caption) (only for debuging purposes) | NO | YES | No parameters | No default |
+| -ls | --list-stream | Lists all available streams (video, audio, caption) (only for debuging purposes) | NO | YES | No parameters | No default |
-| -ri | Shows the video information in raw json format | NO | YES | No parameters | No default |
+| -ri | --raw-info | Shows the video information in raw json format | NO | YES | No parameters | No default |
-| -jp | Shows raw json output in prettified view (with indentation: 4) (primarily used with -ri flag)| NO | YES | No parameters | No default |
+| -jp | --json-prettify | Shows raw json output in prettified view (with indentation: 4) (primarily used with -ri flag)| NO | YES | No parameters | No default |
-| -ds | Set default download stream | YES | NO | `144p` `240p` `360p` `480p` `720p` `1080p` `1440p` `2160p` `4320p` `mp3` `max` (Pass any one of them) | `max` |
+| -ds | --default-stream | Set default download stream | YES | NO | `144p` `240p` `360p` `480p` `720p` `1080p` `1440p` `2160p` `4320p` `mp3` `max` (Pass any one of them) | `max` |
-| -dc | Set default caption | YES | NO | All [ISO 639-1 Language Codes](https://www.w3schools.com/tags/ref_language_codes.asp) + some others + `none` for No Caption (Pass any one of them) eg: `en` for English | `none` |
+| -dc | --default-caption | Set default caption | YES | NO | All [ISO 639-1 Language Codes](https://www.w3schools.com/tags/ref_language_codes.asp) + auto generated ones + `none` for No Caption (Pass any one of them) eg: `en` for English | `none` |
-| -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 `PytubePP Downloads` folder in your System's `Downloads` folder |
+| -df | --download-folder | 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 `PytubePP Downloads` folder in your System's `Downloads` folder |
-| -r | Reset to default configuration (Download Folder, Default Stream) | NO | NO | No parameters | No default |
+| -r | --reset-default | Reset to default configuration (Download Folder, Default Stream, Default Caption) | NO | NO | No parameters | No default |
-| -sc | Show all current user configurations | NO | NO | No parameters | No default |
+| -sc | --show-config | Show all current user configurations | NO | NO | No parameters | No default |
-| -ct | Clear temporary files (audio, video, thumbnail) of the failed, incomplete downloads | NO | NO | No parameters | No default |
+| -ct | --clear-temp | Clear temporary files (audio, video, thumbnail, caption) of the failed, incomplete downloads | NO | NO | No parameters | No default |
+| -pi | --postinstall | Auto install all external dependencies (FFmpeg, Node.js) (works in Windows, Linux - debian fedora arch, MacOS) | NO | NO | No parameters | No default |
 
 ### 🛠️ Contributing / Building from Source
 
@@ -134,19 +158,20 @@ Want to be part of this? Feel free to contribute...!! Pull Requests are always w
 
 > Use `python3` and `pip3` commands instead of `python` and `pip` if you are on Linux or MacOS.
 
-3. Install python dependencies
+3. Create a Python virtual environment (venv) and activate it (Optional)
+4. Install python dependencies
 
 ```terminal
 pip install -r requirements.txt
 ```
-4. build, install and test the module
+5. build, install and test the module
 
 ```terminal
-python -m build                                        // build the module
+python -m build   // build the module
 
 pip install .\dist\pytubepp-<version>-py3-none-any.whl   // install the module (give the path to the newly genrated whl file based on your OS path style and don't forget to replace the <version> with the actual version number)
 ```
-5. Do the changes, Send a Pull Request with proper Description (NOTE: Pull Requests Without Proper Description will be Rejected)
+6. Do the changes, Send a Pull Request with proper Description (NOTE: Pull Requests Without Proper Description will be Rejected)
 
 ⭕ Noticed any Bugs? or Want to give me some suggetions? always feel free to open an issue...!!
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytubepp"
-version = "1.1.5"
+version = "1.1.8"
 authors = [
   { name="Subhamoy Biswas", email="hey@neosubhamoy.com" },
 ]

pytubepp/download.py

@@ -1,6 +1,6 @@
 from tqdm import tqdm
 from .config import get_temporary_directory, load_config
-from .utils import get_unique_filename, postprocess_cleanup
+from .utils import get_unique_filename, postprocess_cleanup, unpack_caption
 import os, re, requests, shutil, sys, random, ffmpy
 
 userConfig = load_config()
@@ -21,6 +21,7 @@ def download_progressive(stream, itag, title, resolution, file_extention, captio
     if caption_code:
         print(f'Downloading Caption ({caption_code})...')
         caption = captions[caption_code]
+        _, caption_lang = unpack_caption(caption)
         caption_file = os.path.join(tempDIR, random_filename + '_cap.srt')
         caption.save_captions(caption_file)
         print('Processing...')
@@ -28,7 +29,7 @@ def download_progressive(stream, itag, title, resolution, file_extention, captio
         output_temp_file_with_subs = os.path.join(tempDIR, random_filename + '_merged.' + file_extention)
         ff = ffmpy.FFmpeg(
             inputs={output_temp_file: None},
-            outputs={output_temp_file_with_subs: ['-i', caption_file, '-c', 'copy', '-c:s', 'mov_text', '-metadata:s:s:0', f'language={caption_code}', '-metadata:s:s:0', f'title={caption_code}', '-metadata:s:s:0', f'handler_name={caption_code}']}
+            outputs={output_temp_file_with_subs: ['-i', caption_file, '-c', 'copy', '-c:s', 'mov_text', '-metadata:s:s:0', f'language={caption_code}', '-metadata:s:s:0', f'title={caption_lang}', '-metadata:s:s:0', f'handler_name={caption_lang}']}
         )
         ff.run(stdout=devnull, stderr=devnull)
         devnull.close()

pytubepp/main.py

@@ -3,7 +3,8 @@ from tabulate import tabulate
 from .config import get_temporary_directory, load_config, update_config, reset_config
 from .download import download_progressive, download_nonprogressive, download_audio, progress
 from .postprocess import merge_audio_video, convert_to_mp3
-from .utils import get_version, clear_temp_files, is_valid_url, network_available, ffmpeg_installed, nodejs_installed
+from .utils import get_version, clear_temp_files, is_valid_url, network_available, ffmpeg_installed, nodejs_installed, unpack_caption
+from .postinstaller import postinstall
 import appdirs, os, re, sys, argparse, json
 
 class YouTubeDownloader:
@@ -46,7 +47,7 @@ class YouTubeDownloader:
         if not nodejs_installed():
             print("\nWarning: Node.js is not installed or not found in PATH!")
             print("BotGuard poToken generation will not work properly without Node.js environment")
-            print("Please install Node.js from https://nodejs.org/en/download\n")
+            print("Please install Node.js, by running: pytubepp --postinstall or read https://github.com/neosubhamoy/pytubepp#%EF%B8%8F-installation for manual instructions\n")
         
         if is_valid_url(link):
             link = is_valid_url(link).group(1)
@@ -104,6 +105,13 @@ class YouTubeDownloader:
             
             # Use HDR stream if available, otherwise use the original stream
             final_stream = hdr_stream if hdr_stream else matching_stream
+            
+            # For 720p, check if HigherFps MP4 version exists and prefer it
+            if res == '720p' and not hdr_stream:
+                higher_fps_stream = self.stream.get_by_itag(298)
+                if higher_fps_stream:
+                    final_stream = higher_fps_stream
+            
             audio_stream = self.stream.get_by_itag(_select_suitable_audio_stream(final_stream))
             
             total_size = final_stream.filesize + audio_stream.filesize
@@ -151,9 +159,19 @@ class YouTubeDownloader:
                 print('Sorry, No video streams found....!!!')
                 sys.exit()
 
-            print(f'\nTitle: {self.video.title}\nAuthor: {self.author}\nPublished On: {self.video.publish_date.strftime("%d/%m/%Y")}\nDuration: {f"{self.video.length//3600:02}:{(self.video.length%3600)//60:02}:{self.video.length%60:02}" if self.video.length >= 3600 else f"{(self.video.length%3600)//60:02}:{self.video.length%60:02}"}\nViews: {self.views}\nCaptions: {[caption.code for caption in self.captions.keys()] or "Unavailable"}\n')
+            print(f'\nTitle: {self.video.title}\nAuthor: {self.author}\nPublished On: {self.video.publish_date.strftime("%d/%m/%Y")}\nDuration: {f"{self.video.length//3600:02}:{(self.video.length%3600)//60:02}:{self.video.length%60:02}" if self.video.length >= 3600 else f"{(self.video.length%3600)//60:02}:{self.video.length%60:02}"}\nViews: {self.views}\nCaptions: {"Available" if self.captions else "Unavailable"}')
+                
+            print('\n')
             print(tabulate(table, headers=['Stream', 'Alias (for -s flag)', 'Format', 'Size', 'FrameRate', 'V-Codec', 'A-Codec', 'V-BitRate', 'A-BitRate']))
             print('\n')
+
+            if self.captions:
+                caption_table = []
+                for caption in self.captions:
+                    cap_code, cap_lang = unpack_caption(caption)
+                    caption_table.append([cap_lang, cap_code])
+                print(tabulate(caption_table, headers=['Caption', 'CaptionCode (for -c flag)']))
+                print('\n')
         else:
             print('\nInvalid video link! Please enter a valid video url...!!')
 
@@ -204,6 +222,15 @@ class YouTubeDownloader:
                 print('Sorry, No video streams found....!!!')
                 sys.exit()
 
+            captions_list = []
+            if self.captions:
+                for caption in self.captions:
+                    cap_code, cap_lang = unpack_caption(caption)
+                    captions_list.append({
+                        'code': cap_code,
+                        'lang': cap_lang
+                    })
+
             output = {
                 'id': self.video.video_id,
                 'title': self.video.title,
@@ -213,7 +240,7 @@ class YouTubeDownloader:
                 'published_on': self.video.publish_date.strftime('%d/%m/%Y'),
                 'duration': self.video.length,
                 'streams': streams_list,
-                'captions': [caption.code for caption in self.captions.keys()] or None
+                'captions': captions_list or None
             }
             
             print(json.dumps(output, indent=4 if prettify else None))
@@ -244,11 +271,11 @@ class YouTubeDownloader:
         print(f'\nTitle: {self.title}')
         
         if chosen_stream == 'mp3':
-            print(f'Selected: Audio [128kbps (140)]')
+            print(f'Selected: Audio [128kbps (140)] --> (MP3)')
             return
             
         if chosen_stream in ['360', '360p']:
-            print(f"Selected: Video [360p (18)] + Audio [96kbps (18)]{f' + Caption [{chosen_caption}]' if chosen_caption else ''}")
+            print(f"Selected: Video [360p (18)] + Audio [96kbps (18)]{f' + Caption [{chosen_caption}]' if chosen_caption else ''} --> (MP4)")
             return
             
         _select_suitable_audio_stream = lambda stream: 251 if stream.mime_type == 'video/webm' else 140
@@ -261,15 +288,25 @@ class YouTubeDownloader:
                 hdr_stream = self.stream.get_by_itag(hdr_itags.get(res))
             
             matching_stream = hdr_stream if hdr_stream else self.stream.filter(res=res).first()
+            
+            if res == '720p' and not hdr_stream:
+                high_fps_stream = self.stream.get_by_itag(298)
+                if high_fps_stream:
+                    matching_stream = high_fps_stream
+            
             audio_stream = self.stream.get_by_itag(_select_suitable_audio_stream(matching_stream))
             
-            print(f"Selected: Video [{res} ({matching_stream.itag})] + Audio [{audio_stream.abr} ({audio_stream.itag})]{f' + Caption [{chosen_caption}]' if chosen_caption else ''}")
+            output_format = 'MP4'
+            if matching_stream.mime_type == 'video/webm':
+                output_format = 'WEBM'
+            
+            print(f"Selected: Video [{res} ({matching_stream.itag})] + Audio [{audio_stream.abr} ({audio_stream.itag})]{f' + Caption [{chosen_caption}]' if chosen_caption else ''} --> ({output_format})")
 
     def download_stream(self, link, chosen_stream, chosen_caption=None):
         if not ffmpeg_installed():
             print("\nWarning: FFmpeg is not installed or not found in PATH!")
             print("Some core functionalities like video processing will not work properly without FFmpeg")
-            print("Please install FFmpeg, read https://github.com/neosubhamoy/pytubepp#%EF%B8%8F-installation for instructions\n")
+            print("Please install FFmpeg, by running: pytubepp --postinstall or read https://github.com/neosubhamoy/pytubepp#%EF%B8%8F-installation for manual instructions\n")
             sys.exit()
         
         if self.set_video_info(link):
@@ -362,6 +399,7 @@ def main():
     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)')
     parser.add_argument('-ct', '--clear-temp', action='store_true', help='clear temporary files (audio, video, thumbnail files of the failed, incomplete downloads)')
+    parser.add_argument('-pi', '--postinstall', action='store_true', help='auto install external dependencies (supported os: windows, linux - debian fedora arch, macos)')
     parser.add_argument('-v', '--version', action='store_true', help='show version number')
     args = parser.parse_args()
 
@@ -388,11 +426,15 @@ def main():
             print('\nVideo url supplied! ignoreing -ct flag...!!')
         if args.show_config:
             print('\nVideo url supplied! ignoreing -sc flag...!!')
+        if args.postinstall:
+            print('\nVideo url supplied! ignoreing -pi flag...!!')
 
         # Handle info display flags
         if args.show_info:
+            print('Loading...')
             downloader.show_video_info(args.url)
         if args.list_stream:
+            print('Loading...')
             downloader.show_all_streams(args.url)
         if args.raw_info:
             downloader.show_raw_info(args.url, args.json_prettify)
@@ -401,6 +443,7 @@ def main():
         
         # Handle download cases
         if hasattr(args, 'stream') and hasattr(args, 'caption'):
+            print('Loading...')
             if downloader.set_video_info(args.url):
                 if (args.caption not in downloader.captions.keys()) and (args.caption != 'none'):
                     print('\nInvalid caption code or caption not available! Please choose a different caption...!! (use -i to see available captions)')
@@ -409,10 +452,7 @@ def main():
                     downloader.download_stream(args.url, args.stream)
                 elif args.stream == 'mp3' and downloader.stream.get_by_itag(140):
                     print(f'\nYou have chosen to download mp3 stream! ( Captioning audio files is not supported )')
-                    answer = input('Do you still want to continue downloading ? [yes/no]\n')
+                    answer = input('Do you still want to continue downloading? [yes/No]: ').strip().lower()
-                    while answer not in ['yes', 'y', 'no', 'n']:
-                        print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                        answer = input('Do you still want to continue downloading ? [yes/no]\n')
                     if answer in ['yes', 'y']:
                         downloader.download_stream(args.url, args.stream)
                     else:
@@ -420,15 +460,13 @@ def main():
                 else:
                     downloader.download_stream(args.url, args.stream, args.caption)
         elif hasattr(args, 'stream'):
+            print('Loading...')
             if downloader.set_video_info(args.url):
                 if downloader.default_caption == 'none':
                     downloader.download_stream(args.url, args.stream)
                 elif args.stream == 'mp3' and downloader.stream.get_by_itag(140):
                         print(f'\nYou have chosen to download mp3 stream! ( Captioning audio files is not supported )')
-                        answer = input('Do you still want to continue downloading ? [yes/no]\n')
+                        answer = input('Do you still want to continue downloading? [yes/No]: ').strip().lower()
-                        while answer not in ['yes', 'y', 'no', 'n']:
-                            print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                            answer = input('Do you still want to continue downloading ? [yes/no]\n')
                         if answer in ['yes', 'y']:
                             downloader.download_stream(args.url, args.stream)
                         else:
@@ -437,15 +475,13 @@ def main():
                     downloader.download_stream(args.url, args.stream, downloader.default_caption)
                 else:
                     print(f'\nDefault caption not available! ( Default: {downloader.default_caption} | Available: {[caption.code for caption in downloader.captions.keys()] or "Nothing"} )')
-                    answer = input('Do you still want to continue downloading without caption? [yes/no]\n')
+                    answer = input('Do you still want to continue downloading without caption? [yes/No]: ').strip().lower()
-                    while answer not in ['yes', 'y', 'no', 'n']:
-                        print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                        answer = input('Do you still want to continue downloading without caption? [yes/no]\n')
                     if answer in ['yes', 'y']:
                         downloader.download_stream(args.url, args.stream)
                     else:
                         print('Download cancelled! exiting...!!')
         elif hasattr(args, 'caption'):
+            print('Loading...')
             if downloader.set_video_info(args.url):
                 if (args.caption not in downloader.captions.keys()) and (args.caption != 'none'):
                     print('\nInvalid caption code or caption not available! Please choose a different caption...!! (use -i to see available captions)')
@@ -460,10 +496,7 @@ def main():
                     else:
                         if downloader.maxres:
                             print(f'\nDefault stream not available! ( Default: {downloader.default_stream} | Available: {downloader.maxres} )')
-                            answer = input('Do you want to download the maximum available stream ? [yes/no]\n')
+                            answer = input('Do you want to download the maximum available stream? [yes/No]: ').strip().lower()
-                            while answer not in ['yes', 'y', 'no', 'n']:
-                                print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                                answer = input('Do you want to download the maximum available stream ? [yes/no]\n')
                             if answer in ['yes', 'y']:
                                 downloader.download_stream(args.url, downloader.maxres)
                             else:
@@ -474,10 +507,7 @@ def main():
                     downloader.download_stream(args.url, downloader.maxres, args.caption)
                 elif downloader.default_stream == 'mp3' and downloader.stream.get_by_itag(140):
                         print(f'\nDefault stream set to mp3! ( Captioning audio files is not supported )')
-                        answer = input('Do you still want to continue downloading ? [yes/no]\n')
+                        answer = input('Do you still want to continue downloading? [yes/No]: ').strip().lower()
-                        while answer not in ['yes', 'y', 'no', 'n']:
-                            print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                            answer = input('Do you still want to continue downloading ? [yes/no]\n')
                         if answer in ['yes', 'y']:
                             downloader.download_stream(args.url, downloader.default_stream)
                         else:
@@ -487,10 +517,7 @@ def main():
                 else:
                     if downloader.maxres:
                         print(f'\nDefault stream not available! ( Default: {downloader.default_stream} | Available: {downloader.maxres} )')
-                        answer = input('Do you want to download the maximum available stream ? [yes/no]\n')
+                        answer = input('Do you want to download the maximum available stream? [yes/No]: ').strip().lower()
-                        while answer not in ['yes', 'y', 'no', 'n']:
-                            print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                            answer = input('Do you want to download the maximum available stream ? [yes/no]\n')
                         if answer in ['yes', 'y']:
                             downloader.download_stream(args.url, downloader.maxres, args.caption)
                         else:
@@ -498,6 +525,7 @@ def main():
                     else:
                         print('Sorry, No downloadable video stream found....!!!')
         elif not any([args.show_info, args.raw_info, args.json_prettify, args.list_stream]):  # If no info flags are set
+            print('Loading...')
             if downloader.set_video_info(args.url):
                 if downloader.default_stream == 'max' and downloader.maxres:
                     if downloader.default_caption == 'none':
@@ -506,10 +534,7 @@ def main():
                         downloader.download_stream(args.url, downloader.maxres, downloader.default_caption)
                     else:
                         print(f'\nDefault caption not available! ( Default: {downloader.default_caption} | Available: {[caption.code for caption in downloader.captions.keys()] or "Nothing"} )')
-                        answer = input('Do you still want to continue downloading without caption? [yes/no]\n')
+                        answer = input('Do you still want to continue downloading without caption? [yes/No]: ').strip().lower()
-                        while answer not in ['yes', 'y', 'no', 'n']:
-                            print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                            answer = input('Do you still want to continue downloading without caption? [yes/no]\n')
                         if answer in ['yes', 'y']:
                             downloader.download_stream(args.url, downloader.maxres)
                         else:
@@ -519,10 +544,7 @@ def main():
                         downloader.download_stream(args.url, downloader.default_stream)
                     elif downloader.default_stream == 'mp3' and downloader.stream.get_by_itag(140):
                         print(f'\nDefault stream set to mp3! ( Captioning audio files is not supported )')
-                        answer = input('Do you still want to continue downloading ? [yes/no]\n')
+                        answer = input('Do you still want to continue downloading? [yes/No]: ').strip().lower()
-                        while answer not in ['yes', 'y', 'no', 'n']:
-                            print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                            answer = input('Do you still want to continue downloading ? [yes/no]\n')
                         if answer in ['yes', 'y']:
                             downloader.download_stream(args.url, downloader.default_stream)
                         else:
@@ -531,10 +553,7 @@ def main():
                         downloader.download_stream(args.url, downloader.default_stream, downloader.default_caption)
                     else:
                         print(f'\nDefault caption not available! ( Default: {downloader.default_caption} | Available: {[caption.code for caption in downloader.captions.keys()] or "Nothing"} )')
-                        answer = input('Do you still want to continue downloading without caption? [yes/no]\n')
+                        answer = input('Do you still want to continue downloading without caption? [yes/No]: ').strip().lower()
-                        while answer not in ['yes', 'y', 'no', 'n']:
-                            print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                            answer = input('Do you still want to continue downloading without caption? [yes/no]\n')
                         if answer in ['yes', 'y']:
                             downloader.download_stream(args.url, downloader.default_stream)
                         else:
@@ -542,10 +561,7 @@ def main():
                 else:
                     if downloader.maxres:
                         print(f'\nDefault stream not available! ( Default: {downloader.default_stream} | Available: {downloader.maxres} )')
-                        answer = input('Do you want to download the maximum available stream ? [yes/no]\n')
+                        answer = input('Do you want to download the maximum available stream? [yes/No]: ').strip().lower()
-                        while answer not in ['yes', 'y', 'no', 'n']:
-                            print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                            answer = input('Do you want to download the maximum available stream ? [yes/no]\n')
                         if answer in ['yes', 'y']:
                             if downloader.default_caption == 'none':
                                 downloader.download_stream(args.url, downloader.maxres)
@@ -553,14 +569,13 @@ def main():
                                 downloader.download_stream(args.url, downloader.maxres, downloader.default_caption)
                             else:
                                 print(f'\nDefault caption not available! ( Default: {downloader.default_caption} | Available: {[caption.code for caption in downloader.captions.keys()] or "Nothing"} )')
-                                answer = input('Do you still want to continue downloading without caption? [yes/no]\n')
+                                answer = input('Do you still want to continue downloading without caption? [yes/No]: ').strip().lower()
-                                while answer not in ['yes', 'y', 'no', 'n']:
-                                    print('Invalid answer! try again...!! answer with: [yes/y/no/n]')
-                                    answer = input('Do you still want to continue downloading without caption? [yes/no]\n')
                                 if answer in ['yes', 'y']:
                                     downloader.download_stream(args.url, downloader.maxres)
                                 else:
                                     print('Download cancelled! exiting...!!')
+                        else:
+                            print('Download cancelled! exiting...!!')
                     else:
                         print('Sorry, No downloadable video stream found....!!!')
     else:
@@ -587,8 +602,13 @@ def main():
         
         if hasattr(args, 'default_caption'):
             if args.default_caption != downloader.default_caption:
-                if not all(c.isalpha() or c in '.-' for c in args.default_caption) or len(args.default_caption) > 10:
+                if not (re.match(r'^[a-z]{2}(-[A-Za-z]+)?$', args.default_caption) or
-                    print('\nInvalid caption code! Only a-z, A-Z, dash (-) and dot (.) are allowed with maximum 10 characters...!!')
+                        re.match(r'^a\.[a-z]{2}(-[A-Za-z]+)?$', args.default_caption) or
+                        re.match(r'^none$', args.default_caption)):
+                    print('\nInvalid caption code! Allowed formats are:\n'
+                        '- ISO 639-1 language codes (e.g: en, zh-Hans)\n'
+                        '- Auto-generated variants: a.ISO639-1LanguageCode (e.g: a.en, a.zh-Hans)\n'
+                        '- none\n')
                 else:
                     update_config('defaultCaption', args.default_caption)
                     print(f'\nDefault caption updated to: {args.default_caption}')
@@ -604,6 +624,9 @@ def main():
         if args.show_config:
             print(f'\ntempDIR: {downloader.temp_dir} (Unchangeable) \nconfigDIR: {downloader.config_dir} (Unchangeable)\ndownloadDIR: {downloader.download_dir}\ndefaultStream: {downloader.default_stream}\ndefaultCaption: {downloader.default_caption}\n')
 
+        if args.postinstall:
+            postinstall()
+
         if args.version:
             print(f'pytubepp {downloader.version}')
 

pytubepp/postinstaller.py

@@ -0,0 +1,130 @@
+from .utils import ffmpeg_installed, nodejs_installed
+import subprocess, platform
+
+def postinstall():
+    os_type = platform.system().lower()
+    package_manager = None
+
+    print("### PytubePP Post-Install Script ###\n")
+
+    print("Checking requirements...")
+    ffmpeg_needed = not ffmpeg_installed()
+    nodejs_needed = not nodejs_installed()
+
+    if ffmpeg_needed or nodejs_needed:
+        if os_type == 'windows':
+            version_info = platform.version().split('.')
+            if int(version_info[0]) >= 10 and (int(version_info[1]) > 0 or int(version_info[2]) >= 1709):
+                winget_check = subprocess.run(['winget', '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                if winget_check.returncode == 0:
+                    print("OS: Windows (winget)")
+                    package_manager = 'winget'  # Windows Package Manager
+                else:
+                    print("OS: Windows (winget not enabled)")
+                    user_input = input("WinGet is not available. Do you want to enable winget? (Make sure to login to Windows before enabling) [Yes/no]: ").strip().lower()
+                    if user_input in ['yes', 'y', '']:
+                        print("Enabling winget...")
+                        subprocess.run(['powershell', '-Command', 'Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe'])
+                        print("WinGet enabled successfully! Please restart your computer and re-run the post install script: pytubepp --postinstall")
+                        return
+                    else:
+                        print("Installation aborted! exiting...!!")
+                        return
+            else:
+                print("OS: Windows (winget not supported)")
+                print("Unsupported Windows version! WinGet requires Windows 10 1709 (build 16299) or later, Please install dependencies manually...!!")
+                return
+        elif os_type == 'linux':
+            # Determine the Linux distribution
+            if subprocess.run(['command', '-v', 'apt'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0:
+                print("OS: Linux (apt)")
+                package_manager = 'apt'  # APT for Debian/Ubuntu
+            elif subprocess.run(['command', '-v', 'dnf'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0:
+                print("OS: Linux (dnf)")
+                distro_id = subprocess.run(['grep', '^ID=', '/etc/os-release'], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+                if distro_id.returncode == 0 and 'fedora' in distro_id.stdout.decode().strip() and ffmpeg_needed:
+                    user_input = input("Looks like you are using Fedora. Do you want to enable RPM Fusion free and nonfree repositories? (answer no if already enabled) [Yes/no]: ").strip().lower()
+                    if user_input in ['yes', 'y', '']:
+                        print("Enabling RPM Fusion repositories...")
+                        fedora_version = subprocess.run(['rpm', '-E', '%fedora'], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+                        if fedora_version.returncode == 0:
+                            fedora_version_str = fedora_version.stdout.decode().strip()
+                            subprocess.run(['sudo', 'dnf', 'install', f'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{fedora_version_str}.noarch.rpm', '-y'], check=True)
+                            subprocess.run(['sudo', 'dnf', 'install', f'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{fedora_version_str}.noarch.rpm', '-y'], check=True)
+                        else:
+                            print("Failed to retrieve Fedora version. Please install RPM Fusion repositories manually.")
+                    else:
+                        print("RPM Fusion repositories installation skipped...!!")
+                package_manager = 'dnf'  # DNF for Fedora
+            elif subprocess.run(['command', '-v', 'pacman'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0:
+                print("OS: Linux (pacman)")
+                package_manager = 'pacman'  # Pacman for Arch Linux
+            else:
+                print("OS: Linux (unknown)")
+                print("Unsupported Linux distribution! Please install dependencies manually...!!")
+                return
+        elif os_type == 'darwin':
+            homebrew_check = subprocess.run(['brew', '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            if homebrew_check.returncode == 0:
+                print("OS: MacOS (brew)")
+                package_manager = 'brew'  # Homebrew for macOS
+            else:
+                print("OS: MacOS (brew not installed)")
+                user_input = input("Homebrew is not installed. Do you want to install Homebrew? [Yes/no]: ").strip().lower()
+                if user_input in ['yes', 'y', '']:
+                    print("Installing Homebrew...")
+                    subprocess.run('/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"', shell=True)
+                    print("Homebrew installation completed! Please restart your mac and re-run the post install script: pytubepp --postinstall")
+                    return
+                else:
+                    print("Installation aborted! exiting...!!")
+                    return
+        else:
+            print("Unsupported OS! Please install dependencies manually...!!")
+            return
+
+        print("The following packages are about to be installed:")
+        if ffmpeg_needed:
+            print("- FFmpeg")
+        if nodejs_needed:
+            print("- Node.js")
+        
+        user_input = input("Do you want to proceed with the installation? [Yes/no]: ").strip().lower()
+        if user_input not in ['yes', 'y', '']:
+            print("Installation aborted! exiting...!!")
+            return
+
+        if ffmpeg_needed:
+            print("Installing FFmpeg...")
+            install_ffmpeg(package_manager)
+        if nodejs_needed:
+            print("Installing Node.js...")
+            install_nodejs(package_manager)
+    else:
+        print("Dependencies already satisfied! exiting...!!")
+
+def install_ffmpeg(package_manager):
+    if package_manager == 'winget':
+        subprocess.run(['winget', 'install', 'ffmpeg'], check=True)
+    elif package_manager == 'apt':
+        subprocess.run(['sudo', 'apt', 'install', 'ffmpeg', '-y'], check=True)
+    elif package_manager == 'dnf':
+        subprocess.run(['sudo', 'dnf', 'install', 'ffmpeg', '-y'], check=True)
+    elif package_manager == 'pacman':
+        subprocess.run(['sudo', 'pacman', '-S', 'ffmpeg', '--noconfirm'], check=True)
+    elif package_manager == 'brew':
+        subprocess.run(['brew', 'install', 'ffmpeg'], check=True)
+    print("FFmpeg installation completed")
+
+def install_nodejs(package_manager):
+    if package_manager == 'winget':
+        subprocess.run(['winget', 'install', 'OpenJS.NodeJS.LTS'], check=True)
+    elif package_manager == 'apt':
+        subprocess.run(['sudo', 'apt', 'install', 'nodejs', '-y'], check=True)
+    elif package_manager == 'dnf':
+        subprocess.run(['sudo', 'dnf', 'install', 'nodejs', '-y'], check=True)
+    elif package_manager == 'pacman':
+        subprocess.run(['sudo', 'pacman', '-S', 'nodejs-lts-iron', 'npm', '--noconfirm'], check=True)
+    elif package_manager == 'brew':
+        subprocess.run(['brew', 'install', 'node'], check=True)
+    print("Node.js installation completed")

pytubepp/postprocess.py

@@ -1,6 +1,6 @@
 from mutagen.id3 import ID3, APIC, TIT2, TPE1, TALB
 from .config import get_temporary_directory, load_config
-from .utils import get_unique_filename, postprocess_cleanup
+from .utils import get_unique_filename, postprocess_cleanup, unpack_caption
 from .download import download_thumbnail
 import os, shutil, ffmpy
 
@@ -17,6 +17,7 @@ def merge_audio_video(title, resolution, file_extention, random_filename, captio
     if caption_code:
         print(f'Downloading Caption ({caption_code})...')
         caption = captions[caption_code]
+        _, caption_lang = unpack_caption(caption)
         srt_file = os.path.join(tempDIR, random_filename + '_cap.srt')
         caption.save_captions(srt_file)
         vtt_file = os.path.join(tempDIR, random_filename + '_cap.vtt')
@@ -38,7 +39,7 @@ def merge_audio_video(title, resolution, file_extention, random_filename, captio
         input_params = {video_file: None, audio_file: None}
         output_params = {output_temp_file: ['-i', subtitle_file, '-c:v', 'copy', '-c:a', 'copy', 
                         '-c:s', subtitle_codec, '-metadata:s:s:0', f'language={caption_code}',
-                        '-metadata:s:s:0', f'title={caption_code}', '-metadata:s:s:0', f'handler_name={caption_code}']}
+                        '-metadata:s:s:0', f'title={caption_lang}', '-metadata:s:s:0', f'handler_name={caption_lang}']}
         
         devnull = open(os.devnull, 'w')
         ff = ffmpy.FFmpeg(inputs=input_params, outputs=output_params)

pytubepp/utils.py

@@ -36,7 +36,7 @@ def get_version():
         return "Unknown"
     
 def is_valid_url(url):
-    match = re.search(r"(https?://(?:www\.|music\.)?youtube\.com/watch\?v=[^&]{11}|https?://youtu\.be/[^?&]*(\?si=[^&]*)?)", url)
+    match = re.search(r"(https?://(?:www\.|music\.)?youtube\.com/(?:watch\?v=[^&]{11}|shorts/[^?&]+)|https?://youtu\.be/[^?&]*(\?si=[^&]*)?)", url)
     return match
     
 def get_unique_filename(filename, directory=downloadDIR):
@@ -47,6 +47,17 @@ def get_unique_filename(filename, directory=downloadDIR):
         counter += 1
     return filename
 
+def unpack_caption(caption):
+    caption_str = str(caption)
+    code_start = caption_str.find('code="') + 6
+    code_end = caption_str.find('"', code_start)
+    lang_start = caption_str.find('lang="') + 6
+    lang_end = caption_str.find('"', lang_start)
+    
+    code = caption_str[code_start:code_end]
+    lang = caption_str[lang_start:lang_end]
+    return code, lang
+
 def postprocess_cleanup(dir, files, random_filename):
     for file in files:
         file_path = os.path.join(dir, random_filename + file)