From e52b223b0f3ceee0a5b1fd95b1f81a4020eabad3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 7 Jun 2009 09:47:19 -0700 Subject: [PATCH 1/2] Cards A and B are now correctly indentified on linux by the usbms driver --- src/calibre/devices/usbms/device.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index 4e09dae4da..d3e5bada96 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -365,8 +365,8 @@ class Device(DeviceConfig, DevicePlugin): ok[node] = False except: ok[node] = False - if ok[node]: - devnodes.append(node) + devnodes.append(node) + devnodes += list(repeat(None, 3)) ans = tuple(['/dev/'+x if ok.get(x, False) else None for x in devnodes[:3]]) return self.linux_swap_drives(ans) @@ -423,7 +423,7 @@ class Device(DeviceConfig, DevicePlugin): label = self.STORAGE_CARD_VOLUME_LABEL + ' 2' extra = 0 while True: - q = '_(%d)'%extra if extra else '' + q = ' (%d)'%extra if extra else '' if not os.path.exists('/media/'+label+q): break extra += 1 @@ -457,16 +457,16 @@ class Device(DeviceConfig, DevicePlugin): _('Unable to mount main memory (Error code: %d)')%ret) if not mp.endswith('/'): mp += '/' self._main_prefix = mp - cards = [x for x in (carda, cardb) if x is not None] - prefix, typ = '_card_a_prefix', 'carda' - for card in cards: + cards = [(carda, '_card_a_prefix', 'carda'), + (cardb, '_card_b_prefix', 'cardb')] + for card, prefix, typ in cards: + if card is None: continue mp, ret = mount(card, typ) if mp is None: print >>sys.stderr, 'Unable to mount card (Error code: %d)'%ret else: if not mp.endswith('/'): mp += '/' setattr(self, prefix, mp) - prefix, typ = '_card_b_prefix', 'cardb' def open(self): time.sleep(5) From 9bfacddc960d689d22ff467744946d9e0a89840d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 7 Jun 2009 09:50:13 -0700 Subject: [PATCH 2/2] oops --- src/calibre/gui2/widgets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py index e999c1b6df..80a5b275f1 100644 --- a/src/calibre/gui2/widgets.py +++ b/src/calibre/gui2/widgets.py @@ -181,8 +181,8 @@ class LocationModel(QAbstractListModel): return 1 + len([i for i in self.free if i >= 0]) def get_device_row(self, row): - if row == 1 and self.free[1] == -1 and self.free[2] > -1: - row = 2 + if row == 2 and self.free[1] == -1 and self.free[2] > -1: + row = 3 return row def data(self, index, role):