X-Git-Url: https://git.ucc.asn.au/?p=planet-ucc.git;a=blobdiff_plain;f=update-planet;h=7f31e5279f859208f4137323de8e941a82f7a7d9;hp=4e23e5b98e8ce8bd761fa69bbf71ef3fddba45ab;hb=2a563de3bcc327fa440671db368a261d70e9114b;hpb=dc7db379d1b11f9de8894865689f1c626d62a523 diff --git a/update-planet b/update-planet index 4e23e5b..7f31e52 100755 --- a/update-planet +++ b/update-planet @@ -38,17 +38,15 @@ for feed in feeds: blog.feedURL = feed[1] blogs.append(blog) # check the old copy of the cache, vs the new copy - if not feed[2] or not feed[2].cache or not blog or not blog.cache or feed[2].cache != blog.cache: + if not feed[2] or not feed[2].cache or not blog.cache or feed[2].cache != blog.cache: tainted = True + elif len(blog.items) > 0 and len(feed[2].items) > 0 and (blog.items[0].itemTitle != feed[2].items[0].itemTitle or blog.items[0].contents != feed[2].items[0].contents): + tainted = True # write the cache back down to disk cache.storeBlog(blog) else: pass -if not tainted: - sys.stdout.write('PlanetUCC: no objects have changed in the cache, not updating\n') - sys.exit(1) - # step 3: sift the feeds xmlwriter = XMLWriter.XMLWriter(blogs) @@ -57,6 +55,7 @@ try: codecs.open('planet.html', 'wb', 'utf-8').write(xmlwriter.write(XHTMLWriter.XHTMLWriter)) except: sys.stderr.write('DEBUG: update-planet: could not write planet.html, aborting\n') + raise try: codecs.open('rss2.xml', 'wb', 'utf-8').write(xmlwriter.write(RSS2Writer.RSS2Writer)) @@ -77,4 +76,9 @@ try: codecs.open('opml.xml', 'wb', 'utf-8').write(xmlwriter.write(OPMLWriter.OPMLWriter)) except: sys.stderr.write('DEBUG: update-planet: could not write opml.xml, aborting\n') - raise + + +if not tainted: + sys.stdout.write('PlanetUCC: no objects have changed in the cache, not updating\n') + sys.exit(1) +