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 loading of profiles from files and strings

Browse Source
This commit is contained in:
Kovid Goyal 2008-03-19 00:25:29 +00:00
parent fb805aa4ec
commit 6663154e16
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libprs500/web/feeds/main.py
View File

@ -21,6 +21,7 @@ import sys, os, logging
from libprs500.web.feeds.recipes import get_builtin_recipe, compile_recipe, titles from libprs500.web.feeds.recipes import get_builtin_recipe, compile_recipe, titles
from libprs500.web.fetch.simple import option_parser as _option_parser from libprs500.web.fetch.simple import option_parser as _option_parser
from libprs500.web.feeds.news import Profile2Recipe from libprs500.web.feeds.news import Profile2Recipe
from libprs500.ebooks.lrf.web.profiles import DefaultProfile
def option_parser(usage='''\ def option_parser(usage='''\
@ -106,6 +107,7 @@ def run_recipe(opts, recipe_arg, parser, notification=None, handler=None):
if os.access(recipe_arg, os.R_OK): if os.access(recipe_arg, os.R_OK):
try: try:
recipe = compile_recipe(open(recipe_arg).read()) recipe = compile_recipe(open(recipe_arg).read())
is_profile = DefaultProfile in recipe.__bases__
except: except:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
@ -116,6 +118,7 @@ def run_recipe(opts, recipe_arg, parser, notification=None, handler=None):
recipe, is_profile = get_builtin_recipe(recipe_arg) recipe, is_profile = get_builtin_recipe(recipe_arg)
if recipe is None: if recipe is None:
recipe = compile_recipe(recipe_arg) recipe = compile_recipe(recipe_arg)
is_profile = DefaultProfile in recipe.__bases__
if recipe is None: if recipe is None:
raise RecipeError(recipe_arg+ ' is an invalid recipe') raise RecipeError(recipe_arg+ ' is an invalid recipe')