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

IGN:Fix various regression caused by recent device driver refactoring

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-03 12:53:30 -06:00
parent d182cbbb79
commit cbb1407bd0
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/devices/prs505/driver.py
View File

@ -51,6 +51,7 @@ class PRS505(CLI, Device):
SUPPORTS_SUB_DIRS = True SUPPORTS_SUB_DIRS = True
MUST_READ_METADATA = True MUST_READ_METADATA = True
EBOOK_DIR_MAIN = 'database/media/books'
def open(self): def open(self):
Device.open(self) Device.open(self)
@ -113,7 +114,7 @@ class PRS505(CLI, Device):
path = self._sanity_check(on_card, files) path = self._sanity_check(on_card, files)
paths, ctimes = [], [] paths, ctimes, sizes = [], [], []
names = iter(names) names = iter(names)
metadata = iter(metadata) metadata = iter(metadata)
for i, infile in enumerate(files): for i, infile in enumerate(files):
@ -121,10 +122,9 @@ class PRS505(CLI, Device):
filepath = self.create_upload_path(path, mdata, fname) filepath = self.create_upload_path(path, mdata, fname)
paths.append(filepath) paths.append(filepath)
self.put_file(infile, paths[-1], replace_file=True) self.put_file(infile, paths[-1], replace_file=True)
ctimes.append(os.path.getctime(paths[-1])) ctimes.append(os.path.getctime(paths[-1]))
sizes.append(os.stat(paths[-1]).st_size)
self.report_progress((i+1) / float(len(files)), _('Transferring books to device...')) self.report_progress((i+1) / float(len(files)), _('Transferring books to device...'))

16
src/calibre/devices/usbms/device.py
View File

@ -22,7 +22,7 @@ from itertools import repeat
from math import ceil from math import ceil
from calibre.devices.interface import DevicePlugin from calibre.devices.interface import DevicePlugin
from calibre.devices.errors import DeviceError from calibre.devices.errors import DeviceError, FreeSpaceError
from calibre.devices.usbms.deviceconfig import DeviceConfig from calibre.devices.usbms.deviceconfig import DeviceConfig
from calibre import iswindows, islinux, isosx, __appname__ from calibre import iswindows, islinux, isosx, __appname__
from calibre.utils.filenames import ascii_filename as sanitize from calibre.utils.filenames import ascii_filename as sanitize
@ -57,6 +57,11 @@ class Device(DeviceConfig, DevicePlugin):
SUPPORTS_SUB_DIRS = False SUPPORTS_SUB_DIRS = False
MUST_READ_METADATA = False MUST_READ_METADATA = False
EBOOK_DIR_MAIN = ''
EBOOK_DIR_CARD_A = ''
EBOOK_DIR_CARD_B = ''
DELETE_EXTS = []
FDI_TEMPLATE = \ FDI_TEMPLATE = \
''' '''
<device> <device>
@ -634,11 +639,14 @@ class Device(DeviceConfig, DevicePlugin):
raise DeviceError(_('Selected slot: %s is not supported.') % on_card) raise DeviceError(_('Selected slot: %s is not supported.') % on_card)
if on_card == 'carda': if on_card == 'carda':
path = os.path.join(self._card_a_prefix, self.EBOOK_DIR_CARD_A) path = os.path.join(self._card_a_prefix,
*(self.EBOOK_DIR_CARD_A.split('/')))
elif on_card == 'cardb': elif on_card == 'cardb':
path = os.path.join(self._card_b_prefix, self.EBOOK_DIR_CARD_B) path = os.path.join(self._card_b_prefix,
*(self.EBOOK_DIR_CARD_B.split('/')))
else: else:
path = os.path.join(self._main_prefix, self.EBOOK_DIR_MAIN) path = os.path.join(self._main_prefix,
*(self.EBOOK_DIR_MAIN.split('/')))
def get_size(obj): def get_size(obj):
if hasattr(obj, 'seek'): if hasattr(obj, 'seek'):

4
src/calibre/devices/usbms/driver.py
View File

@ -31,10 +31,6 @@ class USBMS(CLI, Device):
supported_platforms = ['windows', 'osx', 'linux'] supported_platforms = ['windows', 'osx', 'linux']
FORMATS = [] FORMATS = []
EBOOK_DIR_MAIN = ''
EBOOK_DIR_CARD_A = ''
EBOOK_DIR_CARD_B = ''
DELETE_EXTS = []
CAN_SET_METADATA = False CAN_SET_METADATA = False
def reset(self, key='-1', log_packets=False, report_progress=None): def reset(self, key='-1', log_packets=False, report_progress=None):