From 5e3d4428cfb1e07bcb051dd2835dbb881d9a12cd Mon Sep 17 00:00:00 2001
From: Coiby <coiby@users.noreply.github.com>
Date: Sat, 16 Sep 2017 10:48:02 +0800
Subject: [PATCH] Make Wired Monthly Recipe Work again

1. use seperator "." instead of "-", e.g. tag/magazine-25-02/page/1 => tag/magazine-25.02/page/1

Note: if you access the magazine for "LOAD MORE RESULTS" from the page (e.g. https://www.wired.com/magazine/what-lies-ahead/), WIRED will still give you the link "tag/magazine-25-02/page/1". But the actual url is "tag/magazine-25.02/page/1".

2. find story links in div.archive-list-component__items

3. use the same remove_tags, keep_only_tags etc. as in latest wired_daily.recipe, so the article can be downloaded successfully.

4. If no new stories are fetched, morepages = False

The old way of making "morepages = False" is to catch HTTP exception. But accessing "tag/magazine-25.09/page/100" will not raise exception any more.

5. The url of story should begin with "/story" instead of "https://www.wired.com/". As a result, the basic url ""https://www.wired.com" should be added as prefix to the url of story.
---
 recipes/wired.recipe | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/recipes/wired.recipe b/recipes/wired.recipe
index 8d33b8e1fd..0d84fcd8ef 100644
--- a/recipes/wired.recipe
+++ b/recipes/wired.recipe
@@ -8,6 +8,10 @@ from calibre.web.feeds.news import BasicNewsRecipe
 from datetime import date
 import urllib2
 
+def classes(classes):
+    q = frozenset(classes.split(' '))
+    return dict(attrs={
+        'class': lambda x: x and frozenset(x.split()).intersection(q)})
 
 class WiredDailyNews(BasicNewsRecipe):
     title = 'Wired Magazine, Monthly Edition'
@@ -28,27 +32,25 @@ class WiredDailyNews(BasicNewsRecipe):
     ignore_duplicate_articles = {'url'}
     remove_empty_feeds = True
     publication_type = 'newsportal'
-    extra_css = """
+    extra_css             = """
                             .entry-header{
                                           text-transform: uppercase;
                                           vertical-align: baseline;
                                           display: inline;
                                          }
+                            ul li{display: inline}
                             """
 
     remove_tags = [
+        classes('related-cne-video-component tags-component podcast_storyboard inset-left-component'),
         dict(name=['meta', 'link']),
-        dict(name='div', attrs={'class': 'podcast_storyboard'}),
-        dict(name='figure', attrs={'data-js': 'slide'}),
-        dict(name='div', attrs={'class': 'no-underline fix-height'}),
-        dict(name='div',
-             attrs={'class': 'no-underline marg-t-med big-marg-b-med fix-height'}),
-        dict(id=['sharing', 'social', 'article-tags', 'sidebar', 'related']),
+        dict(id=['sharing', 'social', 'article-tags', 'sidebar']),
     ]
     keep_only_tags = [
-        dict(attrs={'data-js': ['post', 'postHeader']}),
-        dict(attrs={'class': 'exchange fsb-content relative'}),
+        dict(name='main', attrs={'class': lambda x: x and 'article-main-component__content' in x}),
     ]
+    remove_attributes = ['srcset']
+    handle_gzip = True
 
     def get_magazine_year_month(self, seperator):
         monthurl = str('{:02d}'.format(date.today().month))
@@ -61,7 +63,7 @@ class WiredDailyNews(BasicNewsRecipe):
         :return: url
         '''
         baseurl = 'https://www.wired.com/tag/magazine-'
-        magazine_year_month = self.get_magazine_year_month('-')
+        magazine_year_month = self.get_magazine_year_month('.')
         # monthurl = str('{:02d}'.format(date.today().month))
         # yearurl = str(date.today().year - 1992)
         dateurl = baseurl + magazine_year_month + '/page/'
@@ -69,9 +71,10 @@ class WiredDailyNews(BasicNewsRecipe):
 
     def parse_wired_index_page(self, currenturl, seen):
         soup = self.index_to_soup(currenturl)
-        for a in soup.find('main').findAll('a', href=True):
+	baseurl = 'https://www.wired.com'
+        for a in soup.find("ul", { "class" : 'archive-list-component__items' }).findAll('a', href=True):
             url = a['href']
-            if url.startswith('https://www.wired.com/') and url.endswith('/'):
+            if url.startswith('/story') and url.endswith('/'):
                 title = self.tag_to_string(a.parent.find('h2'))
                 dateloc = a.parent.find('time')
                 date = self.tag_to_string(dateloc)
@@ -81,7 +84,7 @@ class WiredDailyNews(BasicNewsRecipe):
                     yield {
                         'title': title,
                         'date': date,
-                        'url': url,
+                        'url': baseurl+url,
                         'description': ''
                     }
 
@@ -100,7 +103,10 @@ class WiredDailyNews(BasicNewsRecipe):
             try:
                 urllib2.urlopen(baseurl + str(pagenum))
                 currenturl = baseurl + str(pagenum)
-                articles.extend(self.parse_wired_index_page(currenturl, seen))
+		res=self.parse_wired_index_page(currenturl, seen)
+                articles.extend(res)
+		if len(list(res))==0:
+		      morepages = False
                 pagenum += 1
             except urllib2.HTTPError:
                 morepages = False