github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 05:53:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Video thumbnails can have duplicates (#21681)

Browse Source 
* FIX: Video thumbnails can have duplicates

It's possible that a duplicate video or even a very similar video could
generate the same video thumbnail. Because video thumbnails are mapped
to their corresponding video by using the video sha1 in the thumbnail
filename we need to allow for duplicate thumbnails otherwise even when a
thumbnail has been generated for a topic it will not be mapped
correctly.

This will also allow you to re-upload a video on the same topic to
regenerate the thumbnail.

* fix typo
This commit is contained in:
Blake Erickson
2023-05-23 09:00:09 -06:00
committed by GitHub
parent 0764dc3452
commit b637249169
4 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/upload_creator.rb
View File

@ -74,6 +74,7 @@ class UploadCreator
is_image = FileHelper.is_supported_image?(@filename)
is_image ||= @image_info && FileHelper.is_supported_image?("test.#{@image_info.type}")
is_image = false if @opts[:for_theme]
is_thumbnail = SiteSetting.video_thumbnails_enabled && @opts[:type] == "thumbnail"
# If this is present then it means we are creating an upload record from
# an external_upload_stub and the file is > ExternalUploadManager::DOWNLOAD_LIMIT,
@ -119,13 +120,17 @@ class UploadCreator
# compute the sha of the file and generate a unique hash
# which is only used for secure uploads
sha1 = Upload.generate_digest(@file) if !external_upload_too_big
unique_hash = generate_fake_sha1_hash if SiteSetting.secure_uploads || external_upload_too_big
unique_hash = generate_fake_sha1_hash if SiteSetting.secure_uploads ||
external_upload_too_big || is_thumbnail
# we do not check for duplicate uploads if secure uploads is
# enabled because we use a unique access hash to differentiate
# between uploads instead of the sha1, and to get around various
# access/permission issues for uploads
if !SiteSetting.secure_uploads && !external_upload_too_big
# We do not check for duplicate uploads for video thumbnails because
# their filename needs to match with their corresponding video. This also
# enables rebuilding the html on a topic to regenerate a thumbnail.
if !SiteSetting.secure_uploads && !external_upload_too_big && !is_thumbnail
# do we already have that upload?
@upload = Upload.find_by(sha1: sha1)
@ -163,7 +168,14 @@ class UploadCreator
@upload.user_id = user_id
@upload.original_filename = fixed_original_filename || @filename
@upload.filesize = filesize
@upload.sha1 = (SiteSetting.secure_uploads? || external_upload_too_big) ? unique_hash : sha1
@upload.sha1 =
(
if (SiteSetting.secure_uploads? || external_upload_too_big || is_thumbnail)
unique_hash
else
sha1
end
)
@upload.original_sha1 = SiteSetting.secure_uploads? ? sha1 : nil
@upload.url = ""
@upload.origin = @opts[:origin][0...1000] if @opts[:origin]