grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix video thumbnail generation (fixes #3484) (#4539)

Browse source 
* Fix video thumbnail generation (fixes #3484)

* fix test
This commit is contained in:
Nutomic 2024-03-15 13:41:16 +01:00 committed by GitHub
parent 19a1a077c5
commit 43378c5bb3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/api_common/src/request.rs
View file

@ -59,14 +59,8 @@ pub async fn fetch_link_metadata(
let opengraph_data = extract_opengraph_data(&html_bytes, url) let opengraph_data = extract_opengraph_data(&html_bytes, url)
.map_err(|e| info!("{e}")) .map_err(|e| info!("{e}"))
.unwrap_or_default(); .unwrap_or_default();
let thumbnail = extract_thumbnail_from_opengraph_data( let thumbnail =
url, extract_thumbnail_from_opengraph_data(url, &opengraph_data, generate_thumbnail, context).await;
&opengraph_data,
&content_type,
generate_thumbnail,
context,
)
.await;
Ok(LinkMetadata { Ok(LinkMetadata {
opengraph_data, opengraph_data,
@ -158,23 +152,21 @@ fn extract_opengraph_data(html_bytes: &[u8], url: &Url) -> Result<OpenGraphData,
pub async fn extract_thumbnail_from_opengraph_data( pub async fn extract_thumbnail_from_opengraph_data(
url: &Url, url: &Url,
opengraph_data: &OpenGraphData, opengraph_data: &OpenGraphData,
content_type: &Option<Mime>,
generate_thumbnail: bool, generate_thumbnail: bool,
context: &LemmyContext, context: &LemmyContext,
) -> Option<DbUrl> { ) -> Option<DbUrl> {
let is_image = content_type.as_ref().unwrap_or(&mime::TEXT_PLAIN).type_() == mime::IMAGE; if generate_thumbnail {
if generate_thumbnail && is_image {
let image_url = opengraph_data let image_url = opengraph_data
.image .image
.as_ref() .as_ref()
.map(lemmy_db_schema::newtypes::DbUrl::inner) .map(DbUrl::inner)
.unwrap_or(url); .unwrap_or(url);
generate_pictrs_thumbnail(image_url, context) generate_pictrs_thumbnail(image_url, context)
.await .await
.ok() .ok()
.map(Into::into) .map(Into::into)
} else { } else {
None opengraph_data.image.clone()
} }
} }
@ -363,7 +355,7 @@ mod tests {
Some(mime::TEXT_HTML_UTF_8.to_string()), Some(mime::TEXT_HTML_UTF_8.to_string()),
sample_res.content_type sample_res.content_type
); );
assert_eq!(None, sample_res.thumbnail); assert!(sample_res.thumbnail.is_some());
} }
// #[test] // #[test]