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

Dont use lxml to build recipe collection

Browse Source 
It's crashing on macOS CI but not my local machine. Debugging on CI is
too time consuming.
This commit is contained in:
Kovid Goyal 2023-01-19 08:42:14 +05:30
parent 3d797236a2
commit e5074150a9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,20 +44,22 @@ def iterate_over_builtin_recipe_files():
def serialize_recipe(urn, recipe_class): def serialize_recipe(urn, recipe_class):
from xml.sax.saxutils import quoteattr
def attr(n, d): def attr(n, d):
ans = getattr(recipe_class, n, d) ans = getattr(recipe_class, n, d)
if isinstance(ans, bytes): if isinstance(ans, bytes):
ans = ans.decode('utf-8', 'replace') ans = ans.decode('utf-8', 'replace')
return ans return quoteattr(ans)
default_author = _('You') if urn.startswith('custom:') else _('Unknown') default_author = _('You') if urn.startswith('custom:') else _('Unknown')
ns = attr('needs_subscription', False) ns = getattr(recipe_class, 'needs_subscription', False)
if not ns: if not ns:
ns = 'no' ns = 'no'
if ns is True: if ns is True:
ns = 'yes' ns = 'yes'
return E.recipe({ return (' <recipe id="{id}" title={title} author={author} language={language}'
' needs_subscription="{needs_subscription}" description={description}/>').format(**{
'id' : str(urn), 'id' : str(urn),
'title' : attr('title', _('Unknown')), 'title' : attr('title', _('Unknown')),
'author' : attr('__author__', default_author), 'author' : attr('__author__', default_author),
@ -68,12 +70,7 @@ def serialize_recipe(urn, recipe_class):
def serialize_collection(mapping_of_recipe_classes): def serialize_collection(mapping_of_recipe_classes):
collection = E.recipe_collection() collection = []
'''for u, x in mapping_of_recipe_classes.items():
print 11111, u, repr(x.title)
if isinstance(x.title, bytes):
x.title.decode('ascii')
'''
for urn in sorted(mapping_of_recipe_classes.keys(), for urn in sorted(mapping_of_recipe_classes.keys(),
key=lambda key: force_unicode( key=lambda key: force_unicode(
getattr(mapping_of_recipe_classes[key], 'title', 'zzz'), getattr(mapping_of_recipe_classes[key], 'title', 'zzz'),
@ -85,9 +82,11 @@ def serialize_collection(mapping_of_recipe_classes):
traceback.print_exc() traceback.print_exc()
continue continue
collection.append(recipe) collection.append(recipe)
collection.set('count', str(len(collection))) items = '\n'.join(collection)
return etree.tostring(collection, encoding='utf-8', xml_declaration=True, return f'''<?xml version='1.0' encoding='utf-8'?>
pretty_print=True) <recipe_collection xmlns="http://calibre-ebook.com/recipe_collection" count="{len(collection)}">
{items}
</recipe_collection>'''.encode('utf-8')
def serialize_builtin_recipes(): def serialize_builtin_recipes():