mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-28 12:57:52 +00:00
Code Issues Releases Wiki Activity

Fix proxy not being correctly updated

Browse Source
This commit is contained in:
Dan 2018-05-25 11:52:40 +02:00
parent 65c209000c
commit 00b983ccc3
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pyrogram/client/client.py
View File

@ -144,7 +144,8 @@ class Client(Methods, BaseClient):
self.session_name = session_name self.session_name = session_name
self.api_id = int(api_id) if api_id else None self.api_id = int(api_id) if api_id else None
self.api_hash = api_hash self.api_hash = api_hash
self.proxy = proxy # TODO: Make code consistent, use underscore for private/protected fields
self._proxy = proxy
self.test_mode = test_mode self.test_mode = test_mode
self.phone_number = phone_number self.phone_number = phone_number
self.phone_code = phone_code self.phone_code = phone_code
@ -158,6 +159,15 @@ class Client(Methods, BaseClient):
self.dispatcher = Dispatcher(self, workers) self.dispatcher = Dispatcher(self, workers)
@property
def proxy(self):
return self._proxy
@proxy.setter
def proxy(self, value):
self._proxy["enabled"] = True
self._proxy.update(value)
def start(self, debug: bool = False): def start(self, debug: bool = False):
"""Use this method to start the Client after creating it. """Use this method to start the Client after creating it.
Requires no parameters. Requires no parameters.
@ -183,7 +193,7 @@ class Client(Methods, BaseClient):
self.session = Session( self.session = Session(
self.dc_id, self.dc_id,
self.test_mode, self.test_mode,
self.proxy, self._proxy,
self.auth_key, self.auth_key,
self.api_id, self.api_id,
client=self client=self
@ -331,12 +341,12 @@ class Client(Methods, BaseClient):
self.session.stop() self.session.stop()
self.dc_id = e.x self.dc_id = e.x
self.auth_key = Auth(self.dc_id, self.test_mode, self.proxy).create() self.auth_key = Auth(self.dc_id, self.test_mode, self._proxy).create()
self.session = Session( self.session = Session(
self.dc_id, self.dc_id,
self.test_mode, self.test_mode,
self.proxy, self._proxy,
self.auth_key, self.auth_key,
self.api_id, self.api_id,
client=self client=self
@ -379,12 +389,12 @@ class Client(Methods, BaseClient):
self.session.stop() self.session.stop()
self.dc_id = e.x self.dc_id = e.x
self.auth_key = Auth(self.dc_id, self.test_mode, self.proxy).create() self.auth_key = Auth(self.dc_id, self.test_mode, self._proxy).create()
self.session = Session( self.session = Session(
self.dc_id, self.dc_id,
self.test_mode, self.test_mode,
self.proxy, self._proxy,
self.auth_key, self.auth_key,
self.api_id, self.api_id,
client=self client=self
@ -841,17 +851,17 @@ class Client(Methods, BaseClient):
"More info: https://docs.pyrogram.ml/start/ProjectSetup#configuration" "More info: https://docs.pyrogram.ml/start/ProjectSetup#configuration"
) )
if self.proxy: if self._proxy:
self.proxy["enabled"] = True self._proxy["enabled"] = True
else: else:
self.proxy = {} self._proxy = {}
if parser.has_section("proxy"): if parser.has_section("proxy"):
self.proxy["enabled"] = parser.getboolean("proxy", "enabled") self._proxy["enabled"] = parser.getboolean("proxy", "enabled")
self.proxy["hostname"] = parser.get("proxy", "hostname") self._proxy["hostname"] = parser.get("proxy", "hostname")
self.proxy["port"] = parser.getint("proxy", "port") self._proxy["port"] = parser.getint("proxy", "port")
self.proxy["username"] = parser.get("proxy", "username", fallback=None) or None self._proxy["username"] = parser.get("proxy", "username", fallback=None) or None
self.proxy["password"] = parser.get("proxy", "password", fallback=None) or None self._proxy["password"] = parser.get("proxy", "password", fallback=None) or None
def load_session(self): def load_session(self):
try: try:
@ -860,7 +870,7 @@ class Client(Methods, BaseClient):
except FileNotFoundError: except FileNotFoundError:
self.dc_id = 1 self.dc_id = 1
self.date = 0 self.date = 0
self.auth_key = Auth(self.dc_id, self.test_mode, self.proxy).create() self.auth_key = Auth(self.dc_id, self.test_mode, self._proxy).create()
else: else:
self.dc_id = s["dc_id"] self.dc_id = s["dc_id"]
self.test_mode = s["test_mode"] self.test_mode = s["test_mode"]
@ -1012,7 +1022,7 @@ class Client(Methods, BaseClient):
file_id = file_id or self.rnd_id() file_id = file_id or self.rnd_id()
md5_sum = md5() if not is_big and not is_missing_part else None md5_sum = md5() if not is_big and not is_missing_part else None
session = Session(self.dc_id, self.test_mode, self.proxy, self.auth_key, self.api_id) session = Session(self.dc_id, self.test_mode, self._proxy, self.auth_key, self.api_id)
session.start() session.start()
try: try:
@ -1099,8 +1109,8 @@ class Client(Methods, BaseClient):
session = Session( session = Session(
dc_id, dc_id,
self.test_mode, self.test_mode,
self.proxy, self._proxy,
Auth(dc_id, self.test_mode, self.proxy).create(), Auth(dc_id, self.test_mode, self._proxy).create(),
self.api_id self.api_id
) )
@ -1118,7 +1128,7 @@ class Client(Methods, BaseClient):
session = Session( session = Session(
dc_id, dc_id,
self.test_mode, self.test_mode,
self.proxy, self._proxy,
self.auth_key, self.auth_key,
self.api_id self.api_id
) )
@ -1188,8 +1198,8 @@ class Client(Methods, BaseClient):
cdn_session = Session( cdn_session = Session(
r.dc_id, r.dc_id,
self.test_mode, self.test_mode,
self.proxy, self._proxy,
Auth(r.dc_id, self.test_mode, self.proxy).create(), Auth(r.dc_id, self.test_mode, self._proxy).create(),
self.api_id, self.api_id,
is_cdn=True is_cdn=True
) )