Fix progress bar counter and removes duplication

Author: ferferga

README.md

@@ -65,7 +65,7 @@ This might be what you are looking for if:
 
 * **You did use WinWazzapMigrator to move from WP to Android**: This is what I did, and what was tested
 
-* **You moved to Android starting from scratch there a while ago, and now you want to bring back all your old WP messages to your current WhatsApp installation.**: This will likely be successful, although it wasn't tested.
+* **You moved to Android starting from scratch there a while ago, and now you want to bring back all your old WP messages to your current WhatsApp installation.**: This will likely be successful, although it wasn't tested by me (although [reports claim it works perfectly](https://github.com/ferferga/WhatsAppMigrationTools/issues/1#issuecomment-581165616))
 
 * **You still didn't move from WP and don't want to buy WinWazzapMigrator**: My process is much more difficult and less user-friendly than theirs, but it will likely succeed as well, although it isn't tested. I would say however that this has less chances of being successful than the 2nd case. But worth trying I suppose, you will learn a lot along the way :).
 

merger/merger.py

@@ -613,6 +613,8 @@ def optimize_database():
     msgcount = msgcount + msgstore.fetchone()[0]
     msgstore.execute("SELECT COUNT(message_row_id) FROM message_media")
     msgcount = msgcount + msgstore.fetchone()[0] * 2
+    msgstore.execute("SELECT COUNT(key_id) FROM messages_quotes WHERE key_id NOT IN (SELECT key_id FROM messages)")
+    msgcount = msgcount + msgstore.fetchone()[0]
     print("\nNow backing up data into the temporary database...\n")
     # Sometimes, quotes from groups into private chats and deleted messages might be still in messages_quotes while not present in messages, that means that we need
     # to take care of them individually, in different loops, instead of doing them all at once in a single loop.
@@ -683,7 +685,7 @@ def optimize_database():
                 tmp.execute("INSERT INTO keys_relationship VALUES(?,?,?,?,?)", reg2)
             except:
                 pass
-        msgstore.execute("SELECT key_id, _id FROM messages WHERE key_id NOT IN (SELECT key_id FROM messages)")
+        msgstore.execute("SELECT key_id, _id FROM messages_quotes WHERE key_id NOT IN (SELECT key_id FROM messages)")
         for row in msgstore:
             try:
                 new_quote_id = new_quotes_keys[row[0]]
@@ -1066,15 +1068,6 @@ def optimize_database():
             loopcount = loopcount + 1
             bar.update(loopcount)
         msgstore.execute("SELECT message_row_id FROM message_future")
-        for row in msgstore:
-            try:
-                reg = (keys_relationship[int(row[0])], row[0])
-                msgstore2.execute("UPDATE message_future SET message_row_id = ? WHERE message_row_id = ?", reg)
-            except:
-                pass
-            loopcount = loopcount + 1
-            bar.update(loopcount)
-        msgstore.execute("SELECT message_row_id FROM message_future")
         for row in msgstore:
             try:
                 reg = (keys_relationship[int(row[0])], row[0])