From 08e44361bb276f02e951bf318acabdde93f5eede Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 11 May 2010 09:32:56 -0600 Subject: [PATCH] Fix #5519 (CC Beta: opening a library on non-existent network path hangs) and add EPUB formatting demo to User Manual --- src/calibre/gui2/main.py | 2 +- src/calibre/manual/conversion.rst | 14 ++++++++++++++ src/calibre/web/feeds/news.py | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index c261c38dcf..c47c821913 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -73,7 +73,7 @@ def get_library_path(): except: error_dialog(None, _('Failed to create library'), _('Failed to create calibre library at: %r. Aborting.')%library_path, - det_msg = traceback.print_exc(), show=True) + det_msg=traceback.format_exc(), show=True) library_path = None return library_path diff --git a/src/calibre/manual/conversion.rst b/src/calibre/manual/conversion.rst index 6180f2a3ed..acaf5ab238 100644 --- a/src/calibre/manual/conversion.rst +++ b/src/calibre/manual/conversion.rst @@ -533,3 +533,17 @@ The .cbc file will then contain:: |app| will automatically convert this .cbc file into a e-book with a Table of Contents pointing to each entry in comics.txt. + +EPUB advanced formatting demo +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Various advanced formatting for EPUB files is demonstrated in this `demo file `_. +The file was created from hand coded HTML using calibre and is meant to be used as a template for your own EPUB creation efforts. + +The source HTML it was created from is available `here `_. The settings used to create the +EPUB from the ZIP file are:: + + ebook-convert demo.zip .epub -vv --authors "Kovid Goyal" --language en --level1-toc '//*[@class="title"]' --disable-font-rescaling --page-breaks-before / --no-default-epub-cover + +Note that because this file explores the potential of EPUB, most of the advanced formatting is not going to work on readers less capable than |app|'s builtin EPUB viewer. + diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py index 4bf7950d7f..46e8cd005d 100644 --- a/src/calibre/web/feeds/news.py +++ b/src/calibre/web/feeds/news.py @@ -1266,7 +1266,7 @@ class BasicNewsRecipe(Recipe): feed = Feed() msg = 'Failed feed: %s'%(title if title else url) feed.populate_from_preparsed_feed(msg, []) - feed.description = unicode(err) + feed.description = repr(err) parsed_feeds.append(feed) self.log.exception(msg)