compatibility with an old database file

2020-06-27 19:00:43 -07:00
parent 86224a8151
commit aa9a1c9129
6 changed files with 78 additions and 41 deletions
@@ -101,15 +101,25 @@ SELECT {} FROM message
            self.emoji_groups[md5] = group

        NEEDED_EMOJI_CATALOG = [49, 50, 17]
-        emojiinfo_q = self.cc.execute(
-""" SELECT md5, catalog, name, cdnUrl FROM EmojiInfo""")
-        for row in emojiinfo_q:
-            md5, catalog, name, cdnUrl = row
-            if cdnUrl:
-                self.emoji_url[md5] = cdnUrl
-            if catalog not in NEEDED_EMOJI_CATALOG:
-                continue
-            self.internal_emojis[md5] = name
+        try:
+            emojiinfo_q = self.cc.execute(
+    """ SELECT md5, catalog, name, cdnUrl FROM EmojiInfo""")
+        except: # old database does not have cdnurl
+            emojiinfo_q = self.cc.execute(
+    """ SELECT md5, catalog, name FROM EmojiInfo""")
+            for row in emojiinfo_q:
+                md5, catalog, name = row
+                if catalog not in NEEDED_EMOJI_CATALOG:
+                    continue
+                self.internal_emojis[md5] = name
+        else:
+            for row in emojiinfo_q:
+                md5, catalog, name, cdnUrl = row
+                if cdnUrl:
+                    self.emoji_url[md5] = cdnUrl
+                if catalog not in NEEDED_EMOJI_CATALOG:
+                    continue
+                self.internal_emojis[md5] = name


    def _parse(self):