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

updated normalization to skip removing line breaks

Browse Source
This commit is contained in:
smilerz 2021-04-17 12:49:42 -05:00
parent b9ee77709b
commit d449fc8fd8
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cookbook/helper/recipe_url_import.py
View File

@ -6,8 +6,9 @@ from isodate.isoerror import ISO8601Error
from cookbook.helper.ingredient_parser import parse as parse_single_ingredient from cookbook.helper.ingredient_parser import parse as parse_single_ingredient
from cookbook.models import Keyword from cookbook.models import Keyword
from django.utils.dateparse import parse_duration from django.utils.dateparse import parse_duration
from html import unescape
from recipe_scrapers._schemaorg import SchemaOrgException from recipe_scrapers._schemaorg import SchemaOrgException
from recipe_scrapers._utils import get_minutes, normalize_string from recipe_scrapers._utils import get_minutes
def get_from_scraper(scrape, space): def get_from_scraper(scrape, space):
@ -21,7 +22,6 @@ def get_from_scraper(scrape, space):
try: try:
description = scrape.schema.data.get("description") or '' description = scrape.schema.data.get("description") or ''
except AttributeError: except AttributeError:
description = '' description = ''
@ -192,10 +192,6 @@ def parse_ingredients(ingredients):
def parse_description(description): def parse_description(description):
description = re.sub(r'\n\s*\n', '\n\n', description)
description = re.sub(' +', ' ', description)
description = re.sub('</p>', '\n', description)
description = re.sub('<[^<]+?>', '', description)
return normalize_string(description) return normalize_string(description)
@ -220,10 +216,6 @@ def parse_instructions(instructions):
instruction_text += str(i) instruction_text += str(i)
instructions = instruction_text instructions = instruction_text
instructions = re.sub(r'\n\s*\n', '\n\n', instructions)
instructions = re.sub(' +', ' ', instructions)
instructions = re.sub('</p>', '\n', instructions)
instructions = re.sub('<[^<]+?>', '', instructions)
return normalize_string(instructions) return normalize_string(instructions)
@ -323,3 +315,14 @@ def listify_keywords(keyword_list):
if (type(keyword_list) == list and len(keyword_list) == 1 and ',' in keyword_list[0]): if (type(keyword_list) == list and len(keyword_list) == 1 and ',' in keyword_list[0]):
keyword_list = keyword_list[0].split(',') keyword_list = keyword_list[0].split(',')
return [x.strip() for x in keyword_list] return [x.strip() for x in keyword_list]
def normalize_string(string):
# Convert all named and numeric character references (e.g. &gt;, &#62;)
unescaped_string = unescape(string)
unescaped_string = re.sub('<[^<]+?>', '', unescaped_string)
unescaped_string = re.sub(' +', ' ', unescaped_string)
unescaped_string = re.sub('</p>', '\n', unescaped_string)
unescaped_string = re.sub(r'\n\s*\n', '\n\n', unescaped_string)
unescaped_string = unescaped_string.replace("\xa0", " ").replace("\t", " ").strip()
return unescaped_string