Merge pull request #592 from joshuaboniface/master-10.0.2
Master 10.0.2
This commit is contained in:
commit
27f0633ed8
|
@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Library
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The TVDB API key
|
/// The TVDB API key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly string TvdbApiKey = "B89CE93890E9419B";
|
public static readonly string TvdbApiKey = "OG4V3YJ3FAP7FP2K";
|
||||||
public static readonly string TvdbBaseUrl = "https://www.thetvdb.com/";
|
public static readonly string TvdbBaseUrl = "https://www.thetvdb.com/";
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The banner URL
|
/// The banner URL
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.Providers
|
namespace MediaBrowser.Controller.Providers
|
||||||
{
|
{
|
||||||
public class RemoteSearchQuery<T>
|
public class RemoteSearchQuery<T>
|
||||||
|
@ -5,7 +7,7 @@ namespace MediaBrowser.Controller.Providers
|
||||||
{
|
{
|
||||||
public T SearchInfo { get; set; }
|
public T SearchInfo { get; set; }
|
||||||
|
|
||||||
public string ItemId { get; set; }
|
public Guid ItemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// If set will only search within the given provider
|
/// If set will only search within the given provider
|
||||||
|
|
|
@ -46,7 +46,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
_config.NamedConfigurationUpdating += _config_NamedConfigurationUpdating;
|
_config.NamedConfigurationUpdating += _config_NamedConfigurationUpdating;
|
||||||
|
|
||||||
Utilities.HttpClient = httpClient;
|
Utilities.HttpClient = httpClient;
|
||||||
OpenSubtitles.SetUserAgent("mediabrowser.tv");
|
OpenSubtitles.SetUserAgent("jellyfin");
|
||||||
}
|
}
|
||||||
|
|
||||||
private const string PasswordHashPrefix = "h:";
|
private const string PasswordHashPrefix = "h:";
|
||||||
|
|
|
@ -156,7 +156,7 @@ namespace MediaBrowser.Providers.Manager
|
||||||
|
|
||||||
}).ConfigureAwait(false))
|
}).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
// Workaround for tvheadend channel icons
|
// Workaround for tvheadend channel icons
|
||||||
// TODO: Isolate this hack into the tvh plugin
|
// TODO: Isolate this hack into the tvh plugin
|
||||||
if (string.IsNullOrEmpty(response.ContentType))
|
if (string.IsNullOrEmpty(response.ContentType))
|
||||||
{
|
{
|
||||||
|
|
|
@ -37,7 +37,6 @@ namespace MediaBrowser.Providers.Movies
|
||||||
private readonly IJsonSerializer _json;
|
private readonly IJsonSerializer _json;
|
||||||
|
|
||||||
private const string FanArtBaseUrl = "https://webservice.fanart.tv/v3/movies/{1}?api_key={0}";
|
private const string FanArtBaseUrl = "https://webservice.fanart.tv/v3/movies/{1}?api_key={0}";
|
||||||
// &client_key=52c813aa7b8c8b3bb87f4797532a2f8c
|
|
||||||
|
|
||||||
internal static FanartMovieImageProvider Current;
|
internal static FanartMovieImageProvider Current;
|
||||||
|
|
||||||
|
|
|
@ -168,7 +168,7 @@ namespace MediaBrowser.Providers.Movies
|
||||||
private const string TmdbConfigUrl = BaseMovieDbUrl + "3/configuration?api_key={0}";
|
private const string TmdbConfigUrl = BaseMovieDbUrl + "3/configuration?api_key={0}";
|
||||||
private const string GetMovieInfo3 = BaseMovieDbUrl + @"3/movie/{0}?api_key={1}&append_to_response=casts,releases,images,keywords,trailers";
|
private const string GetMovieInfo3 = BaseMovieDbUrl + @"3/movie/{0}?api_key={1}&append_to_response=casts,releases,images,keywords,trailers";
|
||||||
|
|
||||||
internal static string ApiKey = "f6bd687ffa63cd282b6ff2c6877f2669";
|
internal static string ApiKey = "4219e299c89411838049ab0dab19ebd5";
|
||||||
internal static string AcceptHeader = "application/json,image/*";
|
internal static string AcceptHeader = "application/json,image/*";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace MediaBrowser.Providers.Movies
|
||||||
private static readonly CultureInfo EnUs = new CultureInfo("en-US");
|
private static readonly CultureInfo EnUs = new CultureInfo("en-US");
|
||||||
private const string Search3 = MovieDbProvider.BaseMovieDbUrl + @"3/search/{3}?api_key={1}&query={0}&language={2}";
|
private const string Search3 = MovieDbProvider.BaseMovieDbUrl + @"3/search/{3}?api_key={1}&query={0}&language={2}";
|
||||||
|
|
||||||
internal static string ApiKey = "f6bd687ffa63cd282b6ff2c6877f2669";
|
internal static string ApiKey = "4219e299c89411838049ab0dab19ebd5";
|
||||||
internal static string AcceptHeader = "application/json,image/*";
|
internal static string AcceptHeader = "application/json,image/*";
|
||||||
|
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
|
|
|
@ -27,7 +27,7 @@ namespace MediaBrowser.Providers.Music
|
||||||
|
|
||||||
public static AudioDbArtistProvider Current;
|
public static AudioDbArtistProvider Current;
|
||||||
|
|
||||||
private const string ApiKey = "49jhsf8248yfahka89724011";
|
private const string ApiKey = "195003";
|
||||||
public const string BaseUrl = "https://www.theaudiodb.com/api/v1/json/" + ApiKey;
|
public const string BaseUrl = "https://www.theaudiodb.com/api/v1/json/" + ApiKey;
|
||||||
|
|
||||||
public AudioDbArtistProvider(IServerConfigurationManager config, IFileSystem fileSystem, IHttpClient httpClient, IJsonSerializer json)
|
public AudioDbArtistProvider(IServerConfigurationManager config, IFileSystem fileSystem, IHttpClient httpClient, IJsonSerializer json)
|
||||||
|
|
|
@ -28,7 +28,7 @@ namespace MediaBrowser.Providers.Music
|
||||||
{
|
{
|
||||||
public class FanartArtistProvider : IRemoteImageProvider, IHasOrder
|
public class FanartArtistProvider : IRemoteImageProvider, IHasOrder
|
||||||
{
|
{
|
||||||
internal const string ApiKey = "5c6b04c68e904cfed1e6cbc9a9e683d4";
|
internal const string ApiKey = "184e1a2b1fe3b94935365411f919f638";
|
||||||
private const string FanArtBaseUrl = "https://webservice.fanart.tv/v3.1/music/{1}?api_key={0}";
|
private const string FanArtBaseUrl = "https://webservice.fanart.tv/v3.1/music/{1}?api_key={0}";
|
||||||
|
|
||||||
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
|
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
|
||||||
|
|
|
@ -69,7 +69,7 @@ namespace MediaBrowser.Providers.Omdb
|
||||||
list.Add(new RemoteImageInfo
|
list.Add(new RemoteImageInfo
|
||||||
{
|
{
|
||||||
ProviderName = Name,
|
ProviderName = Name,
|
||||||
Url = string.Format("https://img.omdbapi.com/?i={0}&apikey=fe53f97e", imdbId)
|
Url = string.Format("https://img.omdbapi.com/?i={0}&apikey=2c9d9507", imdbId)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -270,7 +270,7 @@ namespace MediaBrowser.Providers.Omdb
|
||||||
|
|
||||||
public static string GetOmdbUrl(string query, IApplicationHost appHost, CancellationToken cancellationToken)
|
public static string GetOmdbUrl(string query, IApplicationHost appHost, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
const string url = "https://www.omdbapi.com?apikey=fe53f97e";
|
const string url = "https://www.omdbapi.com?apikey=2c9d9507";
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(query))
|
if (string.IsNullOrWhiteSpace(query))
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,6 @@ namespace MediaBrowser.Providers.TV
|
||||||
private readonly IJsonSerializer _json;
|
private readonly IJsonSerializer _json;
|
||||||
|
|
||||||
private const string FanArtBaseUrl = "https://webservice.fanart.tv/v3/tv/{1}?api_key={0}";
|
private const string FanArtBaseUrl = "https://webservice.fanart.tv/v3/tv/{1}?api_key={0}";
|
||||||
// &client_key=52c813aa7b8c8b3bb87f4797532a2f8c
|
|
||||||
|
|
||||||
internal static FanartSeriesProvider Current { get; private set; }
|
internal static FanartSeriesProvider Current { get; private set; }
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net;
|
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
using System.Net.Sockets;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
@ -129,6 +129,10 @@ namespace Rssdp.Infrastructure
|
||||||
{
|
{
|
||||||
_BroadcastListenSocket = ListenForBroadcastsAsync();
|
_BroadcastListenSocket = ListenForBroadcastsAsync();
|
||||||
}
|
}
|
||||||
|
catch (SocketException ex)
|
||||||
|
{
|
||||||
|
_logger.LogError("Failed to bind to port 1900: {Message}. DLNA will be unavailable", ex.Message);
|
||||||
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Error in BeginListeningForBroadcasts");
|
_logger.LogError(ex, "Error in BeginListeningForBroadcasts");
|
||||||
|
@ -148,7 +152,7 @@ namespace Rssdp.Infrastructure
|
||||||
{
|
{
|
||||||
if (_BroadcastListenSocket != null)
|
if (_BroadcastListenSocket != null)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("{0} disposing _BroadcastListenSocket.", GetType().Name);
|
_logger.LogInformation("{0} disposing _BroadcastListenSocket", GetType().Name);
|
||||||
_BroadcastListenSocket.Dispose();
|
_BroadcastListenSocket.Dispose();
|
||||||
_BroadcastListenSocket = null;
|
_BroadcastListenSocket = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("10.0.1")]
|
[assembly: AssemblyVersion("10.0.2")]
|
||||||
|
|
8
debian/changelog
vendored
8
debian/changelog
vendored
|
@ -1,3 +1,11 @@
|
||||||
|
jellyfin (10.0.2-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Hotfix release
|
||||||
|
* jellyfin/jellyfin-web#23: Update Chromecast app ID [via direct commit]
|
||||||
|
* #540: Update Emby API keys to our own
|
||||||
|
* #541: Change ItemId to Guid in ProviderManager
|
||||||
|
* #566: Avoid printing stacktrace when bind to port 1900 fails
|
||||||
|
|
||||||
jellyfin (10.0.1-1) unstable; urgency=medium
|
jellyfin (10.0.1-1) unstable; urgency=medium
|
||||||
|
|
||||||
* Hotfix release, corrects several small bugs from 10.0.0
|
* Hotfix release, corrects several small bugs from 10.0.0
|
||||||
|
|
Loading…
Reference in New Issue
Block a user