implemented decorator function in class_sqlThread module

Author: navjotcis

src/class_sqlThread.py

@@ -20,15 +20,19 @@
 # pylint: disable=attribute-defined-outside-init,protected-access
 
 
-def db_upgrade(func):
+upgrade_dict = {}
+
+
+def db_upgrade(**kwargs):
     """upgrade the migration"""
-    def inner(*args, **kwargs):
+    version_dict = kwargs
+    def inner(func):
         """this is inner method"""
-        reference = args[0]
-        item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        reference.cur.execute(item, parameters)
-        func(reference, int(reference.cur.fetchall()[0][0]))
+        upgrade_dict.update(version_dict)
+        def wrapped(*args):
+            """used for calling main method"""
+            func(*args)
+        return wrapped
     return inner
 
 
@@ -53,18 +57,8 @@ def update_sent(self):
             '''update sent set status='broadcastqueued' where status='broadcastpending'  ''')
         self.conn.commit()
 
-    @db_upgrade
-    def upgrade_migrations(self, currentVersion):
-        """This method is for upgrading migrations"""
-        versionList = [
-            'versionThree', 'versionTwo', 'versionThree',
-            'versionFour', 'versionFive', 'versionSix', 'versionSeven',
-            'versionEight', 'versionNine', 'versionTen'
-        ]
-        if currentVersion < 11:
-            getattr(self, versionList[currentVersion - 1])()
-
-    def versionTwo(self):
+    @db_upgrade(version_two=2)
+    def version_two(self):
         """
         method for getting rid of the first20bytesofencryptedmessage field in
         the inventory table.
@@ -92,7 +86,8 @@ def versionTwo(self):
         parameters = (3,)
         self.cur.execute(item, parameters)
 
-    def versionThree(self):
+    @db_upgrade(version_three=3)
+    def version_three(self):
         """Adding a new column to the inventory table to store tags."""
         logger.debug(
             'In messages.dat database, adding tag field to'
@@ -104,7 +99,8 @@ def versionThree(self):
         parameters = (4,)
         self.cur.execute(item, parameters)
 
-    def versionFour(self):
+    @db_upgrade(versio_four=4)
+    def versio_four(self):
         """
         Add a new column to the pubkeys table to store the address version.
         We're going to trash all of our pubkeys and let them be redownloaded.
@@ -119,7 +115,8 @@ def versionFour(self):
         parameters = (5,)
         self.cur.execute(item, parameters)
 
-    def versionFive(self):
+    @db_upgrade(versio_five=5)
+    def versio_five(self):
         """
         Add a new table: objectprocessorqueue with which to hold objects
         that have yet to be processed if the user shuts down Bitmessage.
@@ -132,7 +129,8 @@ def versionFive(self):
         parameters = (6,)
         self.cur.execute(item, parameters)
 
-    def versionSix(self):
+    @db_upgrade(version_six=6)
+    def version_six(self):
         """
         changes related to protocol v3
         In table inventory and objectprocessorqueue, objecttype is now
@@ -156,7 +154,8 @@ def versionSix(self):
         logger.debug(
             'Finished dropping and recreating the inventory table.')
 
-    def versionSeven(self):
+    @db_upgrade(version_seven=7)
+    def version_seven(self):
         """
         The format of data stored in the pubkeys table has changed. Let's
         clear it, and the pubkeys from inventory, so that they'll
@@ -178,7 +177,8 @@ def versionSeven(self):
         self.cur.execute(query, parameters)
         logger.debug('Finished clearing currently held pubkeys.')
 
-    def versionEight(self):
+    @db_upgrade(version_eight=8)
+    def version_eight(self):
         """
         Add a new column to the inbox table to store the hash of
         the message signature. We'll use this as temporary message UUID
@@ -194,7 +194,8 @@ def versionEight(self):
         parameters = (9,)
         self.cur.execute(item, parameters)
 
-    def versionNine(self):
+    @db_upgrade(version_nine=9)
+    def version_nine(self):
         """
         We'll also need a `sleeptill` field and a `ttl` field. Also we
         can combine the pubkeyretrynumber and msgretrynumber into one.
@@ -259,7 +260,8 @@ def versionNine(self):
             ' and removing the hash field.')
         self.cur.execute('''update settings set value=10 WHERE key='version';''')
 
-    def versionTen(self):
+    @db_upgrade(version_ten=10)
+    def version_ten(self):
         """Update the address colunm to unique in addressbook table"""
         logger.debug(
             'In messages.dat database, updating address column to UNIQUE'
@@ -416,7 +418,17 @@ def run(self):  # pylint: disable=too-many-locals, too-many-branches, too-many-s
 
         self.update_sent()
 
-        self.upgrade_migrations()
+        item = '''SELECT value FROM settings WHERE key='version';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        currentVersion = int(self.cur.fetchall()[0][0])
+        temp_dict = {val:key for key,val in upgrade_dict.items()}
+
+        if temp_dict.get(currentVersion) or currentVersion == 1:
+            if currentVersion == 1:
+                getattr(self, temp_dict.get(3))()
+            else:
+                getattr(self, temp_dict.get(currentVersion))()
 
         # Are you hoping to add a new option to the keys.dat file of existing
         # Bitmessage users or modify the SQLite database? Add it right