diff --git a/src/components/sidebar/tabs/AssetsSidebarListView.vue b/src/components/sidebar/tabs/AssetsSidebarListView.vue index 52a945d397a..c0417ef507f 100644 --- a/src/components/sidebar/tabs/AssetsSidebarListView.vue +++ b/src/components/sidebar/tabs/AssetsSidebarListView.vue @@ -23,7 +23,7 @@ :aria-label=" t('assetBrowser.ariaLabel.assetCard', { name: getAssetDisplayName(item.asset), - type: getAssetMediaType(item.asset) + type: getMediaTypeFromFilename(item.asset.name) }) " :class=" @@ -32,10 +32,10 @@ item.isChild && 'pl-6' ) " - :preview-url="getAssetPreviewUrl(item.asset)" + :preview-url="assetThumbnail(item.asset).src" :preview-alt="getAssetDisplayName(item.asset)" - :icon-name="iconForMediaType(getAssetMediaType(item.asset))" - :is-video-preview="isVideoAsset(item.asset)" + :icon-name="assetThumbnail(item.asset).icon" + :is-video-preview="assetThumbnail(item.asset).isVideo" :primary-text="getAssetPrimaryText(item.asset)" :secondary-text="getAssetSecondaryText(item.asset)" :stack-count="getStackCount(item.asset)" @@ -81,8 +81,7 @@ import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataS import type { AssetItem } from '@/platform/assets/schemas/assetSchema' import { startAssetDrag } from '@/platform/assets/utils/assetDragUtil' import { getAssetDisplayName } from '@/platform/assets/utils/assetMetadataUtils' -import { resolveMediaSrc } from '@/platform/assets/utils/assetUrlUtil' -import { iconForMediaType } from '@/platform/assets/utils/mediaIconUtil' +import { assetThumbnail } from '@/platform/assets/utils/assetThumbnailUtil' import { useAssetsStore } from '@/stores/assetsStore' import { formatDuration, @@ -90,7 +89,6 @@ import { getMediaTypeFromFilename, truncateFilename } from '@/utils/formatUtil' -import { hdrPreviewAssetUrl, isHdrImageFilename } from '@/utils/hdrFormatUtil' import { isPaged, pagedItems } from '@/utils/pagedList' import type { MaybePaged } from '@/utils/pagedList' import { cn } from '@comfyorg/tailwind-utils' @@ -135,23 +133,6 @@ function getAssetPrimaryText(asset: AssetItem): string { return truncateFilename(getAssetDisplayName(asset)) } -function getAssetMediaType(asset: AssetItem) { - return getMediaTypeFromFilename(asset.name) -} - -function isVideoAsset(asset: AssetItem): boolean { - return getAssetMediaType(asset) === 'video' -} - -function getAssetPreviewUrl(asset: AssetItem): string { - const mediaType = getAssetMediaType(asset) - if (asset.preview_id && isHdrImageFilename(asset.name)) - return hdrPreviewAssetUrl(asset.preview_id) - if (mediaType === 'image' || mediaType === 'video') - return resolveMediaSrc(asset.preview_url) - return '' -} - function getAssetSecondaryText(asset: AssetItem): string { const metadata = getOutputAssetMetadata(asset.user_metadata) if (typeof metadata?.executionTimeInSeconds === 'number') { diff --git a/src/platform/assets/components/AssetsListItemPreview.vue b/src/platform/assets/components/AssetsListItemPreview.vue index 624215efc3b..a413be5cd65 100644 --- a/src/platform/assets/components/AssetsListItemPreview.vue +++ b/src/platform/assets/components/AssetsListItemPreview.vue @@ -33,7 +33,12 @@