StreamingCommunity 1.9.90__py3-none-any.whl → 2.0.5__py3-none-any.whl

StreamingCommunity/Lib/M3U8/estimator.py

@@ -1,5 +1,3 @@
-# 20.02.24
-
 import os
 import time
 import logging
@@ -34,10 +32,13 @@ class M3U8_Ts_Estimator:
         self.now_downloaded_size = 0
         self.total_segments = total_segments
         self.lock = threading.Lock()
-        self.speed = {"upload": "N/A", "download": "N/A"}  # Default to N/A
-        self.speed_thread = threading.Thread(target=self.capture_speed)
-        self.speed_thread.daemon = True
-        self.speed_thread.start()
+        self.speed = {"upload": "N/A", "download": "N/A"}
+
+        # Only start the speed capture thread if TQDM_USE_LARGE_BAR is True
+        if not TQDM_USE_LARGE_BAR:
+            self.speed_thread = threading.Thread(target=self.capture_speed)
+            self.speed_thread.daemon = True
+            self.speed_thread.start()
 
     def add_ts_file(self, size: int, size_download: int, duration: float):
         """
@@ -56,43 +57,71 @@ class M3U8_Ts_Estimator:
         self.ts_file_sizes.append(size)
         self.now_downloaded_size += size_download
 
-    def capture_speed(self, interval: float = 1):
+    def capture_speed(self, interval: float = 1, pid: int = None):
         """
-        Capture the internet speed periodically and store the values.
+        Capture the internet speed periodically for a specific process (identified by PID) 
+        or the entire system if no PID is provided.
         """
-        def get_network_io():
-            """Get network I/O counters, handle missing psutil gracefully."""
+        
+        def get_network_io(process=None):
+            """
+            Get network I/O counters for a specific process or system-wide if no process is specified.
+            """
             try:
-                io_counters = psutil.net_io_counters()
-                return io_counters
-            
+                if process:
+                    io_counters = process.io_counters()
+                    return io_counters
+                else:
+                    io_counters = psutil.net_io_counters()
+                    return io_counters
             except Exception as e:
                 logging.warning(f"Unable to access network I/O counters: {e}")
                 return None
 
+        # If a PID is provided, attempt to attach to the corresponding process
+        process = None
+        if pid is not None:
+            try:
+                process = psutil.Process(pid)
+            except psutil.NoSuchProcess:
+                logging.error(f"Process with PID {pid} does not exist.")
+                return
+            except Exception as e:
+                logging.error(f"Failed to attach to process with PID {pid}: {e}")
+                return
+
         while True:
-            old_value = get_network_io()
+            old_value = get_network_io(process)
 
-            if old_value is None:  # If psutil is not available, continue with default values
+            if old_value is None:  # If psutil fails, continue with the next interval
                 time.sleep(interval)
                 continue
 
             time.sleep(interval)
-            new_value = get_network_io()
-            
+            new_value = get_network_io(process)
+
             if new_value is None:  # Handle again if psutil fails in the next call
                 time.sleep(interval)
                 continue
 
             with self.lock:
-                upload_speed = (new_value.bytes_sent - old_value.bytes_sent) / interval
-                download_speed = (new_value.bytes_recv - old_value.bytes_recv) / interval
+
+                # Calculate speed based on process-specific counters if process is specified
+                if process:
+                    upload_speed = (new_value.write_bytes - old_value.write_bytes) / interval
+                    download_speed = (new_value.read_bytes - old_value.read_bytes) / interval
+                    
+                else:
+                    # System-wide counters
+                    upload_speed = (new_value.bytes_sent - old_value.bytes_sent) / interval
+                    download_speed = (new_value.bytes_recv - old_value.bytes_recv) / interval
 
                 self.speed = {
                     "upload": internet_manager.format_transfer_speed(upload_speed),
                     "download": internet_manager.format_transfer_speed(download_speed)
                 }
 
+
     def get_average_speed(self) -> float:
         """
         Calculate the average internet speed.
@@ -159,18 +188,17 @@ class M3U8_Ts_Estimator:
         units_file_downloaded = downloaded_file_size_str.split(' ')[1]
         units_file_total_size = file_total_size.split(' ')[1]
 
-        average_internet_speed = self.get_average_speed()[0]
-        average_internet_unit = self.get_average_speed()[1]
-
         # Update the progress bar's postfix
         if TQDM_USE_LARGE_BAR:
+            average_internet_speed = self.get_average_speed()[0]
+            average_internet_unit = self.get_average_speed()[1]
             progress_counter.set_postfix_str(
                 f"{Colors.WHITE}[ {Colors.GREEN}{number_file_downloaded} {Colors.WHITE}< {Colors.GREEN}{number_file_total_size} {Colors.RED}{units_file_total_size} "
                 f"{Colors.WHITE}| {Colors.CYAN}{average_internet_speed} {Colors.RED}{average_internet_unit}"
             )
+
         else:
             progress_counter.set_postfix_str(
                 f"{Colors.WHITE}[ {Colors.GREEN}{number_file_downloaded}{Colors.RED} {units_file_downloaded} "
-                f"{Colors.WHITE}| {Colors.CYAN}{average_internet_speed} {Colors.RED}{average_internet_unit}"
-            )
-    
+                f"{Colors.WHITE}| {Colors.CYAN}N/A{Colors.RED} N/A"
+            )

StreamingCommunity/Upload/update.py

@@ -57,11 +57,10 @@ def update():
 
     # Check installed version
     if str(__version__).replace('v', '') != str(last_version).replace('v', '') :
-        console.print(f"[red]New version available: [yellow]{last_version}")
+        console.print(f"[red]New version available: [yellow]{last_version} \n")
     else:
-        console.print(f"[red]Everything is up to date")
+        console.print(f" [yellow]Everything is up to date \n")
 
-    console.print("\n")
     console.print(f"[red]{__title__} has been downloaded [yellow]{total_download_count} [red]times, but only [yellow]{percentual_stars}% [red]of users have starred it.\n\
         [cyan]Help the repository grow today by leaving a [yellow]star [cyan]and [yellow]sharing [cyan]it with others online!")
     

StreamingCommunity/Upload/version.py

@@ -1,5 +1,5 @@
 __title__ = 'StreamingCommunity'
-__version__ = '1.9.8'
+__version__ = '2.1.0'
 __author__ = 'Lovi-0'
 __description__ = 'A command-line program to download film'
 __copyright__ = 'Copyright 2024'

StreamingCommunity/Util/ffmpeg_installer.py

@@ -116,21 +116,34 @@ class FFMPEGDownloader:
     def _check_existing_binaries(self) -> Tuple[Optional[str], Optional[str], Optional[str]]:
         """
         Check if FFmpeg binaries already exist in the base directory.
-
-        Returns:
-            Tuple[Optional[str], Optional[str], Optional[str]]: Paths to ffmpeg, ffprobe, and ffplay executables.
-            Returns None for each executable that is not found.
+        Enhanced to check both the binary directory and system paths on macOS.
         """
         config = FFMPEG_CONFIGURATION[self.os_name]
         executables = config['executables']
         found_executables = []
 
-        for executable in executables:
-            exe_paths = glob.glob(os.path.join(self.base_dir, executable))
-            if exe_paths:
-                found_executables.append(exe_paths[0])
-            else:
-                found_executables.append(None)
+        # For macOS, check both binary directory and system paths
+        if self.os_name == 'darwin':
+            potential_paths = [
+                '/usr/local/bin',
+                '/opt/homebrew/bin',
+                '/usr/bin',
+                self.base_dir
+            ]
+            
+            for executable in executables:
+                found = None
+                for path in potential_paths:
+                    full_path = os.path.join(path, executable)
+                    if os.path.exists(full_path) and os.access(full_path, os.X_OK):
+                        found = full_path
+                        break
+                found_executables.append(found)
+        else:
+            # Original behavior for other operating systems
+            for executable in executables:
+                exe_paths = glob.glob(os.path.join(self.base_dir, executable))
+                found_executables.append(exe_paths[0] if exe_paths else None)
 
         return tuple(found_executables) if len(found_executables) == 3 else (None, None, None)
 
@@ -275,37 +288,61 @@ class FFMPEGDownloader:
 def check_ffmpeg() -> Tuple[Optional[str], Optional[str], Optional[str]]:
     """
     Check for FFmpeg executables in the system and download them if not found.
+    Enhanced detection for macOS systems.
 
     Returns:
         Tuple[Optional[str], Optional[str], Optional[str]]: Paths to ffmpeg, ffprobe, and ffplay executables.
-        Returns None for each executable that couldn't be found or downloaded.
-
-    The function first checks if FFmpeg executables are available in the system PATH:
-    - On Windows, uses the 'where' command
-    - On Unix-like systems, uses 'which'
-    
-    If the executables are not found in PATH, it attempts to download and install them
-    using the FFMPEGDownloader class.
     """
     try:
-        if platform.system().lower() == 'windows':
-            ffmpeg_path = subprocess.check_output(['where', 'ffmpeg'], text=True).strip().split('\n')[0] if subprocess.call(['where', 'ffmpeg'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) == 0 else None
-            ffprobe_path = subprocess.check_output(['where', 'ffprobe'], text=True).strip().split('\n')[0] if subprocess.call(['where', 'ffprobe'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) == 0 else None
-            ffplay_path = subprocess.check_output(['where', 'ffplay'], text=True).strip().split('\n')[0] if subprocess.call(['where', 'ffplay'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) == 0 else None
+        system_platform = platform.system().lower()
+        
+        # Special handling for macOS
+        if system_platform == 'darwin':
+            # Common installation paths on macOS
+            potential_paths = [
+                '/usr/local/bin',  # Homebrew default
+                '/opt/homebrew/bin',  # Apple Silicon Homebrew
+                '/usr/bin',  # System default
+                os.path.expanduser('~/Applications/binary'),  # Custom installation
+                '/Applications/binary'  # Custom installation
+            ]
             
-            if all([ffmpeg_path, ffprobe_path, ffplay_path]):
-                return ffmpeg_path, ffprobe_path, ffplay_path
+            for path in potential_paths:
+                ffmpeg_path = os.path.join(path, 'ffmpeg')
+                ffprobe_path = os.path.join(path, 'ffprobe')
+                ffplay_path = os.path.join(path, 'ffplay')
+                
+                if (os.path.exists(ffmpeg_path) and os.path.exists(ffprobe_path) and 
+                    os.access(ffmpeg_path, os.X_OK) and os.access(ffprobe_path, os.X_OK)):
+                    # Return found executables, with ffplay being optional
+                    ffplay_path = ffplay_path if os.path.exists(ffplay_path) else None
+                    return ffmpeg_path, ffprobe_path, ffplay_path
+
+        # Windows detection
+        elif system_platform == 'windows':
+            try:
+                ffmpeg_path = subprocess.check_output(['where', 'ffmpeg'], text=True).strip().split('\n')[0]
+                ffprobe_path = subprocess.check_output(['where', 'ffprobe'], text=True).strip().split('\n')[0]
+                ffplay_path = subprocess.check_output(['where', 'ffplay'], text=True).strip().split('\n')[0]
+                
+                if ffmpeg_path and ffprobe_path:
+                    return ffmpeg_path, ffprobe_path, ffplay_path
+            except subprocess.CalledProcessError:
+                pass
+
+        # Linux detection
         else:
             ffmpeg_path = shutil.which('ffmpeg')
             ffprobe_path = shutil.which('ffprobe')
             ffplay_path = shutil.which('ffplay')
             
-            if all([ffmpeg_path, ffprobe_path, ffplay_path]):
+            if ffmpeg_path and ffprobe_path:
                 return ffmpeg_path, ffprobe_path, ffplay_path
-        
+
+        # If executables were not found, attempt to download FFmpeg
         downloader = FFMPEGDownloader()
         return downloader.download()
-    
+
     except Exception as e:
-        logging.error(f"Error checking FFmpeg: {e}")
+        logging.error(f"Error checking or downloading FFmpeg executables: {e}")
         return None, None, None

StreamingCommunity/Util/os.py

@@ -317,16 +317,13 @@ class InternManager():
     def check_internet():
         while True:
             try:
-                httpx.get("https://www.google.com")
-                #console.log("[bold green]Internet is available![/bold green]")
+                httpx.get("https://www.google.com", timeout=15)
                 break
 
             except urllib.error.URLError:
                 console.log("[bold red]Internet is not available. Waiting...[/bold red]")
                 time.sleep(5)
 
-        print()
-
 
 class OsSummary:
 
@@ -353,20 +350,17 @@ class OsSummary:
             console.print(f"{command[0]} not found", style="bold red")
             sys.exit(0)
 
-    def check_ffmpeg_location(self, command: list):
+    def check_ffmpeg_location(self, command: list) -> str:
         """
-        Run 'where ffmpeg' command to check FFmpeg's location.
-
-        Returns:
-            str: Location of FFmpeg executable or None if not found
+        Check if a specific executable (ffmpeg or ffprobe) is located using the given command.
+        Returns the path of the executable or None if not found.
         """
         try:
-            result = subprocess.check_output(command, stderr=subprocess.STDOUT, text=True).strip()
-            return result
+            result = subprocess.check_output(command, text=True).strip()
+            return result.split('\n')[0] if result else None
         
         except subprocess.CalledProcessError:
-            console.print("FFmpeg not found in system PATH", style="bold red")
-            sys.exit(0)
+            return None
 
     def get_library_version(self, lib_name: str):
         """
@@ -467,27 +461,24 @@ class OsSummary:
         console.print(f"[cyan]Python[white]: [bold red]{python_version} ({python_implementation} {arch}) - {os_info} ({glibc_version})[/bold red]")
         logging.info(f"Python: {python_version} ({python_implementation} {arch}) - {os_info} ({glibc_version})")
         
-        # Usa il comando 'where' su Windows
-        if platform.system() == "Windows":
-            command = 'where'
-
-        # Usa il comando 'which' su Unix/Linux
-        else:
-            command = 'which'
+        # Use the 'where' command on Windows and 'which' command on Unix-like systems
+        system_platform = platform.system().lower()
+        command = 'where' if system_platform == 'windows' else 'which'
 
-        # Locate ffmpeg and ffprobe from path enviroment
-        if self.ffmpeg_path != None and "binary" not in self.ffmpeg_path:        
+        # Locate ffmpeg and ffprobe from the PATH environment
+        if self.ffmpeg_path is not None and "binary" not in self.ffmpeg_path:
             self.ffmpeg_path = self.check_ffmpeg_location([command, 'ffmpeg'])
 
-        if self.ffprobe_path != None and "binary" not in self.ffprobe_path:
+        if self.ffprobe_path is not None and "binary" not in self.ffprobe_path:
             self.ffprobe_path = self.check_ffmpeg_location([command, 'ffprobe'])
 
-        # Locate ffmpeg from bin installation
+        # If ffmpeg or ffprobe is not located, fall back to using the check_ffmpeg function
         if self.ffmpeg_path is None or self.ffprobe_path is None:
             self.ffmpeg_path, self.ffprobe_path, self.ffplay_path = check_ffmpeg()
 
+        # If still not found, print error and exit
         if self.ffmpeg_path is None or self.ffprobe_path is None:
-            console.log("[red]Cant locate ffmpeg or ffprobe")
+            console.log("[red]Can't locate ffmpeg or ffprobe")
             sys.exit(0)
 
         ffmpeg_version = self.get_executable_version([self.ffprobe_path, '-version'])

StreamingCommunity/run.py

@@ -112,7 +112,7 @@ def initialize():
     if platform.system() == "Windows" and "7" in platform.version():
         os.system('mode 120, 40')
 
-    """# Check python version
+    # Check python version
     if sys.version_info < (3, 7):
         console.log("[red]Install python version > 3.7.16")
         sys.exit(0)
@@ -120,9 +120,8 @@ def initialize():
     # Attempting GitHub update
     try:
         git_update()
-        print()
     except:
-        console.log("[red]Error with loading github.")"""
+        console.log("[red]Error with loading github.")
 
 
 def main():

{StreamingCommunity-1.9.90.dist-info → StreamingCommunity-2.0.5.dist-info}/METADATA

@@ -1,17 +1,17 @@
 Metadata-Version: 2.1
 Name: StreamingCommunity
-Version: 1.9.90
-Summary: A streaming community package
+Version: 2.0.5
+Summary: UNKNOWN
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
+License: UNKNOWN
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
 Project-URL: Source, https://github.com/Lovi-0/StreamingCommunity
-Keywords: Streaming Community
+Keywords: streaming community
+Platform: UNKNOWN
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: httpx
-Requires-Dist: cffi
 Requires-Dist: bs4
 Requires-Dist: rich
 Requires-Dist: tqdm
@@ -26,38 +26,67 @@ Requires-Dist: qbittorrent-api
 Requires-Dist: python-qbittorrent
 Requires-Dist: googlesearch-python
 
-# StreamingCommunity Downloader
-
-![Project Logo](https://i.ibb.co/f4h5Y2m/min-logo.png)
-
-A versatile script designed to download films and series from various supported streaming platforms.
-
-# 🤝 Join our Community 
-
-Chat, contribute, and have fun in our **Git_StreamingCommunity** Discord [Server](https://discord.com/invite/8vV68UGRc7)
+<p align="center">
+  <img src="https://i.ibb.co/PFnjvBc/immagine-2024-12-26-180318047.png" alt="Project Logo" width="700"/>
+</p>
+
+<p align="center">
+  <a href="https://pypi.org/project/streamingcommunity">
+    <img src="https://img.shields.io/pypi/v/streamingcommunity?logo=pypi&labelColor=555555&style=for-the-badge" alt="PyPI"/>
+  </a>
+  <a href="https://www.python.org">
+    <img src="https://img.shields.io/badge/Python->=3.8-3776AB?style=for-the-badge&logo=python&logoColor=white" alt="Python"/>
+  </a>
+  <a href="https://www.paypal.com/donate/?hosted_button_id=UXTWMT8P6HE2C">
+    <img src="https://img.shields.io/badge/_-Donate-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge" alt="Donate"/>
+  </a>
+  <a href="https://github.com/Lovi-0/StreamingCommunity/blob/main/LICENSE">
+    <img src="https://img.shields.io/badge/License-GPL_3.0-blue.svg?style=for-the-badge" alt="License"/>
+  </a>
+  <a href="https://github.com/Lovi-0/StreamingCommunity/commits">
+    <img src="https://img.shields.io/github/commit-activity/m/Lovi-0/StreamingCommunity?label=commits&style=for-the-badge" alt="Commits"/>
+  </a>
+  <a href="https://github.com/Lovi-0/StreamingCommunity/commits">
+    <img src="https://img.shields.io/github/last-commit/Lovi-0/StreamingCommunity/main?label=&style=for-the-badge&display_timestamp=committer" alt="Last Commit"/>
+  </a>
+</p>
+
+<p align="center">
+  <a href="https://pypi.org/project/streamingcommunity">
+    <img src="https://img.shields.io/pypi/dm/streamingcommunity?style=for-the-badge" alt="PyPI Downloads"/>
+  </a>
+  <a href="https://github.com/Lovi-0/StreamingCommunity/network/members">
+    <img src="https://img.shields.io/github/forks/Lovi-0/StreamingCommunity?style=for-the-badge" alt="Forks"/>
+  </a>
+  <a href="https://github.com/Lovi-0/StreamingCommunity">
+    <img src="https://img.shields.io/github/languages/code-size/Lovi-0/StreamingCommunity?style=for-the-badge" alt="Code Size"/>
+  </a>
+  <a href="https://github.com/Lovi-0/StreamingCommunity">
+    <img src="https://img.shields.io/github/repo-size/Lovi-0/StreamingCommunity?style=for-the-badge" alt="Repo Size"/>
+  </a>
+</p>
 
 # 📋 Table of Contents
 
-- [Website available](#website-status)
-- [Installation](#installation)
-    - [PyPI Installation](#1-pypi-installation)
-    - [Automatic Installation](#2-automatic-installation)
-    - [Manual Installation](#3-manual-installation)
-        - [Win 7](https://github.com/Ghost6446/StreamingCommunity_api/wiki/Installation#win-7)
-        - [Termux](https://github.com/Ghost6446/StreamingCommunity_api/wiki/Termux)
-- [Configuration](#configuration)
-    - [Default](#default-settings)
-    - [Request](#requests-settings)
-    - [Download](#m3u8_download-settings)
-    - [Parser](#m3u8_parser-settings)
-- [Docker](#docker)
-- [Tutorial](#tutorials)
-- [To Do](#to-do)
-- [Support](#support)
-- [Contribute](#contributing)
-- [Disclamer](#disclaimer)
-
-
+- 🌐 [Website available](#website-status)
+- 🛠️ [Installation](#installation)
+    - 📦 [PyPI Installation](#1-pypi-installation)
+    - 🔄 [Automatic Installation](#2-automatic-installation)
+    - 📝 [Manual Installation](#3-manual-installation)
+        - 💻 [Win 7](https://github.com/Ghost6446/StreamingCommunity_api/wiki/Installation#win-7)
+        - 📱 [Termux](https://github.com/Ghost6446/StreamingCommunity_api/wiki/Termux)
+- ⚙️ [Configuration](#configuration)
+    - 🔧 [Default](#default-settings)
+    - 📩 [Request](#requests-settings)
+    - 📥 [Download](#m3u8_download-settings)
+    - 🔍 [Parser](#m3u8_parser-settings)
+- 🐳 [Docker](#docker)
+- 🎓 [Tutorial](#tutorials)
+- 📝 [To do](#to-do)
+- 💬 [Support](#support)
+- 🤝 [Contribute](#contributing)
+- ⚠️ [Disclaimer](#disclaimer)
+- ⚡ [Contributors](#contributors)  
 
 # Installation
 
@@ -226,7 +255,7 @@ The configuration file is divided into several main sections:
   * `%(episode)` : Is the number of the episode
   * `%(episode_name)` : Is the name of the episode
     `<br/><br/>`
-    
+
 - `not_close`: If true, continues running after downloading
 
     ### qBittorrent Configuration
@@ -330,10 +359,8 @@ forced-ita         hin - Hindi        pol - Polish      tur - Turkish
 
 <br>
 
-
 # COMMAND
 
-
 - Download a specific season by entering its number.
   *  **Example:** `1` will download *Season 1* only.
 
@@ -404,13 +431,7 @@ The `run-container` command mounts also the `config.json` file, so any change to
 
 # To Do 
 
-- Create website API -> https://github.com/Lovi-0/StreamingCommunity/tree/test_gui_1
-
-# Support
-
-If you'd like to support this project, consider making a donation!
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/donate/?hosted_button_id=UXTWMT8P6HE2C)
+- Finish [website API](https://github.com/Lovi-0/StreamingCommunity/tree/test_gui_1)
 
 # Contributing
 
@@ -425,3 +446,11 @@ Contributions are welcome! Steps:
 # Disclaimer
 
 This software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the software or the use or other dealings in the software.
+
+## Contributors
+
+<a href="https://github.com/Lovi-0/StreamingCommunity/graphs/contributors" alt="View Contributors">
+  <img src="https://contrib.rocks/image?repo=Lovi-0/StreamingCommunity&max=1000&columns=10" alt="Contributors" />
+</a>
+
+