mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-22 23:10:38 +00:00
Code Issues Projects Releases Wiki Activity

fix avatar import path

Browse source
This commit is contained in:
Hugh Rundle 2024-01-28 15:56:44 +11:00
parent 582e97e4a5
commit a3e05254b5
No known key found for this signature in database
GPG key ID: A7E35779918253F9
2 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
bookwyrm/models/bookwyrm_export_job.py
View file

@ -246,9 +246,7 @@ class AddFileToTar(ChildJob):
# Add avatar image if present # Add avatar image if present
if getattr(user, "avatar", False): if getattr(user, "avatar", False):
tar.add_image( tar.add_image(user.avatar, filename="avatar")
user.avatar, filename="avatar", directory="avatar/"
)
for book in editions: for book in editions:
if getattr(book, "cover", False): if getattr(book, "cover", False):
@ -284,7 +282,6 @@ def start_export_task(**kwargs):
job.user.save() job.user.save()
job.export_json = job.user.to_activity() job.export_json = job.user.to_activity()
logger.info(job.export_json)
job.save(update_fields=["export_data", "export_json"]) job.save(update_fields=["export_data", "export_json"])
# let's go # let's go
@ -345,45 +342,48 @@ def export_reading_goals_task(**kwargs):
def json_export(**kwargs): def json_export(**kwargs):
"""Generate an export for a user""" """Generate an export for a user"""
job = BookwyrmExportJob.objects.get(id=kwargs["job_id"]) try:
job.set_status("active") job = BookwyrmExportJob.objects.get(id=kwargs["job_id"])
job_id = kwargs["job_id"] job.set_status("active")
job_id = kwargs["job_id"]
# I don't love this but it prevents a JSON encoding error if not job.export_json.get("icon"):
# when there is no user image job.export_json["icon"] = {}
if isinstance( else:
job.export_json["icon"], # change the URL to be relative to the JSON file
dataclasses._MISSING_TYPE, # pylint: disable=protected-access file_type = job.export_json["icon"]["url"].rsplit(".", maxsplit=1)[-1]
): filename = f"avatar.{file_type}"
job.export_json["icon"] = {} job.export_json["icon"]["url"] = filename
else:
# change the URL to be relative to the JSON file
file_type = job.export_json["icon"]["url"].rsplit(".", maxsplit=1)[-1]
filename = f"avatar.{file_type}"
job.export_json["icon"]["url"] = filename
# Additional settings - can't be serialized as AP # Additional settings - can't be serialized as AP
vals = [ vals = [
"show_goal", "show_goal",
"preferred_timezone", "preferred_timezone",
"default_post_privacy", "default_post_privacy",
"show_suggested_users", "show_suggested_users",
] ]
job.export_json["settings"] = {} job.export_json["settings"] = {}
for k in vals: for k in vals:
job.export_json["settings"][k] = getattr(job.user, k) job.export_json["settings"][k] = getattr(job.user, k)
job.export_json["books"] = [] job.export_json["books"] = []
# save settings we just updated # save settings we just updated
job.save(update_fields=["export_json"]) job.save(update_fields=["export_json"])
# trigger subtasks # trigger subtasks
export_saved_lists_task.delay(job_id=job_id, no_children=False) export_saved_lists_task.delay(job_id=job_id, no_children=False)
export_follows_task.delay(job_id=job_id, no_children=False) export_follows_task.delay(job_id=job_id, no_children=False)
export_blocks_task.delay(job_id=job_id, no_children=False) export_blocks_task.delay(job_id=job_id, no_children=False)
trigger_books_jobs.delay(job_id=job_id, no_children=False) trigger_books_jobs.delay(job_id=job_id, no_children=False)
except Exception as err: # pylint: disable=broad-except
logger.exception(
"json_export task in job %s Failed with error: %s",
job.id,
err,
)
job.set_status("failed")
@app.task(queue=IMPORTS, base=ParentTask) @app.task(queue=IMPORTS, base=ParentTask)
def trigger_books_jobs(**kwargs): def trigger_books_jobs(**kwargs):

2
bookwyrm/models/bookwyrm_import_job.py
View file

@ -215,7 +215,7 @@ def upsert_statuses(user, cls, data, book_remote_id):
instance.save() # save and broadcast instance.save() # save and broadcast
else: else:
logger.info("User does not have permission to import statuses") logger.warning("User does not have permission to import statuses")
def upsert_lists(user, lists, book_id): def upsert_lists(user, lists, book_id):