kenzuya/unshackle
1
0
Fork 1
mirror of https://github.com/unshackle-dl/unshackle.git synced 2026-03-10 08:29:00 +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

14
unshackle/core/service.py
View File

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