From 1f2f7560bc59acdfb5e96ddf377edea89ec2084b Mon Sep 17 00:00:00 2001
From: Yuxin Wu <ppwwyyxxc@gmail.com>
Date: Sat, 18 Jun 2016 10:04:53 -0700
Subject: [PATCH] emoji cache downloadd

---
 dump-audio.py    |  2 +-
 wechat/render.py |  2 +-
 wechat/res.py    | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/dump-audio.py b/dump-audio.py
index 2eb6dbe..ddbcab6 100755
--- a/dump-audio.py
+++ b/dump-audio.py
@@ -28,7 +28,7 @@ if __name__ == '__main__':
     output_file = args.output
 
     parser = WeChatDBParser(args.db)
-    res = Resource(args.res, '')
+    res = Resource(parser, args.res, '')
 
     if name and name in parser.msgs_by_chat:
         msgs = parser.msgs_by_chat[name]
diff --git a/wechat/render.py b/wechat/render.py
index 08152d5..eeae031 100644
--- a/wechat/render.py
+++ b/wechat/render.py
@@ -131,7 +131,7 @@ class HTMLRender(object):
         elif msg.type == TYPE_CUSTOM_EMOJI:
             pq = PyQuery(msg.content)
             md5 = pq('emoticonmd5').text()
-            format_dict['img'] = self.res.get_emoji(md5, None)
+            format_dict['img'] = self.res.get_emoji_by_md5(md5)
             return template.format(**format_dict)
         elif msg.type == TYPE_LINK:
             content = msg.msg_str()
diff --git a/wechat/res.py b/wechat/res.py
index 7bba0bb..043017b 100644
--- a/wechat/res.py
+++ b/wechat/res.py
@@ -65,14 +65,15 @@ class EmojiCache(object):
 
 class Resource(object):
     """ multimedia resources in chat"""
-    def __init__(self, parser, res_dir, avt_db,
-            emoji_cache_file='emoji.cache'):
+    def __init__(self, parser, res_dir, avt_db):
         def check(subdir):
             assert os.path.isdir(os.path.join(res_dir, subdir)), \
                     "No such directory: {}".format(subdir)
         [check(k) for k in ['', AVATAR_DIRNAME, IMG_DIRNAME, EMOJI_DIRNAME, VOICE_DIRNAME]]
 
-        self.emoji_cache = EmojiCache(emoji_cache_file)
+        self.emoji_cache = EmojiCache(
+                os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                    '..', 'emoji.cache'))
         self.res_dir = res_dir
         self.parser = parser
         self.voice_cache_idx = {}
@@ -118,7 +119,14 @@ class Resource(object):
         if im is None:
             return ""
         buf = cStringIO.StringIO()
-        im.save(buf, 'JPEG', quality=JPEG_QUALITY)
+        try:
+            im.save(buf, 'JPEG', quality=JPEG_QUALITY)
+        except IOError:
+            try:
+                # sometimes it works the second time...
+                im.save(buf, 'JPEG', quality=JPEG_QUALITY)
+            except IOError:
+                return ""
         jpeg_str = buf.getvalue()
         return base64.b64encode(jpeg_str)