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

more fix from super ugly merge

Browse Source
This commit is contained in:
smilerz 2021-03-19 16:06:02 -05:00
parent 7c8d41753c
commit 4015517c0a
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cookbook/helper/recipe_html_import.py
View File

@ -10,7 +10,7 @@ from cookbook.helper import recipe_url_import as helper
# %% # %%
# %% # %%
def get_from_raw(text): def get_from_raw(text, space):
def build_node(k, v): def build_node(k, v):
if isinstance(v, dict): if isinstance(v, dict):
node = { node = {
@ -85,7 +85,10 @@ def get_from_raw(text):
for el in parse_list: for el in parse_list:
if isinstance(el, Tag): if isinstance(el, Tag):
try:
el = json.loads(el.string) el = json.loads(el.string)
except TypeError:
continue
for k, v in el.items(): for k, v in el.items():
if isinstance(v, dict): if isinstance(v, dict):
@ -106,8 +109,11 @@ def get_from_raw(text):
'value': str(v) 'value': str(v)
} }
temp_tree.append(node) temp_tree.append(node)
if ('@type' in el and el['@type'] == 'Recipe'): # recipes type might be wrapped in @graph type
recipe_json = helper.find_recipe_json(el, None) if '@graph' in el:
for x in el['@graph']:
if '@type' in x and x['@type'] == 'Recipe':
recipe_json = helper.find_recipe_json(x, None, space)
recipe_tree += [{'name': 'ld+json', 'children': temp_tree}] recipe_tree += [{'name': 'ld+json', 'children': temp_tree}]
else: else:
recipe_tree += [{'name': 'json', 'children': temp_tree}] recipe_tree += [{'name': 'json', 'children': temp_tree}]

20
cookbook/templates/url_import.html
View File

@ -85,7 +85,7 @@
</textarea> </textarea>
</div> </div>
<br> <br>
<button @click="loadPreviewHTML()" class="btn btn-primary shadow-none" type="button" <button @click="loadPreviewRaw()" class="btn btn-primary shadow-none" type="button"
id="id_btn_HTML"><i class="fas fa-code"></i> {% trans 'Preview Import' %} id="id_btn_HTML"><i class="fas fa-code"></i> {% trans 'Preview Import' %}
</button> </button>
</div> </div>
@ -136,7 +136,7 @@
<div class="card mb-2"> <div class="card mb-2">
<div class="card-header"> <div class="card-header">
<div class="row" style="display:flex; justify-content:space-between;"> <div class="row px-3" style="justify-content:space-between;">
{% trans 'Keywords' %} {% trans 'Keywords' %}
<i class="fas fa-eraser" style="cursor:pointer;" @click="deletePreview('keywords')" title="{% trans 'Clear Contents'%}"></i> <i class="fas fa-eraser" style="cursor:pointer;" @click="deletePreview('keywords')" title="{% trans 'Clear Contents'%}"></i>
</div> </div>
@ -197,7 +197,7 @@
<div class="card mb-2"> <div class="card mb-2">
<div class="card-header"> <div class="card-header">
<div class="row" style="display:flex; justify-content:space-between;"> <div class="row px-3" style="display:flex; justify-content:space-between;">
{% trans 'Ingredients' %} {% trans 'Ingredients' %}
<i class="fas fa-eraser" style="cursor:pointer;" @click="deletePreview('ingredients')" title="{% trans 'Clear Contents'%}"></i> <i class="fas fa-eraser" style="cursor:pointer;" @click="deletePreview('ingredients')" title="{% trans 'Clear Contents'%}"></i>
</div> </div>
@ -206,7 +206,7 @@
<div class="card-body drop-zone" @drop="replacePreview('ingredients', $event)" @dragover.prevent @dragenter.prevent> <div class="card-body drop-zone" @drop="replacePreview('ingredients', $event)" @dragover.prevent @dragenter.prevent>
<ul class="list-group list-group"> <ul class="list-group list-group">
<div v-for="i in recipe_json.recipeIngredient"> <div v-for="i in recipe_json.recipeIngredient">
<li class="row border" style="border:1px"> <li class="row border-light" >
<div class="col-sm-1 border">[[i.amount]]</div> <div class="col-sm-1 border">[[i.amount]]</div>
<div class="col-sm border">[[i.unit.text]]</div> <div class="col-sm border">[[i.unit.text]]</div>
<div class="col-sm border">[[i.ingredient.text]]</div> <div class="col-sm border">[[i.ingredient.text]]</div>
@ -218,10 +218,13 @@
</div> </div>
<div class="card mb-2"> <div class="card mb-2">
<div class="card-header" style="display:flex; justify-content:space-between;"> <div class="card-header">
<div class="row px-3" style="justify-content:space-between;">
{% trans 'Instructions' %} {% trans 'Instructions' %}
<i class="fas fa-eraser" style="cursor:pointer;" @click="deletePreview('instructions')" title="{% trans 'Clear Contents'%}"></i> <i class="fas fa-eraser" style="cursor:pointer;" @click="deletePreview('instructions')" title="{% trans 'Clear Contents'%}"></i>
</div> </div>
<div class="small text-muted">{% trans 'Recipe instructions dragged here will be appended to current instructions.'%}</div>
</div>
<div class="card-body drop-zone" @drop="replacePreview('instructions', $event)" @dragover.prevent @dragenter.prevent> <div class="card-body drop-zone" @drop="replacePreview('instructions', $event)" @dragover.prevent @dragenter.prevent>
<div class="card-text">[[recipe_json.recipeInstructions]]</div> <div class="card-text">[[recipe_json.recipeInstructions]]</div>
</div> </div>
@ -229,7 +232,7 @@
</div> </div>
</div> </div>
<br/> <br/>
<button @click="loadRecipeHTML()" class="btn btn-primary shadow-none" type="button" <button @click="loadRecipeRaw()" class="btn btn-primary shadow-none" type="button"
id="id_btn_json"><i class="fas fa-code"></i> {% trans 'Import' %} id="id_btn_json"><i class="fas fa-code"></i> {% trans 'Import' %}
</button> </button>
</div> </div>
@ -596,13 +599,12 @@
this.makeToast(gettext('Error'), msg, 'danger') this.makeToast(gettext('Error'), msg, 'danger')
}) })
}, },
loadRecipeHTML: function () { loadRecipeRaw: function () {
// TODO this needs refactored to get HTML elements
this.error = undefined this.error = undefined
this.loading = true this.loading = true
this.parsed = false this.parsed = false
this.recipe_json['@type'] = "Recipe" this.recipe_json['@type'] = "Recipe"
this.$http.post("{% url 'api_recipe_from_json' %}", {'html': JSON.stringify(this.raw_data)}, {emulateJSON: true}).then((response) => { this.$http.post("{% url 'api_recipe_from_json' %}", {'json': JSON.stringify(this.recipe_json)}, {emulateJSON: true}).then((response) => {
console.log(response.data) console.log(response.data)
this.recipe_data = response.data; this.recipe_data = response.data;
this.loading = false this.loading = false

2
cookbook/views/api.py
View File

@ -618,7 +618,7 @@ def recipe_from_url_old(request):
@group_required('user') @group_required('user')
def manual_recipe_from_json(request): def manual_recipe_from_json(request):
json_data = request.POST['data'] json_data = request.POST['data']
recipe_json, recipe_tree = get_from_raw(json_data) recipe_json, recipe_tree = get_from_raw(json_data, request.space)
if len(recipe_tree) == 0 and len(recipe_json) == 0: if len(recipe_tree) == 0 and len(recipe_json) == 0:
return JsonResponse( return JsonResponse(
{ {