diff --git a/cookbook/helper/recipe_url_import.py b/cookbook/helper/recipe_url_import.py index a87f8b7d..dd6c2435 100644 --- a/cookbook/helper/recipe_url_import.py +++ b/cookbook/helper/recipe_url_import.py @@ -11,6 +11,7 @@ from cookbook.helper import recipe_url_import as helper from cookbook.helper.ingredient_parser import IngredientParser from cookbook.models import Keyword + # from recipe_scrapers._utils import get_minutes ## temporary until/unless upstream incorporates get_minutes() PR @@ -33,6 +34,7 @@ def get_from_scraper(scrape, request): description = '' recipe_json['description'] = parse_description(description) + recipe_json['internal'] = True try: servings = scrape.yields() or None @@ -51,20 +53,20 @@ def get_from_scraper(scrape, request): recipe_json['servings'] = max(servings, 1) try: - recipe_json['prepTime'] = get_minutes(scrape.schema.data.get("prepTime")) or 0 + recipe_json['working_time'] = get_minutes(scrape.schema.data.get("prepTime")) or 0 except Exception: - recipe_json['prepTime'] = 0 + recipe_json['working_time'] = 0 try: - recipe_json['cookTime'] = get_minutes(scrape.schema.data.get("cookTime")) or 0 + recipe_json['waiting_time'] = get_minutes(scrape.schema.data.get("cookTime")) or 0 except Exception: - recipe_json['cookTime'] = 0 + recipe_json['waiting_time'] = 0 - if recipe_json['cookTime'] + recipe_json['prepTime'] == 0: + if recipe_json['working_time'] + recipe_json['waiting_time'] == 0: try: - recipe_json['prepTime'] = get_minutes(scrape.total_time()) or 0 + recipe_json['working_time'] = get_minutes(scrape.total_time()) or 0 except Exception: try: - get_minutes(scrape.schema.data.get("totalTime")) or 0 + recipe_json['working_time'] = get_minutes(scrape.schema.data.get("totalTime")) or 0 except Exception: pass @@ -101,54 +103,49 @@ def get_from_scraper(scrape, request): ingredient_parser = IngredientParser(request, True) - ingredients = [] + recipe_json['steps'] = [] + + for i in parse_instructions(scrape.instructions()): + recipe_json['steps'].append({'instruction': i, 'ingredients': [], }) + if len(recipe_json['steps']) == 0: + recipe_json['steps'].append({'instruction': '', 'ingredients': [], }) + try: for x in scrape.ingredients(): try: amount, unit, ingredient, note = ingredient_parser.parse(x) - ingredients.append( + recipe_json['steps'][0]['ingredients'].append( { 'amount': amount, 'unit': { - 'text': unit, - 'id': random.randrange(10000, 99999) + 'name': unit, }, - 'ingredient': { - 'text': ingredient, - 'id': random.randrange(10000, 99999) + 'food': { + 'name': ingredient, }, 'note': note, - 'original': x + 'original_text': x } ) except Exception: - ingredients.append( + recipe_json['steps'][0]['ingredients'].append( { 'amount': 0, 'unit': { - 'text': '', - 'id': random.randrange(10000, 99999) + 'name': '', }, - 'ingredient': { - 'text': x, - 'id': random.randrange(10000, 99999) + 'food': { + 'name': x, }, 'note': '', - 'original': x + 'original_text': x } ) - recipe_json['recipeIngredient'] = ingredients except Exception: - recipe_json['recipeIngredient'] = ingredients - - try: - recipe_json['recipeInstructions'] = parse_instructions(scrape.instructions()) - except Exception: - recipe_json['recipeInstructions'] = "" + pass if scrape.url: - recipe_json['url'] = scrape.url - recipe_json['recipeInstructions'] += "\n\nImported from " + scrape.url + recipe_json['source_url'] = scrape.url return recipe_json @@ -161,102 +158,46 @@ def parse_name(name): return normalize_string(name) -def parse_ingredients(ingredients): - # some pages have comma separated ingredients in a single array entry - try: - if type(ingredients[0]) == dict: - return ingredients - except (KeyError, IndexError): - pass - - if (len(ingredients) == 1 and type(ingredients) == list): - ingredients = ingredients[0].split(',') - elif type(ingredients) == str: - ingredients = ingredients.split(',') - - for x in ingredients: - if '\n' in x: - ingredients.remove(x) - for i in x.split('\n'): - ingredients.insert(0, i) - - ingredient_list = [] - - for x in ingredients: - if x.replace(' ', '') != '': - x = x.replace('½', "0.5").replace('¼', "0.25").replace('¾', "0.75") - try: - amount, unit, ingredient, note = parse_single_ingredient(x) - if ingredient: - ingredient_list.append( - { - 'amount': amount, - 'unit': { - 'text': unit, - 'id': random.randrange(10000, 99999) - }, - 'ingredient': { - 'text': ingredient, - 'id': random.randrange(10000, 99999) - }, - 'note': note, - 'original': x - } - ) - except Exception: - ingredient_list.append( - { - 'amount': 0, - 'unit': { - 'text': '', - 'id': random.randrange(10000, 99999) - }, - 'ingredient': { - 'text': x, - 'id': random.randrange(10000, 99999) - }, - 'note': '', - 'original': x - } - ) - - ingredients = ingredient_list - else: - ingredients = [] - return ingredients - - def parse_description(description): return normalize_string(description) -def parse_instructions(instructions): - instruction_text = '' - - # flatten instructions if they are in a list - if type(instructions) == list: - for i in instructions: - if type(i) == str: - instruction_text += i - else: - if 'text' in i: - instruction_text += i['text'] + '\n\n' - elif 'itemListElement' in i: - for ile in i['itemListElement']: - if type(ile) == str: - instruction_text += ile + '\n\n' - elif 'text' in ile: - instruction_text += ile['text'] + '\n\n' - else: - instruction_text += str(i) - instructions = instruction_text - - normalized_string = normalize_string(instructions) +def clean_instruction_string(instruction): + normalized_string = normalize_string(instruction) normalized_string = normalized_string.replace('\n', ' \n') normalized_string = normalized_string.replace(' \n \n', '\n\n') return normalized_string +def parse_instructions(instructions): + """ + Convert arbitrary instructions object from website import and turn it into a flat list of strings + :param instructions: any instructions object from import + :return: list of strings (from one to many elements depending on website) + """ + instruction_list = [] + + if type(instructions) == list: + for i in instructions: + if type(i) == str: + instruction_list.append(clean_instruction_string(i)) + else: + if 'text' in i: + instruction_list.append(clean_instruction_string(i['text'])) + elif 'itemListElement' in i: + for ile in i['itemListElement']: + if type(ile) == str: + instruction_list.append(clean_instruction_string(ile)) + elif 'text' in ile: + instruction_list.append(clean_instruction_string(ile['text'])) + else: + instruction_list.append(clean_instruction_string(str(i))) + else: + instruction_list.append(clean_instruction_string(instructions)) + + return instruction_list + + def parse_image(image): # check if list of images is returned, take first if so if not image: @@ -334,9 +275,9 @@ def parse_keywords(keyword_json, space): kw = normalize_string(kw) if len(kw) != 0: if k := Keyword.objects.filter(name=kw, space=space).first(): - keywords.append({'id': str(k.id), 'text': str(k)}) + keywords.append({'name': str(k)}) else: - keywords.append({'id': random.randrange(1111111, 9999999, 1), 'text': kw}) + keywords.append({'name': kw}) return keywords @@ -367,6 +308,7 @@ def normalize_string(string): unescaped_string = unescaped_string.replace("\xa0", " ").replace("\t", " ").strip() return unescaped_string + # TODO deprecate when merged into recipe_scapers @@ -408,9 +350,9 @@ def get_minutes(time_text): if "/" in (hours := matched.groupdict().get("hours") or ''): number = hours.split(" ") if len(number) == 2: - minutes += 60*int(number[0]) + minutes += 60 * int(number[0]) fraction = number[-1:][0].split("/") - minutes += 60 * float(int(fraction[0])/int(fraction[1])) + minutes += 60 * float(int(fraction[0]) / int(fraction[1])) else: minutes += 60 * float(hours) diff --git a/cookbook/migrations/0172_auto_20220219_1655.py b/cookbook/migrations/0172_auto_20220219_1655.py new file mode 100644 index 00000000..36238f5f --- /dev/null +++ b/cookbook/migrations/0172_auto_20220219_1655.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.12 on 2022-02-19 15:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cookbook', '0171_alter_searchpreference_trigram_threshold'), + ] + + operations = [ + migrations.AddField( + model_name='ingredient', + name='original_text', + field=models.CharField(blank=True, default=None, max_length=512, null=True), + ), + migrations.AddField( + model_name='recipe', + name='source_url', + field=models.CharField(blank=True, default=None, max_length=1024, null=True), + ), + ] diff --git a/cookbook/models.py b/cookbook/models.py index 8f3041e9..5db27217 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -240,7 +240,7 @@ class Space(ExportModelOperationsMixin('space'), models.Model): max_users = models.IntegerField(default=0) allow_sharing = models.BooleanField(default=True) demo = models.BooleanField(default=False) - food_inherit = models.ManyToManyField(FoodInheritField, blank=True) + food_inherit = models.ManyToManyField(FoodInheritField, blank=True) show_facet_count = models.BooleanField(default=False) def __str__(self): @@ -336,7 +336,7 @@ class UserPreference(models.Model, PermissionModelMixin): default_delay = models.DecimalField(default=4, max_digits=8, decimal_places=4) shopping_recent_days = models.PositiveIntegerField(default=7) csv_delim = models.CharField(max_length=2, default=",") - csv_prefix = models.CharField(max_length=10, blank=True,) + csv_prefix = models.CharField(max_length=10, blank=True, ) created_at = models.DateTimeField(auto_now_add=True) space = models.ForeignKey(Space, on_delete=models.CASCADE, null=True) @@ -495,11 +495,11 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin): ignore_shopping = models.BooleanField(default=False) # inherited field onhand_users = models.ManyToManyField(User, blank=True) description = models.TextField(default='', blank=True) - inherit_fields = models.ManyToManyField(FoodInheritField, blank=True) + inherit_fields = models.ManyToManyField(FoodInheritField, blank=True) substitute = models.ManyToManyField("self", blank=True) substitute_siblings = models.BooleanField(default=False) substitute_children = models.BooleanField(default=False) - child_inherit_fields = models.ManyToManyField(FoodInheritField, blank=True, related_name='child_inherit') + child_inherit_fields = models.ManyToManyField(FoodInheritField, blank=True, related_name='child_inherit') space = models.ForeignKey(Space, on_delete=models.CASCADE) objects = ScopedManager(space='space', _manager_class=TreeManager) @@ -532,7 +532,7 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin): if food: # if child inherit fields is preset children should be set to that, otherwise inherit this foods inherited fields inherit = list((food.child_inherit_fields.all() or food.inherit_fields.all()).values('id', 'field')) - tree_filter = Q(path__startswith=food.path, space=space, depth=food.depth+1) + tree_filter = Q(path__startswith=food.path, space=space, depth=food.depth + 1) else: inherit = list(space.food_inherit.all().values('id', 'field')) tree_filter = Q(space=space) @@ -663,9 +663,7 @@ class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModel servings = models.IntegerField(default=1) servings_text = models.CharField(default='', blank=True, max_length=32) image = models.ImageField(upload_to='recipes/', blank=True, null=True) - storage = models.ForeignKey( - Storage, on_delete=models.PROTECT, blank=True, null=True - ) + storage = models.ForeignKey(Storage, on_delete=models.PROTECT, blank=True, null=True) file_uid = models.CharField(max_length=256, default="", blank=True) file_path = models.CharField(max_length=512, default="", blank=True) link = models.CharField(max_length=512, null=True, blank=True) @@ -675,7 +673,7 @@ class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModel working_time = models.IntegerField(default=0) waiting_time = models.IntegerField(default=0) internal = models.BooleanField(default=False) - nutrition = models.ForeignKey( NutritionInformation, blank=True, null=True, on_delete=models.CASCADE ) + nutrition = models.ForeignKey(NutritionInformation, blank=True, null=True, on_delete=models.CASCADE) source_url = models.CharField(max_length=1024, default=None, blank=True, null=True) created_by = models.ForeignKey(User, on_delete=models.PROTECT) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index b1b72d3e..d41a47be 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -483,7 +483,7 @@ class IngredientSerializer(WritableNestedModelSerializer): model = Ingredient fields = ( 'id', 'food', 'unit', 'amount', 'note', 'order', - 'is_header', 'no_amount' + 'is_header', 'no_amount', 'original_text' ) diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 55ba8f46..9e62bbdf 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -1138,10 +1138,10 @@ def recipe_from_source(request): }, status=400) else: return JsonResponse({ - 'recipe_tree': recipe_tree, 'recipe_json': recipe_json, + 'recipe_tree': recipe_tree, 'recipe_html': recipe_html, - 'images': images, + 'recipe_images': images, }) else: diff --git a/vue/src/apps/ImportView/ImportView.vue b/vue/src/apps/ImportView/ImportView.vue index 3dccc870..adacc222 100644 --- a/vue/src/apps/ImportView/ImportView.vue +++ b/vue/src/apps/ImportView/ImportView.vue @@ -32,218 +32,21 @@
Options
-
-
- -
-
-

Recipe Preview

-
Drag recipe attributes from the - right into the appropriate box below. -
-
-
-
-
-
- Name - -
-
Text dragged here will - be appended to the name. -
-
- -
-
{{recipe_json.name}}
-
- -
- -
-
-
- {% trans 'Description' %} - -
-
{% trans 'Text dragged here will - be appended to the description.' %} -
-
- -
-
{{recipe_json.description}}
-
- -
- -
-
-
- {% trans 'Keywords' %} - -
-
{% trans 'Keywords dragged here - will be appended to current list' %} -
-
- -
-
-
{{ kw.text }}
-
-
- -
- -
-
- {% trans 'Image' %} - -
- -
- Recipe Image -
- -
- -
-
-
-
- {% trans 'Servings' %} - -
-
-
{{recipe_json.servings}}
-
-
-
-
-
-
- {% trans 'Prep Time' %} - -
-
-
{{recipe_json.prepTime}}
-
-
-
-
-
-
- {% trans 'Cook Time' %} - -
-
-
{{recipe_json.cookTime}}
-
-
-
-
- -
-
-
- {% trans 'Ingredients' %} - -
-
{% trans 'Ingredients dragged here - will be appended to current list.' %} -
-
- -
-
    -
    -
  • -
    {{i.amount}}
    -
    {{i.unit.text}}
    -
    - {{i.ingredient.text}} -
    -
    {{i.note}}
    -
    • -
    -
-
- -
- -
-
-
- {% trans 'Instructions' %} - -
-
{% trans 'Recipe instructions - dragged here will be appended to current instructions.' %} -
-
- -
-
{{recipe_json.recipeInstructions}} -
-
- -
-
-
-
- - -
+
+ Images + Keywords +
    +
  • {{k}}
    • +
+ Steps +
    +
  • {{s}}
    • +
-
+
Import
+ Import @@ -277,6 +80,7 @@ import 'bootstrap-vue/dist/bootstrap-vue.css' import {resolveDjangoUrl, ResolveUrlMixin, StandardToasts, ToastMixin} from "@/utils/utils"; import axios from "axios"; +import {ApiApiFactory} from "@/utils/openapi/api"; Vue.use(BootstrapVue) @@ -293,8 +97,8 @@ export default { website_url: '', recent_urls: [], source_data: '', - recipe_data: undefined, recipe_json: undefined, + recipe_data: undefined, recipe_tree: undefined, recipe_images: [], automatic: true, @@ -309,6 +113,18 @@ export default { }, methods: { + /** + * Import recipe based on the data configured by the client + */ + importRecipe: function () { + let apiFactory = new ApiApiFactory() + apiFactory.createRecipe(this.recipe_json).then(response => { + StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE) + window.location = resolveDjangoUrl('edit_recipe', response.data.id) + }).catch(err => { + StandardToasts.makeStandardToast(StandardToasts.FAIL_CREATE) + }) + }, /** * Requests the recipe to be loaded form the source (url/data) from the server * Updates all variables to contain what they need to render either simple preview or manual mapping mode @@ -340,7 +156,7 @@ export default { this.recipe_json = response.data['recipe_json']; this.recipe_tree = response.data['recipe_tree']; this.recipe_html = response.data['recipe_html']; - this.recipe_images = response.data['images']; //todo change on backend as well after old view is deprecated + this.recipe_images = response.data['recipe_images']; //todo change on backend as well after old view is deprecated if (this.automatic) { this.recipe_data = this.recipe_json; this.preview = false diff --git a/vue/src/apps/RecipeEditView/RecipeEditView.vue b/vue/src/apps/RecipeEditView/RecipeEditView.vue index 215f9fb8..f09ae673 100644 --- a/vue/src/apps/RecipeEditView/RecipeEditView.vue +++ b/vue/src/apps/RecipeEditView/RecipeEditView.vue @@ -308,6 +308,8 @@
+ +
{{ingredient.original_text}}
diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts index 07281335..dae44015 100644 --- a/vue/src/utils/openapi/api.ts +++ b/vue/src/utils/openapi/api.ts @@ -746,6 +746,12 @@ export interface Ingredient { * @memberof Ingredient */ no_amount?: boolean; + /** + * + * @type {string} + * @memberof Ingredient + */ + original_text?: string | null; } /** * @@ -1905,6 +1911,12 @@ export interface RecipeIngredients { * @memberof RecipeIngredients */ no_amount?: boolean; + /** + * + * @type {string} + * @memberof RecipeIngredients + */ + original_text?: string | null; } /** *