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

recipes/android_com_pl.recipe

@@ -8,10 +8,12 @@ class Android_com_pl(BasicNewsRecipe):
     description = u'Android.com.pl - to największe w Polsce centrum Android OS. Znajdziesz tu: nowości, forum, pomoc, recenzje, gry, aplikacje.'
     category = 'Android, mobile'
     language = 'pl'
-    use_embedded_content = True
     cover_url = 'http://android.com.pl/wp-content/themes/android/images/logo.png'
     oldest_article = 8
     max_articles_per_feed = 100
+    keep_only_tags = [dict(name='div', attrs={'class': ['title', 'post-content']})]
+    remove_tags_after = [{'class': 'post-content'}]
+    remove_tags = [dict(name='ul', attrs={'class': 'tags small-tags'}), dict(name='a', attrs={'onclick': 'return ss_plugin_loadpopup_js(this);'})]
     preprocess_regexps = [
         (re.compile(ur'<p>.{,1}</p>', re.DOTALL), lambda match: '')]
     feeds = [(u'Android', u'http://android.com.pl/feed/')]

recipes/drytooling_pl.recipe

@@ -15,13 +15,4 @@ class BasicUserRecipe1337668045(BasicNewsRecipe):
     auto_cleanup = True
 
     feeds = [
-    (u'Newsy', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=4&format=raw'),
-    (u'Artyku\u0142y', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=3&format=raw'),
-    (u'Imprezy i zawody', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=5&format=raw'),
-    (u'Baza G\xf3rska', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=6&format=raw'),
-    (u'Wyprawy', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=7&format=raw'),
-
-    (u'Newsy / alpinizm', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=12&format=raw'),
-    (u'Newsy / klasyka zimowa', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=11&format=raw'),
-    (u'Newsy / himalaizm', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=10&format=raw'),
-    (u'Outdoor', u'http://drytooling.com.pl/index.php?option=com_ninjarsssyndicator&feed_id=8&format=raw')]
+    (u'Newsy', u'http://drytooling.com.pl/rss?format=feed&type=rss')]