daniel543x/artcraft
1
0 Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-11-03 08:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

hack fixes for thumbnails and cdn in dev

Browse Source
This commit is contained in:
Brandon Thomas committed 2025-02-01 23:36:05 -05:00
1 parent 1d7bc11be3
commit e3973e4ce1
3 files changed
+15 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/service/web/storyteller_web/src/http_server/common_responses/media/cdn_link.rs
+2 -2
View File
@@ -6,8 +6,8 @@ use url::Url;
const FAKEYOU_CDN_STR: &str = "https://cdn-2.fakeyou.com";
const STORYTELLER_CDN_STR: &str = "https://cdn-2.fakeyou.com"; // TODO(bt,2025-01-31): This doesn't work
const FAKEYOU_DEVELOPMENT_CDN_STR: &str = "https://pub-c8a4a5bdbdb048f286b77bdf9f786ff2.r2.dev/";
const STORYTELLER_DEVELOPMENT_CDN_STR: &str = "https://pub-c8a4a5bdbdb048f286b77bdf9f786ff2.r2.dev/";
const FAKEYOU_DEVELOPMENT_CDN_STR: &str = "https://pub-c8a4a5bdbdb048f286b77bdf9f786ff2.r2.dev";
const STORYTELLER_DEVELOPMENT_CDN_STR: &str = "https://pub-c8a4a5bdbdb048f286b77bdf9f786ff2.r2.dev";
const FAKEYOU_CDN: Lazy<Url> = Lazy::new(|| Url::parse(FAKEYOU_CDN_STR)
crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs
+11 -5
View File
@@ -4,7 +4,7 @@ use utoipa::ToSchema;
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
use server_environment::ServerEnvironment;
use crate::http_server::common_responses::media::cdn_link::new_cdn_url;
use crate::http_server::common_responses::media::cdn_link::{get_cdn_host, new_cdn_url};
// TODO(bt,2024-09-05): Worth reducing the quality at all?
const QUALITY : u8 = 95;
@@ -77,7 +77,7 @@ impl MediaLinks {
cdn_url.set_path(rooted_path);
MediaLinks {
cdn_url,
maybe_thumbnail_template: thumbnail_template(domain, rooted_path),
maybe_thumbnail_template: thumbnail_template(domain, server_environment, rooted_path),
maybe_video_previews: VideoPreviews::from_rooted_path(domain, rooted_path),
}
}
@@ -118,14 +118,20 @@ fn video_preview(media_domain: MediaDomain, rooted_path: &str, thumbnail_type: P
}
/// Returns a thumbnail template for image
fn thumbnail_template(media_domain: MediaDomain, rooted_path: &str) -> Option<String> {
fn thumbnail_template(media_domain: MediaDomain, server_environment: ServerEnvironment, rooted_path: &str) -> Option<String> {
if !rooted_path.ends_with(".jpg")
&& !rooted_path.ends_with(".png")
&& !rooted_path.ends_with(".gif") {
return None;
}
let host = media_domain.cdn_url_str();
Some(format!("{host}/cdn-cgi/image/width={{WIDTH}},quality={QUALITY}{rooted_path}"))
let host = get_cdn_host(media_domain, server_environment);
// NB(bt,2025-02-01): Development doesn't currently support thumbnails, so serve the full image.
match server_environment {
ServerEnvironment::Development => Some(format!("{host}{rooted_path}")), // NB(bt,2025-02-01): No thumbnails in development.
ServerEnvironment::Production => Some(format!("{host}/cdn-cgi/image/width={{WIDTH}},quality={QUALITY}{rooted_path}"))
}
}
/// Returns a thumbnail template for video
crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs
+2 -1
View File
@@ -340,7 +340,8 @@ pub async fn list_media_files_for_user_handler(
maybe_origin_model_type: record.maybe_origin_model_type
.map(|t| PublicMediaFileModelType::from_enum(t)),
maybe_origin_model_token: record.maybe_origin_model_token,
media_links: MediaLinks::from_media_path(media_domain, &public_bucket_path),
media_links: MediaLinks::from_media_path_and_env(
media_domain, server_state.server_environment, &public_bucket_path),
public_bucket_path: public_bucket_path
.get_full_object_path_str()
.to_string(),