mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-01-31 05:10:45 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fixes. Support for socks4a proxies

Browse Source
This commit is contained in:
Jose Manuel Delicado 2021-01-22 17:54:47 +01:00
parent b59d262dca
commit fbcba39e69
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.py
View File

@ -9,7 +9,7 @@ log = logging.getLogger("config")
MAINFILE = "twblue.conf" MAINFILE = "twblue.conf"
MAINSPEC = "app-configuration.defaults" MAINSPEC = "app-configuration.defaults"
proxyTypes = ["system", "HTTP", "SOCKS4", "SOCKS5", "SOCKS5H"] proxyTypes = ["system", "http", "socks4", "socks4a", "socks5", "socks5h"]
app = None app = None
keymap=None keymap=None
changed_keymap = False changed_keymap = False

2
src/controller/settings.py
View File

@ -74,7 +74,7 @@ class globalSettingsController(object):
self.dialog.set_value("general", "update_period", config.app["app-settings"]["update_period"]) self.dialog.set_value("general", "update_period", config.app["app-settings"]["update_period"])
self.dialog.set_value("general", "check_for_updates", config.app["app-settings"]["check_for_updates"]) self.dialog.set_value("general", "check_for_updates", config.app["app-settings"]["check_for_updates"])
self.dialog.set_value("general", "remember_mention_and_longtweet", config.app["app-settings"]["remember_mention_and_longtweet"]) self.dialog.set_value("general", "remember_mention_and_longtweet", config.app["app-settings"]["remember_mention_and_longtweet"])
proxyTypes = [_("System default"), _("HTTP"), _("SOCKS v4"), _("SOCKS v5"), _("SOCKS v5 with DNS support")] proxyTypes = [_("System default"), _("HTTP"), _("SOCKS v4"), _("SOCKS v4 with DNS support"), _("SOCKS v5"), _("SOCKS v5 with DNS support")]
self.dialog.create_proxy(proxyTypes) self.dialog.create_proxy(proxyTypes)
try: try:
self.dialog.proxy.type.SetSelection(config.app["proxy"]["type"]) self.dialog.proxy.type.SetSelection(config.app["proxy"]["type"])

2
src/main.py
View File

@ -108,6 +108,8 @@ def proxy_setup():
proxy_url = config.app["proxy"]["server"] + ":" + str(config.app["proxy"]["port"]) proxy_url = config.app["proxy"]["server"] + ":" + str(config.app["proxy"]["port"])
if config.app["proxy"]["user"] != "" and config.app["proxy"]["password"] != "": if config.app["proxy"]["user"] != "" and config.app["proxy"]["password"] != "":
proxy_url = config.app["proxy"]["user"] + ":" + config.app["proxy"]["password"] + "@" + proxy_url proxy_url = config.app["proxy"]["user"] + ":" + config.app["proxy"]["password"] + "@" + proxy_url
elif config.app["proxy"]["user"] != "" and config.proxyTypes[config.app["proxy"]["type"]] in ["socks4", "socks4a"]:
proxy_url = config.app["proxy"]["user"] + "@" + proxy_url
proxy_url = config.proxyTypes[config.app["proxy"]["type"]] + "://" + proxy_url proxy_url = config.proxyTypes[config.app["proxy"]["type"]] + "://" + proxy_url
os.environ["HTTP_PROXY"] = proxy_url os.environ["HTTP_PROXY"] = proxy_url
os.environ["HTTPS_PROXY"] = proxy_url os.environ["HTTPS_PROXY"] = proxy_url