X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=cnn_rss_renderer.py;h=0d8a0bd9b2d5af00e5d346e96c89b4b4814231b5;hb=08440780a64ab1226bb4447b49ce422edfd1500e;hp=402d9878fa3f8caf608a839327f9164ce19a05e2;hpb=4b1f3d8a8b278ca6d62f461ea80c8ea21080c301;p=kiosk.git

diff --git a/cnn_rss_renderer.py b/cnn_rss_renderer.py
index 402d987..0d8a0bd 100644
--- a/cnn_rss_renderer.py
+++ b/cnn_rss_renderer.py
@@ -20,18 +20,32 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
         return "cnn-details-%s" % (self.page_title)
 
     def munge_description(self, description):
-        description = re.sub('[Rr]ead full story for latest details.', '', description)
+        description = re.sub('[Rr]ead full story for latest details.',
+                             '',
+                             description)
         description = re.sub('<[^>]+>', '', description)
         return description
 
+    def find_image(self, item):
+        image = item.findtext('media:thumbnail')
+        if image is not None:
+            image_url = image.get('url')
+            return image_url
+        return None
+
     def should_use_https(self):
         return False
 
     def item_is_interesting_for_headlines(self, title, description, item):
-        return "CNN.com" not in title
+        if self.is_item_older_than_n_days(item, 7):
+            return False
+        return re.search(r'[Cc][Nn][Nn][A-Za-z]*\.com', title) is None
 
     def item_is_interesting_for_article(self, title, description, item):
-        return len(description) >= 65
+        if self.is_item_older_than_n_days(item, 7):
+            return False
+        return (re.search(r'[Cc][Nn][Nn][A-Za-z]*\.com', title) is None and
+                len(description) >= 65)
 
 # Test
 #x = cnn_rss_renderer(
@@ -44,5 +58,5 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
 #    ],
 #    "Test" )
 #if x.fetch_news() == 0:
-#    print "Error fetching news, no items fetched."
+#    print("Error fetching news, no items fetched.")
 #x.shuffle_news()