Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-30 09:19:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1693 from nfnty/api

Browse source 
Use HTTPS for API requests: Fix TheMovieDb and FanArt
This commit is contained in:
Luke 2016-04-29 12:52:14 -04:00
parent a12ec7167e 8711b8be14
commit 6375920933
13 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs
View file

@ -61,7 +61,7 @@ namespace MediaBrowser.Providers.BoxSets
{ {
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
return GetImages(mainResult, language, tmdbImageUrl); return GetImages(mainResult, language, tmdbImageUrl);
} }

2
MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
View file

@ -64,7 +64,7 @@ namespace MediaBrowser.Providers.BoxSets
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
var result = new RemoteSearchResult var result = new RemoteSearchResult
{ {

4
MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
View file

@ -16,6 +16,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
@ -185,6 +186,7 @@ namespace MediaBrowser.Providers.Movies
PopulateImages(list, obj.moviebackground, ImageType.Backdrop, 1920, 1080); PopulateImages(list, obj.moviebackground, ImageType.Backdrop, 1920, 1080);
} }
private Regex _regex_http = new Regex("^http://");
private void PopulateImages(List<RemoteImageInfo> list, List<Image> images, ImageType type, int width, int height) private void PopulateImages(List<RemoteImageInfo> list, List<Image> images, ImageType type, int width, int height)
{ {
if (images == null) if (images == null)
@ -208,7 +210,7 @@ namespace MediaBrowser.Providers.Movies
Width = width, Width = width,
Height = height, Height = height,
ProviderName = Name, ProviderName = Name,
Url = url, Url = _regex_http.Replace(url, "https://", 1),
Language = i.lang Language = i.lang
}; };

2
MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
View file

@ -249,7 +249,7 @@ namespace MediaBrowser.Providers.Movies
} }
resultItem.ResetPeople(); resultItem.ResetPeople();
var tmdbImageUrl = settings.images.base_url + "original"; var tmdbImageUrl = settings.images.secure_base_url + "original";
//Actors, Directors, Writers - all in People //Actors, Directors, Writers - all in People
//actors come from cast //actors come from cast

2
MediaBrowser.Providers/Movies/MovieDbImageProvider.cs
View file

@ -72,7 +72,7 @@ namespace MediaBrowser.Providers.Movies
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
var supportedImages = GetSupportedImages(item).ToList(); var supportedImages = GetSupportedImages(item).ToList();

2
MediaBrowser.Providers/Movies/MovieDbProvider.cs
View file

@ -78,7 +78,7 @@ namespace MediaBrowser.Providers.Movies
var tmdbSettings = await GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
var remoteResult = new RemoteSearchResult var remoteResult = new RemoteSearchResult
{ {

2
MediaBrowser.Providers/Movies/MovieDbSearch.cs
View file

@ -56,7 +56,7 @@ namespace MediaBrowser.Providers.Movies
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
if (!string.IsNullOrWhiteSpace(name)) if (!string.IsNullOrWhiteSpace(name))
{ {

2
MediaBrowser.Providers/Movies/TmdbSettings.cs
View file

@ -5,7 +5,7 @@ namespace MediaBrowser.Providers.Movies
internal class TmdbImageSettings internal class TmdbImageSettings
{ {
public List<string> backdrop_sizes { get; set; } public List<string> backdrop_sizes { get; set; }
public string base_url { get; set; } public string secure_base_url { get; set; }
public List<string> poster_sizes { get; set; } public List<string> poster_sizes { get; set; }
public List<string> profile_sizes { get; set; } public List<string> profile_sizes { get; set; }
} }

2
MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs
View file

@ -67,7 +67,7 @@ namespace MediaBrowser.Providers.People
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
return GetImages(images, item.GetPreferredMetadataLanguage(), tmdbImageUrl); return GetImages(images, item.GetPreferredMetadataLanguage(), tmdbImageUrl);
} }

2
MediaBrowser.Providers/People/MovieDbPersonProvider.cs
View file

@ -59,7 +59,7 @@ namespace MediaBrowser.Providers.People
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
if (!string.IsNullOrEmpty(tmdbId)) if (!string.IsNullOrEmpty(tmdbId))
{ {

2
MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
View file

@ -62,7 +62,7 @@ namespace MediaBrowser.Providers.TV
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
list.AddRange(GetPosters(response.images).Select(i => new RemoteImageInfo list.AddRange(GetPosters(response.images).Select(i => new RemoteImageInfo
{ {

2
MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
View file

@ -64,7 +64,7 @@ namespace MediaBrowser.Providers.TV
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
list.AddRange(GetPosters(results).Select(i => new RemoteImageInfo list.AddRange(GetPosters(results).Select(i => new RemoteImageInfo
{ {

4
MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
View file

@ -69,7 +69,7 @@ namespace MediaBrowser.Providers.TV
var obj = _jsonSerializer.DeserializeFromFile<RootObject>(dataFilePath); var obj = _jsonSerializer.DeserializeFromFile<RootObject>(dataFilePath);
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
var remoteResult = new RemoteSearchResult var remoteResult = new RemoteSearchResult
{ {
@ -460,7 +460,7 @@ namespace MediaBrowser.Providers.TV
if (tv != null) if (tv != null)
{ {
var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
var tmdbImageUrl = tmdbSettings.images.base_url + "original"; var tmdbImageUrl = tmdbSettings.images.secure_base_url + "original";
var remoteResult = new RemoteSearchResult var remoteResult = new RemoteSearchResult
{ {