mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 20:38:24 +02:00
proxy remote images through the server when previewing
This commit is contained in:
parent
403534f80e
commit
ea9fddd5ca
6 changed files with 108 additions and 8 deletions
|
@ -1,4 +1,11 @@
|
||||||
using MediaBrowser.Controller.Dto;
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using MediaBrowser.Common.Configuration;
|
||||||
|
using MediaBrowser.Common.Extensions;
|
||||||
|
using MediaBrowser.Common.IO;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
|
using MediaBrowser.Controller;
|
||||||
|
using MediaBrowser.Controller.Dto;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
|
@ -62,16 +69,31 @@ namespace MediaBrowser.Api
|
||||||
public string ImageUrl { get; set; }
|
public string ImageUrl { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Route("/Images/Remote", "GET")]
|
||||||
|
[Api(Description = "Gets a remote image")]
|
||||||
|
public class GetRemoteImage
|
||||||
|
{
|
||||||
|
[ApiMember(Name = "Url", Description = "The image url", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
|
||||||
|
public string Url { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public class RemoteImageService : BaseApiService
|
public class RemoteImageService : BaseApiService
|
||||||
{
|
{
|
||||||
private readonly IProviderManager _providerManager;
|
private readonly IProviderManager _providerManager;
|
||||||
|
|
||||||
|
private readonly IServerApplicationPaths _appPaths;
|
||||||
|
private readonly IHttpClient _httpClient;
|
||||||
|
private readonly IFileSystem _fileSystem;
|
||||||
|
|
||||||
private readonly IDtoService _dtoService;
|
private readonly IDtoService _dtoService;
|
||||||
|
|
||||||
public RemoteImageService(IProviderManager providerManager, IDtoService dtoService)
|
public RemoteImageService(IProviderManager providerManager, IDtoService dtoService, IServerApplicationPaths appPaths, IHttpClient httpClient, IFileSystem fileSystem)
|
||||||
{
|
{
|
||||||
_providerManager = providerManager;
|
_providerManager = providerManager;
|
||||||
_dtoService = dtoService;
|
_dtoService = dtoService;
|
||||||
|
_appPaths = appPaths;
|
||||||
|
_httpClient = httpClient;
|
||||||
|
_fileSystem = fileSystem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public object Get(GetRemoteImages request)
|
public object Get(GetRemoteImages request)
|
||||||
|
@ -128,5 +150,78 @@ namespace MediaBrowser.Api
|
||||||
await item.RefreshMetadata(CancellationToken.None, forceSave: true, allowSlowProviders: false)
|
await item.RefreshMetadata(CancellationToken.None, forceSave: true, allowSlowProviders: false)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public object Get(GetRemoteImage request)
|
||||||
|
{
|
||||||
|
var task = GetRemoteImage(request);
|
||||||
|
|
||||||
|
return task.Result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<object> GetRemoteImage(GetRemoteImage request)
|
||||||
|
{
|
||||||
|
var urlHash = request.Url.GetMD5();
|
||||||
|
var pointerCachePath = GetFullCachePath(urlHash.ToString());
|
||||||
|
|
||||||
|
string contentPath;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using (var reader = new StreamReader(pointerCachePath))
|
||||||
|
{
|
||||||
|
contentPath = await reader.ReadToEndAsync().ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (File.Exists(contentPath))
|
||||||
|
{
|
||||||
|
return ToStaticFileResult(contentPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (FileNotFoundException)
|
||||||
|
{
|
||||||
|
// Means the file isn't cached yet
|
||||||
|
}
|
||||||
|
|
||||||
|
await DownloadImage(request.Url, urlHash, pointerCachePath).ConfigureAwait(false);
|
||||||
|
|
||||||
|
// Read the pointer file again
|
||||||
|
using (var reader = new StreamReader(pointerCachePath))
|
||||||
|
{
|
||||||
|
contentPath = await reader.ReadToEndAsync().ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ToStaticFileResult(contentPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task DownloadImage(string url, Guid urlHash, string pointerCachePath)
|
||||||
|
{
|
||||||
|
var result = await _httpClient.GetResponse(new HttpRequestOptions
|
||||||
|
{
|
||||||
|
Url = url
|
||||||
|
|
||||||
|
}).ConfigureAwait(false);
|
||||||
|
|
||||||
|
var ext = result.ContentType.Split('/').Last();
|
||||||
|
|
||||||
|
var fullCachePath = GetFullCachePath(urlHash + "." + ext);
|
||||||
|
|
||||||
|
using (var stream = result.Content)
|
||||||
|
{
|
||||||
|
using (var filestream = _fileSystem.GetFileStream(fullCachePath, FileMode.Create, FileAccess.Write, FileShare.Read, true))
|
||||||
|
{
|
||||||
|
await stream.CopyToAsync(filestream).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
using (var writer = new StreamWriter(pointerCachePath))
|
||||||
|
{
|
||||||
|
await writer.WriteAsync(fullCachePath).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetFullCachePath(string filename)
|
||||||
|
{
|
||||||
|
return Path.Combine(_appPaths.DownloadedImagesDataPath, filename.Substring(0, 1), filename);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,6 +100,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
return 0;
|
return 0;
|
||||||
})
|
})
|
||||||
.ThenByDescending(i => i.CommunityRating ?? 0)
|
.ThenByDescending(i => i.CommunityRating ?? 0)
|
||||||
|
.ThenByDescending(i => i.VoteCount ?? 0)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
return Task.FromResult<IEnumerable<RemoteImageInfo>>(list);
|
return Task.FromResult<IEnumerable<RemoteImageInfo>>(list);
|
||||||
|
|
|
@ -97,6 +97,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
return 0;
|
return 0;
|
||||||
})
|
})
|
||||||
.ThenByDescending(i => i.CommunityRating ?? 0)
|
.ThenByDescending(i => i.CommunityRating ?? 0)
|
||||||
|
.ThenByDescending(i => i.VoteCount ?? 0)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
return Task.FromResult<IEnumerable<RemoteImageInfo>>(list);
|
return Task.FromResult<IEnumerable<RemoteImageInfo>>(list);
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
using System.Globalization;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
|
@ -7,6 +6,7 @@ using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
@ -28,7 +28,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
public string Name
|
public string Name
|
||||||
{
|
{
|
||||||
get { return "TvDb"; }
|
get { return "TheTVDB"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Supports(BaseItem item)
|
public bool Supports(BaseItem item)
|
||||||
|
@ -56,7 +56,8 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
var files = TvdbEpisodeProvider.Current.GetEpisodeXmlFiles(episode, seriesDataPath);
|
var files = TvdbEpisodeProvider.Current.GetEpisodeXmlFiles(episode, seriesDataPath);
|
||||||
|
|
||||||
var result = files.Select(i => GetImageInfo(i, cancellationToken)).Where(i => i != null);
|
var result = files.Select(i => GetImageInfo(i, cancellationToken))
|
||||||
|
.Where(i => i != null);
|
||||||
|
|
||||||
return Task.FromResult(result);
|
return Task.FromResult(result);
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,7 +35,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
public static string ProviderName
|
public static string ProviderName
|
||||||
{
|
{
|
||||||
get { return "TvDb"; }
|
get { return "TheTVDB"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Supports(BaseItem item)
|
public bool Supports(BaseItem item)
|
||||||
|
@ -147,6 +147,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
return 0;
|
return 0;
|
||||||
})
|
})
|
||||||
.ThenByDescending(i => i.CommunityRating ?? 0)
|
.ThenByDescending(i => i.CommunityRating ?? 0)
|
||||||
|
.ThenByDescending(i => i.VoteCount ?? 0)
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
public static string ProviderName
|
public static string ProviderName
|
||||||
{
|
{
|
||||||
get { return "TvDb"; }
|
get { return "TheTVDB"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Supports(BaseItem item)
|
public bool Supports(BaseItem item)
|
||||||
|
@ -145,6 +145,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
return 0;
|
return 0;
|
||||||
})
|
})
|
||||||
.ThenByDescending(i => i.CommunityRating ?? 0)
|
.ThenByDescending(i => i.CommunityRating ?? 0)
|
||||||
|
.ThenByDescending(i => i.VoteCount ?? 0)
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue