Merge pull request Bitmessage#62 from navjotcis/newwork

worked on optimizing sql query for all screens
akeelahmedqureshi · Dec 4, 2019 · e13aa5a · e13aa5a
2 parents b5b69f6 + 3fc7414
commit e13aa5a
Show file tree

Hide file tree

Showing 2 changed files with 203 additions and 160 deletions.
diff --git a/src/bitmessagekivy/kivy_helper_search.py b/src/bitmessagekivy/kivy_helper_search.py
@@ -4,7 +4,7 @@
 from helper_sql import sqlQuery
 
 
-def search_sql(xAddress="toaddress", account=None, folder="inbox", where=None, what=None, unreadOnly=False):
+def search_sql(xAddress="toaddress", account=None, folder="inbox", where=None, what=None, unreadOnly=False, start_indx=0, end_indx=20):
     """Method helping for searching mails"""
     # pylint: disable=too-many-arguments, too-many-branches
     if what is not None and what != "":
@@ -59,7 +59,9 @@ def search_sql(xAddress="toaddress", account=None, folder="inbox", where=None, w
     if sqlStatementParts:
         sqlStatementBase += "WHERE " + " AND ".join(sqlStatementParts)
     if folder == "sent" or folder == "draft":
-        sqlStatementBase += " ORDER BY lastactiontime DESC"
+        sqlStatementBase += " ORDER BY lastactiontime DESC limit {0}, {1}".format(start_indx, end_indx)
     elif folder == "inbox":
-        sqlStatementBase += " ORDER BY received DESC"
+        sqlStatementBase += " ORDER BY received DESC limit {0}, {1}".format(start_indx, end_indx)
+    elif folder == "addressbook":
+        sqlStatementBase += " limit {0}, {1}".format(start_indx, end_indx)
     return sqlQuery(sqlStatementBase, sqlArguments)