diff --git a/recipes/icons/replicavedetelor.png b/recipes/icons/replicavedetelor.png new file mode 100644 index 0000000000..57ba42c64c Binary files /dev/null and b/recipes/icons/replicavedetelor.png differ diff --git a/recipes/replicavedetelor.recipe b/recipes/replicavedetelor.recipe new file mode 100644 index 0000000000..b6f1a51d67 --- /dev/null +++ b/recipes/replicavedetelor.recipe @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = u'2011, ' +''' +replicavedetelor.ro +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class ReplicaVedetelor(BasicNewsRecipe): + title = u'Replica Vedetelor' + __author__ = u'Silviu Cotoara' + description = u'Ofer\u0103 vedetelor dreptul la replic\u0103' + publisher = 'Replica Vedetelor' + oldest_article = 5 + language = 'ro' + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = False + category = 'Ziare,Reviste,Vedete' + encoding = 'utf-8' + cover_url = 'http://www.webart-software.eu/_pics/lucrari_referinta/medium/84/1-Replica-Vedetelor.jpg' + + conversion_options = { + 'comments' : description + ,'tags' : category + ,'language' : language + ,'publisher' : publisher + } + + keep_only_tags = [ + dict(name='div', attrs={'id':'zona-continut'}) + ] + + remove_tags = [ + dict(name='ul', attrs={'id':['lista-imagini']}) + , dict(name='form', attrs={'id':['f-trimite-unui-prieten']}) + + ] + + remove_tags_after = [ + dict(name='form', attrs={'id':['f-trimite-unui-prieten']}) + ] + + feeds = [ + (u'Feeds', u'http://www.replicavedetelor.ro/feed') + ] + + def preprocess_html(self, soup): + return self.adeify_images(soup) + diff --git a/recipes/welt_der_physik.recipe b/recipes/welt_der_physik.recipe new file mode 100644 index 0000000000..b3ce9cce1b --- /dev/null +++ b/recipes/welt_der_physik.recipe @@ -0,0 +1,20 @@ +from calibre.web.feeds.news import BasicNewsRecipe + +class AdvancedUserRecipe1303841067(BasicNewsRecipe): + + title = u'Welt der Physik' + __author__ = 'schuster' + remove_tags_befor = [dict(name='div', attrs={'class':'inhalt_bild_text_printonly'})] + remove_tags_after = [dict(name='span', attrs={'class':'clearinhalt_bild'})] + remove_tags = [dict(attrs={'class':['invisible', 'searchfld', 'searchbtn', 'topnavi', 'topsearch']}), + dict(id=['naservice', 'phservicemenu', '',]), + dict(name=['naservice'])] + oldest_article = 7 + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = False + language = 'de' + remove_javascript = True + + + feeds = [(u'Nachrichten und Neuigkeiten', u'http://www.weltderphysik.de/rss/alles.xml')] diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index 3a0254ef20..f5c9a74733 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -38,7 +38,7 @@ class KOBO(USBMS): VENDOR_ID = [0x2237] PRODUCT_ID = [0x4161] - BCD = [0x0110] + BCD = [0x0110, 0x0323] VENDOR_NAME = ['KOBO_INC', 'KOBO'] WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['.KOBOEREADER', 'EREADER']