Merge pull request #125 from xgi/feature/114-proxies

Feature/114 proxies
fixes #114

Author: xgi

castero/net.py

@@ -30,6 +30,10 @@ def Get(*args, **kwargs) -> requests.models.Response:
             *args,
             headers=Net.HEADERS,
             timeout=float(castero.config.Config['request_timeout']),
+            proxies={
+                'http': castero.config.Config['proxy_http'],
+                'https': castero.config.Config['proxy_https'],
+            },
             **kwargs
         )
 
@@ -39,5 +43,9 @@ def GGet(*args, **kwargs):
             *args,
             headers=Net.HEADERS,
             timeout=float(castero.config.Config['request_timeout']),
+            proxies={
+                'http': castero.config.Config['proxy_http'],
+                'https': castero.config.Config['proxy_https'],
+            },
             **kwargs
         )

castero/templates/castero.conf

@@ -56,6 +56,18 @@ player =
 # default: (blank)
 execute_command =
 
+# An HTTP or SOCKS proxy to use for HTTP network requests.
+# example: http://user:pass@10.10.1.10:3128
+# example: socks5://user:pass@host:port
+# default: (blank)
+proxy_http =
+
+# An HTTP or SOCKS proxy to use for HTTPS network requests.
+# example: http://user:pass@10.10.1.10:3128
+# example: socks5://user:pass@host:port
+# default: (blank)
+proxy_https =
+
 
 [feeds]
 # Whether to reload/refresh your feeds when the client starts. Depending on how

requirements.txt

@@ -1,6 +1,6 @@
 python-vlc==3.0.7110
 python-mpv==0.4.5
-requests==2.23.0
+requests[socks]==2.24.0
 grequests==0.6.0
 pytest==5.3.5
 CJKwrap==2.2