Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-12-06 22:56:10 +05:30
commit cac9d648fa
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/devices/ipad.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 62 KiB

24
src/calibre/devices/apple/driver.py
View File

@ -214,9 +214,9 @@ class ITUNES(DriverBase):
"Cannot copy books directly from iDevice. "
"Drag from iTunes Library to desktop, then add to calibre's Library window.")
UNSUPPORTED_DIRECT_CONNECT_MODE_MESSAGE = _(
"Unsupported direct connect mode. "
"*** Unsupported direct connect mode. "
"See http://www.mobileread.com/forums/showthread.php?t=118559 "
"for instructions on using 'Connect to iTunes'")
"for instructions on using 'Connect to iTunes' ***")
ITUNES_SANDBOX_LOCKOUT_MESSAGE = _(
'<p>Unable to communicate with iTunes.</p>'
'<p>Refer to this '
@ -818,7 +818,7 @@ class ITUNES(DriverBase):
if DEBUG:
logger().info("%s.get_device_information()" % self.__class__.__name__)
return (self.sources['iPod'], 'hw v1.0', 'sw v1.0', 'mime type normally goes here')
return (self.sources['iPod'], 'hw v1.0', 'sw v1.0', 'unknown mime type')
def get_file(self, path, outfile, end_session=True):
'''
@ -871,13 +871,14 @@ class ITUNES(DriverBase):
product_id
))
if False:
# Display a dialog recommending using 'Connect to iTunes' if user hasn't
# previously disabled the dialog
if dynamic.get(confirm_config_name(self.DISPLAY_DISABLE_DIALOG), True):
raise AppleOpenFeedback(self)
else:
if DEBUG:
logger().error(" %s" % self.UNSUPPORTED_DIRECT_CONNECT_MODE_MESSAGE)
logger().info(" %s" % self.UNSUPPORTED_DIRECT_CONNECT_MODE_MESSAGE)
# Log supported DEVICE_IDs and BCDs
logger().info(" BCD: %s" % ['0x%x' % x for x in sorted(self.BCD)])
@ -1027,6 +1028,10 @@ class ITUNES(DriverBase):
self.plugboards = plugboards
self.plugboard_func = pb_func
def shutdown(self):
if DEBUG:
logger().info("%s.shutdown()\n" % self.__class__.__name__)
def sync_booklists(self, booklists, end_session=True):
'''
Update metadata on device.
@ -2336,6 +2341,7 @@ class ITUNES(DriverBase):
except:
if DEBUG:
logger().info(" no books in library")
self.library_orphans = library_orphans
return library_books
@ -2547,7 +2553,6 @@ class ITUNES(DriverBase):
'''
PURGE_ORPHANS = False
if PURGE_ORPHANS:
if DEBUG:
logger().info(" %s._purge_orphans()" % self.__class__.__name__)
#self._dump_library_books(library_books)
@ -2557,6 +2562,7 @@ class ITUNES(DriverBase):
if isosx:
if book not in cached_books and \
str(library_books[book].description()).startswith(self.description_prefix):
if PURGE_ORPHANS:
if DEBUG:
logger().info(" '%s' not found on iDevice, removing from iTunes" % book)
btr = {
@ -2564,9 +2570,14 @@ class ITUNES(DriverBase):
'author': library_books[book].artist(),
'lib_book': library_books[book]}
self._remove_from_iTunes(btr)
else:
if DEBUG:
logger().info(" '%s' found in iTunes, but not on iDevice" % (book))
elif iswindows:
if book not in cached_books and \
library_books[book].Description.startswith(self.description_prefix):
if PURGE_ORPHANS:
if DEBUG:
logger().info(" '%s' not found on iDevice, removing from iTunes" % book)
btr = {
@ -2576,7 +2587,7 @@ class ITUNES(DriverBase):
self._remove_from_iTunes(btr)
else:
if DEBUG:
logger().info(" %s._purge_orphans(disabled)" % self.__class__.__name__)
logger().info(" '%s' found in iTunes, but not on iDevice" % (book))
def _remove_existing_copy(self, path, metadata):
'''
@ -3111,7 +3122,6 @@ class ITUNES(DriverBase):
'''
if DEBUG:
logger().info(" %s._wait_for_writable_metadata()" % self.__class__.__name__)
logger().warning(" %s" % self.UNSUPPORTED_DIRECT_CONNECT_MODE_MESSAGE)
attempts = 9
while attempts: