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

added image import

Browse Source
This commit is contained in:
smilerz
2021-03-23 12:15:57 -05:00
parent 215eadb4a0
commit cb708e7e47
4 changed files with 269 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
cookbook/helper/recipe_url_import.py
View File

@ -12,7 +12,7 @@ from cookbook.models import Keyword
from django.http import JsonResponse
from django.utils.dateparse import parse_duration
from django.utils.translation import gettext as _
from recipe_scrapers import _utils
from recipe_scrapers._utils import get_minutes, normalize_string
def get_from_html_old(html_text, url, space):
@ -91,7 +91,9 @@ def find_recipe_json(ld_json, url, space):
else:
ld_json['image'] = ""
if 'description' not in ld_json:
if 'description' in ld_json:
ld_json['description'] = normalize_string(ld_json['description'] )
else:
ld_json['description'] = ""
if 'cookTime' in ld_json:
@ -105,18 +107,11 @@ def find_recipe_json(ld_json, url, space):
ld_json['prepTime'] = 0
if 'servings' in ld_json:
if type(ld_json['servings']) == str:
ld_json['servings'] = int(re.search(r'\d+', ld_json['servings']).group())
ld_json['servings'] = parse_servings(ld_json['servings'])
elif 'recipeYield' in ld_json:
ld_json['servings'] = parse_servings(ld_json['recipeYield'])
else:
ld_json['servings'] = 1
try:
if 'recipeYield' in ld_json:
if type(ld_json['recipeYield']) == str:
ld_json['servings'] = int(re.findall(r'\b\d+\b', ld_json['recipeYield'])[0])
elif type(ld_json['recipeYield']) == list:
ld_json['servings'] = int(re.findall(r'\b\d+\b', ld_json['recipeYield'][0])[0])
except Exception as e:
print(e)
for key in list(ld_json):
if key not in [
@ -136,14 +131,14 @@ def get_from_scraper(scrape, space):
try:
description = scrape.schema.data.get("description") or ''
recipe_json['prepTime'] = _utils.get_minutes(scrape.schema.data.get("prepTime")) or 0
recipe_json['cookTime'] = _utils.get_minutes(scrape.schema.data.get("cookTime")) or 0
recipe_json['prepTime'] = get_minutes(scrape.schema.data.get("prepTime")) or 0
recipe_json['cookTime'] = get_minutes(scrape.schema.data.get("cookTime")) or 0
except AttributeError:
description = ''
recipe_json['prepTime'] = 0
recipe_json['cookTime'] = 0
recipe_json['description'] = description
recipe_json['description'] = normalize_string(description)
try:
servings = scrape.yields()
@ -231,7 +226,7 @@ def parse_name(name):
name = name[0]
except Exception:
name = 'ERROR'
return name
return normalize_string(name)
def parse_ingredients(ingredients):
@ -324,7 +319,7 @@ def parse_instructions(instructions):
instructions = re.sub(' +', ' ', instructions)
instructions = re.sub('</p>', '\n', instructions)
instructions = re.sub('<[^<]+?>', '', instructions)
return instructions
return normalize_string(instructions)
def parse_image(image):
@ -342,6 +337,19 @@ def parse_image(image):
return image
def parse_servings(servings):
if type(servings) == str:
try:
servings = int(re.search(r'\d+', servings).group())
except AttributeError:
servings = 1
elif type(servings) == list:
try:
servings = int(re.findall(r'\b\d+\b', servings[0])[0])
except KeyError:
servings = 1
return servings
def parse_cooktime(cooktime):
if type(cooktime) not in [int, float]:
try:
@ -382,6 +390,7 @@ def parse_keywords(keyword_json, space):
keywords = []
# keywords as list
for kw in keyword_json:
kw = normalize_string(kw)
if k := Keyword.objects.filter(name=kw, space=space).first():
keywords.append({'id': str(k.id), 'text': str(k)})
else:
@ -395,7 +404,7 @@ def listify_keywords(keyword_list):
try:
if type(keyword_list[0]) == dict:
return keyword_list
except KeyError:
except (KeyError, IndexError):
pass
if type(keyword_list) == str:
keyword_list = keyword_list.split(',')