StreamingCommunity 3.0.2__tar.gz → 3.0.3__tar.gz

{streamingcommunity-3.0.2/StreamingCommunity.egg-info → streamingcommunity-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.0.2
+Version: 3.0.3
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -17,6 +17,7 @@ Requires-Dist: m3u8
 Requires-Dist: certifi
 Requires-Dist: psutil
 Requires-Dist: unidecode
+Requires-Dist: dnspython
 Requires-Dist: jsbeautifier
 Requires-Dist: pathvalidate
 Requires-Dist: pycryptodomex

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity/Api/Player/hdplayer.py

@@ -2,14 +2,13 @@
 
 import re
 
-
 # External library
 import httpx
 from bs4 import BeautifulSoup
 
 
 # Internal utilities
-from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.config_json import config_manager
 
 
@@ -19,7 +18,7 @@ MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
 
 class VideoSource:
     def __init__(self, proxy=None):
-        self.client = httpx.Client(headers=get_headers(), timeout=MAX_TIMEOUT, proxy=proxy)
+        self.client = httpx.Client(headers={'user-agent': get_userAgent()}, timeout=MAX_TIMEOUT, proxy=proxy)
 
     def extractLinkHdPlayer(self, response):
         """Extract iframe source from the page."""
@@ -34,6 +33,9 @@ class VideoSource:
         Extract m3u8 URL from hdPlayer page.
         """
         try:
+            base_domain = re.match(r'https?://(?:www\.)?([^/]+)', page_url).group(0)
+            self.client.headers.update({'referer': base_domain})
+            
             # Get the page content
             response = self.client.get(page_url)
             
@@ -41,19 +43,17 @@ class VideoSource:
             iframe_url = self.extractLinkHdPlayer(response)
             if not iframe_url:
                 return None
-
+            
             # Get HDPlayer page content
             response_hdplayer = self.client.get(iframe_url)
             if response_hdplayer.status_code != 200:
                 return None
+                
+            sources_pattern = r'file:"([^"]+)"'
+            match = re.search(sources_pattern, response_hdplayer.text)
 
-            soup = BeautifulSoup(response_hdplayer.text, 'html.parser')
-
-            # Find m3u8 URL in scripts
-            for script in soup.find_all("script"):
-                match = re.search(r'sources:\s*\[\{\s*file:\s*"([^"]+)"', script.text)
-                if match:
-                    return match.group(1)
+            if match:
+                return match.group(1)
 
             return None
 
@@ -62,4 +62,4 @@ class VideoSource:
             return None
 
         finally:
-            self.client.close()
+            self.client.close()

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity/Api/Site/animeworld/site.py

@@ -31,7 +31,11 @@ def get_session_and_csrf() -> dict:
     Get the session ID and CSRF token from the website's cookies and HTML meta data.
     """
     # Send an initial GET request to the website
-    response = httpx.get(site_constant.FULL_URL, headers=get_headers())
+    response = httpx.get(
+        site_constant.FULL_URL, 
+        headers=get_headers(), 
+        verify=False
+    )
 
     # Extract the sessionId from the cookies
     session_id = response.cookies.get('sessionId')
@@ -114,4 +118,4 @@ def title_search(query: str) -> int:
             print(f"Error parsing a film entry: {e}")
 
     # Return the length of media search manager
-    return media_search_manager.get_length()
+    return media_search_manager.get_length()

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity/Lib/Proxies/proxy.py

@@ -103,7 +103,7 @@ class ProxyFinder:
         return proxies
 
     def fetch_proxies_from_sources(self) -> list:
-        print("[cyan]Fetching proxies from sources...[/cyan]")
+        #print("[cyan]Fetching proxies from sources...[/cyan]")
         with ThreadPoolExecutor(max_workers=3) as executor:
             proxyscrape_future = executor.submit(self.fetch_proxyscrape)
             geonode_future = executor.submit(self.fetch_geonode)

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity/Upload/update.py

@@ -3,7 +3,7 @@
 import os
 import sys
 import time
-
+import asyncio
 
 # External library
 import httpx
@@ -24,32 +24,33 @@ else:
     base_path = os.path.dirname(__file__)
 console = Console()
 
+async def fetch_github_data(client, url):
+    """Helper function to fetch data from GitHub API"""
+    response = await client.get(
+        url=url,
+        headers={'user-agent': get_userAgent()},
+        timeout=config_manager.get_int("REQUESTS", "timeout"),
+        follow_redirects=True
+    )
+    return response.json()
+
+async def async_github_requests():
+    """Make concurrent GitHub API requests"""
+    async with httpx.AsyncClient() as client:
+        tasks = [
+            fetch_github_data(client, f"https://api.github.com/repos/{__author__}/{__title__}"),
+            fetch_github_data(client, f"https://api.github.com/repos/{__author__}/{__title__}/releases"),
+            fetch_github_data(client, f"https://api.github.com/repos/{__author__}/{__title__}/commits")
+        ]
+        return await asyncio.gather(*tasks)
 
 def update():
     """
     Check for updates on GitHub and display relevant information.
     """
     try:
-        response_reposity = httpx.get(
-            url=f"https://api.github.com/repos/{__author__}/{__title__}", 
-            headers={'user-agent': get_userAgent()}, 
-            timeout=config_manager.get_int("REQUESTS", "timeout"), 
-            follow_redirects=True
-        ).json()
-
-        response_releases = httpx.get(
-            url=f"https://api.github.com/repos/{__author__}/{__title__}/releases",
-            headers={'user-agent': get_userAgent()}, 
-            timeout=config_manager.get_int("REQUESTS", "timeout"), 
-            follow_redirects=True
-        ).json()
-
-        response_commits = httpx.get(
-            url=f"https://api.github.com/repos/{__author__}/{__title__}/commits",
-            headers={'user-agent': get_userAgent()}, 
-            timeout=config_manager.get_int("REQUESTS", "timeout"), 
-            follow_redirects=True
-        ).json()
+        # Run async requests concurrently
+        response_reposity, response_releases, response_commits = asyncio.run(async_github_requests())
         
     except Exception as e:
         console.print(f"[red]Error accessing GitHub API: {e}")
@@ -92,4 +93,4 @@ def update():
     console.print(f"\n[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!")
     
-    time.sleep(3)
+    time.sleep(4)

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity/Upload/version.py

@@ -1,5 +1,5 @@
 __title__ = 'StreamingCommunity'
-__version__ = '3.0.2'
+__version__ = '3.0.3'
 __author__ = 'Arrowar'
 __description__ = 'A command-line program to download film'
 __copyright__ = 'Copyright 2024'

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity/Util/os.py

@@ -19,6 +19,7 @@ from unidecode import unidecode
 from rich.console import Console
 from rich.prompt import Prompt
 from pathvalidate import sanitize_filename, sanitize_filepath
+from dns.resolver import dns
 
 
 # Internal utilities
@@ -282,6 +283,43 @@ class InternManager():
         else:
             return f"{bytes / (1024 * 1024):.2f} MB/s"
 
+    def check_dns_provider(self):
+        """
+        Check if the system's current DNS server matches any known DNS providers.
+        
+        Returns:
+            bool: True if the current DNS server matches a known provider,
+                  False if no match is found or in case of errors
+        """
+        dns_providers = {
+            "Cloudflare": ["1.1.1.1", "1.0.0.1"],
+            "Google": ["8.8.8.8", "8.8.4.4"],
+            "OpenDNS": ["208.67.222.222", "208.67.220.220"],
+            "Quad9": ["9.9.9.9", "149.112.112.112"],
+            "AdGuard": ["94.140.14.14", "94.140.15.15"],
+            "Comodo": ["8.26.56.26", "8.20.247.20"],
+            "Level3": ["209.244.0.3", "209.244.0.4"],
+            "Norton": ["199.85.126.10", "199.85.127.10"],
+            "CleanBrowsing": ["185.228.168.9", "185.228.169.9"],
+            "Yandex": ["77.88.8.8", "77.88.8.1"]
+        }
+        
+        try:
+            resolver = dns.resolver.Resolver()
+            nameservers = resolver.nameservers
+            
+            if not nameservers:
+                return False
+                
+            for server in nameservers:
+                for provider, ips in dns_providers.items():
+                    if server in ips:
+                        return True
+            return False
+            
+        except Exception:
+            return False
+
 
 class OsSummary:
     def __init__(self):

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity/global_search.py

@@ -58,7 +58,10 @@ def load_search_functions():
             # Get 'indice' from the module
             indice = getattr(mod, 'indice', 0)
             use_for = getattr(mod, '_useFor', 'other')
-            modules.append((module_name, indice, use_for))
+            priority = getattr(mod, '_priority', 0)
+
+            if priority == 0:
+                modules.append((module_name, indice, use_for))
 
         except Exception as e:
             console.print(f"[red]Failed to import module {module_name}: {str(e)}")
@@ -296,17 +299,26 @@ def process_selected_item(selected_item, search_functions):
     console.print(f"\n[bold green]Processing selection from:[/bold green] {selected_item.get('source')}")
     
     # Extract necessary information to pass to the site's search function
-    item_id = selected_item.get('id', selected_item.get('media_id'))
+    item_id = None
+    for id_field in ['id', 'media_id', 'ID', 'item_id', 'url']:
+        item_id = selected_item.get(id_field)
+        if item_id:
+            break
+            
     item_type = selected_item.get('type', selected_item.get('media_type', 'unknown'))
     item_title = selected_item.get('title', selected_item.get('name', 'Unknown'))
     
     if item_id:
         console.print(f"[bold green]Selected item:[/bold green] {item_title} (ID: {item_id}, Type: {item_type})")
         
-        # Call the site's search function with direct_item parameter to process download
         try:
             func(direct_item=selected_item)
+
         except Exception as e:
             console.print(f"[bold red]Error processing download:[/bold red] {str(e)}")
+            logging.exception("Download processing error")
+            
     else:
-        console.print("[bold red]Error: Item ID not found.[/bold red]")
+        console.print("[bold red]Error: Item ID not found. Available fields:[/bold red]")
+        for key in selected_item.keys():
+            console.print(f"[yellow]- {key}: {selected_item[key]}[/yellow]")

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity/run.py

@@ -21,7 +21,7 @@ from rich.prompt import Prompt
 from .global_search import global_search
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.os import os_summary
+from StreamingCommunity.Util.os import os_summary, internet_manager
 from StreamingCommunity.Util.logger import Logger
 from StreamingCommunity.Upload.update import update as git_update
 from StreamingCommunity.Lib.TMBD import tmdb
@@ -200,6 +200,15 @@ def main(script_id = 0):
     # Create logger
     log_not = Logger()
     initialize()
+    
+    if not internet_manager.check_dns_provider():
+        console.print("[red]❌ ERROR: DNS configuration is required!")
+        console.print("[red]The program cannot function correctly without proper DNS settings.")
+        console.print("[yellow]Please configure one of these DNS servers:")
+        console.print("[blue]• Cloudflare (1.1.1.1)")
+        console.print("[blue]• Quad9 (9.9.9.9)")
+        console.print("\n[yellow]⚠️ The program will not work until you configure your DNS settings.")
+        input("[yellow]Press Enter to exit...")
 
     # Load search functions
     search_functions = load_search_functions()
@@ -381,4 +390,4 @@ def main(script_id = 0):
                 # Delete script_id
                 script_id = TelegramSession.get_session()
                 if script_id != "unknown":
-                    TelegramSession.deleteScriptId(script_id)
+                    TelegramSession.deleteScriptId(script_id)

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3/StreamingCommunity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.0.2
+Version: 3.0.3
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -17,6 +17,7 @@ Requires-Dist: m3u8
 Requires-Dist: certifi
 Requires-Dist: psutil
 Requires-Dist: unidecode
+Requires-Dist: dnspython
 Requires-Dist: jsbeautifier
 Requires-Dist: pathvalidate
 Requires-Dist: pycryptodomex

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/StreamingCommunity.egg-info/requires.txt

@@ -6,6 +6,7 @@ m3u8
 certifi
 psutil
 unidecode
+dnspython
 jsbeautifier
 pathvalidate
 pycryptodomex

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/requirements.txt

@@ -6,9 +6,10 @@ m3u8
 certifi
 psutil
 unidecode
+dnspython
 jsbeautifier
 pathvalidate
 pycryptodomex
 ua-generator
 qbittorrent-api
-pyTelegramBotAPI
+pyTelegramBotAPI

{streamingcommunity-3.0.2 → streamingcommunity-3.0.3}/setup.py

@@ -10,7 +10,7 @@ with open(os.path.join(os.path.dirname(__file__), "requirements.txt"), "r", enco
 
 setup(
     name="StreamingCommunity",
-    version="3.0.2",
+    version="3.0.3",
     long_description=read_readme(),
     long_description_content_type="text/markdown",
     author="Lovi-0",