Update Storage API usages in client.py, auth.py and session.py

delivrance · delivrance · commit 1a7d0b1b7e64 · 2019-09-14T19:57:20.000+02:00
diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
@@ -260,12 +260,12 @@ def connect(self) -> bool:
         self.load_config()
         self.load_session()
 
-        self.session = Session(self, self.storage.dc_id, self.storage.auth_key)
+        self.session = Session(self, self.storage.dc_id(), self.storage.auth_key())
         self.session.start()
 
         self.is_connected = True
 
-        return bool(self.storage.user_id)
+        return bool(self.storage.user_id())
 
     def disconnect(self):
         """Disconnect the client from Telegram servers.
@@ -398,9 +398,9 @@ def send_code(self, phone_number: str) -> SentCode:
             except (PhoneMigrate, NetworkMigrate) as e:
                 self.session.stop()
 
-                self.storage.dc_id = e.x
-                self.storage.auth_key = Auth(self, self.storage.dc_id).create()
-                self.session = Session(self, self.storage.dc_id, self.storage.auth_key)
+                self.storage.dc_id(e.x)
+                self.storage.auth_key(Auth(self, self.storage.dc_id()).create())
+                self.session = Session(self, self.storage.dc_id(), self.storage.auth_key())
 
                 self.session.start()
             else:
@@ -475,8 +475,8 @@ def sign_in(self, phone_number: str, phone_code_hash: str, phone_code: str) -> U
 
             return False
         else:
-            self.storage.user_id = r.user.id
-            self.storage.is_bot = False
+            self.storage.user_id(r.user.id)
+            self.storage.is_bot(False)
 
             return User._parse(self, r.user)
 
@@ -513,8 +513,8 @@ def sign_up(self, phone_number: str, phone_code_hash: str, first_name: str, last
             )
         )
 
-        self.storage.user_id = r.user.id
-        self.storage.is_bot = False
+        self.storage.user_id(r.user.id)
+        self.storage.is_bot(False)
 
         return User._parse(self, r.user)
 
@@ -544,14 +544,14 @@ def sign_in_bot(self, bot_token: str) -> User:
             except UserMigrate as e:
                 self.session.stop()
 
-                self.storage.dc_id = e.x
-                self.storage.auth_key = Auth(self, self.storage.dc_id).create()
-                self.session = Session(self, self.storage.dc_id, self.storage.auth_key)
+                self.storage.dc_id(e.x)
+                self.storage.auth_key(Auth(self, self.storage.dc_id()).create())
+                self.session = Session(self, self.storage.dc_id(), self.storage.auth_key())
 
                 self.session.start()
             else:
-                self.storage.user_id = r.user.id
-                self.storage.is_bot = True
+                self.storage.user_id(r.user.id)
+                self.storage.is_bot(True)
 
                 return User._parse(self, r.user)
 
@@ -585,8 +585,8 @@ def check_password(self, password: str) -> User:
             )
         )
 
-        self.storage.user_id = r.user.id
-        self.storage.is_bot = False
+        self.storage.user_id(r.user.id)
+        self.storage.is_bot(False)
 
         return User._parse(self, r.user)
 
@@ -622,8 +622,8 @@ def recover_password(self, recovery_code: str) -> User:
             )
         )
 
-        self.storage.user_id = r.user.id
-        self.storage.is_bot = False
+        self.storage.user_id(r.user.id)
+        self.storage.is_bot(False)
 
         return User._parse(self, r.user)
 
@@ -828,7 +828,7 @@ def start(self):
             if not is_authorized:
                 self.authorize()
 
-            if not self.storage.is_bot and self.takeout:
+            if not self.storage.is_bot() and self.takeout:
                 self.takeout_id = self.send(functions.account.InitTakeoutSession()).id
                 log.warning("Takeout session {} initiated".format(self.takeout_id))
 
@@ -1461,20 +1461,20 @@ def load_session(self):
         self.storage.open()
 
         session_empty = any([
-            self.storage.test_mode is None,
-            self.storage.auth_key is None,
-            self.storage.user_id is None,
-            self.storage.is_bot is None
+            self.storage.test_mode() is None,
+            self.storage.auth_key() is None,
+            self.storage.user_id() is None,
+            self.storage.is_bot() is None
         ])
 
         if session_empty:
-            self.storage.dc_id = 2
-            self.storage.date = 0
+            self.storage.dc_id(2)
+            self.storage.date(0)
 
-            self.storage.test_mode = self.test_mode
-            self.storage.auth_key = Auth(self, self.storage.dc_id).create()
-            self.storage.user_id = None
-            self.storage.is_bot = None
+            self.storage.test_mode(self.test_mode)
+            self.storage.auth_key(Auth(self, self.storage.dc_id()).create())
+            self.storage.user_id(None)
+            self.storage.is_bot(None)
 
     def load_plugins(self):
         if self.plugins:
@@ -1682,7 +1682,7 @@ def resolve_peer(self, peer_id: Union[int, str]):
                     except KeyError:
                         raise PeerIdInvalid
 
-            peer_type = utils.get_type(peer_id)
+            peer_type = utils.get_peer_type(peer_id)
 
             if peer_type == "user":
                 self.fetch_peers(
@@ -1790,7 +1790,7 @@ def save_file(
         file_id = file_id or self.rnd_id()
         md5_sum = md5() if not is_big and not is_missing_part else None
 
-        session = Session(self, self.storage.dc_id, self.storage.auth_key, is_media=True)
+        session = Session(self, self.storage.dc_id(), self.storage.auth_key(), is_media=True)
         session.start()
 
         try:
@@ -1877,7 +1877,7 @@ def get_file(
             session = self.media_sessions.get(dc_id, None)
 
             if session is None:
-                if dc_id != self.storage.dc_id:
+                if dc_id != self.storage.dc_id():
                     session = Session(self, dc_id, Auth(self, dc_id).create(), is_media=True)
                     session.start()
 
@@ -1903,7 +1903,7 @@ def get_file(
                         session.stop()
                         raise AuthBytesInvalid
                 else:
-                    session = Session(self, dc_id, self.storage.auth_key, is_media=True)
+                    session = Session(self, dc_id, self.storage.auth_key(), is_media=True)
                     session.start()
 
                 self.media_sessions[dc_id] = session
diff --git a/pyrogram/session/auth.py b/pyrogram/session/auth.py
@@ -37,7 +37,7 @@ class Auth:
 
     def __init__(self, client: "pyrogram.Client", dc_id: int):
         self.dc_id = dc_id
-        self.test_mode = client.storage.test_mode
+        self.test_mode = client.storage.test_mode()
         self.ipv6 = client.ipv6
         self.proxy = client.proxy
 
diff --git a/pyrogram/session/session.py b/pyrogram/session/session.py
@@ -117,7 +117,7 @@ def start(self):
         while True:
             self.connection = Connection(
                 self.dc_id,
-                self.client.storage.test_mode,
+                self.client.storage.test_mode(),
                 self.client.ipv6,
                 self.client.proxy
             )

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ def start(self):`
`117`	`117`	`while True:`
`118`	`118`	`self.connection = Connection(`
`119`	`119`	`self.dc_id,`
`120`		`- self.client.storage.test_mode,`
	`120`	`+ self.client.storage.test_mode(),`
`121`	`121`	`self.client.ipv6,`
`122`	`122`	`self.client.proxy`
`123`	`123`	`)`