scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

server/posts: reorder content upload code, tolerate duplicate checksums

Browse Source 
cf. #539
This commit is contained in:
Eva
2025-03-30 05:31:32 +02:00
parent 782f069031
commit 4a88bb025d
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/szurubooru/func/posts.py
View File

@ -626,13 +626,12 @@ def update_post_content(post: model.Post, content: Optional[bytes]) -> None:
"Unhandled file type: %r" % post.mime_type
)
post.checksum = util.get_sha1(content)
post.checksum_md5 = util.get_md5(content)
checksum = util.get_sha1(content)
other_post = (
db.session.query(model.Post)
.filter(model.Post.checksum == post.checksum)
.filter(model.Post.checksum == checksum)
.filter(model.Post.post_id != post.post_id)
.one_or_none()
.first()
)
if (
other_post
@ -641,11 +640,6 @@ def update_post_content(post: model.Post, content: Optional[bytes]) -> None:
):
raise PostAlreadyUploadedError(other_post)
if update_signature:
purge_post_signature(post)
post.signature = generate_post_signature(post, content)
post.file_size = len(content)
try:
image = images.Image(content)
post.canvas_width = image.width
@ -667,6 +661,15 @@ def update_post_content(post: model.Post, content: Optional[bytes]) -> None:
else:
post.canvas_width = None
post.canvas_height = None
post.checksum = checksum
post.checksum_md5 = util.get_md5(content)
post.file_size = len(content)
if update_signature:
purge_post_signature(post)
post.signature = generate_post_signature(post, content)
setattr(post, "__content", content)
@ -923,7 +926,7 @@ def search_by_image_exact(image_content: bytes) -> Optional[model.Post]:
return (
db.session.query(model.Post)
.filter(model.Post.checksum == checksum)
.one_or_none()
.first()
)