1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Ensure that height gets set in the image request

Request quality of 96, for up to 16 less jpeg
This commit is contained in:
Odd Stråbø 2021-04-13 18:28:49 +02:00
parent 6253942498
commit 9429f335b9

View file

@ -498,7 +498,7 @@ import ServerConnections from '../ServerConnections';
let imgUrl = null;
let imgTag = null;
let coverImage = false;
let uiAspect = null;
let uiAspect = getDesiredAspect(shape);
let imgType = null;
let itemId = null;
@ -543,12 +543,9 @@ import ServerConnections from '../ServerConnections';
forceName = true;
}
if (primaryImageAspectRatio) {
uiAspect = getDesiredAspect(shape);
if (uiAspect) {
if (primaryImageAspectRatio && uiAspect) {
coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
}
}
} else if (item.SeriesPrimaryImageTag) {
imgType = 'Primary';
imgTag = item.SeriesPrimaryImageTag;
@ -563,12 +560,9 @@ import ServerConnections from '../ServerConnections';
forceName = true;
}
if (primaryImageAspectRatio) {
uiAspect = getDesiredAspect(shape);
if (uiAspect) {
if (primaryImageAspectRatio && uiAspect) {
coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
}
}
} else if (item.ParentPrimaryImageTag) {
imgType = 'Primary';
imgTag = item.ParentPrimaryImageTag;
@ -579,12 +573,9 @@ import ServerConnections from '../ServerConnections';
itemId = item.AlbumId;
height = width && primaryImageAspectRatio ? Math.round(width / primaryImageAspectRatio) : null;
if (primaryImageAspectRatio) {
uiAspect = getDesiredAspect(shape);
if (uiAspect) {
if (primaryImageAspectRatio && uiAspect) {
coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
}
}
} else if (item.Type === 'Season' && item.ImageTags && item.ImageTags.Thumb) {
imgType = 'Thumb';
imgTag = item.ImageTags.Thumb;
@ -613,10 +604,15 @@ import ServerConnections from '../ServerConnections';
}
if (imgTag && imgType) {
// TODO: This place is a mess. Could do with a good spring cleaning.
if (!height && width && uiAspect) {
height = width / uiAspect;
}
imgUrl = apiClient.getScaledImageUrl(itemId, {
type: imgType,
fillHeight: height,
fillWidth: width,
quality: 96,
tag: imgTag
});
}