* make mail messages multipart/alternative messages with a text/plain and

[rss2maildir.git] / rss2maildir.py

diff --git a/rss2maildir.py b/rss2maildir.py
index a735d3af1ef349f302cd0467f44b710ca452573d..60bbe906ed562b1767d6c716d9ed4741891fe3ea 100755 (executable)
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -8,38 +8,87 @@ import urllib
 
 import feedparser
 
 
 import feedparser
 

-import email
+from email.MIMEMultipart import MIMEMultipart
+from email.MIMEText import MIMEText

 
 import datetime
 
 import datetime

+import random
+import string
+
+import socket

 
 from optparse import OptionParser
 from ConfigParser import SafeConfigParser
 
 
 from optparse import OptionParser
 from ConfigParser import SafeConfigParser
 

+from base64 import b64encode
+import md5
+
+import cgi
+import dbm
+

 
 def parse_and_deliver(maildir, url, statedir):
     md = mailbox.Maildir(maildir)
     fp = feedparser.parse(url)
 
 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"]:
     for item in fp["items"]:

-        # things that we need in the message
-        msg = email.message_from_string("")
+        # have we seen it before?
+        # need to work out what the content is first...
+
+        if item.has_key("content"):
+            content = item["content"][0]["value"]
+        else:
+            content = item["summary"]
+
+        md5sum = md5.md5(content.encode("utf8")).hexdigest()
+
+        if db.has_key(item["link"]):
+            data = db[item["link"]]
+            data = cgi.parse_qs(data)
+            if data["contentmd5"][0] == md5sum:
+                continue
+
+        try:
+            author = item["author"]
+        except:
+            author = url
+
+        # 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() + ">"
+        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")
+        msg.add_header("Date", createddate)

         msg.add_header("Subject", item["title"])
         msg.add_header("Subject", item["title"])

-        msg.set_unixfrom("Brett Parker <iDunno@sommitrealweird.co.uk>")
-        msg.add_header("Date", datetime.datetime(*item["created_parsed"][0:6]).strftime("%a, %e %b %Y %T -0000"))
-        msg.add_header("To", url)
-        msg.set_payload(item["content"][0]["value"])
-        msg.set_charset("utf8")

         msg.set_default_type("text/plain")
 
         msg.set_default_type("text/plain")
 

-        # open a temporary file in the maildir
-        fn = os.tempnam(os.path.join(maildir, "tmp"))
+        htmlpart = MIMEText(content.encode("utf8"), "html", "utf8")
+        textpart = MIMEText(content.encode("utf8"), "plain", "utf8")
+
+        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')
+        fn = os.path.join(maildir, "tmp", fname)

         fh = open(fn, "w")
         fh.write(msg.as_string())
         fh.close()
         # now move it in to the new directory
         fh = open(fn, "w")
         fh.write(msg.as_string())
         fh.close()
         # now move it in to the new directory

-        newfn = os.tempnam(os.path.join(maildir, "new"))
+        newfn = os.path.join(maildir, "new", fname)

         os.link(fn, newfn)
         os.unlink(fn)
 
         os.link(fn, newfn)
         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
+
+    db.close()
+

 # first off, parse the command line arguments
 
 oparser = OptionParser()
 # first off, parse the command line arguments
 
 oparser = OptionParser()


@@ -118,6 +167,18 @@ elif scp.has_option("general", "state_dir"):
         except:
             sys.stderr.write("Couldn't create state directory %s\n" %(new_state_dir))
             sys.exit(1)
         except:
             sys.stderr.write("Couldn't create state directory %s\n" %(new_state_dir))
             sys.exit(1)

+else:
+    try:
+        mode = os.stat(state_dir)[stat.ST_MODE]
+        if not stat.S_ISDIR(mode):
+            sys.stderr.write("State directory %s is not a directory\n" %(state_dir))
+            sys.exit(1)
+    except:
+        try:
+            os.mkdir(state_dir)
+        except:
+            sys.stderr.write("State directory %s could not be created\n" %(state_dir))
+            sys.exit(1)

 
 if scp.has_option("general", "maildir_root"):
     maildir_root = scp.get("general", "maildir_root")
 
 if scp.has_option("general", "maildir_root"):
     maildir_root = scp.get("general", "maildir_root")