diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs index 67aa35710..e55321bb1 100644 --- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs +++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs @@ -1,5 +1,6 @@ using MediaBrowser.Common.Net; using MediaBrowser.Controller.Entities; +using MediaBrowser.Model.Entities; using MediaBrowser.Model.Serialization; using System; using System.Globalization; @@ -50,6 +51,20 @@ namespace MediaBrowser.Providers.Omdb { var result = _jsonSerializer.DeserializeFromStream(stream); + item.Name = result.Title; + + int year; + + if (!string.IsNullOrEmpty(result.Year) + && int.TryParse(result.Year, NumberStyles.Number, _usCulture, out year) + && year >= 0) + { + item.ProductionYear = year; + } + + item.OfficialRating = result.Rated; + + var hasCriticRating = item as IHasCriticRating; if (hasCriticRating != null) { @@ -96,6 +111,12 @@ namespace MediaBrowser.Providers.Omdb item.HomePageUrl = result.Website; } + if (!string.IsNullOrWhiteSpace(result.imdbID) + && !string.Equals(result.imdbID, "n/a", StringComparison.OrdinalIgnoreCase)) + { + item.SetProviderId(MetadataProviders.Imdb, result.imdbID); + } + ParseAdditionalMetadata(item, result); } } @@ -153,7 +174,7 @@ namespace MediaBrowser.Providers.Omdb return string.Equals(lang, "en", StringComparison.OrdinalIgnoreCase); } - public class RootObject + private class RootObject { public string Title { get; set; } public string Year { get; set; } diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs index c47332dbe..7490d62d6 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs @@ -1,6 +1,5 @@ using MediaBrowser.Model.Logging; using MediaBrowser.Server.Implementations.HttpServer.SocketSharp; -using ServiceStack; using ServiceStack.Web; using System; using System.Globalization; @@ -29,6 +28,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer { // Try to prevent compatibility view res.AddHeader("X-UA-Compatible", "IE=Edge"); + res.AddHeader("X-Frame-Options", "DENY"); var exception = dto as Exception; @@ -52,7 +52,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer if (hasOptions != null) { - //hasOptions.Options["Server"] = "Mono-HTTPAPI/1.1"; + hasOptions.Options["Server"] = "Mono-HTTPAPI/1.1"; // Content length has to be explicitly set on on HttpListenerResponse or it won't be happy string contentLength; diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 715f06055..5ead3b108 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -13,7 +13,6 @@ using ServiceStack; using ServiceStack.Web; using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using System.Threading.Tasks; diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 6beb51431..11dc1c865 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -336,7 +336,7 @@ namespace MediaBrowser.WebDashboard.Api sb.Append(""); sb.Append(""); sb.Append(""); - sb.Append(""); + sb.Append(""); sb.Append(""); sb.Append(""); sb.Append(""); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 1bc579d29..b369cca7d 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -314,45 +314,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest