Merge pull request #17 from SP-l33t/master

Update

Author: nazar220160

TGConvertor/manager.py

@@ -14,6 +14,7 @@ def __init__(
         user_id: None | int = None,
         valid: None | bool = None,
         api: Type[APIData] = API.TelegramDesktop,
+        phone_number: str = None,
     ):
         """
         Initializes a SessionManager instance with the specified parameters.
@@ -33,6 +34,7 @@ def __init__(
         self.api = api.copy()
         self.user = None
         self.client = None
+        self.phone_number = phone_number
 
     async def __aenter__(self):
         """
@@ -74,7 +76,9 @@ async def from_telethon_file(cls, file: Union[Path, str], api=API.TelegramDeskto
         return cls(
             dc_id=session.dc_id,
             auth_key=session.auth_key,
-            api=api
+            api=api,
+            phone_number=session.phone_number,
+            user_id=session.user_id
         )
 
     @classmethod
@@ -209,6 +213,7 @@ def pyrogram(self) -> PyroSession:
             dc_id=self.dc_id,
             auth_key=self.auth_key,
             user_id=self.user_id,
+            api_id=self.api['api_id']
         )
 
     @property

TGConvertor/sessions/pyro.py

@@ -71,6 +71,7 @@ def __init__(
         is_bot: bool = False,
         test_mode: bool = False,
         api_id: None | int = None,
+        date: int | None = None
     ):
         self.dc_id = dc_id
         self.auth_key = auth_key
@@ -198,3 +199,7 @@ async def to_file(self, path: Union[Path, str]):
             )
             await db.execute(sql, params)
             await db.commit()
+            sql = "INSERT INTO version VALUES (?)"
+            params = (3,)
+            await db.execute(sql, params)
+            await db.commit()

TGConvertor/sessions/tele.py

@@ -12,7 +12,6 @@
 
 from ..exceptions import ValidationError
 
-
 SCHEMA = """
 CREATE TABLE version (version integer primary key);
 
@@ -58,27 +57,31 @@ class TeleSession:
     TABLES = {
         "sessions": {
             "dc_id", "server_address", "port", "auth_key", "takeout_id"
-            },
+        },
         "entities": {"id", "hash", "username", "phone", "name", "date"},
         "sent_files": {"md5_digest", "file_size", "type", "id", "hash"},
         "update_state": {"id", "pts", "qts", "date", "seq"},
         "version": {"version"},
     }
 
     def __init__(
-        self,
-        *,
-        dc_id: int,
-        auth_key: bytes,
-        server_address: None | str = None,
-        port: None | int = None,
-        takeout_id: None | int = None
+            self,
+            *,
+            dc_id: int,
+            auth_key: bytes,
+            server_address: None | str = None,
+            port: None | int = None,
+            takeout_id: None | int = None,
+            user_id: None | int = None,
+            phone_number: None | int = None
     ):
         self.dc_id = dc_id
         self.auth_key = auth_key
         self.server_address = server_address
         self.port = port
         self.takeout_id = takeout_id
+        self.user_id = user_id
+        self.phone_number = phone_number
 
     @classmethod
     def from_string(cls, string: str):
@@ -104,8 +107,12 @@ async def from_file(cls, path: Path):
             db.row_factory = aiosqlite.Row
             async with db.execute("SELECT * FROM sessions") as cursor:
                 session = await cursor.fetchone()
+        async with aiosqlite.connect(path) as db:
+            db.row_factory = aiosqlite.Row
+            async with db.execute("SELECT * FROM entities WHERE id NOT LIKE 0") as cursor:
+                entities = {**(await cursor.fetchone())}
 
-        return cls(**session)
+        return cls(user_id=entities.get('id'), phone_number=entities.get('phone'), **session)
 
     @classmethod
     async def validate(cls, path: Path) -> bool:
@@ -140,10 +147,10 @@ def decode(x: str) -> bytes:
         return base64.urlsafe_b64decode(x)
 
     def client(
-        self,
-        api: Type[APIData],
-        proxy: None | dict = None,
-        no_updates: bool = True
+            self,
+            api: Type[APIData],
+            proxy: None | dict = None,
+            no_updates: bool = True
     ):
         client = TelegramClient(
             session=StringSession(self.to_string()),