Merge memory and file storage

Author: KurimuzonAkuma

pyrogram/client.py

@@ -54,7 +54,7 @@
 from pyrogram.methods import Methods
 from pyrogram.qrlogin import QRLogin
 from pyrogram.session import Auth, Session
-from pyrogram.storage import FileStorage, MemoryStorage, Storage
+from pyrogram.storage import SQLiteStorage, Storage
 from pyrogram.types import LinkPreviewOptions, TermsOfService, User
 from pyrogram.utils import ainput
 
@@ -357,13 +357,18 @@ def __init__(
         self.storage: Storage
 
         if self.session_string:
-            self.storage = MemoryStorage(self.name, self.session_string)
+            self.storage = SQLiteStorage(
+                self.name,
+                workdir=self.workdir,
+                session_string=self.session_string,
+                in_memory=True
+            )
         elif self.in_memory:
-            self.storage = MemoryStorage(self.name)
+            self.storage = SQLiteStorage(self.name, workdir=self.workdir, in_memory=True)
         elif isinstance(storage_engine, Storage):
             self.storage = storage_engine
         else:
-            self.storage = FileStorage(self.name, self.workdir)
+            self.storage = SQLiteStorage(self.name, workdir=self.workdir)
 
         self.dispatcher: Dispatcher = Dispatcher(self)
 

pyrogram/storage/__init__.py

@@ -16,6 +16,5 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
-from .file_storage import FileStorage
-from .memory_storage import MemoryStorage
+from .sqlite_storage import SQLiteStorage
 from .storage import Storage