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

Fix a couple of remaining regressions from two card support

Browse Source
This commit is contained in:
Kovid Goyal 2009-06-06 12:58:14 -07:00
parent 65e78bf1f1
commit c33a1bda71
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,9 +48,9 @@ class CLI(object):
(self._card_b_prefix and path.startswith(self._card_b_prefix))): (self._card_b_prefix and path.startswith(self._card_b_prefix))):
path = self._main_prefix + path[1:] path = self._main_prefix + path[1:]
elif path.startswith('carda:'): elif path.startswith('carda:'):
path = path.replace('carda:', self._card_prefix[:-1]) path = path.replace('carda:', self._card_a_prefix[:-1])
elif path.startswith('cardb:'): elif path.startswith('cardb:'):
path = path.replace('cardb:', self._card_prefix[:-1]) path = path.replace('cardb:', self._card_b_prefix[:-1])
return path return path
def list(self, path, recurse=False, end_session=True, munge=True): def list(self, path, recurse=False, end_session=True, munge=True):

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

@ -174,7 +174,8 @@ class Device(DeviceConfig, DevicePlugin):
cbsz = stats.f_frsize * stats.f_bavail cbsz = stats.f_frsize * stats.f_bavail
else: else:
msz = self._windows_space(self._main_prefix)[1] msz = self._windows_space(self._main_prefix)[1]
csz = self._windows_space(self._card_prefix)[1] casz = self._windows_space(self._card_a_prefix)[1]
cbsz = self._windows_space(self._card_b_prefix)[1]
return (msz, casz, cbsz) return (msz, casz, cbsz)

1
src/calibre/utils/podofo/__init__.py
View File

@ -67,7 +67,6 @@ def get_metadata_quick(raw):
mi.book_producer = creator mi.book_producer = creator
return mi return mi
def get_metadata_(path, cpath=None): def get_metadata_(path, cpath=None):
p = podofo.PDFDoc() p = podofo.PDFDoc()
p.open(path) p.open(path)