cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

paprika importer improvements

Browse Source
This commit is contained in:
vabene1111
2022-04-04 21:30:00 +02:00
parent 85aad42529
commit 090e18e405
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cookbook/helper/recipe_url_import.py
View File

@ -31,7 +31,7 @@ def get_from_scraper(scrape, request):
recipe_json['name'] = '' recipe_json['name'] = ''
try: try:
description = scrape.description() or None description = scrape.description() or None
except Exception: except Exception:
description = None description = None
if not description: if not description:
@ -130,7 +130,7 @@ def get_from_scraper(scrape, request):
if len(recipe_json['steps']) == 0: if len(recipe_json['steps']) == 0:
recipe_json['steps'].append({'instruction': '', 'ingredients': [], }) recipe_json['steps'].append({'instruction': '', 'ingredients': [], })
if len(parse_description(description)) > 256: # split at 256 as long descriptions dont look good on recipe cards if len(parse_description(description)) > 256: # split at 256 as long descriptions dont look good on recipe cards
recipe_json['steps'][0]['instruction'] = f'*{parse_description(description)}* \n\n' + recipe_json['steps'][0]['instruction'] recipe_json['steps'][0]['instruction'] = f'*{parse_description(description)}* \n\n' + recipe_json['steps'][0]['instruction']
else: else:
recipe_json['description'] = parse_description(description)[:512] recipe_json['description'] = parse_description(description)[:512]
@ -255,6 +255,15 @@ def parse_servings(servings):
return servings return servings
def parse_servings_text(servings):
if type(servings) == str:
try:
servings = re.sub("\d+", '', servings).strip()
except Exception:
servings = ''
return servings
def parse_time(recipe_time): def parse_time(recipe_time):
if type(recipe_time) not in [int, float]: if type(recipe_time) not in [int, float]:
try: try:

8
cookbook/integration/paprika.py
View File

@ -6,6 +6,7 @@ from gettext import gettext as _
from io import BytesIO from io import BytesIO
from cookbook.helper.ingredient_parser import IngredientParser from cookbook.helper.ingredient_parser import IngredientParser
from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text
from cookbook.integration.integration import Integration from cookbook.integration.integration import Integration
from cookbook.models import Ingredient, Keyword, Recipe, Step from cookbook.models import Ingredient, Keyword, Recipe, Step
@ -26,10 +27,9 @@ class Paprika(Integration):
recipe.description = '' if len(recipe_json['description'].strip()) > 500 else recipe_json['description'].strip() recipe.description = '' if len(recipe_json['description'].strip()) > 500 else recipe_json['description'].strip()
try: try:
if re.match(r'([0-9])+\s(.)*', recipe_json['servings']): if 'servings' in recipe_json['servings']:
s = recipe_json['servings'].split(' ') recipe.servings = parse_servings(recipe_json['servings'])
recipe.servings = s[0] recipe.servings_text = parse_servings_text(recipe_json['servings'])
recipe.servings_text = s[1]
if len(recipe_json['cook_time'].strip()) > 0: if len(recipe_json['cook_time'].strip()) > 0:
recipe.waiting_time = re.findall(r'\d+', recipe_json['cook_time'])[0] recipe.waiting_time = re.findall(r'\d+', recipe_json['cook_time'])[0]