mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-23 00:26:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix double exports subdir in S3 user export

Browse source
This commit is contained in:
Bart Schuurmans 2024-03-27 23:27:19 +01:00
parent c6ca547d58
commit cdbc1d172c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bookwyrm/models/bookwyrm_export_job.py
View file

@ -99,6 +99,7 @@ def create_archive_task(job_id):
try:
export_task_id = job.task_id
archive_filename = f"{export_task_id}.tar.gz"
export_json_bytes = DjangoJSONEncoder().encode(job.export_json).encode("utf-8")
user = job.user
@ -109,10 +110,9 @@ def create_archive_task(job_id):
storage = S3Boto3Storage()
# Handle for creating the final archive
s3_archive_path = f"exports/{export_task_id}.tar.gz"
s3_tar = S3Tar(
settings.AWS_STORAGE_BUCKET_NAME,
s3_archive_path,
f"exports/{archive_filename}",
session=BookwyrmAwsSession(),
)
@ -135,14 +135,14 @@ def create_archive_task(job_id):
# Create archive and store file name
s3_tar.tar()
job.export_data = s3_archive_path
job.export_data = archive_filename
job.save(update_fields=["export_data"])
# Delete temporary files
S3Boto3Storage.delete(storage, export_json_tmp_file)
else:
job.export_data = f"{export_task_id}.tar.gz"
job.export_data = archive_filename
with job.export_data.open("wb") as tar_file:
with BookwyrmTarFile.open(mode="w:gz", fileobj=tar_file) as tar:
# save json file