Remove command variable and pass string in error_handler()

Author: shekhar-cis

src/class_sqlThread.py

@@ -173,8 +173,7 @@ def check_columns_can_store_binary_null(self):
             if str(err) != 'database or disk is full':
                 logger.error(err)
             else:
-                command = 'null value test'
-                sqlThread().error_handler(err, command)
+                sqlThread().error_handler(err, 'null value test')
 
     def check_vacuum(self):  # pylint: disable=too-many-locals, too-many-branches, too-many-statements,
         # Redefinition-of-parameters-type-from-tuple-to-str, R0204, line-too-long, E501
@@ -195,8 +194,7 @@ def check_vacuum(self):  # pylint: disable=too-many-locals, too-many-branches, t
                 try:
                     self.cur.execute(''' VACUUM ''')
                 except Exception as err:
-                    command = 'VACUUM'
-                    sqlThread().error_handler(err, command)
+                    sqlThread().error_handler(err, 'VACUUM')
                 query = "update settings set value=? WHERE key='lastvacuumtime'"
                 parameters = (int(time.time()),)
                 self.cur.execute(query, parameters)
@@ -275,7 +273,9 @@ def upgrade_config_setting_version(self):
 
     @staticmethod
     def error_handler(err, command):
-
+        """
+            Common error handler
+        """
         if str(err) == 'database or disk is full':
             logger.fatal(
                 "(While %s) Alert: Your disk or data storage volume is full. sqlThread will now exit.", command
@@ -298,18 +298,17 @@ def is_query_commit(self):
         try:
             self.db.conn.commit()
         except Exception as err:
-            command = 'committing'
-            self.error_handler(err, command)
+            self.error_handler(err, 'committing')
 
     def is_query_movemessagstoprog(self):
         """
             When query == 'movemessagstoprogs'
         """
+        logger.debug('the sqlThread is moving the messages.dat file to the local program directory.')
         try:
             self.db.conn.commit()
         except Exception as err:
-            command = 'movemessagstoprog'
-            self.error_handler(err, command)
+            self.error_handler(err, 'movemessagstoprog')
         self.db.conn.close()
         shutil.move(
             paths.lookupAppdataFolder() + 'messages.dat', paths.lookupExeFolder() + 'messages.dat')
@@ -324,8 +323,7 @@ def is_query_deleteandvacuume(self):
         try:
             self.db.cur.execute(''' VACUUM ''')
         except Exception as err:
-            command = 'deleteandvacuume'
-            self.error_handler(err, command)
+            self.error_handler(err, '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()
@@ -354,8 +352,30 @@ def is_query_other(self, query):
                 logger.fatal('This program shall now abruptly exit!')
                 os._exit(0)
             else:
-                command = 'cur.execute'
-                self.error_handler(err, command)
+                self.error_handler(err, 'cur.execute')
+
+    def is_query_movemessagestoappdata(self):
+        """
+            When query == 'movemessagestoappdata'
+        """
+        logger.debug('the sqlThread is moving the messages.dat file to the Appdata folder.')
+        try:
+            self.db.conn.commit()
+        except Exception as err:
+            self.error_handler(err, 'movemessagstoappdata')
+        self.db.conn.close()
+        shutil.move(
+            paths.lookupExeFolder() + 'messages.dat', paths.lookupAppdataFolder() + 'messages.dat')
+        self.db.conn = sqlite3.connect(paths.lookupAppdataFolder() + 'messages.dat')
+        self.db.conn.text_factory = str
+        self.db.cur = self.db.conn.cursor()
+
+    def is_query_exit(self):
+        """
+            When query == 'exit'
+        """
+        self.db.conn.close()
+        logger.info('sqlThread exiting gracefully.')
 
     def loop_queue(self):
         """
@@ -365,31 +385,17 @@ def loop_queue(self):
         if query == 'commit':
             self.is_query_commit()
         elif query == 'exit':
-            self.db.conn.close()
-            logger.info('sqlThread exiting gracefully.')
+            self.is_query_exit()
             return False
         elif query == 'movemessagstoprog':
-            logger.debug('the sqlThread is moving the messages.dat file to the local program directory.')
             self.is_query_movemessagstoprog()
         elif query == 'movemessagstoappdata':
-            logger.debug('the sqlThread is moving the messages.dat file to the Appdata folder.')
-            try:
-                self.db.conn.commit()
-            except Exception as err:
-                command = 'movemessagstoappdata'
-                self.error_handler(err, command)
-            self.db.conn.close()
-            shutil.move(
-                paths.lookupExeFolder() + 'messages.dat', paths.lookupAppdataFolder() + 'messages.dat')
-            self.db.conn = sqlite3.connect(paths.lookupAppdataFolder() + 'messages.dat')
-            self.db.conn.text_factory = str
-            self.db.cur = self.db.conn.cursor()
+            self.is_query_movemessagestoappdata()
         elif query == 'deleteandvacuume':
             self.is_query_deleteandvacuume()
         else:
             self.rowcount = self.is_query_other(query)
             helper_sql.sqlReturnQueue.put((self.db.cur.fetchall(), self.rowcount))
-            # helper_sql.sqlSubmitQueue.task_done()
         return True
 
     def run(self):  # pylint: disable=R0204, E501