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

Added date to filename

Browse Source
This commit is contained in:
Tiago Rascazzi
2022-01-11 15:44:10 -05:00
parent 88e9e39c73
commit fef9bcb1e1
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/integration/default.py
View File

@ -61,9 +61,9 @@ class Default(Integration):
export_zip_obj.writestr(str(r.pk) + '.zip', recipe_zip_stream.getvalue()) export_zip_obj.writestr(str(r.pk) + '.zip', recipe_zip_stream.getvalue())
el.exported_recipes += 1 el.exported_recipes += 1
el.msg += self.recipe_processed_msg(r) el.msg += self.get_recipe_processed_msg(r)
el.save() el.save()
export_zip_obj.close() export_zip_obj.close()
return [[ 'export.zip', export_zip_stream.getvalue() ]] return [[ self.get_export_file_name(), export_zip_stream.getvalue() ]]

21
cookbook/integration/integration.py
View File

@ -6,7 +6,7 @@ import uuid
from io import BytesIO, StringIO from io import BytesIO, StringIO
from zipfile import BadZipFile, ZipFile from zipfile import BadZipFile, ZipFile
from django.core.cache import cache from django.core.cache import cache
import datetime
from bs4 import Tag from bs4 import Tag
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
@ -82,7 +82,8 @@ class Integration:
export_file = file export_file = file
else: else:
export_filename = "export.zip" #zip the files if there is more then one file
export_filename = self.get_export_file_name()
export_stream = BytesIO() export_stream = BytesIO()
export_obj = ZipFile(export_stream, 'w') export_obj = ZipFile(export_stream, 'w')
@ -134,7 +135,7 @@ class Integration:
for d in data_list: for d in data_list:
recipe = self.get_recipe_from_file(d) recipe = self.get_recipe_from_file(d)
recipe.keywords.add(self.keyword) recipe.keywords.add(self.keyword)
il.msg += self.recipe_processed_msg(recipe) il.msg += self.get_recipe_processed_msg(recipe)
self.handle_duplicates(recipe, import_duplicates) self.handle_duplicates(recipe, import_duplicates)
il.imported_recipes += 1 il.imported_recipes += 1
il.save() il.save()
@ -159,7 +160,7 @@ class Integration:
else: else:
recipe = self.get_recipe_from_file(BytesIO(import_zip.read(z.filename))) recipe = self.get_recipe_from_file(BytesIO(import_zip.read(z.filename)))
recipe.keywords.add(self.keyword) recipe.keywords.add(self.keyword)
il.msg += self.recipe_processed_msg(recipe) il.msg += self.get_recipe_processed_msg(recipe)
self.handle_duplicates(recipe, import_duplicates) self.handle_duplicates(recipe, import_duplicates)
il.imported_recipes += 1 il.imported_recipes += 1
il.save() il.save()
@ -174,7 +175,7 @@ class Integration:
try: try:
recipe = self.get_recipe_from_file(d) recipe = self.get_recipe_from_file(d)
recipe.keywords.add(self.keyword) recipe.keywords.add(self.keyword)
il.msg += self.recipe_processed_msg(recipe) il.msg += self.get_recipe_processed_msg(recipe)
self.handle_duplicates(recipe, import_duplicates) self.handle_duplicates(recipe, import_duplicates)
il.imported_recipes += 1 il.imported_recipes += 1
il.save() il.save()
@ -191,7 +192,7 @@ class Integration:
try: try:
recipe = self.get_recipe_from_file(d) recipe = self.get_recipe_from_file(d)
recipe.keywords.add(self.keyword) recipe.keywords.add(self.keyword)
il.msg += self.recipe_processed_msg(recipe) il.msg += self.get_recipe_processed_msg(recipe)
self.handle_duplicates(recipe, import_duplicates) self.handle_duplicates(recipe, import_duplicates)
il.imported_recipes += 1 il.imported_recipes += 1
il.save() il.save()
@ -201,7 +202,7 @@ class Integration:
else: else:
recipe = self.get_recipe_from_file(f['file']) recipe = self.get_recipe_from_file(f['file'])
recipe.keywords.add(self.keyword) recipe.keywords.add(self.keyword)
il.msg += self.recipe_processed_msg(recipe) il.msg += self.get_recipe_processed_msg(recipe)
self.handle_duplicates(recipe, import_duplicates) self.handle_duplicates(recipe, import_duplicates)
except BadZipFile: except BadZipFile:
il.msg += 'ERROR ' + _( il.msg += 'ERROR ' + _(
@ -289,5 +290,9 @@ class Integration:
if DEBUG: if DEBUG:
traceback.print_exc() traceback.print_exc()
def recipe_processed_msg(self, recipe):
def get_export_file_name(self, format='zip'):
return "export_{}.{}".format(datetime.datetime.now().strftime("%Y-%m-%d"), format)
def get_recipe_processed_msg(self, recipe):
return f'{recipe.pk} - {recipe.name} \n' return f'{recipe.pk} - {recipe.name} \n'

2
cookbook/integration/pdfexport.py
View File

@ -57,7 +57,7 @@ class PDFexport(Integration):
await page.close(); await page.close();
el.exported_recipes += 1 el.exported_recipes += 1
el.msg += self.recipe_processed_msg(recipe) el.msg += self.get_recipe_processed_msg(recipe)
await sync_to_async(el.save, thread_sensitive=True)() await sync_to_async(el.save, thread_sensitive=True)()

4
cookbook/integration/recipesage.py
View File

@ -94,10 +94,10 @@ class RecipeSage(Integration):
json_list.append(self.get_file_from_recipe(r)) json_list.append(self.get_file_from_recipe(r))
el.exported_recipes += 1 el.exported_recipes += 1
el.msg += self.recipe_processed_msg(r) el.msg += self.get_recipe_processed_msg(r)
el.save() el.save()
return [['export.json', json.dumps(json_list)]] return [[self.get_export_file_name('json'), json.dumps(json_list)]]
def split_recipe_file(self, file): def split_recipe_file(self, file):
return json.loads(file.read().decode("utf-8")) return json.loads(file.read().decode("utf-8"))

2
cookbook/integration/saffron.py
View File

@ -94,7 +94,7 @@ class Saffron(Integration):
files.append([ filename, data ]) files.append([ filename, data ])
el.exported_recipes += 1 el.exported_recipes += 1
el.msg += self.recipe_processed_msg(r) el.msg += self.get_recipe_processed_msg(r)
el.save() el.save()
return files return files