From 8a7805d4af1d54a0b2908c3ff9678752b6f8b2df Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:41:58 +0530
Subject: [PATCH] update New Scientist

---
 recipes/icons/new_scientist_mag.png | Bin 0 -> 278 bytes
 recipes/new_scientist.recipe        |  70 +++++++++---------
 recipes/new_scientist_mag.recipe    | 110 ++++++++++++++++++++++++++++
 3 files changed, 143 insertions(+), 37 deletions(-)
 create mode 100644 recipes/icons/new_scientist_mag.png
 create mode 100644 recipes/new_scientist_mag.recipe

diff --git a/recipes/icons/new_scientist_mag.png b/recipes/icons/new_scientist_mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..16523e4981c00ad151a38d7b7e0557f1f57d3a66
GIT binary patch
literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000{P)t-s|Ns91
z9zopT<tsyA{{H-*s<-Fr?IJr`LRfMIB1GBU;`sUc`~3WYkD<cJ(WtV%7&B7t@bh7F
zi4QAGNnUnjc8kW%)N_KCY<-anCrHoL+aE_dWB>pFfJsC_R2Y?Q&)W{dFbD=<{?*dM
zMyp$$&i8*%3yT+P<buGLK!9#^iJ={0UM!0%RPT{$0D=%rKqL>x3D8mjr9(x^kK#{=
z1`yUA3RwHd2Beh@8WJ4kXD4T{C#z_F0j$994tvckKi~t->n<A!fk{I9v<*j_E~hX5
cKN{cv0{T@0-iGU(u>b%707*qoM6N<$g5RiheE<Le

literal 0
HcmV?d00001

diff --git a/recipes/new_scientist.recipe b/recipes/new_scientist.recipe
index 89ea94bb69..8cc1ce3349 100644
--- a/recipes/new_scientist.recipe
+++ b/recipes/new_scientist.recipe
@@ -25,7 +25,6 @@ __author__ = 'Darko Miletic'
 newscientist.com
 '''
 
-import re
 from calibre.web.feeds.news import BasicNewsRecipe
 
 
@@ -37,7 +36,7 @@ def classes(classes):
 
 class NewScientist(BasicNewsRecipe):
     title = 'New Scientist - Online News w. subscription'
-    description = 'Science news and science articles from New Scientist.'
+    description = 'Science news and science articles from New Scientist, based on feeds.'
     language = 'en'
     publisher = 'Reed Business Information Ltd.'
     category = 'science news, science articles, science jobs, drugs, cancer, depression, computer software'
@@ -49,34 +48,44 @@ class NewScientist(BasicNewsRecipe):
     needs_subscription = 'optional'
     remove_empty_feeds = True
     ignore_duplicate_articles = {'url'}
-    compress_news_images = False
-    scale_news_images = True
     resolve_internal_links = True
-    extra_css                 = """
-                                 body{font-family: "PT Serif", serif}
-                                 img{margin-bottom: 0.8em; display: block}
-                                 .quotebx{font-size: x-large; font-weight: bold; margin-right: 2em; margin-left: 2em}
-                                 .article-title,h2,h3{font-family: "Lato Black", sans-serif}
-                                 .strap{font-family: "Lato Light", sans-serif}
-                                 .quote{font-family: "Lato Black", sans-serif}
-                                 .box-out{font-family: "Lato Regular", sans-serif}
-                                 .wp-caption-text{font-family: "Lato Bold", sans-serif; font-size:x-small;}
-                                """
+    remove_attributes = ['style', 'height', 'width']
+    masthead_url = 'https://cdn.shopify.com/s/files/1/0266/6843/3505/files/logo.svg?v=1629189295'
+
+    conversion_options = {
+        'comment': description,
+        'tags': category,
+        'publisher': publisher,
+        'language': language
+    }
+
+    extra_css = '''
+        img {display:block; margin:0 auto;}
+        .ArticleHeader__Category { font-size:small; color:#404040; }
+        .ArticleHeader__Author, .ArticleHeader__DateTimeWrapper { font-size:small; }
+        .ArticleHeader__Copy { font-style:italic; color:#202020; }
+        .ArticleImage { font-size:small; text-align:center; }
+        .ArticleImageCaption__Credit { font-size:smaller; }
+    '''
 
     keep_only_tags = [
-        classes('article-header article__content ArticleHeader ArticleContent')
+        classes('ArticleHeader ArticleContent')
     ]
 
     remove_tags = [
-        classes('social__button-container ArticleHeader__SocialWrapper')
+        dict(name=['svg', 'button']),
+        classes('ArticleHeader__SocialWrapper AdvertWrapper ReadMoreWithImage ArticleTopics')
     ]
 
     def preprocess_html(self, soup):
-        for img in soup.findAll('img', attrs={'data-src': True}):
-            img['src'] = img['data-src']
-        for img in soup.findAll('img', attrs={'data-srcset': True}):
-            img['src'] = img['data-srcset'].split(',')[-1].strip().split()[0]
-            img['width'] = img['height'] = ''
+        time = soup.find(**classes('ArticleHeader__DateTimeWrapper'))
+        if time:
+            time.name = 'div'
+        for img in soup.findAll('img', attrs={'data-src':True}):
+            img['src'] = img['data-src'].replace('?width=1200', '?width=700')
+        for figc in soup.findAll('figcaption'):
+            for p in figc.findAll('p'):
+                p.name = 'div'
         return soup
 
     def get_article_url(self, article):
@@ -116,19 +125,6 @@ class NewScientist(BasicNewsRecipe):
     ]
 
     def get_cover_url(self):
-        cover_url = None
-        soup = self.index_to_soup(
-            'https://www.newscientist.com/issue/current/')
-        cover_item = soup.find(
-            'img', attrs={'class': 'issue-new-magazine-cover'})
-        if cover_item:
-            cover_url = self.image_url_processor(None, cover_item['src'])
-        # Configure series and issue number
-        issue_nr = soup.find('div', attrs={'class': 'magnavissue'})
-        if issue_nr:
-            if issue_nr.string is not None:
-                non_decimal = re.compile(r'[^\d.]+')
-                nr = non_decimal.sub('', issue_nr.string)
-                self.conversion_options.update({'series': 'New Scientist'})
-                self.conversion_options.update({'series_index': nr})
-        return cover_url
+        soup = self.index_to_soup('https://www.newscientist.com/issues/current/')
+        div = soup.find('div', attrs={'class':'ThisWeeksMagazineHero__CoverInfo'})
+        return div.find(**classes('ThisWeeksMagazineHero__ImageLink')).img['src']
diff --git a/recipes/new_scientist_mag.recipe b/recipes/new_scientist_mag.recipe
new file mode 100644
index 0000000000..c8ca809905
--- /dev/null
+++ b/recipes/new_scientist_mag.recipe
@@ -0,0 +1,110 @@
+'''
+newscientist.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe, classes
+
+class NewScientist(BasicNewsRecipe):
+    title = 'New Scientist Magazine'
+    __author__ = 'unkn0wn'
+    description = (
+        'New Scientist is the world’s most popular weekly science and technology publication. '
+        'We cover international news from a scientific standpoint, and ask the big-picture questions '
+        'about life, the universe and what it means to be human. If someone in the world has a good idea, '
+        'you will read about it in New Scientist.'
+    )
+    language = 'en'
+    publisher = 'Reed Business Information Ltd.'
+    category = 'science news, science articles, science jobs, drugs, cancer, depression, computer software'
+    no_stylesheets = True
+    use_embedded_content = False
+    encoding = 'utf-8'
+    needs_subscription = 'optional'
+    remove_empty_feeds = True
+    ignore_duplicate_articles = {'url'}
+    resolve_internal_links = True
+    remove_attributes = ['style', 'height', 'width']
+    masthead_url = 'https://cdn.shopify.com/s/files/1/0266/6843/3505/files/logo.svg?v=1629189295'
+
+    conversion_options = {
+        'comment': description,
+        'tags': category,
+        'publisher': publisher,
+        'language': language
+    }
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser(self)
+        if self.username is not None and self.password is not None:
+            def is_login_form(form):
+                return "action" in form.attrs and form.attrs['action'] == "/login/"
+
+            br.open('https://www.newscientist.com/login/')
+            br.select_form(predicate=is_login_form)
+            br['email'] = self.username
+            br['password'] = self.password
+            res = br.submit().read()
+            if b'>Your account<' not in res:
+                raise ValueError('Failed to log in to New Scientist, check your username and password')
+        return br
+
+    # def print_version(self, url):
+    #     return 'https://webcache.googleusercontent.com/search?q=cache:' + url.split('?')[0]
+
+    extra_css = '''
+        img {display:block; margin:0 auto;}
+        .ArticleHeader__Category { font-size:small; color:#404040; }
+        .ArticleHeader__Author, .ArticleHeader__DateTimeWrapper { font-size:small; }
+        .ArticleHeader__Copy { font-style:italic; color:#202020; }
+        .ArticleImage { font-size:small; text-align:center; }
+        .ArticleImageCaption__Credit { font-size:smaller; }
+    '''
+
+    keep_only_tags = [
+        classes('ArticleHeader ArticleContent')
+    ]
+
+    remove_tags = [
+        dict(name=['svg', 'button']),
+        classes('ArticleHeader__SocialWrapper AdvertWrapper ReadMoreWithImage ArticleTopics')
+    ]
+
+    def parse_index(self):
+        soup = self.index_to_soup('https://www.newscientist.com/issues/current/')
+        div = soup.find('div', attrs={'class':'ThisWeeksMagazineHero__CoverInfo'})
+        tme = div.find(**classes('ThisWeeksMagazineHero__MagInfoHeading'))
+        self.log('Downloading issue:', self.tag_to_string(tme))
+        self.timefmt = ' [' + self.tag_to_string(tme) + ']'
+        self.cover_url = div.find(**classes('ThisWeeksMagazineHero__ImageLink')).img['src']
+
+        feeds = []
+        for cont in soup.findAll(attrs={'class':'TableOfContents__Section'}):
+            sec = self.tag_to_string(cont.find('h3'))
+            self.log(sec)
+            articles = []
+            for a in cont.findAll('a', attrs={'class':'CardLink'}):
+                url = a['href']
+                if url.startswith('http') is False:
+                    url = 'https://www.newscientist.com' + a['href']
+                title = self.tag_to_string(a.find(**classes('Card__Title')))
+                desc = ''
+                desc += self.tag_to_string(a.find(**classes('Card__Category')))
+                teaser = a.find(**classes('Card__TeaserCopy'))
+                if teaser:
+                    desc += ' | ' + self.tag_to_string(teaser)
+                self.log('\t', title, '\n\t', desc, '\n\t\t', url)
+                articles.append({'title': title, 'description': desc, 'url': url})
+            if articles:
+                feeds.append((sec, articles))
+        return feeds
+
+    def preprocess_html(self, soup):
+        time = soup.find(**classes('ArticleHeader__DateTimeWrapper'))
+        if time:
+            time.name = 'div'
+        for img in soup.findAll('img', attrs={'data-src':True}):
+            img['src'] = img['data-src'].replace('?width=1200', '?width=700')
+        for figc in soup.findAll('figcaption'):
+            for p in figc.findAll('p'):
+                p.name = 'div'
+        return soup