Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow user-defined session properties. Related to #86

Browse Source 
This commit adds five 5 extra parameters to the Client class:
app_version, device_model, system_version, system_lang_code, lang_code
This commit is contained in:
Dan 2018-06-24 18:47:49 +02:00
parent f4c0793a0b
commit 55ef4abb27
2 changed files with 77 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pyrogram/client/client.py
View File

@ -129,6 +129,11 @@ class Client(Methods, BaseClient):
session_name: str,
api_id: int or str = None,
api_hash: str = None,
app_version: str = None,
device_model: str = None,
system_version: str = None,
system_lang_code: str = None,
lang_code: str = None,
proxy: dict = None,
test_mode: bool = False,
phone_number: str = None,
@ -145,6 +150,11 @@ class Client(Methods, BaseClient):
self.session_name = session_name
self.api_id = int(api_id) if api_id else None
self.api_hash = api_hash
self.app_version = app_version
self.device_model = device_model
self.system_version = system_version
self.system_lang_code = system_lang_code
self.lang_code = lang_code
# TODO: Make code consistent, use underscore for private/protected fields
self._proxy = proxy
self.test_mode = test_mode
@ -854,6 +864,68 @@ class Client(Methods, BaseClient):
"More info: https://docs.pyrogram.ml/start/ProjectSetup#configuration"
)
# TODO: Woah! Some redundant code down here
if self.app_version:
pass
else:
self.app_version = Client.APP_VERSION
if parser.has_section("pyrogram"):
self.app_version = parser.get(
"pyrogram",
"app_version",
fallback=Client.APP_VERSION
)
if self.device_model:
pass
else:
self.device_model = Client.DEVICE_MODEL
if parser.has_section("pyrogram"):
self.device_model = parser.get(
"pyrogram",
"device_model",
fallback=Client.DEVICE_MODEL
)
if self.system_version:
pass
else:
self.system_version = Client.SYSTEM_VERSION
if parser.has_section("pyrogram"):
self.system_version = parser.get(
"pyrogram",
"system_version",
fallback=Client.SYSTEM_VERSION
)
if self.system_lang_code:
pass
else:
self.system_lang_code = Client.SYSTEM_LANG_CODE
if parser.has_section("pyrogram"):
self.system_lang_code = parser.get(
"pyrogram",
"system_lang_code",
fallback=Client.SYSTEM_LANG_CODE
)
if self.lang_code:
pass
else:
self.lang_code = Client.LANG_CODE
if parser.has_section("pyrogram"):
self.lang_code = parser.get(
"pyrogram",
"lang_code",
fallback=Client.LANG_CODE
)
if self._proxy:
self._proxy["enabled"] = True
else:

10
pyrogram/session/session.py
View File

@ -142,11 +142,11 @@ class Session:
layer,
functions.InitConnection(
api_id=self.client.api_id,
device_model=self.client.DEVICE_MODEL,
system_version=self.client.SYSTEM_VERSION,
app_version=self.client.APP_VERSION,
system_lang_code=self.client.SYSTEM_LANG_CODE,
lang_code=self.client.LANG_CODE,
app_version=self.client.app_version,
device_model=self.client.device_model,
system_version=self.client.system_version,
system_lang_code=self.client.system_lang_code,
lang_code=self.client.lang_code,
lang_pack="",
query=functions.help.GetConfig(),
)