kenzuya/unshackle
1
0
Fork 1
mirror of https://github.com/unshackle-dl/unshackle.git synced 2026-03-10 00:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #64 from Aerglonus/dev"

Browse Source 
This reverts commit 55bc2b16ee, reversing
changes made to 8c8c9368ba.
This commit is contained in:
Andy
2026-01-30 15:52:06 +00:00
parent 55bc2b16ee
commit 385fcb2752
4 changed files with 64 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
unshackle/commands/dl.py
View File

@@ -58,25 +58,11 @@ from unshackle.core.titles.episode import Episode
from unshackle.core.tracks import Audio, Subtitle, Tracks, Video from unshackle.core.tracks import Audio, Subtitle, Tracks, Video
from unshackle.core.tracks.attachment import Attachment from unshackle.core.tracks.attachment import Attachment
from unshackle.core.tracks.hybrid import Hybrid from unshackle.core.tracks.hybrid import Hybrid
from unshackle.core.utilities import ( from unshackle.core.utilities import (find_font_with_fallbacks, get_debug_logger, get_system_fonts, init_debug_logger,
find_font_with_fallbacks, is_close_match, suggest_font_packages, time_elapsed_since)
get_debug_logger,
get_system_fonts,
init_debug_logger,
is_close_match,
suggest_font_packages,
time_elapsed_since,
)
from unshackle.core.utils import tags from unshackle.core.utils import tags
from unshackle.core.utils.click_types import ( from unshackle.core.utils.click_types import (LANGUAGE_RANGE, QUALITY_LIST, SEASON_RANGE, ContextData, MultipleChoice,
LANGUAGE_RANGE, SubtitleCodecChoice, VideoCodecChoice)
QUALITY_LIST,
SEASON_RANGE,
ContextData,
MultipleChoice,
SubtitleCodecChoice,
VideoCodecChoice,
)
from unshackle.core.utils.collections import merge_dict from unshackle.core.utils.collections import merge_dict
from unshackle.core.utils.subprocess import ffprobe from unshackle.core.utils.subprocess import ffprobe
from unshackle.core.vaults import Vaults from unshackle.core.vaults import Vaults
@@ -687,10 +673,8 @@ class dl:
# requesting proxy from a specific proxy provider # requesting proxy from a specific proxy provider
requested_provider, proxy = proxy.split(":", maxsplit=1) requested_provider, proxy = proxy.split(":", maxsplit=1)
# Match simple region codes (us, ca, uk1) or provider:region format (nordvpn:ca, windscribe:us) # Match simple region codes (us, ca, uk1) or provider:region format (nordvpn:ca, windscribe:us)
if ( if re.match(r"^[a-z]{2}(?:\d+)?$", proxy, re.IGNORECASE) or re.match(
requested_provider r"^[a-z]+:[a-z]{2}(?:\d+)?$", proxy, re.IGNORECASE
or re.match(r"^[a-z]{2}(?:\d+)?$", proxy, re.IGNORECASE)
or re.match(r"^[a-z]+:[a-z]{2}(?:\d+)?$", proxy, re.IGNORECASE)
): ):
proxy = proxy.lower() proxy = proxy.lower()
status_msg = ( status_msg = (

120
unshackle/core/proxies/windscribevpn.py
View File

@@ -1,10 +1,8 @@
import base64
import json import json
import random
import re import re
from typing import Optional from typing import Optional
from urllib.parse import quote
import requests import requests
from unshackle.core.proxies.proxy import Proxy from unshackle.core.proxies.proxy import Proxy
@@ -16,10 +14,8 @@ class WindscribeVPN(Proxy):
Proxy Service using WindscribeVPN Service Credentials. Proxy Service using WindscribeVPN Service Credentials.
A username and password must be provided. These are Service Credentials, not your Login Credentials. A username and password must be provided. These are Service Credentials, not your Login Credentials.
The Service Credentials can be found login in through the Windscribe Extension. The Service Credentials can be found here: https://windscribe.com/getconfig/openvpn
Both username and password are Base64 encoded.
""" """
if not username: if not username:
raise ValueError("No Username was provided to the WindscribeVPN Proxy Service.") raise ValueError("No Username was provided to the WindscribeVPN Proxy Service.")
if not password: if not password:
@@ -28,22 +24,12 @@ class WindscribeVPN(Proxy):
if server_map is not None and not isinstance(server_map, dict): if server_map is not None and not isinstance(server_map, dict):
raise TypeError(f"Expected server_map to be a dict mapping a region to a hostname, not '{server_map!r}'.") raise TypeError(f"Expected server_map to be a dict mapping a region to a hostname, not '{server_map!r}'.")
self.username = self._try_decode(username) self.username = username
self.password = self._try_decode(password) self.password = password
self.server_map = server_map or {} self.server_map = server_map or {}
self.countries = self.get_countries() self.countries = self.get_countries()
@staticmethod
def _try_decode(value: str) -> str:
"""
Attempt to decode a Base64 string, returning original if failed.
"""
try:
return base64.b64decode(value).decode("utf-8")
except Exception:
return value
def __repr__(self) -> str: def __repr__(self) -> str:
countries = len(set(x.get("country_code") for x in self.countries if x.get("country_code"))) countries = len(set(x.get("country_code") for x in self.countries if x.get("country_code")))
servers = sum( servers = sum(
@@ -58,11 +44,10 @@ class WindscribeVPN(Proxy):
def get_proxy(self, query: str) -> Optional[str]: def get_proxy(self, query: str) -> Optional[str]:
""" """
Get an HTTPS proxy URI for a WindscribeVPN server. Get an HTTPS proxy URI for a WindscribeVPN server.
Supports: Supports:
- Country code: "us", "ca", "gb" - Country code: "us", "ca", "gb"
- City selection: "us:seattle", "ca:toronto" - City selection: "us:seattle", "ca:toronto"
- Server code: "us-central-096", "uk-london-055"
Note: Windscribes static OpenVPN credentials from the configurator are per server use the extension credentials.
""" """
query = query.lower() query = query.lower()
city = None city = None
@@ -72,94 +57,69 @@ class WindscribeVPN(Proxy):
query, city = query.split(":", maxsplit=1) query, city = query.split(":", maxsplit=1)
city = city.strip() city = city.strip()
safe_username = quote(self.username, safe="") # Check server_map for pinned servers (can include city)
safe_password = quote(self.password, safe="")
proxy = f"https://{safe_username}:{safe_password}@"
server_map_key = f"{query}:{city}" if city else query server_map_key = f"{query}:{city}" if city else query
try:
if server_map_key in self.server_map: if server_map_key in self.server_map:
# Use a forced server from server_map if provided hostname = self.server_map[server_map_key]
hostname = f"{self.server_map[server_map_key]}.totallyacdn.com" elif query in self.server_map and not city:
elif "-" in query and not city: hostname = self.server_map[query]
# Supports server codes like "windscribe:us-central-096"
hostname = f"{query}.totallyacdn.com"
else: else:
# Query is likely a country code (e.g., "us") or country+city (e.g., "us:seattle") and not in server_map
if re.match(r"^[a-z]+$", query): if re.match(r"^[a-z]+$", query):
hostname = self.get_random_server(query, city) hostname = self.get_random_server(query, city)
else: else:
raise ValueError(f"The query provided is unsupported and unrecognized: {query}") raise ValueError(f"The query provided is unsupported and unrecognized: {query}")
except ValueError as e:
raise Exception(f"Windscribe Proxy Error: {e}")
if not hostname: if not hostname:
raise Exception(f"Windscribe has no servers for {query!r}") return None
return f"{proxy}{hostname}:443" hostname = hostname.split(':')[0]
return f"https://{self.username}:{self.password}@{hostname}:443"
def get_random_server(self, country_code: str, city: Optional[str]) -> Optional[str]: def get_random_server(self, country_code: str, city: Optional[str] = None) -> Optional[str]:
""" """
Get a random server hostname for a country. Get a random server hostname for a country, optionally filtered by city.
Args: Args:
country_code: The country code (e.g., "us", "ca") country_code: The country code (e.g., "us", "ca")
city: Optional city name to filter by (case-insensitive) city: Optional city name to filter by (case-insensitive)
Returns: Returns:
The hostname of a server in the specified country (and city if provided). A random hostname from matching servers, or None if none available.
- If city is provided but not found, falls back to any server in the country.
Raise error if no servers are available for the country.
""" """
for location in self.countries:
country_code = country_code.lower() if location.get("country_code", "").lower() == country_code.lower():
hostnames = []
# Find the country entry
location = next(
(c for c in self.countries if c.get("country_code", "").lower() == country_code),
None,
)
if not location:
raise ValueError(f"No servers found for country code '{country_code}'.")
all_hosts = []
city_hosts = []
for group in location.get("groups", []): for group in location.get("groups", []):
group_city = group.get("city", "").lower() # Filter by city if specified
if city:
group_city = group.get("city", "")
if group_city.lower() != city.lower():
continue
# Collect hostnames from this group
for host in group.get("hosts", []): for host in group.get("hosts", []):
entry = { if hostname := host.get("hostname"):
"hostname": host["hostname"], hostnames.append(hostname)
"health": host.get("health", float("inf")),
}
all_hosts.append(entry)
if city and group_city == city.lower(): if hostnames:
city_hosts.append(entry) return random.choice(hostnames)
elif city:
# Prefer city-specific servers if available and select the healthiest # No servers found for the specified city
if city_hosts:
return min(city_hosts, key=lambda x: x["health"])["hostname"]
# Fallback to country-level servers and select the healthiest
if all_hosts:
return min(all_hosts, key=lambda x: x["health"])["hostname"]
# Country exists but has zero servers
raise ValueError( raise ValueError(
f"No servers found in city '{city}' for country code '{country_code}'. Try a different city or check the city name spelling." f"No servers found in city '{city}' for country code '{country_code}'. "
"Try a different city or check the city name spelling."
) )
return None
@staticmethod @staticmethod
def get_countries() -> list[dict]: def get_countries() -> list[dict]:
"""Get a list of available Countries and their metadata.""" """Get a list of available Countries and their metadata."""
res = requests.get( res = requests.get(
url="https://assets.windscribe.com/serverlist/chrome/1/937dd9fcfba6925d7a9253ab34e655a453719e02", url="https://assets.windscribe.com/serverlist/firefox/1/1",
headers={ headers={
"Host": "assets.windscribe.com", "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
"Connection": "keep-alive", "Content-Type": "application/json",
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36",
}, },
) )
if not res.ok: if not res.ok:

12
unshackle/core/service.py
View File

@@ -89,9 +89,7 @@ class Service(metaclass=ABCMeta):
proxy = mapped_proxy_uri proxy = mapped_proxy_uri
self.log.info(f"Using mapped proxy from {proxy_provider.__class__.__name__}: {proxy}") self.log.info(f"Using mapped proxy from {proxy_provider.__class__.__name__}: {proxy}")
else: else:
self.log.warning( self.log.warning(f"Failed to get proxy for mapped value '{mapped_value}', using default")
f"Failed to get proxy for mapped value '{mapped_value}', using default"
)
else: else:
self.log.warning(f"Proxy provider '{proxy_provider_name}' not found, using default proxy") self.log.warning(f"Proxy provider '{proxy_provider_name}' not found, using default proxy")
else: else:
@@ -142,11 +140,11 @@ class Service(metaclass=ABCMeta):
} }
) )
# Always verify proxy IP - proxies can change exit nodes # Always verify proxy IP - proxies can change exit nodes
try:
proxy_ip_info = get_ip_info(self.session) proxy_ip_info = get_ip_info(self.session)
if proxy_ip_info: self.current_region = proxy_ip_info.get("country", "").lower() if proxy_ip_info else None
self.current_region = proxy_ip_info.get("country", "").lower() except Exception as e:
else: self.log.warning(f"Failed to verify proxy IP: {e}")
self.log.warning("Failed to verify proxy IP, falling back to proxy config for region")
# Fallback to extracting region from proxy config # Fallback to extracting region from proxy config
self.current_region = get_region_from_proxy(proxy) self.current_region = get_region_from_proxy(proxy)
else: else:

8
unshackle/core/utilities.py
View File

@@ -359,13 +359,7 @@ def get_ip_info(session: Optional[requests.Session] = None) -> dict:
If you provide a Requests Session with a Proxy, that proxies IP information If you provide a Requests Session with a Proxy, that proxies IP information
is what will be returned. is what will be returned.
""" """
try: return (session or requests.Session()).get("https://ipinfo.io/json").json()
response = (session or requests.Session()).get("https://ipinfo.io/json", timeout=10)
if response.ok:
return response.json()
except (requests.RequestException, json.JSONDecodeError):
pass
return None
def get_cached_ip_info(session: Optional[requests.Session] = None) -> Optional[dict]: def get_cached_ip_info(session: Optional[requests.Session] = None) -> Optional[dict]: