From 65fca0012dd788a9175fa01370fc43f8da2d9121 Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Fri, 19 Jun 2020 20:30:35 -0400 Subject: [birka-web] Implement file-specific views and thumbnails. --- src/birka-web.rs | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/birka-web.rs b/src/birka-web.rs index 2053805..4e518aa 100644 --- a/src/birka-web.rs +++ b/src/birka-web.rs @@ -85,6 +85,26 @@ struct FileResult { tags: Vec, } +/// Return whether or not `filename` ends with one of `extensions`. +fn has_extension>(filename: T, extensions: Vec<&str>) -> bool { + filename + .as_ref() + .extension() + .and_then(|ext| ext.to_str()) + .map(|ext| extensions.contains(&ext)) + .unwrap_or(false) +} + +/// Return whether or not `filename` ends with the extension of a known video file type. +fn is_video>(filename: T) -> bool { + has_extension(filename, vec!["mp4", "mkv", "webm"]) +} + +/// Return whether or not `filename` ends with the extension of a known image file type. +fn is_image>(filename: T) -> bool { + has_extension(filename, vec!["png", "jpg", "jpeg", "gif"]) +} + /// Return the store file name of `filename`. fn store_filename>(id: i64, path: T) -> String { if let Some(filename) = path.as_ref().file_name() { @@ -101,10 +121,10 @@ fn store_filename>(id: i64, path: T) -> String { /// Return the store file name of the thumbnail of `filename`. fn thumb_filename>(id: i64, path: T) -> String { - if let Some(filename) = path.as_ref().file_name() { - let filename = filename.to_string_lossy(); - if let Some(n) = filename.rfind('.') { - format!("{id}_thumb.{ext}", id = id, ext = &filename[n + 1..]) + if let Some(ext) = path.as_ref().extension() { + if let Some(ext) = ext.to_str() { + let ext = if is_video(path.as_ref()) { "png" } else { ext }; + format!("{id}_thumb.{ext}", id = id, ext = ext) } else { format!("{}_thumb", id) } @@ -287,6 +307,9 @@ fn display_post(conn: SiteState, id: i64) -> Result