Fix re bug of trasferring

youngspring1 · Oct 18, 2016 · f87c03f · f87c03f
1 parent 35656c6
commit f87c03f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/itchat/__init__.py b/itchat/__init__.py
@@ -3,7 +3,7 @@
 from .client import client
 from . import content # this is for creating pyc
 
-__version__ = '1.1.13'
+__version__ = '1.1.14'
 
 __client = client()
 def auto_login(hotReload=False, statusStorageDir='itchat.pkl', enableCmdQR=False):

diff --git a/itchat/client.py b/itchat/client.py
@@ -1,3 +1,4 @@
+#coding=utf8
 import os, sys, time, re, io
 import threading, subprocess
 import json, xml.dom.minidom, mimetypes
@@ -280,9 +281,10 @@ def __produce_msg(self, l):
                 if m['Url']:
                     regx = r'(.+?\(.+?\))'
                     data = re.search(regx, m['Content'])
+                    data = 'Map' if data is None else data.group(1)
                     msg = {
                         'Type': 'Map',
-                        'Text': data.group(1),}
+                        'Text': data,}
                 else:
                     msg = {
                         'Type': 'Text',
@@ -363,11 +365,15 @@ def download_atta(attaDir=None):
                         'Type': 'Note',
                         'Text': m['FileName'], }
                 elif m['AppMsgType'] == 2000:
-                    regx = r'\[CDATA\[(.+?)\].+?\[CDATA\[(.+?)\]'
+                    regx = r'\[CDATA\[(.+?)\][\s\S]+?\[CDATA\[(.+?)\]'
                     data = re.search(regx, m['Content'])
+                    if data:
+                        data = data.group(2).split(u'。')[0]
+                    else:
+                        data = 'You may found detailed info in Content key.'
                     msg = {
                         'Type': 'Note',
-                        'Text': data.group(2), }
+                        'Text': data, }
                 else:
                     msg = {
                         'Type': 'Sharing',
@@ -400,9 +406,10 @@ def download_video(videoDir=None):
             elif m['MsgType'] == 10002:
                 regx = r'\[CDATA\[(.+?)\]\]'
                 data = re.search(regx, m['Content'])
+                data = 'System message' if data is None else data.group(1).replace('\\', '')
                 msg = {
                     'Type': 'Note',
-                    'Text': data.group(1).replace('\\', ''), }
+                    'Text': data, }
             elif m['MsgType'] in srl:
                 msg = {
                     'Type': 'Useless',