Specify sock ip

pull/16/merge
inpos 2017-12-11 22:21:28 +03:00
parent 5ff31409dc
commit 82d14d2731
5 changed files with 5 additions and 0 deletions

View File

@ -22,6 +22,7 @@ import abc
import sys import sys
proxy = int(sys.modules["__main__"].__settings__.getSetting("cl_proxy")) proxy = int(sys.modules["__main__"].__settings__.getSetting("cl_proxy"))
if proxy == 1: if proxy == 1:
socks_ip = sys.modules["__main__"].__settings__.getSetting("socks_ip")
import socket import socket
from resources import socks from resources import socks
socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9050) socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9050)

View File

@ -29,6 +29,7 @@ import sys
proxy = int(sys.modules["__main__"].__settings__.getSetting("proxy")) proxy = int(sys.modules["__main__"].__settings__.getSetting("proxy"))
if proxy == 2: if proxy == 2:
socks_ip = sys.modules["__main__"].__settings__.getSetting("socks_ip")
from resources import socks from resources import socks
socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9050) socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9050)
socket.socket = socks.socksocket socket.socket = socks.socksocket

View File

@ -46,6 +46,7 @@
<string id="30046">Torrent2HTTP (libtorrent via http)</string> <string id="30046">Torrent2HTTP (libtorrent via http)</string>
<string id="30047">Proxy for Search</string> <string id="30047">Proxy for Search</string>
<string id="31047">Proxy for Content Lists</string> <string id="31047">Proxy for Content Lists</string>
<string id="32047">SOCKS-proxy IP</string>
<string id="30048">None</string> <string id="30048">None</string>
<string id="30049">Anti-zapret</string> <string id="30049">Anti-zapret</string>
<string id="31050">Tor</string> <string id="31050">Tor</string>

View File

@ -46,6 +46,7 @@
<string id="30046">Torrent2HTTP (libtorrent по http)</string> <string id="30046">Torrent2HTTP (libtorrent по http)</string>
<string id="30047">Прокси для поиска</string> <string id="30047">Прокси для поиска</string>
<string id="31047">Прокси для списков медиа</string> <string id="31047">Прокси для списков медиа</string>
<string id="32047">IP SOCKS-прокси</string>
<string id="30048">Не использовать</string> <string id="30048">Не использовать</string>
<string id="30049">Anti-zapret</string> <string id="30049">Anti-zapret</string>
<string id="31050">Tor</string> <string id="31050">Tor</string>

View File

@ -14,6 +14,7 @@
<setting id="num_threads" type="slider" label="30042" default="3" range="1,1,9" option="int"/> <setting id="num_threads" type="slider" label="30042" default="3" range="1,1,9" option="int"/>
<setting id="proxy" type="enum" lvalues="30048|30049|31050" label="30047" default="0"/> <setting id="proxy" type="enum" lvalues="30048|30049|31050" label="30047" default="0"/>
<setting id="cl_proxy" type="enum" lvalues="30048|31050" label="31047" default="0"/> <setting id="cl_proxy" type="enum" lvalues="30048|31050" label="31047" default="0"/>
<setting id="socks_ip" type="ipaddress" label="32047" default="127.0.0.1" visible="eq(-2,2)|eq(-1,1)"/>
<setting id="debug" type="bool" label="30015" default="false"/> <setting id="debug" type="bool" label="30015" default="false"/>
</category> </category>
<category label="30102"> <category label="30102">