From a64ed2aa13e2dfb5b5292a4b2afaf77efe6d25da Mon Sep 17 00:00:00 2001 From: yiling Date: Wed, 29 Jul 2026 22:43:30 +0800 Subject: [PATCH] fix(webui): update file size formatting to SI decimal standard --- .../file-browser/file-list-item.tsx | 14 +++++----- packages/webui/lib/format.test.ts | 26 +++++++++++++++++++ packages/webui/lib/format.ts | 21 ++++++++++++--- 3 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 packages/webui/lib/format.test.ts diff --git a/packages/webui/components/file-browser/file-list-item.tsx b/packages/webui/components/file-browser/file-list-item.tsx index 0cd826ca..2263bbd6 100644 --- a/packages/webui/components/file-browser/file-list-item.tsx +++ b/packages/webui/components/file-browser/file-list-item.tsx @@ -6,6 +6,7 @@ import { useDraggable } from '@dnd-kit/react' import { File, Folder, MoreVertical, AudioLines } from 'lucide-react' import React, { useEffect, useMemo, useRef, useState } from 'react' import { cn } from '@/ui/lib/utils' +import { formatSize } from '@/ui/lib/format' import type { DragState } from '../dnd-types' import FieldRenderer from '../field-renderer' import { Badge } from '@/ui/components/ui/badge' @@ -135,13 +136,6 @@ export function FileListItem({ setName(displayItem.name) }, [displayItem.name]) - const formatSize = (size?: number) => { - if (!size) return '-' - if (size < 1024) return `${size} B` - if (size < 1024 * 1024) return `${(size / 1024).toFixed(1)} KB` - return `${(size / (1024 * 1024)).toFixed(1)} MB` - } - const formatDate = (date?: string) => { if (!date) return '-' return new Date(date).toLocaleDateString('en-US', { @@ -253,7 +247,11 @@ export function FileListItem({ minWidth: columnSizing?.['size'] || 100, }} > - {displayItem.type === 'folder' ? '-' : formatSize(displayItem.sizeByte)} + {displayItem.type === 'folder' + ? '-' + : displayItem.sizeByte + ? formatSize(displayItem.sizeByte) + : '-'}
{ + it('formats zero bytes', () => { + expect(formatSize(0)).toBe('0 B') + }) + + it('formats bytes below 1 KB', () => { + expect(formatSize(500)).toBe('500 B') + }) + + it('formats KB', () => { + expect(formatSize(1000)).toBe('1 KB') + expect(formatSize(1500)).toBe('1.5 KB') + }) + + it('formats MB', () => { + expect(formatSize(1000000)).toBe('1 MB') + expect(formatSize(2500000)).toBe('2.5 MB') + }) + + it('formats GB correctly using decimal standard', () => { + expect(formatSize(4109222091)).toBe('4.11 GB') + }) +}) diff --git a/packages/webui/lib/format.ts b/packages/webui/lib/format.ts index 726d90a7..c8550c65 100644 --- a/packages/webui/lib/format.ts +++ b/packages/webui/lib/format.ts @@ -1,7 +1,20 @@ export function formatSize(bytes: number): string { - if (bytes === 0) return '0 B' - const k = 1024 + if (!bytes || bytes <= 0) return '0 B' + const k = 1000 const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] - const i = Math.floor(Math.log(bytes) / Math.log(k)) - return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i] + let i = Math.floor(Math.log(bytes) / Math.log(k)) + if (i < 0) i = 0 + if (i >= sizes.length) i = sizes.length - 1 + + const val = bytes / Math.pow(k, i) + if (i === 0) { + return `${Math.round(val)} B` + } + + const formatted = parseFloat(val.toFixed(2)) + if (formatted >= 1000 && i < sizes.length - 1) { + return parseFloat((bytes / Math.pow(k, i + 1)).toFixed(2)) + ' ' + sizes[i + 1] + } + + return `${formatted} ${sizes[i]}` }