From e616af8a701a3a0ec604f6acb67e9fcfe20e2dad Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Mon, 23 Apr 2018 20:52:27 +0200 Subject: [PATCH 1/2] Fix isfile should be isdir when pip installing locally --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 80a7d035..29507397 100755 --- a/setup.py +++ b/setup.py @@ -139,7 +139,7 @@ def main(): else: # e.g. install from GitHub - if os.path.isfile(GENERATOR_DIR): + if os.path.isdir(GENERATOR_DIR): generate(['tl', 'errors']) # Get the long description from the README file From ea404c54779d1951e0a0dbcb9766fa695546eee6 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Mon, 23 Apr 2018 21:16:09 +0200 Subject: [PATCH 2/2] Add update_state table to persist pts and such --- telethon/sessions/sqlite.py | 40 +++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/telethon/sessions/sqlite.py b/telethon/sessions/sqlite.py index 1f49d79c..1b7d3c31 100644 --- a/telethon/sessions/sqlite.py +++ b/telethon/sessions/sqlite.py @@ -13,7 +13,7 @@ from ..tl.types import ( ) EXTENSION = '.session' -CURRENT_VERSION = 3 # database version +CURRENT_VERSION = 4 # database version class SQLiteSession(MemorySession): @@ -99,6 +99,14 @@ class SQLiteSession(MemorySession): hash integer, primary key(md5_digest, file_size, type) )""" + , + """update_state ( + id integer primary key, + pts integer, + qts integer, + date integer, + seq integer + )""" ) c.execute("insert into version values (?)", (CURRENT_VERSION,)) # Migrating from JSON -> new table and may have entities @@ -141,18 +149,30 @@ class SQLiteSession(MemorySession): def _upgrade_database(self, old): c = self._cursor() - # old == 1 doesn't have the old sent_files so no need to drop + if old == 1: + old += 1 + # old == 1 doesn't have the old sent_files so no need to drop if old == 2: + old += 1 # Old cache from old sent_files lasts then a day anyway, drop c.execute('drop table sent_files') - self._create_table(c, """sent_files ( - md5_digest blob, - file_size integer, - type integer, - id integer, - hash integer, - primary key(md5_digest, file_size, type) - )""") + self._create_table(c, """sent_files ( + md5_digest blob, + file_size integer, + type integer, + id integer, + hash integer, + primary key(md5_digest, file_size, type) + )""") + if old == 3: + old += 1 + self._create_table(c, """update_state ( + id integer primary key, + pts integer, + qts integer, + date integer, + seq integer + )""") c.close() @staticmethod