mirror of
https://github.com/LonamiWebs/Telethon.git
synced 2024-11-10 19:46:36 +03:00
Allow creating a new parallel connection (closes #102)
This commit is contained in:
parent
3fccfd40e6
commit
c02fbae5aa
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -8,6 +8,9 @@ telethon/tl/all_tlobjects.py
|
||||||
usermedia/
|
usermedia/
|
||||||
api/settings
|
api/settings
|
||||||
|
|
||||||
|
# Quick tests should live in this file
|
||||||
|
example.py
|
||||||
|
|
||||||
# Byte-compiled / optimized / DLL files
|
# Byte-compiled / optimized / DLL files
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.py[cod]
|
*.py[cod]
|
||||||
|
|
|
@ -145,21 +145,13 @@ class TelegramClient(TelegramBareClient):
|
||||||
|
|
||||||
self._cached_clients.clear()
|
self._cached_clients.clear()
|
||||||
|
|
||||||
def reconnect(self, new_dc=None):
|
|
||||||
"""Disconnects and connects again (effectively reconnecting).
|
|
||||||
|
|
||||||
If 'new_dc' is not None, the current authorization key is
|
|
||||||
removed, the DC used is switched, and a new connection is made.
|
|
||||||
|
|
||||||
*args will be ignored.
|
|
||||||
"""
|
|
||||||
super(TelegramClient, self).reconnect(new_dc=new_dc)
|
|
||||||
|
|
||||||
# endregion
|
# endregion
|
||||||
|
|
||||||
# region Working with different Data Centers
|
# region Working with different connections
|
||||||
|
|
||||||
def _get_exported_client(self, dc_id, init_connection=False):
|
def _get_exported_client(self, dc_id,
|
||||||
|
init_connection=False,
|
||||||
|
bypass_cache=False):
|
||||||
"""Gets a cached exported TelegramBareClient for the desired DC.
|
"""Gets a cached exported TelegramBareClient for the desired DC.
|
||||||
|
|
||||||
If it's the first time retrieving the TelegramBareClient, the
|
If it's the first time retrieving the TelegramBareClient, the
|
||||||
|
@ -168,12 +160,16 @@ class TelegramClient(TelegramBareClient):
|
||||||
|
|
||||||
If after using the sender a ConnectionResetError is raised,
|
If after using the sender a ConnectionResetError is raised,
|
||||||
this method should be called again with init_connection=True
|
this method should be called again with init_connection=True
|
||||||
in order to perform the reconnection."""
|
in order to perform the reconnection.
|
||||||
|
|
||||||
|
If bypass_cache is True, a new client will be exported and
|
||||||
|
it will not be cached.
|
||||||
|
"""
|
||||||
# Thanks badoualy/kotlogram on /telegram/api/DefaultTelegramClient.kt
|
# Thanks badoualy/kotlogram on /telegram/api/DefaultTelegramClient.kt
|
||||||
# for clearly showing how to export the authorization! ^^
|
# for clearly showing how to export the authorization! ^^
|
||||||
|
|
||||||
client = self._cached_clients.get(dc_id)
|
client = self._cached_clients.get(dc_id)
|
||||||
if client:
|
if client and not bypass_cache:
|
||||||
if init_connection:
|
if init_connection:
|
||||||
client.reconnect()
|
client.reconnect()
|
||||||
return client
|
return client
|
||||||
|
@ -191,10 +187,37 @@ class TelegramClient(TelegramBareClient):
|
||||||
client = TelegramBareClient(session, self.api_id, self.api_hash)
|
client = TelegramBareClient(session, self.api_id, self.api_hash)
|
||||||
client.connect(exported_auth=export_auth)
|
client.connect(exported_auth=export_auth)
|
||||||
|
|
||||||
|
if not bypass_cache:
|
||||||
# Don't go through this expensive process every time.
|
# Don't go through this expensive process every time.
|
||||||
self._cached_clients[dc_id] = client
|
self._cached_clients[dc_id] = client
|
||||||
return client
|
return client
|
||||||
|
|
||||||
|
def create_new_connection(self, on_dc=None):
|
||||||
|
"""Creates a new connection which can be used in parallel
|
||||||
|
with the original TelegramClient. A TelegramBareClient
|
||||||
|
will be returned already connected, and the caller is
|
||||||
|
responsible to disconnect it.
|
||||||
|
|
||||||
|
If 'on_dc' is None, the new client will run on the same
|
||||||
|
data center as the current client (most common case).
|
||||||
|
|
||||||
|
If the client is meant to be used on a different data
|
||||||
|
center, the data center ID should be specified instead.
|
||||||
|
|
||||||
|
Note that TelegramBareClients will not handle automatic
|
||||||
|
reconnection (i.e. switching to another data center to
|
||||||
|
download media), and InvalidDCError will be raised in
|
||||||
|
such case.
|
||||||
|
"""
|
||||||
|
if on_dc is None:
|
||||||
|
client = TelegramBareClient(self.session, self.api_id, self.api_hash,
|
||||||
|
proxy=self.proxy)
|
||||||
|
client.connect()
|
||||||
|
else:
|
||||||
|
client = self._get_exported_client(on_dc, bypass_cache=True)
|
||||||
|
|
||||||
|
return client
|
||||||
|
|
||||||
# endregion
|
# endregion
|
||||||
|
|
||||||
# region Telegram requests functions
|
# region Telegram requests functions
|
||||||
|
@ -476,6 +499,8 @@ class TelegramClient(TelegramBareClient):
|
||||||
|
|
||||||
# endregion
|
# endregion
|
||||||
|
|
||||||
|
# region Uploading files
|
||||||
|
|
||||||
def send_photo_file(self, input_file, entity, caption=''):
|
def send_photo_file(self, input_file, entity, caption=''):
|
||||||
"""Sends a previously uploaded input_file
|
"""Sends a previously uploaded input_file
|
||||||
(which should be a photo) to the given entity (or input peer)"""
|
(which should be a photo) to the given entity (or input peer)"""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user