X-Git-Url: https://git.sommitrealweird.co.uk/rss2maildir.git/blobdiff_plain/84246cc1794eee3af04f170e4f46c1e886dbf838..8e58c22025a6b22d7c321588b39e28108f71124f:/rss2maildir.py

diff --git a/rss2maildir.py b/rss2maildir.py
index cacf1ee..931de3a 100755
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -132,7 +132,8 @@ class HTML2Text(HTMLParser):
             else:
                 self.text = self.text \
                     + u' * ' \
-                    + u'\n   '.join([a.strip() for a in textwrap.wrap(self.item, 67)]) \
+                    + u'\n   '.join([a.strip() for a in \
+                        textwrap.wrap(self.item, 67)]) \
                     + u'\n'
                 self.item = u''
 
@@ -250,7 +251,8 @@ class HTML2Text(HTMLParser):
             entity = "&" + name + ";"
 
         if self.inparagraph:
-            self.currentparagraph = self.currentparagraph + unicode(entity, "utf-8")
+            self.currentparagraph = self.currentparagraph \
+                + unicode(entity, "utf-8")
         elif self.inblockquote:
             self.blockquote = self.blockquote + unicode(entity, "utf-8")
         else:
@@ -276,9 +278,13 @@ def parse_and_deliver(maildir, url, statedir):
 
         md5sum = md5.md5(content.encode("utf-8")).hexdigest()
 
+        prevmessageid = None
+
         if db.has_key(url + "|" + item["link"]):
             data = db[url + "|" + item["link"]]
             data = cgi.parse_qs(data)
+            if data.has_key("message-id"):
+                prevmessageid = data["message-id"][0]
             if data["contentmd5"][0] == md5sum:
                 continue
 
@@ -301,6 +307,8 @@ def parse_and_deliver(maildir, url, statedir):
         msg.set_unixfrom("\"%s\" <rss2maildir@localhost>" %(url))
         msg.add_header("From", "\"%s\" <rss2maildir@localhost>" %(author))
         msg.add_header("To", "\"%s\" <rss2maildir@localhost>" %(url))
+        if prevmessageid:
+            msg.add_header("References", prevmessageid)
         createddate = datetime.datetime(*item["updated_parsed"][0:6]) \
             .strftime("%a, %e %b %Y %T -0000")
         msg.add_header("Date", createddate)
@@ -335,6 +343,8 @@ def parse_and_deliver(maildir, url, statedir):
         os.unlink(fn)
 
         # now add to the database about the item
+        if prevmessageid:
+            messageid = prevmessageid + " " + messageid
         data = urllib.urlencode((
             ("message-id", messageid), \
             ("created", createddate), \
@@ -369,7 +379,8 @@ if options.conf != None:
         configfile = options.conf
     except:
         # should exit here as the specified file doesn't exist
-        sys.stderr.write("Config file %s does not exist. Exiting.\n" %(options.conf,))
+        sys.stderr.write( \
+            "Config file %s does not exist. Exiting.\n" %(options.conf,))
         sys.exit(2)
 else:
     # check through the default locations
@@ -398,7 +409,8 @@ if options.statedir != None:
     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.stderr.write( \
+                "State directory (%s) is not a directory\n" %(state_dir))
             sys.exit(1)
     except:
         # try to make the directory
@@ -412,7 +424,8 @@ elif scp.has_option("general", "state_dir"):
     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.stderr.write( \
+                "State directory (%s) is not a directory\n" %(state_dir))
             sys.exit(1)
     except:
         # try to create it
@@ -420,19 +433,22 @@ elif scp.has_option("general", "state_dir"):
             os.mkdir(new_state_dir)
             state_dir = new_state_dir
         except:
-            sys.stderr.write("Couldn't create state directory %s\n" %(new_state_dir))
+            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.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.stderr.write( \
+                "State directory %s could not be created\n" %(state_dir))
             sys.exit(1)
 
 if scp.has_option("general", "maildir_root"):
@@ -441,7 +457,9 @@ if scp.has_option("general", "maildir_root"):
 try:
     mode = os.stat(maildir_root)[stat.ST_MODE]
     if not stat.S_ISDIR(mode):
-        sys.stderr.write("Maildir Root %s is not a directory\n" %(maildir_root))
+        sys.stderr.write( \
+            "Maildir Root %s is not a directory\n" \
+            %(maildir_root))
         sys.exit(1)
 except:
     try:
@@ -502,7 +520,9 @@ for section in feeds:
             os.mkdir(os.path.join(maildir, "cur"))
             os.mkdir(os.path.join(maildir, "tmp"))
         except:
-            sys.stderr.write("Couldn't create required maildir directories for %s\n" %(section,))
+            sys.stderr.write( \
+                "Couldn't create required maildir directories for %s\n" \
+                %(section,))
             sys.exit(1)
 
     # right - we've got the directories, we've got the section, we know the