diff --git a/pyrogram/methods/auth/initialize.py b/pyrogram/methods/auth/initialize.py index cb8fd0cc..48bd6f10 100644 --- a/pyrogram/methods/auth/initialize.py +++ b/pyrogram/methods/auth/initialize.py @@ -19,7 +19,6 @@ import logging import pyrogram -from pyrogram.syncer import Syncer log = logging.getLogger(__name__) @@ -46,7 +45,6 @@ class Initialize: self.load_plugins() await self.dispatcher.start() - await Syncer.add(self) self.username = (await self.get_me()).username self.is_initialized = True diff --git a/pyrogram/methods/auth/terminate.py b/pyrogram/methods/auth/terminate.py index 548d030c..707c25e9 100644 --- a/pyrogram/methods/auth/terminate.py +++ b/pyrogram/methods/auth/terminate.py @@ -20,7 +20,6 @@ import logging import pyrogram from pyrogram import raw -from pyrogram.syncer import Syncer log = logging.getLogger(__name__) @@ -44,7 +43,7 @@ class Terminate: await self.invoke(raw.functions.account.FinishTakeoutSession()) log.warning(f"Takeout session {self.takeout_id} finished") - await Syncer.remove(self) + await self.storage.save() await self.dispatcher.stop() for media_session in self.media_sessions.values(): diff --git a/pyrogram/syncer.py b/pyrogram/syncer.py deleted file mode 100644 index 3ff1bfc9..00000000 --- a/pyrogram/syncer.py +++ /dev/null @@ -1,88 +0,0 @@ -# Pyrogram - Telegram MTProto API Client Library for Python -# Copyright (C) 2017-present Dan -# -# This file is part of Pyrogram. -# -# Pyrogram is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pyrogram is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with Pyrogram. If not, see . - -import asyncio -import logging -import time - -log = logging.getLogger(__name__) - - -class Syncer: - INTERVAL = 20 - - clients = {} - event = None - lock = None - - @classmethod - async def add(cls, client): - if cls.event is None: - cls.event = asyncio.Event() - - if cls.lock is None: - cls.lock = asyncio.Lock() - - async with cls.lock: - await cls.sync(client) - - cls.clients[id(client)] = client - - if len(cls.clients) == 1: - cls.start() - - @classmethod - async def remove(cls, client): - async with cls.lock: - await cls.sync(client) - - del cls.clients[id(client)] - - if len(cls.clients) == 0: - cls.stop() - - @classmethod - def start(cls): - cls.event.clear() - asyncio.get_event_loop().create_task(cls.worker()) - - @classmethod - def stop(cls): - cls.event.set() - - @classmethod - async def worker(cls): - while True: - try: - await asyncio.wait_for(cls.event.wait(), cls.INTERVAL) - except asyncio.TimeoutError: - async with cls.lock: - for client in cls.clients.values(): - await cls.sync(client) - else: - break - - @classmethod - async def sync(cls, client): - try: - start = time.time() - await client.storage.save() - except Exception as e: - log.critical(e, exc_info=True) - else: - log.debug(f'Synced "{client.storage.name}" in {(time.time() - start) * 1000:.6} ms')