diff --git a/resources/recipes/las_vegas_review.recipe b/resources/recipes/las_vegas_review.recipe new file mode 100644 index 0000000000..9292c105a4 --- /dev/null +++ b/resources/recipes/las_vegas_review.recipe @@ -0,0 +1,24 @@ +from calibre.web.feeds.news import BasicNewsRecipe + +class AdvancedUserRecipe1274742400(BasicNewsRecipe): + + title = u'Las Vegas Review Journal' + __author__ = 'Joel' + language = 'en' + + oldest_article = 7 + + max_articles_per_feed = 100 + + feeds = [ + (u'News', u'http://www.lvrj.com/news.rss'), + (u'Business', u'http://www.lvrj.com/business.rss'), + (u'Living', u'http://www.lvrj.com/living.rss'), + (u'Opinion', u'http://www.lvrj.com/opinion.rss'), + (u'Neon', u'http://www.lvrj.com/neon.rss'), + (u'Image', u'http://www.lvrj.com/image.rss'), + (u'Home & Garden', u'http://www.lvrj.com/home_and_garden.rss'), + (u'Furniture & Design', u'http://www.lvrj.com/furniture_and_design.rss'), + (u'Drive', u'http://www.lvrj.com/drive.rss'), + (u'Real Estate', u'http://www.lvrj.com/real_estate.rss'), + (u'Sports', u'http://www.lvrj.com/sports.rss')] diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 6bc94d30b0..697bba8152 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -445,7 +445,7 @@ from calibre.devices.nook.driver import NOOK from calibre.devices.prs500.driver import PRS500 from calibre.devices.prs505.driver import PRS505, PRS700 from calibre.devices.android.driver import ANDROID, S60 -from calibre.devices.nokia.driver import N770, N810 +from calibre.devices.nokia.driver import N770, N810, E71X from calibre.devices.eslick.driver import ESLICK from calibre.devices.nuut2.driver import NUUT2 from calibre.devices.iriver.driver import IRIVER_STORY @@ -454,7 +454,8 @@ from calibre.devices.hanvon.driver import N516, EB511, ALEX, AZBOOKA, THEBOOK from calibre.devices.edge.driver import EDGE from calibre.devices.teclast.driver import TECLAST_K3, NEWSMY, IPAPYRUS from calibre.devices.sne.driver import SNE -from calibre.devices.misc import PALMPRE, KOBO, AVANT +from calibre.devices.misc import PALMPRE, AVANT +from calibre.devices.kobo.driver import KOBO from calibre.ebooks.metadata.fetch import GoogleBooks, ISBNDB, Amazon from calibre.library.catalog import CSV_XML, EPUB_MOBI @@ -515,6 +516,7 @@ plugins += [ ANDROID, S60, N770, + E71X, N810, COOL_ER, ESLICK, diff --git a/src/calibre/devices/kobo/__init__.py b/src/calibre/devices/kobo/__init__.py new file mode 100644 index 0000000000..0080175bfa --- /dev/null +++ b/src/calibre/devices/kobo/__init__.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai + +__license__ = 'GPL v3' +__copyright__ = '2010, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + + + diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py new file mode 100644 index 0000000000..4b14b2bf8e --- /dev/null +++ b/src/calibre/devices/kobo/driver.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai + +__license__ = 'GPL v3' +__copyright__ = '2010, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +from calibre.devices.usbms.driver import USBMS + +class KOBO(USBMS): + + name = 'Kobo Reader Device Interface' + gui_name = 'Kobo Reader' + description = _('Communicate with the Kobo Reader') + author = 'Kovid Goyal' + + supported_platforms = ['windows', 'osx', 'linux'] + + # Ordered list of supported formats + FORMATS = ['epub', 'pdf'] + + VENDOR_ID = [0x2237] + PRODUCT_ID = [0x4161] + BCD = [0x0110] + + VENDOR_NAME = 'KOBO_INC' + WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = '.KOBOEREADER' + + EBOOK_DIR_MAIN = '' + SUPPORTS_SUB_DIRS = True + diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py index c7e0356f32..4310c51421 100644 --- a/src/calibre/devices/misc.py +++ b/src/calibre/devices/misc.py @@ -28,27 +28,6 @@ class PALMPRE(USBMS): EBOOK_DIR_MAIN = 'E-books' -class KOBO(USBMS): - - name = 'Kobo Reader Device Interface' - gui_name = 'Kobo Reader' - description = _('Communicate with the Kobo Reader') - author = 'Kovid Goyal' - - supported_platforms = ['windows', 'osx', 'linux'] - - # Ordered list of supported formats - FORMATS = ['epub', 'pdf'] - - VENDOR_ID = [0x2237] - PRODUCT_ID = [0x4161] - BCD = [0x0110] - - VENDOR_NAME = 'KOBO_INC' - WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = '.KOBOEREADER' - - EBOOK_DIR_MAIN = '' - SUPPORTS_SUB_DIRS = True class AVANT(USBMS): name = 'Booq Avant Device Interface' diff --git a/src/calibre/devices/nokia/driver.py b/src/calibre/devices/nokia/driver.py index 59c181a4da..66a4243f2b 100644 --- a/src/calibre/devices/nokia/driver.py +++ b/src/calibre/devices/nokia/driver.py @@ -45,3 +45,25 @@ class N810(N770): WINDOWS_MAIN_MEM = 'N810' MAIN_MEMORY_VOLUME_LABEL = 'N810 Main Memory' + +class E71X(USBMS): + + name = 'Nokia E71X device interface' + gui_name = 'Nokia E71X' + description = 'Communicate with the Nokia E71X' + author = 'Kovid Goyal' + supported_platforms = ['windows', 'linux', 'osx'] + + VENDOR_ID = [0x421] + PRODUCT_ID = [0x1a0] + BCD = [0x100] + + + FORMATS = ['mobi', 'prc'] + + EBOOK_DIR_MAIN = 'eBooks' + SUPPORTS_SUB_DIRS = True + + VENDOR_NAME = 'NOKIA' + WINDOWS_MAIN_MEM = 'S60' +