diff --git a/resources/recipes/starbulletin.recipe b/resources/recipes/starbulletin.recipe index 663ffbfc8c..fd9e25c2cd 100644 --- a/resources/recipes/starbulletin.recipe +++ b/resources/recipes/starbulletin.recipe @@ -29,18 +29,18 @@ class Starbulletin(BasicNewsRecipe): , '--category' , category , '--publisher' , publisher ] - + html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' - + keep_only_tags = [ dict(name='div', attrs={'id':'storyColoumn'}) ] remove_tags = [ dict(name=['object','link']) ,dict(name='span', attrs={'id':'printdesc'}) ,dict(name='div' , attrs={'class':'lightGreyBox storyTools clearAll'}) - ,dict(name='div' , attrs={'id':'breadcrumbs'}) + ,dict(name='div' , attrs={'id':'breadcrumbs'}) ] - + feeds = [ (u'Headlines', u'http://www.starbulletin.com/starbulletin_headlines.rss' ) ,(u'News', u'http://www.starbulletin.com/news/index.rss' ) @@ -57,4 +57,4 @@ class Starbulletin(BasicNewsRecipe): mtag = '\n\n' soup.head.insert(0,mtag) return soup - + diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index ed942b5a9a..9e53a433ad 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -404,7 +404,7 @@ from calibre.devices.bebook.driver import BEBOOK, BEBOOK_MINI from calibre.devices.blackberry.driver import BLACKBERRY from calibre.devices.cybookg3.driver import CYBOOKG3, CYBOOK_OPUS from calibre.devices.eb600.driver import EB600, COOL_ER, SHINEBOOK, \ - POCKETBOOK360, GER2, ITALICA + POCKETBOOK360, GER2, ITALICA, ECLICTO from calibre.devices.iliad.driver import ILIAD from calibre.devices.irexdr.driver import IREXDR1000 from calibre.devices.jetbook.driver import JETBOOK @@ -480,6 +480,7 @@ plugins += [ GER2, ITALICA, SHINEBOOK, + ECLICTO, EB600, ] plugins += [x for x in list(locals().values()) if isinstance(x, type) and \ diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py index 76789fa675..f7ea9e0c24 100644 --- a/src/calibre/devices/eb600/driver.py +++ b/src/calibre/devices/eb600/driver.py @@ -129,3 +129,19 @@ class ITALICA(EB600): MAIN_MEMORY_VOLUME_LABEL = 'Italica Main Memory' STORAGE_CARD_VOLUME_LABEL = 'Italica Storage Card' + +class ECLICTO(EB600): + + name = 'eClicto device interface' + gui_name = 'eClicto' + + FORMATS = ['epub', 'pdf', 'txt'] + + VENDOR_NAME = 'ECLICTO' + WINDOWS_MAIN_MEM = 'EBOOK' + WINDOWS_CARD_A_MEM = 'EBOOK' + + EBOOK_DIR_MAIN = 'Text' + EBOOK_DIR_CARD_A = '' + +