Support the Echo content element by selecting the most appropriate one.

diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index 50b643e83c779d9f385189ee6886882490169297..159b6b36300b042b898b420d5b4f2a22be0a4930 100644 (file)
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -26,6 +26,21 @@ def format_time(secs, config):
        t = time.localtime(secs)
        return time.strftime(config["timeformat"], t) + ", " + time.strftime(config["dayformat"], t)
 
+def select_content(contents):
+       """Select the best content element from an Echo feed."""
+       preferred = ["text/html", "application/xhtml+xml"]
+       cs = []
+       for c in contents:
+               type = c["type"]
+               if type in preferred:
+                       score = preferred.index(type)
+                       cs.append((score, c["value"]))
+       cs.sort()
+       if len(cs) == 0:
+               return None
+       else:
+               return cs[0][1]
+
 class Feed:
        """An RSS feed."""
 
@@ -73,6 +88,8 @@ class Feed:
                        link = item.get("link")
                        if item.has_key("content_encoded"):
                                description = item["content_encoded"]
+                       elif item.has_key("content"):
+                               description = select_content(item["content"])
                        else:
                                description = item.get("description")