From 1556b1497a0763effb4464f31ad37e989e139876 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 24 Jan 2009 08:46:23 -0500 Subject: [PATCH 1/2] Fix authors_to_string error with NoneType objects --- src/calibre/ebooks/metadata/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/__init__.py b/src/calibre/ebooks/metadata/__init__.py index 05b624f811..856133d1ce 100644 --- a/src/calibre/ebooks/metadata/__init__.py +++ b/src/calibre/ebooks/metadata/__init__.py @@ -21,7 +21,10 @@ def string_to_authors(raw): return authors def authors_to_string(authors): - return ' & '.join([a.replace('&', '&&') for a in authors]) + if authors is not None: + return ' & '.join([a.replace('&', '&&') for a in authors]) + else: + return '' def author_to_author_sort(author): tokens = author.split() From bd2640f5c4d43e18b9160f39937f018e447f4ffa Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 24 Jan 2009 08:58:38 -0500 Subject: [PATCH 2/2] Fix ebook dir on Cybook SD card --- src/calibre/devices/cybookg3/driver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py index f05b28b538..f573fb1b75 100644 --- a/src/calibre/devices/cybookg3/driver.py +++ b/src/calibre/devices/cybookg3/driver.py @@ -32,6 +32,7 @@ class CYBOOKG3(USBMS): STORAGE_CARD_VOLUME_LABEL = 'Cybook Gen 3 Storage Card' EBOOK_DIR_MAIN = "eBooks" + EBOOK_DIR_CARD = "eBooks" SUPPORTS_SUB_DIRS = True def upload_books(self, files, names, on_card=False, end_session=True,