From 9429f335b9262a6d7f995a2662497777cc45fd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= Date: Tue, 13 Apr 2021 18:28:49 +0200 Subject: [PATCH 1/3] Ensure that height gets set in the image request Request quality of 96, for up to 16 less jpeg --- src/components/cardbuilder/cardBuilder.js | 28 ++++++++++------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 953d270df..83e0e248f 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -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,11 +543,8 @@ import ServerConnections from '../ServerConnections'; forceName = true; } - if (primaryImageAspectRatio) { - uiAspect = getDesiredAspect(shape); - if (uiAspect) { - coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2; - } + if (primaryImageAspectRatio && uiAspect) { + coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2; } } else if (item.SeriesPrimaryImageTag) { imgType = 'Primary'; @@ -563,11 +560,8 @@ import ServerConnections from '../ServerConnections'; forceName = true; } - if (primaryImageAspectRatio) { - uiAspect = getDesiredAspect(shape); - if (uiAspect) { - coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2; - } + if (primaryImageAspectRatio && uiAspect) { + coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2; } } else if (item.ParentPrimaryImageTag) { imgType = 'Primary'; @@ -579,11 +573,8 @@ import ServerConnections from '../ServerConnections'; itemId = item.AlbumId; height = width && primaryImageAspectRatio ? Math.round(width / primaryImageAspectRatio) : null; - if (primaryImageAspectRatio) { - uiAspect = getDesiredAspect(shape); - if (uiAspect) { - coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2; - } + if (primaryImageAspectRatio && uiAspect) { + coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2; } } else if (item.Type === 'Season' && item.ImageTags && item.ImageTags.Thumb) { imgType = '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 }); } From 72ccf680e3bfd60fb9984d7d391c4eed8873bb03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= Date: Tue, 13 Apr 2021 19:33:46 +0200 Subject: [PATCH 2/3] Bump apiclient to 1.7.0 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 153e21839..4e510edca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5975,9 +5975,9 @@ "dev": true }, "jellyfin-apiclient": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/jellyfin-apiclient/-/jellyfin-apiclient-1.6.0.tgz", - "integrity": "sha512-LL8YwUQJYTFdlx6VwA5C3+KWkLEM0V56fJGruUDwCVUCFQQVJ+E6hpHIO1lMeo26ZxURtebf5VtCCG35ZHugbg==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/jellyfin-apiclient/-/jellyfin-apiclient-1.7.0.tgz", + "integrity": "sha512-aaUmhdvox02ge/ROSc8bsdmghjvfbP1QZ28yEPHaMHzY2GBaFczcCWXvEtl6dcQW+lfkemmFtf8D4OSvLHiFzw==" }, "jest-worker": { "version": "26.6.2", diff --git a/package.json b/package.json index 1a5da1e0d..0af31b5ed 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "headroom.js": "^0.12.0", "hls.js": "^0.14.17", "intersection-observer": "^0.12.0", - "jellyfin-apiclient": "^1.6.0", + "jellyfin-apiclient": "^1.7.0", "jquery": "^3.5.1", "jstree": "^3.3.11", "libarchive.js": "^1.3.0", From 63ea97ad74c9d1d7d71061efa646d95a941c8d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= Date: Wed, 14 Apr 2021 07:46:11 +0200 Subject: [PATCH 3/3] Make eslint happy --- src/components/cardbuilder/cardBuilder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 83e0e248f..be047648a 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -498,7 +498,7 @@ import ServerConnections from '../ServerConnections'; let imgUrl = null; let imgTag = null; let coverImage = false; - let uiAspect = getDesiredAspect(shape); + const uiAspect = getDesiredAspect(shape); let imgType = null; let itemId = null;