check testmode

Author: shekhar-cis

src/class_sqlThread.py

@@ -112,7 +112,7 @@ def sql_schema_version(self, setter):
 
     def upgrade_to_latest(self):
         """
-            Initialise upgrade level
+            Initialize upgrade level
         """
 
         while self.sql_schema_version < self.max_level:
@@ -232,7 +232,7 @@ def upgrade_config_parser_setting_version(self, settingsversion):
 
     def initialize_schema(self):
         """
-            Initialise Db schema
+            Initialize DB schema
         """
         try:
             inbox_exists = list(self.cur.execute('PRAGMA table_info(inbox)'))
@@ -331,6 +331,12 @@ def is_query_movemessagstoprog(self):
         except Exception as err:
             command = 'movemessagstoprog'
             self.error_handler(err, command)
+        self.db.conn.close()
+        shutil.move(
+            paths.lookupAppdataFolder() + 'messages.dat', paths.lookupExeFolder() + 'messages.dat')
+        self.db.conn = sqlite3.connect(paths.lookupExeFolder() + 'messages.dat')
+        self.db.conn.text_factory = str
+        self.db.cur = self.db.conn.cursor()
 
     def is_query_deleteandvacuume(self):
         """
@@ -341,6 +347,9 @@ def is_query_deleteandvacuume(self):
         except Exception as err:
             command = 'deleteandvacuume'
             self.error_handler(err, command)
+        self.db.cur.execute('''delete from inbox where folder='trash' ''')
+        self.db.cur.execute('''delete from sent where folder='trash' ''')
+        self.db.conn.commit()
 
     def is_query_other(self, query):
         """
@@ -383,12 +392,6 @@ def loop_queue(self):
         elif query == 'movemessagstoprog':
             logger.debug('the sqlThread is moving the messages.dat file to the local program directory.')
             self.is_query_movemessagstoprog()
-            self.db.conn.close()
-            shutil.move(
-                paths.lookupAppdataFolder() + 'messages.dat', paths.lookupExeFolder() + 'messages.dat')
-            self.db.conn = sqlite3.connect(paths.lookupExeFolder() + 'messages.dat')
-            self.db.conn.text_factory = str
-            self.db.cur = self.db.conn.cursor()
         elif query == 'movemessagstoappdata':
             logger.debug('the sqlThread is moving the messages.dat file to the Appdata folder.')
             try:
@@ -403,9 +406,6 @@ def loop_queue(self):
             self.db.conn.text_factory = str
             self.db.cur = self.db.conn.cursor()
         elif query == 'deleteandvacuume':
-            self.db.cur.execute('''delete from inbox where folder='trash' ''')
-            self.db.cur.execute('''delete from sent where folder='trash' ''')
-            self.db.conn.commit()
             self.is_query_deleteandvacuume()
         else:
             self.rowcount = self.is_query_other(query)
@@ -417,9 +417,10 @@ def run(self):  # pylint: disable=R0204, E501
         """Process SQL queries from `.helper_sql.sqlSubmitQueue`"""
 
         logger.info('Init thread in sqlthread')
-
-        self.db = TestDB()
-
+        if state.testmode:
+            self.db = TestDB()
+        else:
+            self.db = BitmessageDB()
         helper_sql.sql_available = True
 
         config_ready.wait()