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

Do not allow users to override the builtin recipe files

Browse Source
This commit is contained in:
Kovid Goyal 2011-06-24 22:47:59 -06:00
parent 5bb81ed5a5
commit 2dd8ff2c44
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/web/feeds/recipes/collection.py
View File

@ -85,7 +85,7 @@ def serialize_builtin_recipes():
return serialize_collection(recipe_mapping)
def get_builtin_recipe_collection():
return etree.parse(P('builtin_recipes.xml')).getroot()
return etree.parse(P('builtin_recipes.xml', allow_user_override=False)).getroot()
def get_custom_recipe_collection(*args):
from calibre.web.feeds.recipes import compile_recipe, \
@ -179,7 +179,7 @@ def download_builtin_recipe(urn):
return br.open_novisit('http://status.calibre-ebook.com/recipe/'+urn).read()
def get_builtin_recipe(urn):
with zipfile.ZipFile(P('builtin_recipes.zip'), 'r') as zf:
with zipfile.ZipFile(P('builtin_recipes.zip', allow_user_override=False), 'r') as zf:
return zf.read(urn+'.recipe')
def get_builtin_recipe_by_title(title, log=None, download_recipe=False):

5
src/calibre/web/feeds/recipes/model.py
View File

@ -140,7 +140,8 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser):
self.builtin_recipe_collection = get_builtin_recipe_collection()
self.scheduler_config = SchedulerConfig()
try:
with zipfile.ZipFile(P('builtin_recipes.zip'), 'r') as zf:
with zipfile.ZipFile(P('builtin_recipes.zip',
allow_user_override=False), 'r') as zf:
self.favicons = dict([(x.filename, x) for x in zf.infolist() if
x.filename.endswith('.png')])
except:
@ -181,7 +182,7 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser):
def do_refresh(self, restrict_to_urns=set([])):
self.custom_recipe_collection = get_custom_recipe_collection()
zf = P('builtin_recipes.zip')
zf = P('builtin_recipes.zip', allow_user_override=False)
def factory(cls, parent, *args):
args = list(args)