From fe064ee18d116676f4c0444fd0398ea66d980b8e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Feb 2011 18:09:47 -0700 Subject: [PATCH 1/2] Fix #9126 (Xperia X10 (android 2.1) phone not detected) --- src/calibre/devices/android/driver.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index 99679283a7..95633cbe58 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -74,6 +74,9 @@ class ANDROID(USBMS): # T-Mobile 0x0408 : { 0x03ba : [0x0109], }, + # Xperia + 0x13d3 : { 0x3304 : [0x0001, 0x0002] }, + } EBOOK_DIR_MAIN = ['eBooks/import', 'wordplayer/calibretransfer', 'Books'] EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of directories to ' @@ -83,7 +86,7 @@ class ANDROID(USBMS): VENDOR_NAME = ['HTC', 'MOTOROLA', 'GOOGLE_', 'ANDROID', 'ACER', 'GT-I5700', 'SAMSUNG', 'DELL', 'LINUX', 'GOOGLE', 'ARCHOS', - 'TELECHIP', 'HUAWEI', 'T-MOBILE', ] + 'TELECHIP', 'HUAWEI', 'T-MOBILE', 'SEMC'] WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE', '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897', 'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', From f42f736cc1d8d715450fb99e19280d465ed17533 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Feb 2011 20:17:51 -0700 Subject: [PATCH 2/2] Both nytimes recipes now need subscriptions --- resources/recipes/nytimes.recipe | 4 ++-- resources/recipes/nytimes_sub.recipe | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/recipes/nytimes.recipe b/resources/recipes/nytimes.recipe index 7e313e5727..b2043bb463 100644 --- a/resources/recipes/nytimes.recipe +++ b/resources/recipes/nytimes.recipe @@ -88,8 +88,8 @@ class NYTimes(BasicNewsRecipe): if headlinesOnly: title='New York Times Headlines' - description = 'Headlines from the New York Times' - needs_subscription = False + description = 'Headlines from the New York Times. Needs a subscription from http://www.nytimes.com' + needs_subscription = True elif webEdition: title='New York Times (Web)' description = 'New York Times on the Web' diff --git a/resources/recipes/nytimes_sub.recipe b/resources/recipes/nytimes_sub.recipe index 4077065d91..d24307c887 100644 --- a/resources/recipes/nytimes_sub.recipe +++ b/resources/recipes/nytimes_sub.recipe @@ -96,18 +96,18 @@ class NYTimes(BasicNewsRecipe): if headlinesOnly: title='New York Times Headlines' description = 'Headlines from the New York Times' - needs_subscription = False + needs_subscription = True elif webEdition: title='New York Times (Web)' description = 'New York Times on the Web' needs_subscription = True elif replaceKindleVersion: - title='The New York Times' + title='The New York Times' description = 'Today\'s New York Times' needs_subscription = True else: title='New York Times' - description = 'Today\'s New York Times' + description = 'Today\'s New York Times. Needs subscription from http://www.nytimes.com' needs_subscription = True @@ -676,7 +676,7 @@ class NYTimes(BasicNewsRecipe): if hlines: for hline in hlines: hline.extract() - + #find all section headers hlines = runAround.findAll('h6') if hlines: