From 407ee3ca17ba9b7c87709ec0f03be2e5c2659e51 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 28 Mar 2015 08:38:39 +0530 Subject: [PATCH] Fix a regression that caused importing of a single book from a directory to fail if the directory has no ebook files in it --- src/calibre/db/adding.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/db/adding.py b/src/calibre/db/adding.py index 2627e30761..a941545ad9 100644 --- a/src/calibre/db/adding.py +++ b/src/calibre/db/adding.py @@ -81,8 +81,9 @@ def import_book_directory_multiple(db, dirpath, callback=None, def import_book_directory(db, dirpath, callback=None, added_ids=None): from calibre.ebooks.metadata.meta import metadata_from_formats dirpath = os.path.abspath(dirpath) - formats = find_books_in_directory(dirpath, True) - formats = list(formats)[0] + formats = None + for formats in find_books_in_directory(dirpath, True): + break if not formats: return mi = metadata_from_formats(formats)