* tidy code to be mostly < 80 chars per line

[rss2maildir.git] / rss2maildir.py

diff --git a/rss2maildir.py b/rss2maildir.py
index aaf883f81af394f74f64bb2a2271a4a20fcd3c3a..6a319f47ad2ba14a44df777dfd83b21c7cf0d9da 100755 (executable)
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
 #!/usr/bin/python

-# coding=utf8
+# coding=utf-8

 
 # rss2maildir.py - RSS feeds to Maildir 1 email per item
 # Copyright (C) 2007  Brett Parker <iDunno@sommitrealweird.co.uk>
 
 # rss2maildir.py - RSS feeds to Maildir 1 email per item
 # Copyright (C) 2007  Brett Parker <iDunno@sommitrealweird.co.uk>


@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-import mailbox

 import sys
 import os
 import stat
 import sys
 import os
 import stat


@@ -64,10 +63,16 @@ class HTML2Text(HTMLParser):
         self.inheadingtwo = False
         self.inotherheading = False
         self.inparagraph = True
         self.inheadingtwo = False
         self.inotherheading = False
         self.inparagraph = True

+        self.inblockquote = False

         self.inlink = False
         self.inlink = False

-        self.text = ""
-        self.currentparagraph = ""
-        self.headingtext = ""
+        self.text = u''
+        self.currentparagraph = u''
+        self.headingtext = u''
+        self.blockquote = u''
+        self.inpre = False
+        self.inul = False
+        self.initem = False
+        self.item = u''

         HTMLParser.__init__(self)
 
     def handle_starttag(self, tag, attrs):
         HTMLParser.__init__(self)
 
     def handle_starttag(self, tag, attrs):


@@ -83,47 +88,171 @@ class HTML2Text(HTMLParser):
         elif tag.lower() == "a":
             self.inlink = True
         elif tag.lower() == "br":
         elif tag.lower() == "a":
             self.inlink = True
         elif tag.lower() == "br":

-            self.text = self.text + "\n"
+            if self.inparagraph:
+                self.text = self.text \
+                    + u'\n'.join( \
+                        textwrap.wrap(self.currentparagraph, 70)) \
+                    + u'\n'
+                self.currentparagraph = ""
+            elif self.inblockquote:
+                self.text = self.text \
+                    + u'\n> ' \
+                    + u'\n> '.join( \
+                        [a.strip() \
+                            for a in textwrap.wrap(self.blockquote, 68) \
+                        ]) \
+                    + u'\n'
+                self.blockquote = u''
+            else:
+                self.text = self.text + u'\n'
+        elif tag.lower() == "blockquote":
+            self.inblockquote = True
+            self.text = self.text + u'\n'

         elif tag.lower() == "p":
             if self.text != "":
         elif tag.lower() == "p":
             if self.text != "":

-                self.text = self.text + "\n\n"
-                self.currentparagraph = ""
-                self.inparagraph = True
+                self.text = self.text + u'\n\n'
+            if self.inparagraph:
+                self.text = self.text \
+                    + u'\n'.join(textwrap.wrap(self.currentparagraph, 70))
+            self.currentparagraph = u''
+            self.inparagraph = True
+        elif tag.lower() == "pre":
+            self.text = self.text + "\n"
+            self.inpre = True
+            self.inparagraph = False
+            self.inblockquote = False
+        elif tag.lower() == "ul":
+            self.item = u''
+            self.inul = True
+            self.text = self.text + "\n"
+        elif tag.lower() == "li" and self.inul:
+            if not self.initem:
+                self.initem = True
+                self.item = u''
+            else:
+                self.text = self.text \
+                    + u' * ' \
+                    + u'\n   '.join([a.strip() for a in textwrap.wrap(self.item, 67)]) \
+                    + u'\n'
+                self.item = u''

 
     def handle_startendtag(self, tag, attrs):
         if tag.lower() == "br":
 
     def handle_startendtag(self, tag, attrs):
         if tag.lower() == "br":

-            self.text = self.text + "\n"
+            if self.inparagraph:
+                self.text = self.text \
+                + u'\n'.join( \
+                    [a \
+                        for a in textwrap.wrap( \
+                            self.currentparagraph, 70) \
+                    ] \
+                ) \
+                + u'\n'
+                self.currentparagraph = u''
+            elif self.inblockquote:
+                self.text = self.text \
+                    + u'\n> ' \
+                    + u'\n> '.join( \
+                        [a \
+                            for a in textwrap.wrap( \
+                                self.blockquote.encode("utf-8") \
+                                , 68) \
+                        ] \
+                    ) \
+                    + u'\n'
+                self.blockquote = u''
+            else:
+                self.text = self.text + "\n"

 
     def handle_endtag(self, tag):
         if tag.lower() == "h1":
             self.inheadingone = False
 
     def handle_endtag(self, tag):
         if tag.lower() == "h1":
             self.inheadingone = False

-            self.text = self.text + self.headingtext + "\n" + "=" * len(self.headingtext)
-            self.headingtext = ""
+            self.text = self.text \
+                + u'\n\n' \
+                + self.headingtext.encode("utf-8") \
+                + u'\n' \
+                + u'=' * len(self.headingtext.encode("utf-8").strip())
+            self.headingtext = u''

         elif tag.lower() == "h2":
             self.inheadingtwo = False
         elif tag.lower() == "h2":
             self.inheadingtwo = False

-            self.text = self.text + self.headingtext + "\n" + "-" * len(self.headingtext)
-            self.headingtext = ""
+            self.text = self.text \
+                + u'\n\n' \
+                + self.headingtext.encode("utf-8") \
+                + u'\n' \
+                + u'-' * len(self.headingtext.encode("utf-8").strip())
+            self.headingtext = u''

         elif tag.lower() in ["h3", "h4", "h5", "h6"]:
             self.inotherheading = False
         elif tag.lower() in ["h3", "h4", "h5", "h6"]:
             self.inotherheading = False

-            self.text = self.text + self.headingtext + "\n" + "~" * len(self.headingtext)
-            self.headingtext = ""
+            self.text = self.text \
+                + u'\n\n' \
+                + self.headingtext.encode("utf-8") \
+                + u'\n' \
+                + u'~' * len(self.headingtext.encode("utf-8").strip())
+            self.headingtext = u''

         elif tag.lower() == "p":
         elif tag.lower() == "p":

-            self.text = self.text + "\n".join(textwrap.wrap(self.currentparagraph, 70))
+            self.text = self.text \
+                + u'\n'.join(textwrap.wrap( \
+                    self.currentparagraph, 70) \
+                )

             self.inparagraph = False
             self.inparagraph = False

+            self.currentparagraph = u''
+        elif tag.lower() == "blockquote":
+            self.text = self.text \
+                + u'\n> ' \
+                + u'\n> '.join( \
+                    [a.strip() for a in textwrap.wrap(self.blockquote, 68)] \
+                    ).encode("utf-8") \
+                + u'\n'
+            self.inblockquote = False
+            self.blockquote = u''
+        elif tag.lower() == "pre":
+            self.inpre = False
+        elif tag.lower() == "li":
+            self.initem = False
+            if self.item != "":
+                self.text = self.text \
+                    + u' * ' \
+                    + u'\n   '.join( \
+                        [a.strip() for a in textwrap.wrap(self.item, 67)]) \
+                    + u'\n'
+            self.item = u''
+        elif tag.lower() == "ul":
+            self.inul = False

 
     def handle_data(self, data):
 
     def handle_data(self, data):

-        if not self.inheadingone and not self.inheadingtwo and not self.inotherheading and not self.inparagraph:
-            self.text = self.text + data.strip() + " "
+        if self.inheadingone or self.inheadingtwo or self.inotherheading:
+            self.headingtext = self.headingtext \
+                + unicode(data, "utf-8").strip() \
+                + u' '
+        elif self.inblockquote:
+            self.blockquote = self.blockquote \
+                + unicode(data, "utf-8").strip() \
+                + u' '

         elif self.inparagraph:
         elif self.inparagraph:

-            self.currentparagraph = self.currentparagraph + data.strip() + " "
+            self.currentparagraph = self.currentparagraph \
+                + unicode(data, "utf-8").strip() \
+                + u' '
+        elif self.inul and self.initem:
+            self.item = self.item + unicode(data, "utf-8")
+        elif self.inpre:
+            self.text = self.text + unicode(data, "utf-8")

         else:
         else:

-            self.headingtext = self.headingtext + data.strip() + " "
+            self.text = self.text + unicode(data, "utf-8").strip() + u' '

 
     def handle_entityref(self, name):
 
     def handle_entityref(self, name):

+        entity = name

         if entities.has_key(name.lower()):
         if entities.has_key(name.lower()):

-            self.text = self.text + entities[name.lower()]
+            entity = entities[name.lower()]
+        elif name[0] == "#":
+            entity = unichr(int(name[1:]))
+        else:
+            entity = "&" + name + ";"
+
+        if self.inparagraph:
+            self.currentparagraph = self.currentparagraph + entity
+        elif self.inblockquote:
+            self.blockquote = self.blockquote + entity

         else:
         else:

-            self.text = self.text + "&" + name + ";"
+            self.text = self.text + entity

 
     def gettext(self):
         data = self.text
 
     def gettext(self):
         data = self.text


@@ -132,7 +261,6 @@ class HTML2Text(HTMLParser):
         return data
 
 def parse_and_deliver(maildir, url, statedir):
         return data
 
 def parse_and_deliver(maildir, url, statedir):

-    md = mailbox.Maildir(maildir)

     fp = feedparser.parse(url)
     db = dbm.open(os.path.join(statedir, "seen"), "c")
     for item in fp["items"]:
     fp = feedparser.parse(url)
     db = dbm.open(os.path.join(statedir, "seen"), "c")
     for item in fp["items"]:


@@ -144,10 +272,10 @@ def parse_and_deliver(maildir, url, statedir):
         else:
             content = item["summary"]
 
         else:
             content = item["summary"]
 

-        md5sum = md5.md5(content.encode("utf8")).hexdigest()
+        md5sum = md5.md5(content.encode("utf-8")).hexdigest()

 
 

-        if db.has_key(item["link"]):
-            data = db[item["link"]]
+        if db.has_key(url + "|" + item["link"]):
+            data = db[url + "|" + item["link"]]

             data = cgi.parse_qs(data)
             if data["contentmd5"][0] == md5sum:
                 continue
             data = cgi.parse_qs(data)
             if data["contentmd5"][0] == md5sum:
                 continue


@@ -159,27 +287,42 @@ def parse_and_deliver(maildir, url, statedir):
 
         # create a basic email message
         msg = MIMEMultipart("alternative")
 
         # create a basic email message
         msg = MIMEMultipart("alternative")

-        messageid = "<" + datetime.datetime.now().strftime("%Y%m%d%H%M") + "." + "".join([random.choice(string.ascii_letters + string.digits) for a in range(0,6)]) + "@" + socket.gethostname() + ">"
+        messageid = "<" \
+            + datetime.datetime.now().strftime("%Y%m%d%H%M") \
+            + "." \
+            + "".join( \
+                [random.choice( \
+                    string.ascii_letters + string.digits \
+                    ) for a in range(0,6) \
+                ]) + "@" + socket.gethostname() + ">"

         msg.add_header("Message-ID", messageid)
         msg.set_unixfrom("\"%s\" <rss2maildir@localhost>" %(url))
         msg.add_header("From", "\"%s\" <rss2maildir@localhost>" %(author))
         msg.add_header("To", "\"%s\" <rss2maildir@localhost>" %(url))
         msg.add_header("Message-ID", messageid)
         msg.set_unixfrom("\"%s\" <rss2maildir@localhost>" %(url))
         msg.add_header("From", "\"%s\" <rss2maildir@localhost>" %(author))
         msg.add_header("To", "\"%s\" <rss2maildir@localhost>" %(url))

-        createddate = datetime.datetime(*item["updated_parsed"][0:6]).strftime("%a, %e %b %Y %T -0000")
+        createddate = datetime.datetime(*item["updated_parsed"][0:6]) \
+            .strftime("%a, %e %b %Y %T -0000")

         msg.add_header("Date", createddate)
         msg.add_header("Subject", item["title"])
         msg.set_default_type("text/plain")
 
         msg.add_header("Date", createddate)
         msg.add_header("Subject", item["title"])
         msg.set_default_type("text/plain")
 

-        htmlpart = MIMEText(content.encode("utf8"), "html", "utf8")
+        htmlpart = MIMEText(content.encode("utf-8"), "html", "utf-8")

         textparser = HTML2Text()
         textparser = HTML2Text()

-        textparser.feed(content.encode("utf8"))
+        textparser.feed(content.encode("utf-8"))

         textcontent = textparser.gettext()
         textcontent = textparser.gettext()

-        textpart = MIMEText(textcontent, "plain", "utf8")
+        textpart = MIMEText(textcontent.encode("utf-8"), "plain", "utf-8")

         msg.attach(textpart)
         msg.attach(htmlpart)
 
         # start by working out the filename we should be writting to, we do
         # this following the normal maildir style rules
         msg.attach(textpart)
         msg.attach(htmlpart)
 
         # start by working out the filename we should be writting to, we do
         # this following the normal maildir style rules

-        fname = str(os.getpid()) + "." + socket.gethostname() + "." + "".join([random.choice(string.ascii_letters + string.digits) for a in range(0,10)]) + "." + datetime.datetime.now().strftime('%s')
+        fname = str(os.getpid()) \
+            + "." + socket.gethostname() \
+            + "." + "".join( \
+                [random.choice( \
+                    string.ascii_letters + string.digits \
+                    ) for a in range(0,10) \
+                ]) + "." \
+            + datetime.datetime.now().strftime('%s')

         fn = os.path.join(maildir, "tmp", fname)
         fh = open(fn, "w")
         fh.write(msg.as_string())
         fn = os.path.join(maildir, "tmp", fname)
         fh = open(fn, "w")
         fh.write(msg.as_string())


@@ -190,8 +333,12 @@ def parse_and_deliver(maildir, url, statedir):
         os.unlink(fn)
 
         # now add to the database about the item
         os.unlink(fn)
 
         # now add to the database about the item

-        data = urllib.urlencode((("message-id", messageid), ("created", createddate), ("contentmd5", md5sum)))
-        db[item["link"]] = data
+        data = urllib.urlencode((
+            ("message-id", messageid), \
+            ("created", createddate), \
+            ("contentmd5", md5sum) \
+            ))
+        db[url + "|" + item["link"]] = data

 
     db.close()
 
 
     db.close()