Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-11 09:13:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-09-10 21:31:05 +05:30
parent a6be50425a
commit 9b988d5037
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/conversion/plugins/recipe_input.py
View File

@ -66,6 +66,7 @@ class RecipeInput(InputFormatPlugin):
if os.access(recipe_or_file, os.R_OK): if os.access(recipe_or_file, os.R_OK):
self.recipe_source = open(recipe_or_file, 'rb').read() self.recipe_source = open(recipe_or_file, 'rb').read()
recipe = compile_recipe(self.recipe_source) recipe = compile_recipe(self.recipe_source)
log('Using custom recipe')
else: else:
from calibre.web.feeds.recipes.collection import \ from calibre.web.feeds.recipes.collection import \
get_builtin_recipe_by_title get_builtin_recipe_by_title
@ -87,12 +88,15 @@ class RecipeInput(InputFormatPlugin):
'back to builtin one') 'back to builtin one')
builtin = True builtin = True
if builtin: if builtin:
log('Using bundled builtin recipe')
raw = get_builtin_recipe_by_title(title, log=log, raw = get_builtin_recipe_by_title(title, log=log,
download_recipe=False) download_recipe=False)
if raw is None: if raw is None:
raise ValueError('Failed to find builtin recipe: '+title) raise ValueError('Failed to find builtin recipe: '+title)
recipe = compile_recipe(raw) recipe = compile_recipe(raw)
self.recipe_source = raw self.recipe_source = raw
else:
log('Using downloaded builtin recipe')
if recipe is None: if recipe is None:
raise ValueError('%r is not a valid recipe file or builtin recipe' % raise ValueError('%r is not a valid recipe file or builtin recipe' %