WIP

feedpipe.py

@@ -1,7 +1,9 @@
 #!/usr/bin/python
 
 import feedparser
+import xe
 import feed.atom as FA
+import feed.date.tools as FT
 from uuid import uuid4
 from datetime import datetime
 
@@ -116,15 +118,31 @@ def cat(self, feeds):
                 if 'author' in e:
                     entry.author = FA.Author(e.author)
 
-                if 'content' in e:
-                    entry.content = e.content[0].value
+                class Div(xe.NestElement):
+                    def __init__(self, content='', **attrs):
+                        xe.NestElement.__init__(self, tag_name="div")
+                        for k, v in attrs.items():
+                            self.attrs[k] = v
+                        self.content = xe.XMLText(content)
+
+                class Content(xe.NestElement):
+                    def __init__(self, content='', _type='xhtml'):
+                        xe.NestElement.__init__(self, tag_name="content")
+                        self.attrs["type"] = _type
+                        self.div = Div(xmlns="http://www.w3.org/1999/xhtml")
+                        self.div.content = content
+
+                if 'summary' in e:
+                    entry._lock = False
+                    entry.content = Content(e.summary)
+                    entry._lock = True
+                elif 'content' in e:
+                    entry.content = Content(e.content[0].value)
 
                 if 'link' in e:
                     link = FA.Link(e.link)
                     entry.link = link
 
-                if 'summary' in e:
-                    entry.summary = e.summary
 
                 if 'tags' in e:
                     entry.categories = FA.Collection(
@@ -134,12 +152,7 @@ def cat(self, feeds):
                         for tag in e.tags)
 
                 if 'published' in e:
-                    try:
-                        entry.published = e.published
-                    except ValueError:
-                        entry.published = datetime.strptime(
-                            e.published, '%a, %d %b %Y %H:%M:%S %Z'
-                        ).isoformat()
+                    entry.published = FT.tf_from_s(e.published)
 
                 self.entries.append(entry)
 
@@ -296,7 +309,7 @@ def as_xml(self):
         xmldoc = FA.XMLDoc()
         xmldoc.root_element = self.as_atom_obj()
 
-        return str(xmldoc)
+        return unicode(xmldoc).encode('utf-8').strip()
 
     def count(self):
         """