Merge lp:~3v1n0/gwibber/failing-messages-loading-fix into lp:gwibber

[Marco Trevisan (Treviño)]

Fix bug #645512 (which causes Twitter not to load any message if just one, or a small subset, is failing) plus it includes a fix for not throwing exceptions for a plugin when just one message fails.

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2010-11-16 19:02:53 +0000
+++ gwibber/microblog/dispatcher.py	2010-12-08 20:02:53 +0000
@@ -56,37 +56,40 @@
 
     if message_data is not None:
       for m in message_data:
-        if isinstance(m, dict) and m.has_key("mid"):
-          m["id"] = uuid.uuid1().hex
-          m["operation"] = opname
-          m["stream"] = stream
-          m["transient"] = transient
-          m["rtl"] = util.isRTL(re.sub(text_cleaner, "", m["text"].decode('utf-8')))
-
-          log.logger.debug("%s Adding record", logtext)
-
-          new_messages.insert(0, (
-            m["id"],
-            m["mid"],
-            m["account"],
-            account["service"],
-            opname,
-            transient,
-            stream,
-            m["time"],
-            m["text"],
-            m.get("sender", {}).get("is_me", None), 
-            m.get("to_me", None),
-            m.get("sender", {}).get("nick", None),
-            m.get("reply", {}).get("nick", None),
-            json.dumps(m)
-          ))
-        elif isinstance(m, dict) and m.has_key("error"):
-          new_messages.insert(0, (
-            "error",
-            json.dumps(m)
-          ))
-          
+        try: 
+          if isinstance(m, dict) and m.has_key("mid"):
+            m["id"] = uuid.uuid1().hex
+            m["operation"] = opname
+            m["stream"] = stream
+            m["transient"] = transient
+            m["rtl"] = util.isRTL(re.sub(text_cleaner, "", m["text"].decode('utf-8')))
+
+            log.logger.debug("%s Adding record", logtext)
+
+            new_messages.insert(0, (
+              m["id"],
+              m["mid"],
+              m["account"],
+              account["service"],
+              opname,
+              transient,
+              stream,
+              m["time"],
+              m["text"],
+              m.get("sender", {}).get("is_me", None), 
+              m.get("to_me", None),
+              m.get("sender", {}).get("nick", None),
+              m.get("reply", {}).get("nick", None),
+              json.dumps(m)
+            ))
+          elif isinstance(m, dict) and m.has_key("error"):
+            new_messages.insert(0, (
+              "error",
+              json.dumps(m)
+            ))
+        except Exception as e:
+          if not "logtext" in locals(): logtext = "<UNKNOWN>"
+          log.logger.error("%s Operation failed", logtext)
 
     log.logger.debug("%s Finished operation", logtext)
     return ("Success", new_messages)

=== modified file 'gwibber/microblog/plugins/twitter/__init__.py'
--- gwibber/microblog/plugins/twitter/__init__.py	2010-10-27 20:02:23 +0000
+++ gwibber/microblog/plugins/twitter/__init__.py	2010-12-08 20:02:53 +0000
@@ -1,5 +1,6 @@
 from gwibber.microblog import network, util
-import htmllib, re
+from htmlentitydefs import name2codepoint
+import re
 import gnomekeyring
 from oauth import oauth
 from gwibber.microblog.util import log, exceptions
@@ -54,10 +55,8 @@
 API_PREFIX = "https://api.twitter.com/1"
 
 def unescape(s):
-  p = htmllib.HTMLParser(None)
-  p.save_bgn()
-  p.feed(s)
-  return p.save_end()
+  return re.sub('&(%s);' % '|'.join(name2codepoint), 
+    lambda m: unichr(name2codepoint[m.group(1)]), s)
 
 class Client:
   def __init__(self, acct):
@@ -73,7 +72,7 @@
     self.token = oauth.OAuthToken(acct["access_token"], acct["secret_token"])
 
   def _common(self, data):
-    m = {}; 
+    m = {};
     try:
       m["mid"] = str(data["id"])
       m["service"] = "twitter"
@@ -95,6 +94,7 @@
         m["images"] = images
     except: 
       log.logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
+      return {}
  
     return m