From d20cffe1b29463d05f41022c66d591a3af2cd62a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Feb 2018 22:35:36 +0530
Subject: [PATCH] Update New Statesman

Fixes #1747712 [New recipe for New Statesman magazine](https://bugs.launchpad.net/calibre/+bug/1747712)
---
 recipes/icons/new_statesman.png | Bin 0 -> 889 bytes
 recipes/new_statesman.recipe    |  98 ++++++++++----------------------
 2 files changed, 30 insertions(+), 68 deletions(-)
 create mode 100644 recipes/icons/new_statesman.png

diff --git a/recipes/icons/new_statesman.png b/recipes/icons/new_statesman.png
new file mode 100644
index 0000000000000000000000000000000000000000..b30fce8d1ac5d2831e2f0586e40a8b2c9504ca68
GIT binary patch
literal 889
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><YADU|?Jl;1lBd9}Iq;IQ4DC
zs&6Y-|Gstm-{&viH*Ny5zi-;|_tWRES8hF@wc<(Nyw@wY{(AA|V@>^2Hl8O8tZzdj
zf8V_I%FOx+1KVpW`!@?$pHg%<C2M<H)%h@!>WkSc|2%*G($MS)1JhF;!SCC5d|$uu
zDVM<4Wh-taR~%+meY1Y|mkZY~m<PXFzWLv$Pp{0ap9zUSVP=0D6be$wEA)Ni<{Poa
zhZq!ZC6<3We*VX!XMcbEd}U(!+STi&p3zfY!4E~H&jiGNY}@`~;kqLnnui$VkMSE^
z3(Wd<>;6k)^LMd{pZg{}VPb!wtp1c&`1_Wv|Ni`axp>26m$+lRdIuTg?&dW?l>K@B
z;+2`z69(p|Y~0^BZ~b)Y(ue&g{(k@QxP1oD_A8!AKzsi@eDp#~|BYYJzb{|EE?V-0
zjq3?3Cop_&#Fm^^asGVz(!+*HKnDPw`v330k9CbezdV<a{km{5FfiZv20jy#_`YM;
z{i@z$d<G|_t&a;CUoZ>$bn+rF?El<<@axQ3AOZ&0pC?a$ojd>U<Hz40K7TrO@!htA
z9}b-S_3}-h&eS|$L^39MySp%Su*!M>IqW5#zOL-|xp{;*O}jFi+JQoAJzX3_BrYc>
zD99QZ8E)RNX=8CgQQ_wgpFT3XvaqzaxVjuYqN=iVNoq<XQ_&}`F0WHstFm56&5F9^
zz$hDQTg&XMoGct{T+Hn~p<(LQ-nDc0HZPvMxqG#=$AP<tFQ2}B{Q7x&1p^HU6#*eB
zF*!j=QCVSW@%a-@9GEa=&ZJq>=1rVAb?)TZ)8h{u2#5%Y35p7f3ychn4URs3AmILm
z8&}R;xOD5<y^A-m`nH{ykYI=}RBPAaIKTpQxN3=OL`h0wNvc(HQ7VvPFfuSS)ipHK
zH8ct_w6HR;v@$i;HZZg@FsQsYy#_@?ZhlH;S|x4`9L@R%fEpx0HU#IVm6RtIr7}3C
i<R_&nc;+Uirv{}arc@T5Oa<l#1_n=8KbLh*2~7Y+y`nY%

literal 0
HcmV?d00001

diff --git a/recipes/new_statesman.recipe b/recipes/new_statesman.recipe
index 877444ce43..22e4e15d76 100644
--- a/recipes/new_statesman.recipe
+++ b/recipes/new_statesman.recipe
@@ -1,81 +1,43 @@
+# -*- mode: python -*-
+# -*- coding: utf-8 -*-
+
 __license__ = 'GPL v3'
+__copyright__ = '2018, Darko Miletic <darko.miletic at gmail.com>'
 '''
-newstatesman.com
+www.newstatesman.com
 '''
+
 from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class NewStatesman(BasicNewsRecipe):
-
     title = 'New Statesman'
-    language = 'en_GB'
-    __author__ = "NotTaken"
-    description = "Britain's Current Affairs & Politics Magazine (bi-weekly)"
-    oldest_article = 4.0
+    __author__ = 'Darko Miletic'
+    description = "Current affairs, world politics, the arts and more from Britain's award-winning magazine"
+    publisher = 'New Statesman Media'
+    category = 'New Statesman magazine, International Politics, British Politics, Britain, UK, Tony Blair, Gordon Brown, Geoffrey Robinson, David Cameron, Sir Menzies Campbell, Labour, Conservative, Liberal Democrat, UK Politics, House of Commons, House of Lords, Legislation, politics magazine'  # noqa
+    oldest_article = 30
     no_stylesheets = True
-    use_embedded_content = False
+    encoding = 'utf8'
+    use_embedded_content = True
+    language = 'en_GB'
     remove_empty_feeds = True
+    publication_type = 'magazine'
+    auto_cleanup = True
+    resolve_internal_links = True
+    ignore_duplicate_articles = {'url'}
+    masthead_url = 'https://www.newstatesman.com/sites/all/themes/creative-responsive-theme/images/newstatesman_logo@2x.png'
 
-    keep_only_tags = [dict(attrs={'class': 'node'})]
+    extra_css = """
+        body{font-family: serif}
+        img{margin-top:1em; margin-bottom: 1em; display:block}
+    """
 
-    remove_tags_after = [
-        dict(attrs={'class': lambda x: x and 'content123' in x})
-    ]
+    conversion_options = {
+        'comment': description,
+        'tags': category,
+        'publisher': publisher,
+        'language': language
+    }
 
-    remove_tags = [
-        dict(attrs={'class': lambda x: x and 'links_bookmark' in x})
-    ]
-
-    extra_css = '''
-        .title-main {font-size: x-large;}
-        h2 { font-size: small;  }
-        h1 { font-size: medium;  }
-        .field-field-nodeimage-title {
-            font-size: small;
-            color: #3C3C3C;
-        }
-        .link_col {
-            font-size: x-small;
-        }
-    '''
-
-    processed_urls = []
-
-    def populate_article_metadata(self, article, soup, first):
-        if first and hasattr(self, 'add_toc_thumbnail'):
-            pic = soup.find('img')
-            if pic is not None:
-                self.add_toc_thumbnail(article, pic['src'])
-
-    def get_article_url(self, article):
-        url = BasicNewsRecipe.get_article_url(self, article)
-
-        if url in self.processed_urls:
-            self.log('skipping duplicate article: %s' % article.title)
-            return None
-
-        self.processed_urls.append(url)
-        return url
-
-    feeds = [
-        (u'Politics',
-         u'http://www.newstatesman.com/politics.rss'),
-        (u'Business',
-         u'http://www.newstatesman.com/business.rss'),
-        (u'Economics',
-         u'http://www.newstatesman.com/economics.rss'),
-        (u'Culture',
-         u'http://www.newstatesman.com/culture.rss'),
-        (u'Media',
-         u'http://www.newstatesman.com/media.rss'),
-        (u'Books',
-         u'http://www.newstatesman.com/taxonomy/term/feed/27'),
-        (u'Life & Society',
-         u'http://www.newstatesman.com/taxonomyfeed/11'),
-        (u'World Affairs',
-         u'http://www.newstatesman.com/world-affairs.rss'),
-        (u'Sci-Tech',
-         u'http://www.newstatesman.com/feeds/topics/sci-tech.rss'),
-        (u'Others',
-         u'http://www.newstatesman.com/feeds_allsite/site_feed.php'),
-    ]
+    feeds = [(u'Articles', u'https://www.newstatesman.com/feeds/site_feed.rss')]