From 2ab64729d8273efb6ff02749b258421ff111a3ea Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 16 Jan 2015 08:57:09 +0530 Subject: [PATCH] Fix a regression that broke adding of books from sub-folders if the folder contained only an opf file. Fixes #1411240 [Add books from subdirectories (One book per directory) problem](https://bugs.launchpad.net/calibre/+bug/1411240) --- src/calibre/db/adding.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/calibre/db/adding.py b/src/calibre/db/adding.py index d3931248a1..9a5f01d8af 100644 --- a/src/calibre/db/adding.py +++ b/src/calibre/db/adding.py @@ -17,9 +17,7 @@ def splitext(path): return key, ext[1:].lower() def formats_ok(formats): - if formats and (len(formats) > 1 or tuple(formats.iterkeys()) != ('opf',)): - return True - return False + return len(formats) > 0 def path_ok(path): return not os.path.isdir(path) and os.access(path, os.R_OK)