Skip to content

Commit 257675e

Browse files
committed
better unit handling
1 parent cd8cbb3 commit 257675e

File tree

1 file changed

+6
-6
lines changed
  • crates/next-core/src/next_app/metadata

1 file changed

+6
-6
lines changed

crates/next-core/src/next_app/metadata/route.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ async fn static_route_source(mode: NextMode, path: FileSystemPath) -> Result<Vc<
158158
let file_size_limit_mb = if is_twitter { 5 } else { 8 };
159159
if (is_twitter || is_open_graph)
160160
&& let Some(content) = path.read().await?.as_content()
161-
&& let file_size_mb = content.content().to_bytes().len() / 1024 / 1024
162-
&& file_size_mb > file_size_limit_mb
161+
&& let file_size = content.content().to_bytes().len()
162+
&& file_size > (file_size_limit_mb * 1024 * 1024)
163163
{
164164
StaticMetadataFileSizeIssue {
165165
img_name: if is_twitter {
@@ -169,7 +169,7 @@ async fn static_route_source(mode: NextMode, path: FileSystemPath) -> Result<Vc<
169169
},
170170
path: path.clone(),
171171
file_size_limit_mb,
172-
file_size_mb,
172+
file_size,
173173
}
174174
.resolved_cell()
175175
.emit();
@@ -428,7 +428,7 @@ async fn dynamic_image_route_source(path: FileSystemPath) -> Result<Vc<Box<dyn S
428428
struct StaticMetadataFileSizeIssue {
429429
img_name: RcStr,
430430
path: FileSystemPath,
431-
file_size_mb: usize,
431+
file_size: usize,
432432
file_size_limit_mb: usize,
433433
}
434434

@@ -458,11 +458,11 @@ impl Issue for StaticMetadataFileSizeIssue {
458458
Ok(Vc::cell(Some(
459459
StyledString::Text(
460460
format!(
461-
"File size for {} image {} exceeds {}MB. (Current: {}MB)",
461+
"File size for {} image \"{}\" exceeds {}MB. (Current: {:.1}MB)",
462462
self.img_name,
463463
self.path.value_to_string().await?,
464464
self.file_size_limit_mb,
465-
self.file_size_mb,
465+
(self.file_size as f32) / 1024.0 / 1024.0
466466
)
467467
.into(),
468468
)

0 commit comments

Comments
 (0)