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

Merge pull request #2645 from joshuaboniface/remove-image-proxy

Browse source
This commit is contained in:
Joshua M. Boniface 2021-05-02 16:14:00 -04:00 • committed by GitHub
commit 9e845fb917
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/imageDownloader/imageDownloader.js
View file

@ -79,7 +79,7 @@ import template from './imageDownloader.template.html';
let html = ''; let html = '';
for (let i = 0, length = imagesResult.Images.length; i < length; i++) { for (let i = 0, length = imagesResult.Images.length; i < length; i++) {
html += getRemoteImageHtml(imagesResult.Images[i], imageType, apiClient); html += getRemoteImageHtml(imagesResult.Images[i], imageType);
} }
const availableImagesList = page.querySelector('.availableImagesList'); const availableImagesList = page.querySelector('.availableImagesList');
@ -150,11 +150,7 @@ import template from './imageDownloader.template.html';
}); });
} }
function getDisplayUrl(url, apiClient) { function getRemoteImageHtml(image, imageType) {
return apiClient.getUrl('Images/Remote', { imageUrl: url });
}
function getRemoteImageHtml(image, imageType, apiClient) {
const tagName = layoutManager.tv ? 'button' : 'div'; const tagName = layoutManager.tv ? 'button' : 'div';
const enableFooterButtons = !layoutManager.tv; const enableFooterButtons = !layoutManager.tv;
@ -209,9 +205,9 @@ import template from './imageDownloader.template.html';
html += '<div class="cardContent">'; html += '<div class="cardContent">';
if (layoutManager.tv || !appHost.supports('externallinks')) { if (layoutManager.tv || !appHost.supports('externallinks')) {
html += '<div class="cardImageContainer lazy" data-src="' + getDisplayUrl(image.Url, apiClient) + '" style="background-position:center center;background-size:contain;"></div>'; html += '<div class="cardImageContainer lazy" data-src="' + image.Url + '" style="background-position:center center;background-size:contain;"></div>';
} else { } else {
html += '<a is="emby-linkbutton" target="_blank" href="' + getDisplayUrl(image.Url, apiClient) + '" class="button-link cardImageContainer lazy" data-src="' + getDisplayUrl(image.Url, apiClient) + '" style="background-position:center center;background-size:contain"></a>'; html += '<a is="emby-linkbutton" target="_blank" href="' + image.Url + '" class="button-link cardImageContainer lazy" data-src="' + image.Url + '" style="background-position:center center;background-size:contain"></a>';
} }
html += '</div>'; html += '</div>';

18
src/components/itemidentifier/itemidentifier.js
View file

@ -171,9 +171,7 @@ import template from './itemidentifier.template.html';
let resultHtml = lines.join('<br/>'); let resultHtml = lines.join('<br/>');
if (identifyResult.ImageUrl) { if (identifyResult.ImageUrl) {
const displayUrl = getSearchImageDisplayUrl(identifyResult.ImageUrl, identifyResult.SearchProviderName); resultHtml = `<div style="display:flex;align-items:center;"><img src="${identifyResult.ImageUrl}" style="max-height:240px;" /><div style="margin-left:1em;">${resultHtml}</div>`;
resultHtml = `<div style="display:flex;align-items:center;"><img src="${displayUrl}" style="max-height:240px;" /><div style="margin-left:1em;">${resultHtml}</div>`;
} }
page.querySelector('.selectedSearchResult').innerHTML = resultHtml; page.querySelector('.selectedSearchResult').innerHTML = resultHtml;
@ -218,9 +216,7 @@ import template from './itemidentifier.template.html';
html += '<div class="cardContent searchImage">'; html += '<div class="cardContent searchImage">';
if (result.ImageUrl) { if (result.ImageUrl) {
const displayUrl = getSearchImageDisplayUrl(result.ImageUrl, result.SearchProviderName); html += `<div class="cardImageContainer coveredImage" style="background-image:url('${result.ImageUrl}');"></div>`;
html += `<div class="cardImageContainer coveredImage" style="background-image:url('${displayUrl}');"></div>`;
} else { } else {
html += `<div class="cardImageContainer coveredImage defaultCardBackground defaultCardBackground1"><div class="cardText cardCenteredText">${result.Name}</div></div>`; html += `<div class="cardImageContainer coveredImage defaultCardBackground defaultCardBackground1"><div class="cardText cardCenteredText">${result.Name}</div></div>`;
} }
@ -258,16 +254,6 @@ import template from './itemidentifier.template.html';
return html; return html;
} }
function getSearchImageDisplayUrl(url, provider) {
const apiClient = getApiClient();
return apiClient.getUrl('Items/RemoteSearch/Image', {
imageUrl: url,
ProviderName: provider,
api_key: apiClient.accessToken()
});
}
function submitIdentficationResult(page) { function submitIdentficationResult(page) {
loading.show(); loading.show();

1
src/index.html
View file

@ -11,6 +11,7 @@
<meta name="mobile-web-app-capable" content="yes"> <meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="Jellyfin"> <meta name="application-name" content="Jellyfin">
<meta name="robots" content="noindex, nofollow, noarchive"> <meta name="robots" content="noindex, nofollow, noarchive">
<meta name="referrer" content="no-referrer">
<meta property="og:title" content="Jellyfin"> <meta property="og:title" content="Jellyfin">
<meta property="og:site_name" content="Jellyfin"> <meta property="og:site_name" content="Jellyfin">
<meta property="og:url" content="http://jellyfin.org"> <meta property="og:url" content="http://jellyfin.org">