basic nextcloud import
This commit is contained in:
@ -134,8 +134,9 @@ class ShoppingForm(forms.Form):
|
|||||||
class ImportExportBase(forms.Form):
|
class ImportExportBase(forms.Form):
|
||||||
DEFAULT = 'DEFAULT'
|
DEFAULT = 'DEFAULT'
|
||||||
PAPRIKA = 'PAPRIKA'
|
PAPRIKA = 'PAPRIKA'
|
||||||
|
NEXTCLOUD = 'NEXTCLOUD'
|
||||||
|
|
||||||
type = forms.ChoiceField(choices=((DEFAULT, _('Default')), (PAPRIKA, _('Paprika')),))
|
type = forms.ChoiceField(choices=((DEFAULT, _('Default')), (PAPRIKA, _('Paprika')), (NEXTCLOUD, _('Nextcloud Cookbook')),))
|
||||||
|
|
||||||
|
|
||||||
class ImportForm(ImportExportBase):
|
class ImportForm(ImportExportBase):
|
||||||
|
@ -63,6 +63,16 @@ class Integration:
|
|||||||
response['Content-Disposition'] = 'attachment; filename="export.zip"'
|
response['Content-Disposition'] = 'attachment; filename="export.zip"'
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
def import_file_name_filter(self, zip_info_object):
|
||||||
|
"""
|
||||||
|
Since zipfile.namelist() returns all files in all subdirectories this function allows filtering of files
|
||||||
|
If false is returned the file will be ignored
|
||||||
|
By default all files are included
|
||||||
|
:param zip_info_object: ZipInfo object
|
||||||
|
:return: Boolean if object should be included
|
||||||
|
"""
|
||||||
|
return True
|
||||||
|
|
||||||
def do_import(self, files):
|
def do_import(self, files):
|
||||||
"""
|
"""
|
||||||
Imports given files
|
Imports given files
|
||||||
@ -73,8 +83,9 @@ class Integration:
|
|||||||
for f in files:
|
for f in files:
|
||||||
if '.zip' in f.name:
|
if '.zip' in f.name:
|
||||||
import_zip = ZipFile(f.file)
|
import_zip = ZipFile(f.file)
|
||||||
for z in import_zip.namelist():
|
for z in import_zip.filelist:
|
||||||
recipe = self.get_recipe_from_file(BytesIO(import_zip.read(z)))
|
if self.import_file_name_filter(z):
|
||||||
|
recipe = self.get_recipe_from_file(BytesIO(import_zip.read(z.filename)))
|
||||||
recipe.keywords.add(self.keyword)
|
recipe.keywords.add(self.keyword)
|
||||||
else:
|
else:
|
||||||
recipe = self.get_recipe_from_file(f.file)
|
recipe = self.get_recipe_from_file(f.file)
|
||||||
|
52
cookbook/integration/nextcloud_cookbook.py
Normal file
52
cookbook/integration/nextcloud_cookbook.py
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
import json
|
||||||
|
import re
|
||||||
|
from io import BytesIO
|
||||||
|
from zipfile import ZipFile
|
||||||
|
|
||||||
|
from rest_framework.renderers import JSONRenderer
|
||||||
|
|
||||||
|
from cookbook.helper.ingredient_parser import parse
|
||||||
|
from cookbook.integration.integration import Integration
|
||||||
|
from cookbook.models import Recipe, Step, Food, Unit, Ingredient
|
||||||
|
from cookbook.serializer import RecipeExportSerializer
|
||||||
|
|
||||||
|
|
||||||
|
class NextcloudCookbook(Integration):
|
||||||
|
|
||||||
|
def import_file_name_filter(self, zip_info_object):
|
||||||
|
print("testing", zip_info_object.filename)
|
||||||
|
return re.match(r'^Recipes/([A-Za-z\d\s])+/recipe.json$', zip_info_object.filename)
|
||||||
|
|
||||||
|
def get_recipe_from_file(self, file):
|
||||||
|
recipe_json = json.loads(file.getvalue().decode("utf-8"))
|
||||||
|
|
||||||
|
recipe = Recipe.objects.create(
|
||||||
|
name=recipe_json['name'].strip(), description=recipe_json['description'].strip(),
|
||||||
|
created_by=self.request.user, internal=True,
|
||||||
|
servings=recipe_json['recipeYield'])
|
||||||
|
|
||||||
|
#TODO parse times (given in PT2H3M )
|
||||||
|
|
||||||
|
ingredients_added = False
|
||||||
|
for s in recipe_json['recipeInstructions']:
|
||||||
|
step = Step.objects.create(
|
||||||
|
instruction=s
|
||||||
|
)
|
||||||
|
if not ingredients_added:
|
||||||
|
ingredients_added = True
|
||||||
|
|
||||||
|
for ingredient in recipe_json['recipeIngredient']:
|
||||||
|
amount, unit, ingredient, note = parse(ingredient)
|
||||||
|
f, created = Food.objects.get_or_create(name=ingredient)
|
||||||
|
u, created = Unit.objects.get_or_create(name=unit)
|
||||||
|
step.ingredients.add(Ingredient.objects.create(
|
||||||
|
food=f, unit=u, amount=amount, note=note
|
||||||
|
))
|
||||||
|
recipe.steps.add(step)
|
||||||
|
|
||||||
|
return recipe
|
||||||
|
|
||||||
|
def get_file_from_recipe(self, recipe):
|
||||||
|
export = RecipeExportSerializer(recipe).data
|
||||||
|
|
||||||
|
return 'recipe.json', JSONRenderer().render(export).decode("utf-8")
|
@ -7,6 +7,7 @@ from django.utils.translation import gettext as _
|
|||||||
from cookbook.forms import ExportForm, ImportForm, ImportExportBase
|
from cookbook.forms import ExportForm, ImportForm, ImportExportBase
|
||||||
from cookbook.helper.permission_helper import group_required
|
from cookbook.helper.permission_helper import group_required
|
||||||
from cookbook.integration.default import Default
|
from cookbook.integration.default import Default
|
||||||
|
from cookbook.integration.nextcloud_cookbook import NextcloudCookbook
|
||||||
from cookbook.integration.paprika import Paprika
|
from cookbook.integration.paprika import Paprika
|
||||||
from cookbook.models import Recipe
|
from cookbook.models import Recipe
|
||||||
|
|
||||||
@ -16,6 +17,8 @@ def get_integration(request, export_type):
|
|||||||
return Default(request)
|
return Default(request)
|
||||||
if export_type == ImportExportBase.PAPRIKA:
|
if export_type == ImportExportBase.PAPRIKA:
|
||||||
return Paprika(request)
|
return Paprika(request)
|
||||||
|
if export_type == ImportExportBase.NEXTCLOUD:
|
||||||
|
return NextcloudCookbook(request)
|
||||||
|
|
||||||
|
|
||||||
@group_required('user')
|
@group_required('user')
|
||||||
|
Reference in New Issue
Block a user