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

Add the possibility for the client to change the lpath

Browse Source
This commit is contained in:
Charles Haley 2015-06-22 14:03:02 +02:00
parent ed81958a44
commit 81afab0669
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/devices/smart_device_app/driver.py
View File

@ -669,9 +669,14 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
'totalBooks': total_books, 'totalBooks': total_books,
'willStreamBooks': True, 'willStreamBooks': True,
'willStreamBinary' : True, 'willStreamBinary' : True,
'wantsSendOkToSendbook' : self.can_send_ok_to_sendbook}, 'wantsSendOkToSendbook' : self.can_send_ok_to_sendbook,
'canSupportLpathChanges': True},
print_debug_info=False, print_debug_info=False,
wait_for_response=self.can_send_ok_to_sendbook) wait_for_response=self.can_send_ok_to_sendbook)
if self.can_send_ok_to_sendbook:
lpath = result.get('lpath', lpath)
book_metadata.lpath = lpath
self._set_known_metadata(book_metadata) self._set_known_metadata(book_metadata)
pos = 0 pos = 0
failed = False failed = False
@ -686,7 +691,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
self.time = None self.time = None
if close_: if close_:
infile.close() infile.close()
return -1 if failed else length return (-1, None) if failed else (length, lpath)
def _get_smartdevice_option_number(self, opt_string): def _get_smartdevice_option_number(self, opt_string):
if opt_string == 'password': if opt_string == 'password':
@ -1015,7 +1020,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
'timestampFormat': tweaks['gui_timestamp_display_format'], 'timestampFormat': tweaks['gui_timestamp_display_format'],
'lastModifiedFormat': tweaks['gui_last_modified_display_format'], 'lastModifiedFormat': tweaks['gui_last_modified_display_format'],
'calibre_version': numeric_version, 'calibre_version': numeric_version,
'canSupportUpdateBooks': True}) 'canSupportUpdateBooks': True,
'canSupportLpathChanges': True})
if opcode != 'OK': if opcode != 'OK':
# Something wrong with the return. Close the socket # Something wrong with the return. Close the socket
# and continue. # and continue.
@ -1443,7 +1449,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
if not hasattr(infile, 'read'): if not hasattr(infile, 'read'):
infile = USBMS.normalize_path(infile) infile = USBMS.normalize_path(infile)
book = SDBook(self.PREFIX, lpath, other=mdata) book = SDBook(self.PREFIX, lpath, other=mdata)
length = self._put_file(infile, lpath, book, i, len(files)) length, lpath = self._put_file(infile, lpath, book, i, len(files))
if length < 0: if length < 0:
raise ControlError(desc='Sending book %s to device failed' % lpath) raise ControlError(desc='Sending book %s to device failed' % lpath)
paths.append((lpath, length)) paths.append((lpath, length))