ActivityPub-federated video streaming platform using P2P directly in your web browser
Rework thumbnail size system
Chocobozzz4d13e41258b7
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.htmlindex 160fcf32cb..8fcc538996 100644--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html@@ -49,6 +49,7 @@@for (video of getVideosOf(videoChannel); track video) {<my-video-miniature[video]="video" [user]="userMiniature" [displayVideoActions]="true" [displayOptions]="miniatureDisplayOptions"+ thumbnailSizes="201px"></my-video-miniature>}diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scssindex c53dba9e60..307d3fb853 100644--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss@@ -77,9 +77,7 @@ my-subscribe-button {position: relative;my-video-miniature {- --thumbnail-width: #{$video-thumbnail-medium-width}; // Required by video-thumbnail component-- min-width: $video-thumbnail-medium-width;+ min-width: $video-thumbnail-medium-width; // Keep it sync with thumbnailSizes defined in templatemax-width: $video-thumbnail-medium-width;@include margin-right(15px);diff --git a/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.html b/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.htmlindex 2f2cbe6f47..2f9cb6c8d0 100644--- a/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.html+++ b/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.html@@ -25,7 +25,7 @@<my-video-miniature[displayOptions]="displayOptions" [video]="video" [user]="user" [displayAsRow]="displayAsRow()"(videoBlocked)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()" (videoAccountMuted)="onVideoRemoved()"- actorImageSize="32"+ actorImageSize="32" thumbnailSizes="201px"></my-video-miniature>@if (!playlist() && i === 0 && length > 1 && autoPlayNextVideo) {diff --git a/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.scss b/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.scssindex a0b926bfa5..307700c81d 100644--- a/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.scss+++ b/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.scss@@ -50,10 +50,9 @@ my-video-miniature {.other-videos:not(.display-as-row) my-video-miniature {--co-miniature-max-width: #{$video-thumbnail-medium-width};- --thumbnail-width: var(--co-miniature-max-width); // Required by video-thumbnail componentmin-width: var(--co-miniature-min-width);- max-width: var(--co-miniature-max-width);+ max-width: var(--co-miniature-max-width); // Keep it sync with thumbnailSizes defined in template}.display-as-row {diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.html b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.htmlindex 6f646d4698..300234e068 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.html+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.html@@ -2,7 +2,7 @@<my-video-miniature[video]="video()" [user]="user" [displayAsRow]="false"[displayVideoActions]="true" [displayOptions]="displayOptions"- thumbnailWidthPx="280"+ thumbnailSizes="280px"></my-video-miniature>}diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.scss b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.scssindex da93f8820a..d640da658e 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.scss+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.scss@@ -3,5 +3,5 @@my-video-miniature {display: inline-block;- width: $video-thumbnail-width;+ width: $video-thumbnail-width; // Keep in sync with thumbnailSizes in template}diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.html b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.htmlindex b3576b1755..ecb17b4c62 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.html+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.html@@ -6,7 +6,6 @@<my-video-miniature[video]="video" [user]="user" [displayAsRow]="false"[displayVideoActions]="true" [displayOptions]="displayOptions"- thumbnailWidthPx="280"></my-video-miniature></div>diff --git a/client/src/app/shared/shared-tables/video-cell.component.html b/client/src/app/shared/shared-tables/video-cell.component.htmlindex 5779ebe153..b0d9c3fc10 100644--- a/client/src/app/shared/shared-tables/video-cell.component.html+++ b/client/src/app/shared/shared-tables/video-cell.component.html@@ -2,7 +2,7 @@@if (thumbnail()) {<my-video-thumbnail- blur="false"+ blur="false" sizes="139px"[video]="video()" [videoRouterLink]="getVideoUrl()" [ariaLabel]="video().name" playOverlay="false"></my-video-thumbnail>}diff --git a/client/src/app/shared/shared-tables/video-cell.component.scss b/client/src/app/shared/shared-tables/video-cell.component.scssindex c3b3be0624..fe4c4cceaa 100644--- a/client/src/app/shared/shared-tables/video-cell.component.scss+++ b/client/src/app/shared/shared-tables/video-cell.component.scss@@ -9,8 +9,7 @@.root {--co-image-height: 78px;- --co-image-width: #{getWidth(78px)};- --thumbnail-width: var(--co-image-width); // Required by video-thumbnail component+ --co-image-width: #{getWidth(78px)}; // Keep it sync with "sizes" attribute of my-video-thumbnail in the templatedisplay: flex;align-items: center;diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.htmlindex 9cc1f2e7ea..b4a0484d8f 100644--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html@@ -9,7 +9,7 @@}<ng-template #aContent>- <img alt="" [attr.src]="getImageUrl()" [ngClass]="{ 'blur-filter': blur() }" />+ <img alt="" [attr.src]="src" [srcset]="srcset" [sizes]="sizes()" [ngClass]="{ 'blur-filter': blur() }" />@if (displayWatchLaterPlaylist()) {<div class="actions-overlay">diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.tsindex 819eff5aff..66f74f7c93 100644--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts@@ -1,10 +1,8 @@import { CommonModule } from '@angular/common'-import { booleanAttribute, Component, ElementRef, inject, input, numberAttribute, OnChanges, output, viewChild } from '@angular/core'+import { booleanAttribute, Component, input, OnChanges, output, viewChild } from '@angular/core'import { RouterLink } from '@angular/router'import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'import { Video as VideoServerModel, VideoState } from '@peertube/peertube-models'-import { findAppropriateThumbnailFileUrl } from '@root-helpers/images'-import { logger } from '@root-helpers/logger'import { GlobalIconComponent } from '../shared-icons/global-icon.component'import { FromNowPipe } from '../shared-main/date/from-now.pipe'import { Video } from '../shared-main/video/video.model'@@ -31,9 +29,8 @@ export type VideoThumbnailInput = Pick<imports: [ CommonModule, RouterLink, NgbTooltip, GlobalIconComponent, FromNowPipe ]})export class VideoThumbnailComponent implements OnChanges {- private el = inject(ElementRef)-readonly video = input.required<VideoThumbnailInput>()+ readonly sizes = input.required<string>()readonly videoRouterLink = input<string | any[]>(undefined)readonly queryParams = input<{@@ -52,13 +49,14 @@ export class VideoThumbnailComponent implements OnChanges {readonly watchLaterTooltip = viewChild<NgbTooltip>('watchLaterTooltip')readonly watchLaterClick = output<boolean>()- readonly widthPx = input(undefined, { transform: numberAttribute })-addToWatchLaterText: stringremoveFromWatchLaterText: stringdurationLabel: string+ src: string+ srcset: string+constructor () {this.addToWatchLaterText = $localize`Add to watch later`this.removeFromWatchLaterText = $localize`Remove from watch later`@@ -68,6 +66,15 @@ export class VideoThumbnailComponent implements OnChanges {this.durationLabel = this.video().duration? Video.buildDurationLabel(this.video()): undefined++ const thumbnails = this.video().thumbnails || []+ this.src = thumbnails.length > 0+ ? thumbnails[0].fileUrl+ : undefined++ this.srcset = thumbnails.filter(t => t.aspectRatio === '16:9')+ .map(t => `${t.fileUrl} ${t.width}w`)+ .join(', ')}getWatchIconText () {@@ -99,35 +106,6 @@ export class VideoThumbnailComponent implements OnChanges {return new Date(this.video().liveSchedules[0].startAt)}- getImageUrl () {- const video = this.video()- if (!video) return ''-- // From search index, handle instances that do not have `thumbnails` introduced in peertube 8.1- if (!video.thumbnails) return video.thumbnailUrl-- const computedStyle = window.getComputedStyle(this.el.nativeElement)-- let width = this.widthPx()-- if (!width) {- const cssVariable = computedStyle.getPropertyValue('--thumbnail-width')-- const widthStr = cssVariable === '100%'- ? window.innerWidth- : cssVariable.replace('px', '').trim()-- if (!widthStr || isNaN(+widthStr)) {- logger.error('Cannot find thumbnail width in CSS variables. Fallback to 280px')- width = 280- } else {- width = +widthStr- }- }-- return findAppropriateThumbnailFileUrl(video.thumbnails, width, '16:9')- }-getProgressPercent () {const video = this.video()if (!video.userHistory) return 0diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.htmlindex 954a48aa3f..633614d32c 100644--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html@@ -9,7 +9,7 @@[displayWatchLaterPlaylist]="isWatchLaterPlaylistDisplayed()"[inWatchLaterPlaylist]="inWatchLaterPlaylist"(watchLaterClick)="onWatchLaterClick($event)"- [widthPx]="thumbnailWidthPx()"+ [sizes]="thumbnailSizes() || '280px'"><!-- Don't use use imbricated @if that seems broken with content projection (Angular 20.3) -->@if (displayOptions().privacyLabel && isUnlistedVideo()) {diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss b/client/src/app/shared/shared-video-miniature/video-miniature.component.scssindex ee4a019f07..44c0f89782 100644--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss@@ -106,8 +106,6 @@ my-actor-host {}my-video-thumbnail {- --thumbnail-width: 100%; // Required by video-thumbnail component-margin-bottom: 0.35rem;@include block-ratio($selector: "::ng-deep .video-thumbnail");@@ -144,6 +142,7 @@ my-actor-host {margin-top: 3px;}+ // Keep breakpoint in sync with thumbnailSizes in template@media screen and (max-width: $small-view) {width: 100%;margin-bottom: 25px;@@ -173,9 +172,8 @@ my-actor-host {--co-fs-medium: #{$miniature-fs-row-medium};--co-fs-big: #{$miniature-fs-row-big};- --co-row-thumbnail-width: #{$video-thumbnail-width};+ --co-row-thumbnail-width: #{$video-thumbnail-width}; // Keep in sync with thumbnailSizes in template--co-row-thumbnail-height: #{$video-thumbnail-height};- --thumbnail-width: var(--co-row-thumbnail-width); // Required by video-thumbnail componentdisplay: flex;flex-direction: row;diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.tsindex e45abf06c2..b22d71a10d 100644--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts@@ -66,6 +66,7 @@ export class VideoMiniatureComponent implements OnInit {readonly user = input.required<User>()readonly video = input.required<Video>()+ readonly thumbnailSizes = input('')readonly displayOptions = input<MiniatureDisplayOptions>({date: true,@@ -94,8 +95,6 @@ export class VideoMiniatureComponent implements OnInit {readonly videoLinkType = input<LinkType>('internal')- readonly thumbnailWidthPx = input(undefined, { transform: numberAttribute })-readonly videoBlocked = output()readonly videoUnblocked = output()readonly videoRemoved = output()@@ -124,6 +123,8 @@ export class VideoMiniatureComponent implements OnInit {nsfwTooltip: string+ defaultThumbnailSizes: string+private ownerDisplayType: 'account' | 'videoChannel'private actionsLoaded = false@@ -146,6 +147,12 @@ export class VideoMiniatureComponent implements OnInit {ngOnInit () {this.serverConfig = this.serverService.getHTMLConfig()+ if (this.displayAsRow()) {+ this.defaultThumbnailSizes = '280px'+ } else {+ this.defaultThumbnailSizes = '(width <= 800px) 800px, 280px'+ }+this.buildVideoLink()this.buildOwnerLink()diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.htmlindex 66b45c8ba8..c0846fba04 100644--- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html+++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html@@ -12,6 +12,7 @@<my-video-thumbnail[video]="playlistElement().video" [blur]="hasNSFWBlur(playlistElement().video)"[videoRouterLink]="buildRouterLink()" [queryParams]="buildRouterQuery()" [ariaLabel]="getVideoAriaLabel()"+ sizes="130px"></my-video-thumbnail>} @else {<div class="fake-thumbnail"></div>diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.scss b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.scssindex 7a2c143eb5..e10fd3d5ac 100644--- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.scss+++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.scss@@ -6,9 +6,8 @@ $thumbnail-width: 130px;$thumbnail-height: 72px;.video {- --co-miniature-width: #{$thumbnail-width};+ --co-miniature-width: #{$thumbnail-width}; // Keep it sync with "sizes" attribute of my-video-thumbnail in the template--co-miniature-height: #{$thumbnail-height};- --thumbnail-width: var(--co-miniature-width); // Required by video-thumbnail component}my-timestamp-input {diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scssindex 6c14bc099b..1a0f69d9b6 100644--- a/client/src/sass/include/_miniature.scss+++ b/client/src/sass/include/_miniature.scss@@ -126,7 +126,6 @@.playlists {--co-miniature-min-width: #{$video-thumbnail-width - 25px};--co-miniature-max-width: #{$video-thumbnail-width};- --thumbnail-width: var(--co-miniature-max-width); // Required by video-thumbnail componentdisplay: grid;column-gap: 30px;@@ -148,7 +147,7 @@my-video-playlist-miniature {display: block;min-width: var(--co-miniature-min-width);- max-width: var(--co-miniature-max-width);+ max-width: var(--co-miniature-max-width); // Keep breakpoint in sync with thumbnailSizes in template}}