diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 913c54bffe..6950c66526 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -2,7 +2,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = 'calibre' -__version__ = '0.5.0' +__version__ = '0.5.1' __author__ = "Kovid Goyal " ''' Various run time constants. diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py index ceae3094c4..08a18fbe60 100644 --- a/src/calibre/library/cli.py +++ b/src/calibre/library/cli.py @@ -244,7 +244,10 @@ def do_add(db, paths, one_book_per_directory, recurse, add_duplicates): if os.path.isdir(path): dirs.append(path) else: - files.append(path) + if os.path.exists(path): + files.append(path) + else: + print path, 'not found' formats, metadata = [], [] for book in files: @@ -261,12 +264,14 @@ def do_add(db, paths, one_book_per_directory, recurse, add_duplicates): formats.append(format) metadata.append(mi) - - file_duplicates = db.add_books(files, formats, metadata, add_duplicates=add_duplicates) - if not file_duplicates[0]: - file_duplicates = [] - else: - file_duplicates = file_duplicates[0] + + file_duplicates = [] + if files: + file_duplicates = db.add_books(files, formats, metadata, + add_duplicates=add_duplicates) + if file_duplicates: + file_duplicates = file_duplicates[0] + dir_dups = [] for dir in dirs: @@ -286,7 +291,9 @@ def do_add(db, paths, one_book_per_directory, recurse, add_duplicates): db.import_book(mi, formats) else: if dir_dups or file_duplicates: - print >>sys.stderr, _('The following books were not added as they already exist in the database (see --duplicates option):') + print >>sys.stderr, _('The following books were not added as ' + 'they already exist in the database ' + '(see --duplicates option):') for mi, formats in dir_dups: title = mi.title if isinstance(title, unicode): diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst index c069842e53..4e5eefe4c4 100644 --- a/src/calibre/manual/faq.rst +++ b/src/calibre/manual/faq.rst @@ -131,6 +131,8 @@ First install the Stanza reader on your iPhone from http://www.lexcycle.com . Th with the IP address of your computer. Stanza will the use the |app| content server to access all the EPUB books in your |app| database. +A more detailed guide is available `here `_ + Library Management ------------------ diff --git a/src/calibre/web/feeds/recipes/recipe_time_magazine.py b/src/calibre/web/feeds/recipes/recipe_time_magazine.py index bceac5fd69..6d34caead4 100644 --- a/src/calibre/web/feeds/recipes/recipe_time_magazine.py +++ b/src/calibre/web/feeds/recipes/recipe_time_magazine.py @@ -14,6 +14,7 @@ class Time(BasicNewsRecipe): description = 'Weekly magazine' oldest_article = 7 max_articles_per_feed = 100 + encoding = 'utf-8' no_stylesheets = True language = _('English') use_embedded_content = False