* make db key actually unique for feed url + link url

diff --git a/rss2maildir.py b/rss2maildir.py
index aaf883f81af394f74f64bb2a2271a4a20fcd3c3a..d721d0e49c19994c84b6e6407766e02c836ce5d4 100755 (executable)
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -146,8 +146,8 @@ def parse_and_deliver(maildir, url, statedir):
 
         md5sum = md5.md5(content.encode("utf8")).hexdigest()
 
 
         md5sum = md5.md5(content.encode("utf8")).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


@@ -191,7 +191,7 @@ def parse_and_deliver(maildir, url, statedir):
 
         # now add to the database about the item
         data = urllib.urlencode((("message-id", messageid), ("created", createddate), ("contentmd5", md5sum)))
 
         # now add to the database about the item
         data = urllib.urlencode((("message-id", messageid), ("created", createddate), ("contentmd5", md5sum)))

-        db[item["link"]] = data
+        db[url + "|" + item["link"]] = data

 
     db.close()
 
 
     db.close()