From 8ff44715fb68c7045bbf655ae1e71e441e996500 Mon Sep 17 00:00:00 2001 From: John Schember Date: Mon, 15 Jun 2009 17:00:59 -0400 Subject: [PATCH] Enchance error detection for BeBook swap names on OS X. --- src/calibre/devices/bebook/driver.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/bebook/driver.py b/src/calibre/devices/bebook/driver.py index 324de00823..c732fb0d58 100644 --- a/src/calibre/devices/bebook/driver.py +++ b/src/calibre/devices/bebook/driver.py @@ -50,8 +50,14 @@ class BEBOOK(USBMS): main = names.get('main', None) card = names.get('carda', None) - main_num = int(re.findall('\d+', main)[0]) if main else None - card_num = int(re.findall('\d+', card)[0]) if card else None + try: + main_num = int(re.findall('\d+', main)[0]) if main else None + except: + main_num = None + try: + card_num = int(re.findall('\d+', card)[0]) if card else None + except: + card_num = None if card_num is not None and main_num is not None and card_num < main_num: names['main'] = card