Merge branch 'master' of https://github.com/t3d/calibre

recipes/equipped.recipe

@@ -1,28 +0,0 @@
-#!/usr/bin/env  python2
-
-__license__ = 'GPL v3'
-__author__ = 'teepel <teepel44@gmail.com>, Artur Stachecki <artur.stachecki@gmail.com>'
-
-'''
-equipped.pl
-'''
-
-from calibre.web.feeds.news import BasicNewsRecipe
-
-
-class equipped(BasicNewsRecipe):
-    title = u'Equipped'
-    __author__ = 'teepel <teepel44@gmail.com>'
-    language = 'pl'
-    description = u'Wiadomości z equipped.pl'
-    INDEX = 'http://equipped.pl'
-    extra_css = '.alignleft {float:left; margin-right:5px;}'
-    oldest_article = 7
-    max_articles_per_feed = 100
-    remove_empty_feeds = True
-    simultaneous_downloads = 5
-    remove_javascript = True
-    no_stylesheets = True
-    use_embedded_content = False
-
-    feeds = [(u'Equipped', u'http://feeds.feedburner.com/Equippedpl?format=xml')]

recipes/gameplay_pl.recipe

@@ -8,21 +8,21 @@ class Gameplay_pl(BasicNewsRecipe):
     description = u'gameplay.pl - serwis o naszych zainteresowaniach, grach, filmach, książkach, muzyce, fotografii i konsolach.'
     category = 'games, movies, books, music'
     language = 'pl'
-    index = 'http://gameplay.pl'
+    index = 'https://gameplay.pl'
-    masthead_url = 'http://gameplay.pl/img/gpy_top_logo.png'
+    masthead_url = 'https://gameplay.pl/img/gpy_top_logo.png'
-    cover_url = 'http://gameplay.pl/img/gpy_top_logo.png'
+    cover_url = 'https://gameplay.pl/img/gpy_top_logo.png'
     max_articles_per_feed = 100
     remove_javascript = True
     no_stylesheets = True
     keep_only_tags = [dict(
-        name='div', attrs={'class': ['news_endpage_tit', 'news', 'news_container']})]
+        name='div', attrs={'class':'news-container'})]
-    remove_tags = [dict(name='div', attrs={'class': ['galeria', 'noedit center im', 'news_list', 'news_list_autor', 'stop_bot', 'tagi', 'news_tagi']}), dict(
+    remove_tags = [dict(name='div', attrs={'class': ['galeria', 'noedit center im', 'news_list', 'news_list_autor', 'stop_bot', 'tagi', 'news_tagi', 'social-16']}), dict(
         attrs={'usemap': '#map'}), dict(name='a', attrs={'class': ['pin-it-button', 'twitter-share-button']})]
-    feeds = [(u'Wiadomo\u015bci', u'http://gameplay.pl/rss/')]
+    feeds = [(u'Wiadomo\u015bci', u'https://gameplay.pl/rss/')]
 
     def image_url_processor(self, baseurl, url):
-        if 'http' not in url:
+        if 'https' not in url:
-            return 'http://gameplay.pl' + url[2:]
+            return 'https://gameplay.pl' + url[2:]
         else:
             return url