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

Fix #1127666 (Recipes with slash in name can't be called with ebook-convert)

Browse Source
This commit is contained in:
Kovid Goyal 2013-02-17 09:15:49 +05:30
parent d181153952
commit 82ecd7bdfa
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/conversion/cli.py
View File

@ -67,6 +67,8 @@ def check_command_line_options(parser, args, log):
('-h' in args or '--help' in args): ('-h' in args or '--help' in args):
log.error('Cannot read from', input) log.error('Cannot read from', input)
raise SystemExit(1) raise SystemExit(1)
if input.endswith('.recipe') and not os.access(input, os.R_OK):
input = args[1]
output = args[2] output = args[2]
if (output.startswith('.') and output[:2] not in {'..', '.'} and '/' not in if (output.startswith('.') and output[:2] not in {'..', '.'} and '/' not in

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

@ -68,10 +68,15 @@ class RecipeInput(InputFormatPlugin):
recipe = compile_recipe(self.recipe_source) recipe = compile_recipe(self.recipe_source)
log('Using custom recipe') 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, get_builtin_recipe_titles)
title = getattr(opts, 'original_recipe_input_arg', recipe_or_file) title = getattr(opts, 'original_recipe_input_arg', recipe_or_file)
title = os.path.basename(title).rpartition('.')[0] title = os.path.basename(title).rpartition('.')[0]
titles = frozenset(get_builtin_recipe_titles())
if title not in titles:
title = getattr(opts, 'original_recipe_input_arg', recipe_or_file)
title = title.rpartition('.')[0]
raw = get_builtin_recipe_by_title(title, log=log, raw = get_builtin_recipe_by_title(title, log=log,
download_recipe=not opts.dont_download_recipe) download_recipe=not opts.dont_download_recipe)
builtin = False builtin = False