From 036dfc416878b401b379446add505ea47df2096a Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Wed, 9 Jan 2019 12:09:40 -0500 Subject: [PATCH 01/12] Update TheMovieDB API key to our own --- MediaBrowser.Providers/Movies/MovieDbProvider.cs | 2 +- MediaBrowser.Providers/Movies/MovieDbSearch.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs index 1ebf56e23c..8465634bcf 100644 --- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs @@ -168,7 +168,7 @@ namespace MediaBrowser.Providers.Movies 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"; - internal static string ApiKey = "f6bd687ffa63cd282b6ff2c6877f2669"; + internal static string ApiKey = "4219e299c89411838049ab0dab19ebd5"; internal static string AcceptHeader = "application/json,image/*"; /// diff --git a/MediaBrowser.Providers/Movies/MovieDbSearch.cs b/MediaBrowser.Providers/Movies/MovieDbSearch.cs index b332207e15..f92417b168 100644 --- a/MediaBrowser.Providers/Movies/MovieDbSearch.cs +++ b/MediaBrowser.Providers/Movies/MovieDbSearch.cs @@ -20,7 +20,7 @@ namespace MediaBrowser.Providers.Movies 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}"; - internal static string ApiKey = "f6bd687ffa63cd282b6ff2c6877f2669"; + internal static string ApiKey = "4219e299c89411838049ab0dab19ebd5"; internal static string AcceptHeader = "application/json,image/*"; private readonly ILogger _logger; From 18fae029d643d0a3031de1804406afbad43a8d68 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Wed, 9 Jan 2019 12:19:10 -0500 Subject: [PATCH 02/12] Update TheAudioDB API key to our own --- MediaBrowser.Providers/Music/AudioDbArtistProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs index e0d193ff16..1769bc1aeb 100644 --- a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs +++ b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs @@ -27,7 +27,7 @@ namespace MediaBrowser.Providers.Music 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 AudioDbArtistProvider(IServerConfigurationManager config, IFileSystem fileSystem, IHttpClient httpClient, IJsonSerializer json) From 44ec5d263119ba43942b6f7866f5bb204b2d0bcc Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Wed, 9 Jan 2019 12:24:16 -0500 Subject: [PATCH 03/12] Update FanArt API key to our own --- MediaBrowser.Providers/Music/FanArtArtistProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs index 99a717ca18..041a2690f8 100644 --- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs +++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs @@ -28,7 +28,7 @@ namespace MediaBrowser.Providers.Music { 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 readonly CultureInfo _usCulture = new CultureInfo("en-US"); From a90a85c3066e85263cb63b800cc6b61a005516cf Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Wed, 9 Jan 2019 12:44:48 -0500 Subject: [PATCH 04/12] Update TheTVDB API key to our own --- MediaBrowser.Controller/Library/TVUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs index dc95ba1127..162ebc75e6 100644 --- a/MediaBrowser.Controller/Library/TVUtils.cs +++ b/MediaBrowser.Controller/Library/TVUtils.cs @@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Library /// /// The TVDB API key /// - public static readonly string TvdbApiKey = "B89CE93890E9419B"; + public static readonly string TvdbApiKey = "OG4V3YJ3FAP7FP2K"; public static readonly string TvdbBaseUrl = "https://www.thetvdb.com/"; /// /// The banner URL From 478306ca1518d15e82a2e01922fa7c373d2169cb Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Thu, 10 Jan 2019 13:26:52 -0500 Subject: [PATCH 05/12] Update OpenSubtitles User Agent to our own --- MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs index 2d29f29e3d..b62fa83985 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs @@ -46,7 +46,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles _config.NamedConfigurationUpdating += _config_NamedConfigurationUpdating; Utilities.HttpClient = httpClient; - OpenSubtitles.SetUserAgent("mediabrowser.tv"); + OpenSubtitles.SetUserAgent("jellyfin"); } private const string PasswordHashPrefix = "h:"; From ce0c928ddb63b983bef3788c2bf0596558ee96f7 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Thu, 10 Jan 2019 15:16:01 -0500 Subject: [PATCH 06/12] Update Omdb API key to our own --- MediaBrowser.Providers/Omdb/OmdbImageProvider.cs | 2 +- MediaBrowser.Providers/Omdb/OmdbProvider.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs index 1eb9b31039..a138d4b8c4 100644 --- a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs +++ b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs @@ -69,7 +69,7 @@ namespace MediaBrowser.Providers.Omdb list.Add(new RemoteImageInfo { 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) }); } } diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs index bb4624b5c0..e8e1e3a293 100644 --- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs +++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs @@ -270,7 +270,7 @@ namespace MediaBrowser.Providers.Omdb 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)) { From 58af3d4f5c3d850fd5068020090206708ff92b2a Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Thu, 10 Jan 2019 15:16:51 -0500 Subject: [PATCH 07/12] Update Fanart commented-out API key to our own --- MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs | 1 - MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs index 6d489498e0..9ac9931186 100644 --- a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs +++ b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs @@ -37,7 +37,6 @@ namespace MediaBrowser.Providers.Movies private readonly IJsonSerializer _json; private const string FanArtBaseUrl = "https://webservice.fanart.tv/v3/movies/{1}?api_key={0}"; - // &client_key=52c813aa7b8c8b3bb87f4797532a2f8c internal static FanartMovieImageProvider Current; diff --git a/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs index 3ca0137300..62fd82d350 100644 --- a/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs +++ b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs @@ -36,7 +36,6 @@ namespace MediaBrowser.Providers.TV private readonly IJsonSerializer _json; private const string FanArtBaseUrl = "https://webservice.fanart.tv/v3/tv/{1}?api_key={0}"; - // &client_key=52c813aa7b8c8b3bb87f4797532a2f8c internal static FanartSeriesProvider Current { get; private set; } From 30fef791209e04a79cf988046194aab6956f9a1b Mon Sep 17 00:00:00 2001 From: cvium Date: Thu, 10 Jan 2019 15:30:26 +0100 Subject: [PATCH 08/12] Change ItemId to Guid like all the others --- MediaBrowser.Controller/Providers/RemoteSearchQuery.cs | 4 +++- MediaBrowser.Providers/Manager/ProviderManager.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs b/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs index 77cf9e2559..9fe6f96bc3 100644 --- a/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs +++ b/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs @@ -1,3 +1,5 @@ +using System; + namespace MediaBrowser.Controller.Providers { public class RemoteSearchQuery @@ -5,7 +7,7 @@ namespace MediaBrowser.Controller.Providers { public T SearchInfo { get; set; } - public string ItemId { get; set; } + public Guid ItemId { get; set; } /// /// If set will only search within the given provider diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs index 8eed5e6266..ae3788f342 100644 --- a/MediaBrowser.Providers/Manager/ProviderManager.cs +++ b/MediaBrowser.Providers/Manager/ProviderManager.cs @@ -156,7 +156,7 @@ namespace MediaBrowser.Providers.Manager }).ConfigureAwait(false)) { - // Workaround for tvheadend channel icons + // Workaround for tvheadend channel icons // TODO: Isolate this hack into the tvh plugin if (string.IsNullOrEmpty(response.ContentType)) { From 5348fddc9eb9584cbec4449273c0c356becfe354 Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Sat, 12 Jan 2019 22:25:55 +0100 Subject: [PATCH 09/12] Don't print stacktrace when failing to bind to 1900 --- RSSDP/SsdpCommunicationsServer.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/RSSDP/SsdpCommunicationsServer.cs b/RSSDP/SsdpCommunicationsServer.cs index 65ec0ca714..fb13298eef 100644 --- a/RSSDP/SsdpCommunicationsServer.cs +++ b/RSSDP/SsdpCommunicationsServer.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net; using System.Net.Http; +using System.Net.Sockets; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -129,6 +129,10 @@ namespace Rssdp.Infrastructure { _BroadcastListenSocket = ListenForBroadcastsAsync(); } + catch (SocketException) + { + _logger.LogError("Failed to bind to port 1900. DLNA will be unavailable"); + } catch (Exception ex) { _logger.LogError(ex, "Error in BeginListeningForBroadcasts"); @@ -148,7 +152,7 @@ namespace Rssdp.Infrastructure { if (_BroadcastListenSocket != null) { - _logger.LogInformation("{0} disposing _BroadcastListenSocket.", GetType().Name); + _logger.LogInformation("{0} disposing _BroadcastListenSocket", GetType().Name); _BroadcastListenSocket.Dispose(); _BroadcastListenSocket = null; } From 0ca76597e507bae3ee8713ccf55ff530a7a98978 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Sun, 13 Jan 2019 01:30:43 +0100 Subject: [PATCH 10/12] Add exception message to log. Output will be something line: `Failed to bind to port 1900: Address already in use. DLNA will be unavailable` --- RSSDP/SsdpCommunicationsServer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RSSDP/SsdpCommunicationsServer.cs b/RSSDP/SsdpCommunicationsServer.cs index fb13298eef..f526673660 100644 --- a/RSSDP/SsdpCommunicationsServer.cs +++ b/RSSDP/SsdpCommunicationsServer.cs @@ -129,9 +129,9 @@ namespace Rssdp.Infrastructure { _BroadcastListenSocket = ListenForBroadcastsAsync(); } - catch (SocketException) + catch (SocketException ex) { - _logger.LogError("Failed to bind to port 1900. DLNA will be unavailable"); + _logger.LogError("Failed to bind to port 1900: {Message}. DLNA will be unavailable", ex.Message); } catch (Exception ex) { From 3051b2a1e431297394b9f8430c6422be63438bce Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Tue, 15 Jan 2019 19:19:07 -0500 Subject: [PATCH 11/12] Bump version for 10.0.2 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 0fbf7b9258..963ffad230 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("10.0.1")] +[assembly: AssemblyVersion("10.0.2")] From 09606d0353ac11b54fe59e6991ff61b301d4410f Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Tue, 15 Jan 2019 19:52:17 -0500 Subject: [PATCH 12/12] Update Debian version --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 685d31a5eb..f7a1994b76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 * Hotfix release, corrects several small bugs from 10.0.0