From c7d84b206dabf32ec2a20e03d39bbdaa8a819b64 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 29 Apr 2014 17:42:35 +0530
Subject: [PATCH] Update Private Eye

---
 recipes/icons/private_eye.png | Bin 0 -> 2906 bytes
 recipes/private_eye.recipe    |  39 ++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 recipes/icons/private_eye.png

diff --git a/recipes/icons/private_eye.png b/recipes/icons/private_eye.png
new file mode 100644
index 0000000000000000000000000000000000000000..83aad3d46dec92cf2217c776fbc7af195eb05eab
GIT binary patch
literal 2906
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
ba6>&<IP8zu|0;edehb(iKaGBd^0@IITGVwW

literal 0
HcmV?d00001

diff --git a/recipes/private_eye.recipe b/recipes/private_eye.recipe
index 265812125d..d92bd08538 100644
--- a/recipes/private_eye.recipe
+++ b/recipes/private_eye.recipe
@@ -1,31 +1,38 @@
+import re
+
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class AdvancedUserRecipe1359406781(BasicNewsRecipe):
     title          = u'Private Eye'
-    oldest_article = 15
+    publication_type = 'magazine'
+    description = u'Private Eye is a fortnightly British satirical and current affairs magazine, edited by Ian Hislop'
+    oldest_article = 13
     max_articles_per_feed = 100
     remove_empty_feeds = True
     remove_javascript     = True
     no_stylesheets = True
     ignore_duplicate_articles = {'title'}
     language = 'en_GB'
-    __author__ = 'Martyn Pritchard'
-    encoding     =  'iso-8859-1'
-    compress_news_images = True
-    compress_news_images_auto_size = 8
-    scale_news_images_to_device = False
-    scale_news_images = (220, 300)
+    encoding   =  'iso-8859-1'
+    __author__ = u'MartynPritchard@yahoo.com'
+    __copyright__ = '2014, Martyn Pritchard <MartynPritchard@yahoo.com>'
 
     def get_cover_url(self):
-            soup = self.index_to_soup('http://www.private-eye.co.uk')
-            cov = soup.find(attrs={'width' : '180', 'border' : '0'})
-            cover_url = 'http://www.private-eye.co.uk/'+cov['src']
-            return cover_url
+        cover_url = None
+        soup = self.index_to_soup('http://www.private-eye.co.uk/current_issue.php')
+        for citem in soup.findAll('img'):
+            if citem['src'].endswith('big.jpg'):
+                return 'http://www.private-eye.co.uk/' + citem['src']
+        return cover_url
 
-    keep_only_tags = [dict(name='table', attrs={'width':['100%'], 'border':['0'], 'align': ['center'], 'cellspacing':['0'], 'cellpadding':['0']}),
-                      dict(name='table', attrs={'width':['480'], 'cellspacing':['0'], 'cellpadding':['0']}),
-                      dict(name='table', attrs={'width':['490'], 'border':['0'], 'align': ['left'], 'cellspacing':['0'], 'cellpadding':['1']}),
-                      dict(name='table', attrs={'width':['500'], 'cellspacing':['0'], 'cellpadding':['0']}),
-                     ]
+    remove_tags_before = {'class':"sub_dave"}
+    remove_tags = [dict(name='td', attrs={'class':'sub_dave'})]
+
+    preprocess_regexps = [
+                   (re.compile(r'../grfx', re.DOTALL|re.IGNORECASE), lambda match: 'http://www.private-eye.co.uk/grfx'),
+                   (re.compile(r'More From This Issue.*</body>', re.DOTALL|re.IGNORECASE), lambda match: '</body>'),
+                   (re.compile(r'More top stories in the latest issue:.*</body>', re.DOTALL|re.IGNORECASE), lambda match: '</body>'),
+                   (re.compile(r'Also Available Online.*</body>', re.DOTALL|re.IGNORECASE), lambda match: '</body>'),
+                         ]
 
     feeds          = [(u'Private Eye', u'http://www.private-eye.co.uk/rss/rss.php')]