From 9f1005d679cb9afe0c98c3f1ee73573a5e64c58d Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Mon, 17 Sep 2012 16:21:46 -0400 Subject: Added Reload Beginning/Completed events --- MediaBrowser.Controller/Kernel.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 2a2916a743..682abb6322 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -97,18 +97,18 @@ namespace MediaBrowser.Controller /// /// Performs initializations that can be reloaded at anytime /// - public override async Task Reload(IProgress progress) + protected override async Task ReloadInternal(IProgress progress) { - await base.Reload(progress).ConfigureAwait(false); + await base.ReloadInternal(progress).ConfigureAwait(false); ReloadWeatherClient(); ExtractFFMpeg(); - progress.Report(new TaskProgress { Description = "Loading Users" }); + ReportProgress(progress, "Loading Users"); ReloadUsers(); - progress.Report(new TaskProgress { Description = "Loading Media Library" }); + ReportProgress(progress, "Loading Media Library"); await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false); } -- cgit v1.2.3 From 01a25c48a0c5718c40456c48e311e6c0955f7791 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Mon, 17 Sep 2012 20:08:21 -0400 Subject: Renamed UserRating to CommunityRating --- MediaBrowser.Api/ApiService.cs | 2 +- MediaBrowser.Controller/Entities/BaseItem.cs | 2 +- MediaBrowser.Controller/Providers/BaseItemXmlParser.cs | 2 +- MediaBrowser.Model/DTO/DTOBaseItem.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs index 17ad1ef438..20f8ce29bc 100644 --- a/MediaBrowser.Api/ApiService.cs +++ b/MediaBrowser.Api/ApiService.cs @@ -170,7 +170,7 @@ namespace MediaBrowser.Api dto.TrailerUrl = item.TrailerUrl; dto.Type = item.GetType().Name; - dto.UserRating = item.UserRating; + dto.CommunityRating = item.CommunityRating; dto.UserData = GetDtoUserItemData(item.GetUserData(user, false)); diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 68a192065f..2adc4ecb93 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -48,7 +48,7 @@ namespace MediaBrowser.Controller.Entities public string DisplayMediaType { get; set; } - public float? UserRating { get; set; } + public float? CommunityRating { get; set; } public long? RunTimeTicks { get; set; } public string AspectRatio { get; set; } diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index 1cb2e2af34..a30d398516 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -219,7 +219,7 @@ namespace MediaBrowser.Controller.Providers if (float.TryParse(rating, out val)) { - item.UserRating = val; + item.CommunityRating = val; } } break; diff --git a/MediaBrowser.Model/DTO/DTOBaseItem.cs b/MediaBrowser.Model/DTO/DTOBaseItem.cs index 66049d3fd3..61607ab02c 100644 --- a/MediaBrowser.Model/DTO/DTOBaseItem.cs +++ b/MediaBrowser.Model/DTO/DTOBaseItem.cs @@ -46,7 +46,7 @@ namespace MediaBrowser.Model.DTO public string DisplayMediaType { get; set; } [ProtoMember(12)] - public float? UserRating { get; set; } + public float? CommunityRating { get; set; } [ProtoMember(13)] public long? RunTimeTicks { get; set; } -- cgit v1.2.3 From 8b7effd6ff1694688e93d03a48c5dcddb4efe4f0 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Tue, 18 Sep 2012 15:33:57 -0400 Subject: Moved discovery of loggers and weather providers to MEF. Also added support for third-party image processors, also discovered through MEF. --- MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 94 ++++++---- MediaBrowser.Api/HttpHandlers/VideoHandler.cs | 5 +- MediaBrowser.Api/HttpHandlers/WeatherHandler.cs | 3 +- MediaBrowser.Api/ImageProcessor.cs | 104 ----------- MediaBrowser.Api/MediaBrowser.Api.csproj | 1 - MediaBrowser.Api/Plugin.cs | 1 - MediaBrowser.Common/Drawing/DrawingUtils.cs | 81 -------- MediaBrowser.Common/Kernel/BaseKernel.cs | 106 ++++------- MediaBrowser.Common/Logging/BaseLogger.cs | 86 +-------- MediaBrowser.Common/Logging/LogSeverity.cs | 4 +- MediaBrowser.Common/Logging/Logger.cs | 66 ++++++- MediaBrowser.Common/Logging/StreamLogger.cs | 37 ---- MediaBrowser.Common/Logging/TraceFileLogger.cs | 38 ++++ MediaBrowser.Common/Logging/TraceLogger.cs | 12 -- MediaBrowser.Common/MediaBrowser.Common.csproj | 8 +- MediaBrowser.Common/Plugins/BasePlugin.cs | 3 + MediaBrowser.Common/UI/BaseApplication.cs | 5 +- .../Drawing/BaseImageProcessor.cs | 33 ++++ MediaBrowser.Controller/Drawing/DrawingUtils.cs | 81 ++++++++ MediaBrowser.Controller/Drawing/ImageProcessor.cs | 148 +++++++++++++++ MediaBrowser.Controller/Kernel.cs | 46 ++--- .../MediaBrowser.Controller.csproj | 7 +- .../Weather/BaseWeatherProvider.cs | 34 ++++ MediaBrowser.Controller/Weather/WeatherClient.cs | 207 --------------------- MediaBrowser.Controller/Weather/WeatherProvider.cs | 189 +++++++++++++++++++ MediaBrowser.sln | 3 + 26 files changed, 719 insertions(+), 683 deletions(-) delete mode 100644 MediaBrowser.Api/ImageProcessor.cs delete mode 100644 MediaBrowser.Common/Drawing/DrawingUtils.cs delete mode 100644 MediaBrowser.Common/Logging/StreamLogger.cs create mode 100644 MediaBrowser.Common/Logging/TraceFileLogger.cs delete mode 100644 MediaBrowser.Common/Logging/TraceLogger.cs create mode 100644 MediaBrowser.Controller/Drawing/BaseImageProcessor.cs create mode 100644 MediaBrowser.Controller/Drawing/DrawingUtils.cs create mode 100644 MediaBrowser.Controller/Drawing/ImageProcessor.cs create mode 100644 MediaBrowser.Controller/Weather/BaseWeatherProvider.cs delete mode 100644 MediaBrowser.Controller/Weather/WeatherClient.cs create mode 100644 MediaBrowser.Controller/Weather/WeatherProvider.cs (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index f73f783afb..73098c71b5 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -2,6 +2,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Entities; using System; @@ -20,7 +21,7 @@ namespace MediaBrowser.Api.HttpHandlers { return ApiService.IsApiUrlMatch("image", request); } - + private string _imagePath; private async Task GetImagePath() { @@ -29,49 +30,57 @@ namespace MediaBrowser.Api.HttpHandlers return _imagePath; } - private async Task DiscoverImagePath() + private BaseEntity _sourceEntity; + private async Task GetSourceEntity() { - string personName = QueryString["personname"]; - - if (!string.IsNullOrEmpty(personName)) + if (_sourceEntity == null) { - return (await Kernel.Instance.ItemController.GetPerson(personName).ConfigureAwait(false)).PrimaryImagePath; - } + if (!string.IsNullOrEmpty(QueryString["personname"])) + { + _sourceEntity = await Kernel.Instance.ItemController.GetPerson(QueryString["personname"]).ConfigureAwait(false); + } - string genreName = QueryString["genre"]; + else if (!string.IsNullOrEmpty(QueryString["genre"])) + { + _sourceEntity = await Kernel.Instance.ItemController.GetGenre(QueryString["genre"]).ConfigureAwait(false); + } - if (!string.IsNullOrEmpty(genreName)) - { - return (await Kernel.Instance.ItemController.GetGenre(genreName).ConfigureAwait(false)).PrimaryImagePath; - } + else if (!string.IsNullOrEmpty(QueryString["year"])) + { + _sourceEntity = await Kernel.Instance.ItemController.GetYear(int.Parse(QueryString["year"])).ConfigureAwait(false); + } - string year = QueryString["year"]; + else if (!string.IsNullOrEmpty(QueryString["studio"])) + { + _sourceEntity = await Kernel.Instance.ItemController.GetStudio(QueryString["studio"]).ConfigureAwait(false); + } - if (!string.IsNullOrEmpty(year)) - { - return (await Kernel.Instance.ItemController.GetYear(int.Parse(year)).ConfigureAwait(false)).PrimaryImagePath; + else if (!string.IsNullOrEmpty(QueryString["userid"])) + { + _sourceEntity = ApiService.GetUserById(QueryString["userid"], false); + } + + else + { + _sourceEntity = ApiService.GetItemById(QueryString["id"]); + } } - string studio = QueryString["studio"]; + return _sourceEntity; + } - if (!string.IsNullOrEmpty(studio)) - { - return (await Kernel.Instance.ItemController.GetStudio(studio).ConfigureAwait(false)).PrimaryImagePath; - } + private async Task DiscoverImagePath() + { + var entity = await GetSourceEntity().ConfigureAwait(false); - string userId = QueryString["userid"]; + var item = entity as BaseItem; - if (!string.IsNullOrEmpty(userId)) + if (item != null) { - return ApiService.GetUserById(userId, false).PrimaryImagePath; + return GetImagePathFromTypes(item, ImageType, ImageIndex); } - BaseItem item = ApiService.GetItemById(QueryString["id"]); - - string imageIndex = QueryString["index"]; - int index = string.IsNullOrEmpty(imageIndex) ? 0 : int.Parse(imageIndex); - - return GetImagePathFromTypes(item, ImageType, index); + return entity.PrimaryImagePath; } private Stream _sourceStream; @@ -114,8 +123,6 @@ namespace MediaBrowser.Api.HttpHandlers public async override Task GetContentType() { - await EnsureSourceStream().ConfigureAwait(false); - if (await GetSourceStream().ConfigureAwait(false) == null) { return null; @@ -134,8 +141,6 @@ namespace MediaBrowser.Api.HttpHandlers protected async override Task GetLastDateModified() { - await EnsureSourceStream().ConfigureAwait(false); - if (await GetSourceStream().ConfigureAwait(false) == null) { return null; @@ -144,6 +149,21 @@ namespace MediaBrowser.Api.HttpHandlers return File.GetLastWriteTimeUtc(await GetImagePath().ConfigureAwait(false)); } + private int ImageIndex + { + get + { + string val = QueryString["index"]; + + if (string.IsNullOrEmpty(val)) + { + return 0; + } + + return int.Parse(val); + } + } + private int? Height { get @@ -236,7 +256,11 @@ namespace MediaBrowser.Api.HttpHandlers protected override async Task WriteResponseToOutputStream(Stream stream) { - ImageProcessor.ProcessImage(await GetSourceStream().ConfigureAwait(false), stream, Width, Height, MaxWidth, MaxHeight, Quality); + Stream sourceStream = await GetSourceStream().ConfigureAwait(false); + + var entity = await GetSourceEntity().ConfigureAwait(false); + + ImageProcessor.ProcessImage(sourceStream, stream, Width, Height, MaxWidth, MaxHeight, Quality, entity, ImageType, ImageIndex); } private string GetImagePathFromTypes(BaseItem item, ImageType imageType, int imageIndex) diff --git a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs index 9d52136f0a..e34a1b41f7 100644 --- a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Common.Drawing; -using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; using System.ComponentModel.Composition; using System.Drawing; -using System.IO; using System.Linq; using System.Net; diff --git a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs index 93d4c8877e..90ecae1222 100644 --- a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs @@ -3,6 +3,7 @@ using MediaBrowser.Controller; using MediaBrowser.Model.Weather; using System; using System.ComponentModel.Composition; +using System.Linq; using System.Net; using System.Threading.Tasks; @@ -27,7 +28,7 @@ namespace MediaBrowser.Api.HttpHandlers zipCode = Kernel.Instance.Configuration.WeatherZipCode; } - return Kernel.Instance.WeatherClient.GetWeatherInfoAsync(zipCode); + return Kernel.Instance.WeatherProviders.First().GetWeatherInfoAsync(zipCode); } /// diff --git a/MediaBrowser.Api/ImageProcessor.cs b/MediaBrowser.Api/ImageProcessor.cs deleted file mode 100644 index f02b90c220..0000000000 --- a/MediaBrowser.Api/ImageProcessor.cs +++ /dev/null @@ -1,104 +0,0 @@ -using MediaBrowser.Common.Drawing; -using System; -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Drawing.Imaging; -using System.IO; - -namespace MediaBrowser.Api -{ - public static class ImageProcessor - { - /// - /// Resizes an image from a source stream and saves the result to an output stream - /// - /// Use if a fixed width is required. Aspect ratio will be preserved. - /// Use if a fixed height is required. Aspect ratio will be preserved. - /// Use if a max width is required. Aspect ratio will be preserved. - /// Use if a max height is required. Aspect ratio will be preserved. - /// Quality level, from 0-100. Currently only applies to JPG. The default value should suffice. - public static void ProcessImage(Stream sourceImageStream, Stream toStream, int? width, int? height, int? maxWidth, int? maxHeight, int? quality) - { - Image originalImage = Image.FromStream(sourceImageStream); - - Size newSize = DrawingUtils.Resize(originalImage.Size, width, height, maxWidth, maxHeight); - - Bitmap thumbnail; - - // Graphics.FromImage will throw an exception if the PixelFormat is Indexed, so we need to handle that here - if (originalImage.PixelFormat.HasFlag(PixelFormat.Indexed)) - { - thumbnail = new Bitmap(originalImage, newSize.Width, newSize.Height); - } - else - { - thumbnail = new Bitmap(newSize.Width, newSize.Height, originalImage.PixelFormat); - } - - thumbnail.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution); - - Graphics thumbnailGraph = Graphics.FromImage(thumbnail); - - thumbnailGraph.CompositingQuality = CompositingQuality.HighQuality; - thumbnailGraph.SmoothingMode = SmoothingMode.HighQuality; - thumbnailGraph.InterpolationMode = InterpolationMode.HighQualityBicubic; - thumbnailGraph.PixelOffsetMode = PixelOffsetMode.HighQuality; - thumbnailGraph.CompositingMode = CompositingMode.SourceOver; - - thumbnailGraph.DrawImage(originalImage, 0, 0, newSize.Width, newSize.Height); - - Write(originalImage, thumbnail, toStream, quality); - - thumbnailGraph.Dispose(); - thumbnail.Dispose(); - originalImage.Dispose(); - } - - private static void Write(Image originalImage, Image newImage, Stream toStream, int? quality) - { - // Use special save methods for jpeg and png that will result in a much higher quality image - // All other formats use the generic Image.Save - if (ImageFormat.Jpeg.Equals(originalImage.RawFormat)) - { - SaveJpeg(newImage, toStream, quality); - } - else if (ImageFormat.Png.Equals(originalImage.RawFormat)) - { - newImage.Save(toStream, ImageFormat.Png); - } - else - { - newImage.Save(toStream, originalImage.RawFormat); - } - } - - private static void SaveJpeg(Image newImage, Stream target, int? quality) - { - if (!quality.HasValue) - { - quality = 90; - } - - using (var encoderParameters = new EncoderParameters(1)) - { - encoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, quality.Value); - newImage.Save(target, GetImageCodeInfo("image/jpeg"), encoderParameters); - } - } - - private static ImageCodecInfo GetImageCodeInfo(string mimeType) - { - ImageCodecInfo[] info = ImageCodecInfo.GetImageEncoders(); - - for (int i = 0; i < info.Length; i++) - { - ImageCodecInfo ici = info[i]; - if (ici.MimeType.Equals(mimeType, StringComparison.OrdinalIgnoreCase)) - { - return ici; - } - } - return info[1]; - } - } -} diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 858717e6ed..44b58852b8 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -83,7 +83,6 @@ - diff --git a/MediaBrowser.Api/Plugin.cs b/MediaBrowser.Api/Plugin.cs index b2bcefd1f7..8def96da8d 100644 --- a/MediaBrowser.Api/Plugin.cs +++ b/MediaBrowser.Api/Plugin.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Plugins; -using MediaBrowser.Model.Plugins; using System.ComponentModel.Composition; namespace MediaBrowser.Api diff --git a/MediaBrowser.Common/Drawing/DrawingUtils.cs b/MediaBrowser.Common/Drawing/DrawingUtils.cs deleted file mode 100644 index 4c0b5c207d..0000000000 --- a/MediaBrowser.Common/Drawing/DrawingUtils.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using System.Drawing; - -namespace MediaBrowser.Common.Drawing -{ - public static class DrawingUtils - { - /// - /// Resizes a set of dimensions - /// - public static Size Resize(int currentWidth, int currentHeight, int? width, int? height, int? maxWidth, int? maxHeight) - { - return Resize(new Size(currentWidth, currentHeight), width, height, maxWidth, maxHeight); - } - - /// - /// Resizes a set of dimensions - /// - /// The original size object - /// A new fixed width, if desired - /// A new fixed neight, if desired - /// A max fixed width, if desired - /// A max fixed height, if desired - /// A new size object - public static Size Resize(Size size, int? width, int? height, int? maxWidth, int? maxHeight) - { - decimal newWidth = size.Width; - decimal newHeight = size.Height; - - if (width.HasValue && height.HasValue) - { - newWidth = width.Value; - newHeight = height.Value; - } - - else if (height.HasValue) - { - newWidth = GetNewWidth(newHeight, newWidth, height.Value); - newHeight = height.Value; - } - - else if (width.HasValue) - { - newHeight = GetNewHeight(newHeight, newWidth, width.Value); - newWidth = width.Value; - } - - if (maxHeight.HasValue && maxHeight < newHeight) - { - newWidth = GetNewWidth(newHeight, newWidth, maxHeight.Value); - newHeight = maxHeight.Value; - } - - if (maxWidth.HasValue && maxWidth < newWidth) - { - newHeight = GetNewHeight(newHeight, newWidth, maxWidth.Value); - newWidth = maxWidth.Value; - } - - return new Size(Convert.ToInt32(newWidth), Convert.ToInt32(newHeight)); - } - - private static decimal GetNewWidth(decimal currentHeight, decimal currentWidth, int newHeight) - { - decimal scaleFactor = newHeight; - scaleFactor /= currentHeight; - scaleFactor *= currentWidth; - - return scaleFactor; - } - - private static decimal GetNewHeight(decimal currentHeight, decimal currentWidth, int newWidth) - { - decimal scaleFactor = newWidth; - scaleFactor /= currentWidth; - scaleFactor *= currentHeight; - - return scaleFactor; - } - } -} diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 0eebc863c7..5a0e1c5e5d 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -10,7 +10,6 @@ using System; using System.Collections.Generic; using System.ComponentModel.Composition; using System.ComponentModel.Composition.Hosting; -using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; @@ -72,6 +71,12 @@ namespace MediaBrowser.Common.Kernel [ImportMany(typeof(BaseHandler))] private IEnumerable HttpHandlers { get; set; } + /// + /// Gets the list of currently registered Loggers + /// + [ImportMany(typeof(BaseLogger))] + public IEnumerable Loggers { get; set; } + /// /// Both the Ui and server will have a built-in HttpServer. /// People will inevitably want remote control apps so it's needed in the Ui too. @@ -83,6 +88,8 @@ namespace MediaBrowser.Common.Kernel /// private IDisposable HttpListener { get; set; } + private CompositionContainer CompositionContainer { get; set; } + protected virtual string HttpServerUrlPrefix { get @@ -101,13 +108,13 @@ namespace MediaBrowser.Common.Kernel /// public async Task Init(IProgress progress) { + Logger.Kernel = this; + // Performs initializations that only occur once InitializeInternal(progress); // Performs initializations that can be reloaded at anytime await Reload(progress).ConfigureAwait(false); - - ReportProgress(progress, "Loading Complete"); } /// @@ -117,8 +124,6 @@ namespace MediaBrowser.Common.Kernel { ApplicationPaths = new TApplicationPathsType(); - ReloadLogger(); - ReportProgress(progress, "Loading Configuration"); ReloadConfiguration(); @@ -136,6 +141,8 @@ namespace MediaBrowser.Common.Kernel await ReloadInternal(progress).ConfigureAwait(false); OnReloadCompleted(progress); + + ReportProgress(progress, "Kernel.Reload Complete"); } /// @@ -151,23 +158,6 @@ namespace MediaBrowser.Common.Kernel }).ConfigureAwait(false); } - /// - /// Disposes the current logger and creates a new one - /// - private void ReloadLogger() - { - DisposeLogger(); - - DateTime now = DateTime.Now; - - string logFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log"); - - Trace.Listeners.Add(new TextWriterTraceListener(logFilePath)); - Trace.AutoFlush = true; - - Logger.LoggerInstance = new TraceLogger(); - } - /// /// Uses MEF to locate plugins /// Subclasses can use this to locate types within plugins @@ -176,14 +166,13 @@ namespace MediaBrowser.Common.Kernel { DisposeComposableParts(); - var container = GetCompositionContainer(includeCurrentAssembly: true); + CompositionContainer = GetCompositionContainer(includeCurrentAssembly: true); - container.ComposeParts(this); + CompositionContainer.ComposeParts(this); OnComposablePartsLoaded(); - container.Catalog.Dispose(); - container.Dispose(); + CompositionContainer.Catalog.Dispose(); } /// @@ -198,8 +187,7 @@ namespace MediaBrowser.Common.Kernel var catalog = new AggregateCatalog(pluginAssemblies.Select(a => new AssemblyCatalog(a))); // Include composable parts in the Common assembly - // Uncomment this if it's ever needed - //catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly())); + catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly())); if (includeCurrentAssembly) { @@ -215,8 +203,13 @@ namespace MediaBrowser.Common.Kernel /// protected virtual void OnComposablePartsLoaded() { + foreach (var logger in Loggers) + { + logger.Initialize(this); + } + // Start-up each plugin - foreach (BasePlugin plugin in Plugins) + foreach (var plugin in Plugins) { plugin.Initialize(this); } @@ -230,17 +223,16 @@ namespace MediaBrowser.Common.Kernel //Configuration information for anything other than server-specific configuration will have to come via the API... -ebr // Deserialize config - if (!File.Exists(ApplicationPaths.SystemConfigurationFilePath)) + // Use try/catch to avoid the extra file system lookup using File.Exists + try { - Configuration = new TConfigurationType(); - XmlSerializer.SerializeToFile(Configuration, ApplicationPaths.SystemConfigurationFilePath); + Configuration = XmlSerializer.DeserializeFromFile(ApplicationPaths.SystemConfigurationFilePath); } - else + catch (FileNotFoundException) { - Configuration = XmlSerializer.DeserializeFromFile(ApplicationPaths.SystemConfigurationFilePath); + Configuration = new TConfigurationType(); + XmlSerializer.SerializeToFile(Configuration, ApplicationPaths.SystemConfigurationFilePath); } - - Logger.LoggerInstance.LogSeverity = Configuration.EnableDebugLevelLogging ? LogSeverity.Debug : LogSeverity.Info; } /// @@ -275,11 +267,9 @@ namespace MediaBrowser.Common.Kernel { Logger.LogInfo("Beginning Kernel.Dispose"); - DisposeComposableParts(); - DisposeHttpServer(); - DisposeLogger(); + DisposeComposableParts(); } /// @@ -287,22 +277,9 @@ namespace MediaBrowser.Common.Kernel /// protected virtual void DisposeComposableParts() { - DisposePlugins(); - } - - /// - /// Disposes all plugins - /// - private void DisposePlugins() - { - if (Plugins != null) + if (CompositionContainer != null) { - Logger.LogInfo("Disposing Plugins"); - - foreach (BasePlugin plugin in Plugins) - { - plugin.Dispose(); - } + CompositionContainer.Dispose(); } } @@ -324,21 +301,6 @@ namespace MediaBrowser.Common.Kernel } } - /// - /// Disposes the current Logger instance - /// - private void DisposeLogger() - { - Trace.Listeners.Clear(); - - if (Logger.LoggerInstance != null) - { - Logger.LogInfo("Disposing Logger"); - - Logger.LoggerInstance.Dispose(); - } - } - /// /// Gets the current application version /// @@ -354,10 +316,7 @@ namespace MediaBrowser.Common.Kernel { progress.Report(new TaskProgress { Description = message }); - if (Logger.LoggerInstance != null) - { - Logger.LogInfo(message); - } + Logger.LogInfo(message); } BaseApplicationPaths IKernel.ApplicationPaths @@ -373,6 +332,7 @@ namespace MediaBrowser.Common.Kernel Task Init(IProgress progress); Task Reload(IProgress progress); + IEnumerable Loggers { get; } void Dispose(); } } diff --git a/MediaBrowser.Common/Logging/BaseLogger.cs b/MediaBrowser.Common/Logging/BaseLogger.cs index 572ce36b2d..a97bc201f2 100644 --- a/MediaBrowser.Common/Logging/BaseLogger.cs +++ b/MediaBrowser.Common/Logging/BaseLogger.cs @@ -1,92 +1,16 @@ -using System; -using System.Text; -using System.Threading; +using MediaBrowser.Common.Kernel; +using System; namespace MediaBrowser.Common.Logging { public abstract class BaseLogger : IDisposable { - public LogSeverity LogSeverity { get; set; } - - public void LogInfo(string message, params object[] paramList) - { - LogEntry(message, LogSeverity.Info, paramList); - } - - public void LogDebugInfo(string message, params object[] paramList) - { - LogEntry(message, LogSeverity.Debug, paramList); - } - - public void LogError(string message, params object[] paramList) - { - LogEntry(message, LogSeverity.Error, paramList); - } - - public void LogException(string message, Exception exception, params object[] paramList) - { - var builder = new StringBuilder(); - - if (exception != null) - { - builder.AppendFormat("Exception. Type={0} Msg={1} StackTrace={3}{2}", - exception.GetType().FullName, - exception.Message, - exception.StackTrace, - Environment.NewLine); - } - - message = FormatMessage(message, paramList); - - LogError(string.Format("{0} ( {1} )", message, builder)); - } - - public void LogWarning(string message, params object[] paramList) - { - LogEntry(message, LogSeverity.Warning, paramList); - } - - private string FormatMessage(string message, params object[] paramList) - { - if (paramList != null) - { - for (int i = 0; i < paramList.Length; i++) - { - message = message.Replace("{" + i + "}", paramList[i].ToString()); - } - } - - return message; - } - - private void LogEntry(string message, LogSeverity severity, params object[] paramList) - { - if (severity < LogSeverity) return; - - message = FormatMessage(message, paramList); - - Thread currentThread = Thread.CurrentThread; - - var row = new LogRow - { - Severity = severity, - Message = message, - ThreadId = currentThread.ManagedThreadId, - ThreadName = currentThread.Name, - Time = DateTime.Now - }; - - LogEntry(row); - } - - protected virtual void Flush() - { - } + public abstract void Initialize(IKernel kernel); + public abstract void LogEntry(LogRow row); public virtual void Dispose() { + Logger.LogInfo("Disposing " + GetType().Name); } - - protected abstract void LogEntry(LogRow row); } } diff --git a/MediaBrowser.Common/Logging/LogSeverity.cs b/MediaBrowser.Common/Logging/LogSeverity.cs index 2abab1a448..97abfe7b58 100644 --- a/MediaBrowser.Common/Logging/LogSeverity.cs +++ b/MediaBrowser.Common/Logging/LogSeverity.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace MediaBrowser.Common.Logging { @@ -11,4 +11,4 @@ namespace MediaBrowser.Common.Logging Warning = 4, Error = 8 } -} +} \ No newline at end of file diff --git a/MediaBrowser.Common/Logging/Logger.cs b/MediaBrowser.Common/Logging/Logger.cs index e66c1d8444..9ac02fe3ea 100644 --- a/MediaBrowser.Common/Logging/Logger.cs +++ b/MediaBrowser.Common/Logging/Logger.cs @@ -1,24 +1,28 @@ using System; +using System.Diagnostics; +using System.Text; +using System.Threading; +using MediaBrowser.Common.Kernel; namespace MediaBrowser.Common.Logging { public static class Logger { - public static BaseLogger LoggerInstance { get; set; } + internal static IKernel Kernel { get; set; } public static void LogInfo(string message, params object[] paramList) { - LoggerInstance.LogInfo(message, paramList); + LogEntry(message, LogSeverity.Info, paramList); } public static void LogDebugInfo(string message, params object[] paramList) { - LoggerInstance.LogDebugInfo(message, paramList); + LogEntry(message, LogSeverity.Debug, paramList); } public static void LogError(string message, params object[] paramList) { - LoggerInstance.LogError(message, paramList); + LogEntry(message, LogSeverity.Error, paramList); } public static void LogException(Exception ex, params object[] paramList) @@ -28,12 +32,62 @@ namespace MediaBrowser.Common.Logging public static void LogException(string message, Exception ex, params object[] paramList) { - LoggerInstance.LogException(message, ex, paramList); + var builder = new StringBuilder(); + + if (ex != null) + { + builder.AppendFormat("Exception. Type={0} Msg={1} StackTrace={3}{2}", + ex.GetType().FullName, + ex.Message, + ex.StackTrace, + Environment.NewLine); + } + + message = FormatMessage(message, paramList); + + LogError(string.Format("{0} ( {1} )", message, builder)); } public static void LogWarning(string message, params object[] paramList) { - LoggerInstance.LogWarning(message, paramList); + LogEntry(message, LogSeverity.Warning, paramList); + } + + private static void LogEntry(string message, LogSeverity severity, params object[] paramList) + { + message = FormatMessage(message, paramList); + + Thread currentThread = Thread.CurrentThread; + + var row = new LogRow + { + Severity = severity, + Message = message, + ThreadId = currentThread.ManagedThreadId, + ThreadName = currentThread.Name, + Time = DateTime.Now + }; + + if (Kernel.Loggers != null) + { + foreach (var logger in Kernel.Loggers) + { + logger.LogEntry(row); + } + } + } + + private static string FormatMessage(string message, params object[] paramList) + { + if (paramList != null) + { + for (int i = 0; i < paramList.Length; i++) + { + message = message.Replace("{" + i + "}", paramList[i].ToString()); + } + } + + return message; } } } diff --git a/MediaBrowser.Common/Logging/StreamLogger.cs b/MediaBrowser.Common/Logging/StreamLogger.cs deleted file mode 100644 index 03b9bd6d26..0000000000 --- a/MediaBrowser.Common/Logging/StreamLogger.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.IO; -using System.Text; - -namespace MediaBrowser.Common.Logging -{ - /// - /// Provides a Logger that can write to any Stream - /// - public class StreamLogger : BaseLogger - { - private Stream Stream { get; set; } - - public StreamLogger(Stream stream) - : base() - { - Stream = stream; - } - - protected override void LogEntry(LogRow row) - { - byte[] bytes = new UTF8Encoding().GetBytes(row.ToString() + Environment.NewLine); - - lock (Stream) - { - Stream.Write(bytes, 0, bytes.Length); - Stream.Flush(); - } - } - - public override void Dispose() - { - base.Dispose(); - Stream.Dispose(); - } - } -} diff --git a/MediaBrowser.Common/Logging/TraceFileLogger.cs b/MediaBrowser.Common/Logging/TraceFileLogger.cs new file mode 100644 index 0000000000..7ab67a137e --- /dev/null +++ b/MediaBrowser.Common/Logging/TraceFileLogger.cs @@ -0,0 +1,38 @@ +using MediaBrowser.Common.Kernel; +using System; +using System.ComponentModel.Composition; +using System.Diagnostics; +using System.IO; + +namespace MediaBrowser.Common.Logging +{ + [Export(typeof(BaseLogger))] + public class TraceFileLogger : BaseLogger + { + private TraceListener Listener { get; set; } + + public override void Initialize(IKernel kernel) + { + DateTime now = DateTime.Now; + + string logFilePath = Path.Combine(kernel.ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log"); + + Listener = new TextWriterTraceListener(logFilePath); + Trace.Listeners.Add(Listener); + Trace.AutoFlush = true; + } + + public override void Dispose() + { + base.Dispose(); + + Trace.Listeners.Remove(Listener); + Listener.Dispose(); + } + + public override void LogEntry(LogRow row) + { + Trace.WriteLine(row.ToString()); + } + } +} diff --git a/MediaBrowser.Common/Logging/TraceLogger.cs b/MediaBrowser.Common/Logging/TraceLogger.cs deleted file mode 100644 index d152f97806..0000000000 --- a/MediaBrowser.Common/Logging/TraceLogger.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Diagnostics; - -namespace MediaBrowser.Common.Logging -{ - public class TraceLogger : BaseLogger - { - protected override void LogEntry(LogRow row) - { - Trace.WriteLine(row.ToString()); - } - } -} diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 16b4f236ca..ce5f4e34ea 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -83,8 +83,9 @@ - - + + + @@ -96,11 +97,8 @@ - - - diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs index 23825db045..a764c5eab6 100644 --- a/MediaBrowser.Common/Plugins/BasePlugin.cs +++ b/MediaBrowser.Common/Plugins/BasePlugin.cs @@ -1,4 +1,5 @@ using MediaBrowser.Common.Kernel; +using MediaBrowser.Common.Logging; using MediaBrowser.Common.Serialization; using MediaBrowser.Model.Plugins; using System; @@ -200,6 +201,8 @@ namespace MediaBrowser.Common.Plugins /// public void Dispose() { + Logger.LogInfo("Disposing {0} Plugin", Name); + if (Context == KernelContext.Server) { DisposeOnServer(); diff --git a/MediaBrowser.Common/UI/BaseApplication.cs b/MediaBrowser.Common/UI/BaseApplication.cs index 90583da4d0..c3792c714a 100644 --- a/MediaBrowser.Common/UI/BaseApplication.cs +++ b/MediaBrowser.Common/UI/BaseApplication.cs @@ -64,10 +64,7 @@ namespace MediaBrowser.Common.UI } catch (Exception ex) { - if (Logger.LoggerInstance != null) - { - Logger.LogException(ex); - } + Logger.LogException(ex); MessageBox.Show("There was an error launching Media Browser: " + ex.Message); splash.Close(); diff --git a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs new file mode 100644 index 0000000000..a2b223a707 --- /dev/null +++ b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs @@ -0,0 +1,33 @@ +using MediaBrowser.Controller.Entities; +using MediaBrowser.Model.Entities; +using System.Drawing; + +namespace MediaBrowser.Controller.Drawing +{ + /// + /// Provides a base image processor class that plugins can use to process images as they are being writen to http responses + /// Since this is completely modular with MEF, a plugin only needs to have a subclass in their assembly with the following attribute on the class: + /// [Export(typeof(BaseImageProcessor))] + /// This will require a reference to System.ComponentModel.Composition + /// + public abstract class BaseImageProcessor + { + /// + /// Processes the primary image for a BaseEntity (Person, Studio, User, etc) + /// + /// The bitmap holding the original image, after re-sizing + /// The graphics surface on which the output is drawn + /// The entity that owns the image + public abstract void ProcessImage(Bitmap bitmap, Graphics graphics, BaseEntity entity); + + /// + /// Processes an image for a BaseItem + /// + /// The bitmap holding the original image, after re-sizing + /// The graphics surface on which the output is drawn + /// The entity that owns the image + /// The image type + /// The image index (currently only used with backdrops) + public abstract void ProcessImage(Bitmap bitmap, Graphics graphics, BaseItem entity, ImageType imageType, int imageIndex); + } +} diff --git a/MediaBrowser.Controller/Drawing/DrawingUtils.cs b/MediaBrowser.Controller/Drawing/DrawingUtils.cs new file mode 100644 index 0000000000..8e2f829b98 --- /dev/null +++ b/MediaBrowser.Controller/Drawing/DrawingUtils.cs @@ -0,0 +1,81 @@ +using System; +using System.Drawing; + +namespace MediaBrowser.Controller.Drawing +{ + public static class DrawingUtils + { + /// + /// Resizes a set of dimensions + /// + public static Size Resize(int currentWidth, int currentHeight, int? width, int? height, int? maxWidth, int? maxHeight) + { + return Resize(new Size(currentWidth, currentHeight), width, height, maxWidth, maxHeight); + } + + /// + /// Resizes a set of dimensions + /// + /// The original size object + /// A new fixed width, if desired + /// A new fixed neight, if desired + /// A max fixed width, if desired + /// A max fixed height, if desired + /// A new size object + public static Size Resize(Size size, int? width, int? height, int? maxWidth, int? maxHeight) + { + decimal newWidth = size.Width; + decimal newHeight = size.Height; + + if (width.HasValue && height.HasValue) + { + newWidth = width.Value; + newHeight = height.Value; + } + + else if (height.HasValue) + { + newWidth = GetNewWidth(newHeight, newWidth, height.Value); + newHeight = height.Value; + } + + else if (width.HasValue) + { + newHeight = GetNewHeight(newHeight, newWidth, width.Value); + newWidth = width.Value; + } + + if (maxHeight.HasValue && maxHeight < newHeight) + { + newWidth = GetNewWidth(newHeight, newWidth, maxHeight.Value); + newHeight = maxHeight.Value; + } + + if (maxWidth.HasValue && maxWidth < newWidth) + { + newHeight = GetNewHeight(newHeight, newWidth, maxWidth.Value); + newWidth = maxWidth.Value; + } + + return new Size(Convert.ToInt32(newWidth), Convert.ToInt32(newHeight)); + } + + private static decimal GetNewWidth(decimal currentHeight, decimal currentWidth, int newHeight) + { + decimal scaleFactor = newHeight; + scaleFactor /= currentHeight; + scaleFactor *= currentWidth; + + return scaleFactor; + } + + private static decimal GetNewHeight(decimal currentHeight, decimal currentWidth, int newWidth) + { + decimal scaleFactor = newWidth; + scaleFactor /= currentWidth; + scaleFactor *= currentHeight; + + return scaleFactor; + } + } +} diff --git a/MediaBrowser.Controller/Drawing/ImageProcessor.cs b/MediaBrowser.Controller/Drawing/ImageProcessor.cs new file mode 100644 index 0000000000..b7815750b5 --- /dev/null +++ b/MediaBrowser.Controller/Drawing/ImageProcessor.cs @@ -0,0 +1,148 @@ +using MediaBrowser.Controller.Entities; +using MediaBrowser.Model.Entities; +using System; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Drawing.Imaging; +using System.IO; +using System.Linq; + +namespace MediaBrowser.Controller.Drawing +{ + public static class ImageProcessor + { + /// + /// Processes an image by resizing to target dimensions + /// + /// The stream containing the source image + /// The stream to save the new image to + /// Use if a fixed width is required. Aspect ratio will be preserved. + /// Use if a fixed height is required. Aspect ratio will be preserved. + /// Use if a max width is required. Aspect ratio will be preserved. + /// Use if a max height is required. Aspect ratio will be preserved. + /// Quality level, from 0-100. Currently only applies to JPG. The default value should suffice. + /// The entity that owns the image + /// The image type + /// The image index (currently only used with backdrops) + public static void ProcessImage(Stream sourceImageStream, Stream toStream, int? width, int? height, int? maxWidth, int? maxHeight, int? quality, BaseEntity entity, ImageType imageType, int imageIndex) + { + Image originalImage = Image.FromStream(sourceImageStream); + + // Determine the output size based on incoming parameters + Size newSize = DrawingUtils.Resize(originalImage.Size, width, height, maxWidth, maxHeight); + + Bitmap thumbnail; + + // Graphics.FromImage will throw an exception if the PixelFormat is Indexed, so we need to handle that here + if (originalImage.PixelFormat.HasFlag(PixelFormat.Indexed)) + { + thumbnail = new Bitmap(originalImage, newSize.Width, newSize.Height); + } + else + { + thumbnail = new Bitmap(newSize.Width, newSize.Height, originalImage.PixelFormat); + } + + // Preserve the original resolution + thumbnail.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution); + + Graphics thumbnailGraph = Graphics.FromImage(thumbnail); + + thumbnailGraph.CompositingQuality = CompositingQuality.HighQuality; + thumbnailGraph.SmoothingMode = SmoothingMode.HighQuality; + thumbnailGraph.InterpolationMode = InterpolationMode.HighQualityBicubic; + thumbnailGraph.PixelOffsetMode = PixelOffsetMode.HighQuality; + thumbnailGraph.CompositingMode = CompositingMode.SourceOver; + + thumbnailGraph.DrawImage(originalImage, 0, 0, newSize.Width, newSize.Height); + + // Run Kernel image processors + if (Kernel.Instance.ImageProcessors.Any()) + { + ExecuteAdditionalImageProcessors(thumbnail, thumbnailGraph, entity, imageType, imageIndex); + } + + // Write to the output stream + SaveImage(originalImage.RawFormat, thumbnail, toStream, quality); + + thumbnailGraph.Dispose(); + thumbnail.Dispose(); + originalImage.Dispose(); + } + + /// + /// Executes additional image processors that are registered with the Kernel + /// + /// The bitmap holding the original image, after re-sizing + /// The graphics surface on which the output is drawn + /// The entity that owns the image + /// The image type + /// The image index (currently only used with backdrops) + private static void ExecuteAdditionalImageProcessors(Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex) + { + var baseItem = entity as BaseItem; + + if (baseItem != null) + { + foreach (var processor in Kernel.Instance.ImageProcessors) + { + processor.ProcessImage(bitmap, graphics, baseItem, imageType, imageIndex); + } + } + else + { + foreach (var processor in Kernel.Instance.ImageProcessors) + { + processor.ProcessImage(bitmap, graphics, entity); + } + } + } + + public static void SaveImage(ImageFormat originalImageRawFormat, Image newImage, Stream toStream, int? quality) + { + // Use special save methods for jpeg and png that will result in a much higher quality image + // All other formats use the generic Image.Save + if (ImageFormat.Jpeg.Equals(originalImageRawFormat)) + { + SaveJpeg(newImage, toStream, quality); + } + else if (ImageFormat.Png.Equals(originalImageRawFormat)) + { + newImage.Save(toStream, ImageFormat.Png); + } + else + { + newImage.Save(toStream, originalImageRawFormat); + } + } + + public static void SaveJpeg(Image image, Stream target, int? quality) + { + if (!quality.HasValue) + { + quality = 90; + } + + using (var encoderParameters = new EncoderParameters(1)) + { + encoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, quality.Value); + image.Save(target, GetImageCodecInfo("image/jpeg"), encoderParameters); + } + } + + public static ImageCodecInfo GetImageCodecInfo(string mimeType) + { + ImageCodecInfo[] info = ImageCodecInfo.GetImageEncoders(); + + for (int i = 0; i < info.Length; i++) + { + ImageCodecInfo ici = info[i]; + if (ici.MimeType.Equals(mimeType, StringComparison.OrdinalIgnoreCase)) + { + return ici; + } + } + return info[1]; + } + } +} diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 682abb6322..4c0dc6965e 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -1,5 +1,6 @@ using MediaBrowser.Common.Kernel; using MediaBrowser.Common.Logging; +using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.IO; @@ -27,7 +28,6 @@ namespace MediaBrowser.Controller public static Kernel Instance { get; private set; } public ItemController ItemController { get; private set; } - public WeatherClient WeatherClient { get; private set; } public IEnumerable Users { get; private set; } public Folder RootFolder { get; private set; } @@ -47,6 +47,12 @@ namespace MediaBrowser.Controller get { return KernelContext.Server; } } + /// + /// Gets the list of currently registered weather prvoiders + /// + [ImportMany(typeof(BaseWeatherProvider))] + public IEnumerable WeatherProviders { get; private set; } + /// /// Gets the list of currently registered metadata prvoiders /// @@ -71,6 +77,12 @@ namespace MediaBrowser.Controller /// internal IBaseItemResolver[] EntityResolvers { get; private set; } + /// + /// Gets the list of currently registered entity resolvers + /// + [ImportMany(typeof(BaseImageProcessor))] + internal IEnumerable ImageProcessors { get; private set; } + /// /// Creates a kernel based on a Data path, which is akin to our current programdata path /// @@ -85,13 +97,15 @@ namespace MediaBrowser.Controller /// protected override void InitializeInternal(IProgress progress) { + base.InitializeInternal(progress); + ItemController = new ItemController(); DirectoryWatchers = new DirectoryWatchers(); ItemController.PreBeginResolvePath += ItemController_PreBeginResolvePath; ItemController.BeginResolvePath += ItemController_BeginResolvePath; - base.InitializeInternal(progress); + ExtractFFMpeg(); } /// @@ -101,14 +115,11 @@ namespace MediaBrowser.Controller { await base.ReloadInternal(progress).ConfigureAwait(false); - ReloadWeatherClient(); - - ExtractFFMpeg(); - ReportProgress(progress, "Loading Users"); ReloadUsers(); ReportProgress(progress, "Loading Media Library"); + await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false); } @@ -121,8 +132,6 @@ namespace MediaBrowser.Controller DirectoryWatchers.Stop(); - DisposeWeatherClient(); - ItemController.PreBeginResolvePath -= ItemController_PreBeginResolvePath; ItemController.BeginResolvePath -= ItemController_BeginResolvePath; } @@ -413,26 +422,5 @@ namespace MediaBrowser.Controller } } } - - /// - /// Disposes the current WeatherClient - /// - private void DisposeWeatherClient() - { - if (WeatherClient != null) - { - WeatherClient.Dispose(); - } - } - - /// - /// Disposes the current WeatherClient and creates a new one - /// - private void ReloadWeatherClient() - { - DisposeWeatherClient(); - - WeatherClient = new WeatherClient(); - } } } diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 8d1f4965a0..131825af35 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -36,6 +36,7 @@ + @@ -58,6 +59,9 @@ + + + @@ -107,7 +111,8 @@ - + + diff --git a/MediaBrowser.Controller/Weather/BaseWeatherProvider.cs b/MediaBrowser.Controller/Weather/BaseWeatherProvider.cs new file mode 100644 index 0000000000..c3d436e667 --- /dev/null +++ b/MediaBrowser.Controller/Weather/BaseWeatherProvider.cs @@ -0,0 +1,34 @@ +using MediaBrowser.Common.Logging; +using MediaBrowser.Model.Weather; +using System; +using System.Net; +using System.Net.Cache; +using System.Net.Http; +using System.Threading.Tasks; + +namespace MediaBrowser.Controller.Weather +{ + public abstract class BaseWeatherProvider : IDisposable + { + protected HttpClient HttpClient { get; private set; } + + protected BaseWeatherProvider() + { + var handler = new WebRequestHandler { }; + + handler.AutomaticDecompression = DecompressionMethods.Deflate; + handler.CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate); + + HttpClient = new HttpClient(handler); + } + + public virtual void Dispose() + { + Logger.LogInfo("Disposing " + GetType().Name); + + HttpClient.Dispose(); + } + + public abstract Task GetWeatherInfoAsync(string zipCode); + } +} diff --git a/MediaBrowser.Controller/Weather/WeatherClient.cs b/MediaBrowser.Controller/Weather/WeatherClient.cs deleted file mode 100644 index 7226dccf04..0000000000 --- a/MediaBrowser.Controller/Weather/WeatherClient.cs +++ /dev/null @@ -1,207 +0,0 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Common.Serialization; -using MediaBrowser.Model.Weather; -using System; -using System.IO; -using System.Linq; -using System.Net; -using System.Net.Cache; -using System.Net.Http; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Weather -{ - /// - /// Based on http://www.worldweatheronline.com/free-weather-feed.aspx - /// The classes in this file are a reproduction of the json output, which will then be converted to our weather model classes - /// - public class WeatherClient : IDisposable - { - private HttpClient HttpClient { get; set; } - - public WeatherClient() - { - var handler = new WebRequestHandler { }; - - handler.AutomaticDecompression = DecompressionMethods.Deflate; - handler.CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate); - - HttpClient = new HttpClient(handler); - } - - public async Task GetWeatherInfoAsync(string zipCode) - { - if (string.IsNullOrWhiteSpace(zipCode)) - { - return null; - } - - const int numDays = 5; - const string apiKey = "24902f60f1231941120109"; - - string url = "http://free.worldweatheronline.com/feed/weather.ashx?q=" + zipCode + "&format=json&num_of_days=" + numDays + "&key=" + apiKey; - - Logger.LogInfo("Accessing weather from " + url); - - using (Stream stream = await HttpClient.GetStreamAsync(url).ConfigureAwait(false)) - { - WeatherData data = JsonSerializer.DeserializeFromStream(stream).data; - - return GetWeatherInfo(data); - } - } - - /// - /// Converst the json output to our WeatherInfo model class - /// - private WeatherInfo GetWeatherInfo(WeatherData data) - { - var info = new WeatherInfo(); - - if (data.current_condition != null) - { - if (data.current_condition.Any()) - { - info.CurrentWeather = data.current_condition.First().ToWeatherStatus(); - } - } - - if (data.weather != null) - { - info.Forecasts = data.weather.Select(w => w.ToWeatherForecast()).ToArray(); - } - - return info; - } - - public void Dispose() - { - HttpClient.Dispose(); - } - } - - class WeatherResult - { - public WeatherData data { get; set; } - } - - public class WeatherData - { - public WeatherCondition[] current_condition { get; set; } - public DailyWeatherInfo[] weather { get; set; } - } - - public class WeatherCondition - { - public string temp_C { get; set; } - public string temp_F { get; set; } - public string humidity { get; set; } - public string weatherCode { get; set; } - - public WeatherStatus ToWeatherStatus() - { - return new WeatherStatus - { - TemperatureCelsius = int.Parse(temp_C), - TemperatureFahrenheit = int.Parse(temp_F), - Humidity = int.Parse(humidity), - Condition = DailyWeatherInfo.GetCondition(weatherCode) - }; - } - } - - public class DailyWeatherInfo - { - public string date { get; set; } - public string precipMM { get; set; } - public string tempMaxC { get; set; } - public string tempMaxF { get; set; } - public string tempMinC { get; set; } - public string tempMinF { get; set; } - public string weatherCode { get; set; } - public string winddir16Point { get; set; } - public string winddirDegree { get; set; } - public string winddirection { get; set; } - public string windspeedKmph { get; set; } - public string windspeedMiles { get; set; } - - public WeatherForecast ToWeatherForecast() - { - return new WeatherForecast - { - Date = DateTime.Parse(date), - HighTemperatureCelsius = int.Parse(tempMaxC), - HighTemperatureFahrenheit = int.Parse(tempMaxF), - LowTemperatureCelsius = int.Parse(tempMinC), - LowTemperatureFahrenheit = int.Parse(tempMinF), - Condition = GetCondition(weatherCode) - }; - } - - public static WeatherConditions GetCondition(string weatherCode) - { - switch (weatherCode) - { - case "362": - case "365": - case "320": - case "317": - case "182": - return WeatherConditions.Sleet; - case "338": - case "335": - case "332": - case "329": - case "326": - case "323": - case "377": - case "374": - case "371": - case "368": - case "395": - case "392": - case "350": - case "227": - case "179": - return WeatherConditions.Snow; - case "314": - case "311": - case "308": - case "305": - case "302": - case "299": - case "296": - case "293": - case "284": - case "281": - case "266": - case "263": - case "359": - case "356": - case "353": - case "185": - case "176": - return WeatherConditions.Rain; - case "260": - case "248": - return WeatherConditions.Fog; - case "389": - case "386": - case "200": - return WeatherConditions.Thunderstorm; - case "230": - return WeatherConditions.Blizzard; - case "143": - return WeatherConditions.Mist; - case "122": - return WeatherConditions.Overcast; - case "119": - return WeatherConditions.Cloudy; - case "115": - return WeatherConditions.PartlyCloudy; - default: - return WeatherConditions.Sunny; - } - } - } -} diff --git a/MediaBrowser.Controller/Weather/WeatherProvider.cs b/MediaBrowser.Controller/Weather/WeatherProvider.cs new file mode 100644 index 0000000000..0fc7288790 --- /dev/null +++ b/MediaBrowser.Controller/Weather/WeatherProvider.cs @@ -0,0 +1,189 @@ +using MediaBrowser.Common.Logging; +using MediaBrowser.Common.Serialization; +using MediaBrowser.Model.Weather; +using System; +using System.ComponentModel.Composition; +using System.IO; +using System.Linq; +using System.Threading.Tasks; + +namespace MediaBrowser.Controller.Weather +{ + /// + /// Based on http://www.worldweatheronline.com/free-weather-feed.aspx + /// The classes in this file are a reproduction of the json output, which will then be converted to our weather model classes + /// + [Export(typeof(BaseWeatherProvider))] + public class WeatherProvider : BaseWeatherProvider + { + public override async Task GetWeatherInfoAsync(string zipCode) + { + if (string.IsNullOrWhiteSpace(zipCode)) + { + return null; + } + + const int numDays = 5; + const string apiKey = "24902f60f1231941120109"; + + string url = "http://free.worldweatheronline.com/feed/weather.ashx?q=" + zipCode + "&format=json&num_of_days=" + numDays + "&key=" + apiKey; + + Logger.LogInfo("Accessing weather from " + url); + + using (Stream stream = await HttpClient.GetStreamAsync(url).ConfigureAwait(false)) + { + WeatherData data = JsonSerializer.DeserializeFromStream(stream).data; + + return GetWeatherInfo(data); + } + } + + /// + /// Converst the json output to our WeatherInfo model class + /// + private WeatherInfo GetWeatherInfo(WeatherData data) + { + var info = new WeatherInfo(); + + if (data.current_condition != null) + { + if (data.current_condition.Any()) + { + info.CurrentWeather = data.current_condition.First().ToWeatherStatus(); + } + } + + if (data.weather != null) + { + info.Forecasts = data.weather.Select(w => w.ToWeatherForecast()).ToArray(); + } + + return info; + } + } + + class WeatherResult + { + public WeatherData data { get; set; } + } + + public class WeatherData + { + public WeatherCondition[] current_condition { get; set; } + public DailyWeatherInfo[] weather { get; set; } + } + + public class WeatherCondition + { + public string temp_C { get; set; } + public string temp_F { get; set; } + public string humidity { get; set; } + public string weatherCode { get; set; } + + public WeatherStatus ToWeatherStatus() + { + return new WeatherStatus + { + TemperatureCelsius = int.Parse(temp_C), + TemperatureFahrenheit = int.Parse(temp_F), + Humidity = int.Parse(humidity), + Condition = DailyWeatherInfo.GetCondition(weatherCode) + }; + } + } + + public class DailyWeatherInfo + { + public string date { get; set; } + public string precipMM { get; set; } + public string tempMaxC { get; set; } + public string tempMaxF { get; set; } + public string tempMinC { get; set; } + public string tempMinF { get; set; } + public string weatherCode { get; set; } + public string winddir16Point { get; set; } + public string winddirDegree { get; set; } + public string winddirection { get; set; } + public string windspeedKmph { get; set; } + public string windspeedMiles { get; set; } + + public WeatherForecast ToWeatherForecast() + { + return new WeatherForecast + { + Date = DateTime.Parse(date), + HighTemperatureCelsius = int.Parse(tempMaxC), + HighTemperatureFahrenheit = int.Parse(tempMaxF), + LowTemperatureCelsius = int.Parse(tempMinC), + LowTemperatureFahrenheit = int.Parse(tempMinF), + Condition = GetCondition(weatherCode) + }; + } + + public static WeatherConditions GetCondition(string weatherCode) + { + switch (weatherCode) + { + case "362": + case "365": + case "320": + case "317": + case "182": + return WeatherConditions.Sleet; + case "338": + case "335": + case "332": + case "329": + case "326": + case "323": + case "377": + case "374": + case "371": + case "368": + case "395": + case "392": + case "350": + case "227": + case "179": + return WeatherConditions.Snow; + case "314": + case "311": + case "308": + case "305": + case "302": + case "299": + case "296": + case "293": + case "284": + case "281": + case "266": + case "263": + case "359": + case "356": + case "353": + case "185": + case "176": + return WeatherConditions.Rain; + case "260": + case "248": + return WeatherConditions.Fog; + case "389": + case "386": + case "200": + return WeatherConditions.Thunderstorm; + case "230": + return WeatherConditions.Blizzard; + case "143": + return WeatherConditions.Mist; + case "122": + return WeatherConditions.Overcast; + case "119": + return WeatherConditions.Cloudy; + case "115": + return WeatherConditions.PartlyCloudy; + default: + return WeatherConditions.Sunny; + } + } + } +} diff --git a/MediaBrowser.sln b/MediaBrowser.sln index 17b3a62908..b3f1b78359 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -52,4 +52,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection EndGlobal -- cgit v1.2.3 From e76ff3bf160dc90968a5530b7477daaff67480b8 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Tue, 18 Sep 2012 17:39:42 -0400 Subject: Improved image processing --- MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 8 +++- .../Drawing/BaseImageProcessor.cs | 56 +++++++++++++++++++++- MediaBrowser.Controller/Drawing/ImageProcessor.cs | 27 +++++++---- MediaBrowser.Controller/Kernel.cs | 2 +- 4 files changed, 80 insertions(+), 13 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index 73098c71b5..da20e0533a 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Common.Logging; +using System.Drawing.Imaging; +using MediaBrowser.Common.Logging; using MediaBrowser.Common.Net; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; @@ -128,6 +129,11 @@ namespace MediaBrowser.Api.HttpHandlers return null; } + if (Kernel.Instance.ImageProcessors.Any(i => i.RequiresTransparency)) + { + return MimeTypes.GetMimeType(".png"); + } + return MimeTypes.GetMimeType(await GetImagePath().ConfigureAwait(false)); } diff --git a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs index a2b223a707..ebd0e22c86 100644 --- a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs @@ -1,6 +1,8 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Entities; +using System.ComponentModel.Composition; using System.Drawing; +using System.Drawing.Drawing2D; namespace MediaBrowser.Controller.Drawing { @@ -15,19 +17,69 @@ namespace MediaBrowser.Controller.Drawing /// /// Processes the primary image for a BaseEntity (Person, Studio, User, etc) /// + /// The original Image, before re-sizing /// The bitmap holding the original image, after re-sizing /// The graphics surface on which the output is drawn /// The entity that owns the image - public abstract void ProcessImage(Bitmap bitmap, Graphics graphics, BaseEntity entity); + public abstract void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity); /// /// Processes an image for a BaseItem /// + /// The original Image, before re-sizing /// The bitmap holding the original image, after re-sizing /// The graphics surface on which the output is drawn /// The entity that owns the image /// The image type /// The image index (currently only used with backdrops) - public abstract void ProcessImage(Bitmap bitmap, Graphics graphics, BaseItem entity, ImageType imageType, int imageIndex); + public abstract void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseItem entity, ImageType imageType, int imageIndex); + + /// + /// If true, the image output format will be forced to png, resulting in an output size that will generally run larger than jpg + /// + public virtual bool RequiresTransparency + { + get + { + return false; + } + } + } + + /// + /// This is demo-ware and should be deleted eventually + /// + //[Export(typeof(BaseImageProcessor))] + public class MyRoundedCornerImageProcessor : BaseImageProcessor + { + public override void ProcessImage(Image originalImage, Bitmap bitmap, Graphics g, BaseEntity entity) + { + var CornerRadius = 20; + + g.Clear(Color.Transparent); + + using (GraphicsPath gp = new GraphicsPath()) + { + gp.AddArc(0, 0, CornerRadius, CornerRadius, 180, 90); + gp.AddArc(0 + bitmap.Width - CornerRadius, 0, CornerRadius, CornerRadius, 270, 90); + gp.AddArc(0 + bitmap.Width - CornerRadius, 0 + bitmap.Height - CornerRadius, CornerRadius, CornerRadius, 0, 90); + gp.AddArc(0, 0 + bitmap.Height - CornerRadius, CornerRadius, CornerRadius, 90, 90); + + g.SetClip(gp); + g.DrawImage(originalImage, 0, 0, bitmap.Width, bitmap.Height); + } + } + + public override void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseItem entity, ImageType imageType, int imageIndex) + { + } + + public override bool RequiresTransparency + { + get + { + return true; + } + } } } diff --git a/MediaBrowser.Controller/Drawing/ImageProcessor.cs b/MediaBrowser.Controller/Drawing/ImageProcessor.cs index b7815750b5..f9b6366c65 100644 --- a/MediaBrowser.Controller/Drawing/ImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/ImageProcessor.cs @@ -43,6 +43,8 @@ namespace MediaBrowser.Controller.Drawing thumbnail = new Bitmap(newSize.Width, newSize.Height, originalImage.PixelFormat); } + thumbnail.MakeTransparent(); + // Preserve the original resolution thumbnail.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution); @@ -56,14 +58,21 @@ namespace MediaBrowser.Controller.Drawing thumbnailGraph.DrawImage(originalImage, 0, 0, newSize.Width, newSize.Height); + ImageFormat outputFormat = originalImage.RawFormat; + // Run Kernel image processors if (Kernel.Instance.ImageProcessors.Any()) { - ExecuteAdditionalImageProcessors(thumbnail, thumbnailGraph, entity, imageType, imageIndex); + ExecuteAdditionalImageProcessors(originalImage, thumbnail, thumbnailGraph, entity, imageType, imageIndex); + + if (Kernel.Instance.ImageProcessors.Any(i => i.RequiresTransparency)) + { + outputFormat = ImageFormat.Png; + } } // Write to the output stream - SaveImage(originalImage.RawFormat, thumbnail, toStream, quality); + SaveImage(outputFormat, thumbnail, toStream, quality); thumbnailGraph.Dispose(); thumbnail.Dispose(); @@ -78,7 +87,7 @@ namespace MediaBrowser.Controller.Drawing /// The entity that owns the image /// The image type /// The image index (currently only used with backdrops) - private static void ExecuteAdditionalImageProcessors(Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex) + private static void ExecuteAdditionalImageProcessors(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex) { var baseItem = entity as BaseItem; @@ -86,33 +95,33 @@ namespace MediaBrowser.Controller.Drawing { foreach (var processor in Kernel.Instance.ImageProcessors) { - processor.ProcessImage(bitmap, graphics, baseItem, imageType, imageIndex); + processor.ProcessImage(originalImage, bitmap, graphics, baseItem, imageType, imageIndex); } } else { foreach (var processor in Kernel.Instance.ImageProcessors) { - processor.ProcessImage(bitmap, graphics, entity); + processor.ProcessImage(originalImage, bitmap, graphics, entity); } } } - public static void SaveImage(ImageFormat originalImageRawFormat, Image newImage, Stream toStream, int? quality) + public static void SaveImage(ImageFormat outputFormat, Image newImage, Stream toStream, int? quality) { // Use special save methods for jpeg and png that will result in a much higher quality image // All other formats use the generic Image.Save - if (ImageFormat.Jpeg.Equals(originalImageRawFormat)) + if (ImageFormat.Jpeg.Equals(outputFormat)) { SaveJpeg(newImage, toStream, quality); } - else if (ImageFormat.Png.Equals(originalImageRawFormat)) + else if (ImageFormat.Png.Equals(outputFormat)) { newImage.Save(toStream, ImageFormat.Png); } else { - newImage.Save(toStream, originalImageRawFormat); + newImage.Save(toStream, outputFormat); } } diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 4c0dc6965e..1c11b9fc85 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -81,7 +81,7 @@ namespace MediaBrowser.Controller /// Gets the list of currently registered entity resolvers /// [ImportMany(typeof(BaseImageProcessor))] - internal IEnumerable ImageProcessors { get; private set; } + public IEnumerable ImageProcessors { get; private set; } /// /// Creates a kernel based on a Data path, which is akin to our current programdata path -- cgit v1.2.3 From bd6c2d2a22c099e35fd69816e28b5c46a83176b1 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Tue, 18 Sep 2012 18:32:37 -0400 Subject: A few more image improvements --- MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 138 +++++++-------------- .../Drawing/BaseImageProcessor.cs | 55 +++++--- MediaBrowser.Controller/Drawing/ImageProcessor.cs | 59 ++++++--- 3 files changed, 122 insertions(+), 130 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index da20e0533a..c168569cd0 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -1,6 +1,4 @@ -using System.Drawing.Imaging; -using MediaBrowser.Common.Logging; -using MediaBrowser.Common.Net; +using MediaBrowser.Common.Net; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; using MediaBrowser.Controller.Drawing; @@ -24,6 +22,7 @@ namespace MediaBrowser.Api.HttpHandlers } private string _imagePath; + private async Task GetImagePath() { _imagePath = _imagePath ?? await DiscoverImagePath(); @@ -32,28 +31,34 @@ namespace MediaBrowser.Api.HttpHandlers } private BaseEntity _sourceEntity; + private async Task GetSourceEntity() { if (_sourceEntity == null) { if (!string.IsNullOrEmpty(QueryString["personname"])) { - _sourceEntity = await Kernel.Instance.ItemController.GetPerson(QueryString["personname"]).ConfigureAwait(false); + _sourceEntity = + await Kernel.Instance.ItemController.GetPerson(QueryString["personname"]).ConfigureAwait(false); } else if (!string.IsNullOrEmpty(QueryString["genre"])) { - _sourceEntity = await Kernel.Instance.ItemController.GetGenre(QueryString["genre"]).ConfigureAwait(false); + _sourceEntity = + await Kernel.Instance.ItemController.GetGenre(QueryString["genre"]).ConfigureAwait(false); } else if (!string.IsNullOrEmpty(QueryString["year"])) { - _sourceEntity = await Kernel.Instance.ItemController.GetYear(int.Parse(QueryString["year"])).ConfigureAwait(false); + _sourceEntity = + await + Kernel.Instance.ItemController.GetYear(int.Parse(QueryString["year"])).ConfigureAwait(false); } else if (!string.IsNullOrEmpty(QueryString["studio"])) { - _sourceEntity = await Kernel.Instance.ItemController.GetStudio(QueryString["studio"]).ConfigureAwait(false); + _sourceEntity = + await Kernel.Instance.ItemController.GetStudio(QueryString["studio"]).ConfigureAwait(false); } else if (!string.IsNullOrEmpty(QueryString["userid"])) @@ -74,85 +79,62 @@ namespace MediaBrowser.Api.HttpHandlers { var entity = await GetSourceEntity().ConfigureAwait(false); - var item = entity as BaseItem; + return ImageProcessor.GetImagePath(entity, ImageType, ImageIndex); + } - if (item != null) + public override async Task GetContentType() + { + if (Kernel.Instance.ImageProcessors.Any(i => i.RequiresTransparency)) { - return GetImagePathFromTypes(item, ImageType, ImageIndex); + return MimeTypes.GetMimeType(".png"); } - return entity.PrimaryImagePath; + return MimeTypes.GetMimeType(await GetImagePath().ConfigureAwait(false)); } - private Stream _sourceStream; - private async Task GetSourceStream() + public override TimeSpan CacheDuration { - await EnsureSourceStream().ConfigureAwait(false); - return _sourceStream; + get { return TimeSpan.FromDays(365); } } - private bool _sourceStreamEnsured; - private async Task EnsureSourceStream() + protected override async Task GetLastDateModified() { - if (!_sourceStreamEnsured) + string path = await GetImagePath().ConfigureAwait(false); + + DateTime date = File.GetLastWriteTimeUtc(path); + + // If the file does not exist it will return jan 1, 1601 + // http://msdn.microsoft.com/en-us/library/system.io.file.getlastwritetimeutc.aspx + if (date.Year == 1601) { - try - { - _sourceStream = File.OpenRead(await GetImagePath().ConfigureAwait(false)); - } - catch (FileNotFoundException ex) - { - StatusCode = 404; - Logger.LogException(ex); - } - catch (DirectoryNotFoundException ex) + if (!File.Exists(path)) { StatusCode = 404; - Logger.LogException(ex); - } - catch (UnauthorizedAccessException ex) - { - StatusCode = 403; - Logger.LogException(ex); - } - finally - { - _sourceStreamEnsured = true; + return null; } } - } - - public async override Task GetContentType() - { - if (await GetSourceStream().ConfigureAwait(false) == null) - { - return null; - } - if (Kernel.Instance.ImageProcessors.Any(i => i.RequiresTransparency)) - { - return MimeTypes.GetMimeType(".png"); - } - - return MimeTypes.GetMimeType(await GetImagePath().ConfigureAwait(false)); + return await GetMostRecentDateModified(date); } - public override TimeSpan CacheDuration + private async Task GetMostRecentDateModified(DateTime imageFileLastDateModified) { - get - { - return TimeSpan.FromDays(365); - } - } + var date = imageFileLastDateModified; - protected async override Task GetLastDateModified() - { - if (await GetSourceStream().ConfigureAwait(false) == null) + var entity = await GetSourceEntity().ConfigureAwait(false); + + foreach (var processor in Kernel.Instance.ImageProcessors) { - return null; + if (processor.IsConfiguredToProcess(entity, ImageType, ImageIndex)) + { + if (processor.ProcessingConfigurationDateLastModifiedUtc > date) + { + date = processor.ProcessingConfigurationDateLastModifiedUtc; + } + } } - return File.GetLastWriteTimeUtc(await GetImagePath().ConfigureAwait(false)); + return date; } private int ImageIndex @@ -262,37 +244,9 @@ namespace MediaBrowser.Api.HttpHandlers protected override async Task WriteResponseToOutputStream(Stream stream) { - Stream sourceStream = await GetSourceStream().ConfigureAwait(false); - var entity = await GetSourceEntity().ConfigureAwait(false); - ImageProcessor.ProcessImage(sourceStream, stream, Width, Height, MaxWidth, MaxHeight, Quality, entity, ImageType, ImageIndex); - } - - private string GetImagePathFromTypes(BaseItem item, ImageType imageType, int imageIndex) - { - if (imageType == ImageType.Logo) - { - return item.LogoImagePath; - } - if (imageType == ImageType.Backdrop) - { - return item.BackdropImagePaths.ElementAt(imageIndex); - } - if (imageType == ImageType.Banner) - { - return item.BannerImagePath; - } - if (imageType == ImageType.Art) - { - return item.ArtImagePath; - } - if (imageType == ImageType.Thumbnail) - { - return item.ThumbnailImagePath; - } - - return item.PrimaryImagePath; + ImageProcessor.ProcessImage(entity, ImageType, ImageIndex, stream, Width, Height, MaxWidth, MaxHeight, Quality); } } } diff --git a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs index ebd0e22c86..8fc6564e7e 100644 --- a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs @@ -1,5 +1,6 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Entities; +using System; using System.ComponentModel.Composition; using System.Drawing; using System.Drawing.Drawing2D; @@ -15,16 +16,7 @@ namespace MediaBrowser.Controller.Drawing public abstract class BaseImageProcessor { /// - /// Processes the primary image for a BaseEntity (Person, Studio, User, etc) - /// - /// The original Image, before re-sizing - /// The bitmap holding the original image, after re-sizing - /// The graphics surface on which the output is drawn - /// The entity that owns the image - public abstract void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity); - - /// - /// Processes an image for a BaseItem + /// Processes an image for a BaseEntity /// /// The original Image, before re-sizing /// The bitmap holding the original image, after re-sizing @@ -32,10 +24,11 @@ namespace MediaBrowser.Controller.Drawing /// The entity that owns the image /// The image type /// The image index (currently only used with backdrops) - public abstract void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseItem entity, ImageType imageType, int imageIndex); + public abstract void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex); /// /// If true, the image output format will be forced to png, resulting in an output size that will generally run larger than jpg + /// If false, the original image format is preserved. /// public virtual bool RequiresTransparency { @@ -44,6 +37,18 @@ namespace MediaBrowser.Controller.Drawing return false; } } + + /// + /// Determines if the image processor is configured to process the specified entity, image type and image index + /// This will aid http response caching so that we don't invalidate image caches when we don't have to + /// + public abstract bool IsConfiguredToProcess(BaseEntity entity, ImageType imageType, int imageIndex); + + /// + /// This is used for caching purposes, since a configuration change needs to invalidate a user's image cache + /// If the image processor is hosted within a plugin then this should be the plugin ConfigurationDateLastModified + /// + public abstract DateTime ProcessingConfigurationDateLastModifiedUtc { get; } } /// @@ -52,34 +57,44 @@ namespace MediaBrowser.Controller.Drawing //[Export(typeof(BaseImageProcessor))] public class MyRoundedCornerImageProcessor : BaseImageProcessor { - public override void ProcessImage(Image originalImage, Bitmap bitmap, Graphics g, BaseEntity entity) + public override void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex) { var CornerRadius = 20; - g.Clear(Color.Transparent); - + graphics.Clear(Color.Transparent); + using (GraphicsPath gp = new GraphicsPath()) { gp.AddArc(0, 0, CornerRadius, CornerRadius, 180, 90); gp.AddArc(0 + bitmap.Width - CornerRadius, 0, CornerRadius, CornerRadius, 270, 90); gp.AddArc(0 + bitmap.Width - CornerRadius, 0 + bitmap.Height - CornerRadius, CornerRadius, CornerRadius, 0, 90); gp.AddArc(0, 0 + bitmap.Height - CornerRadius, CornerRadius, CornerRadius, 90, 90); - - g.SetClip(gp); - g.DrawImage(originalImage, 0, 0, bitmap.Width, bitmap.Height); + + graphics.SetClip(gp); + graphics.DrawImage(originalImage, 0, 0, bitmap.Width, bitmap.Height); } } - public override void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseItem entity, ImageType imageType, int imageIndex) + public override bool RequiresTransparency { + get + { + return true; + } } - public override bool RequiresTransparency + public override DateTime ProcessingConfigurationDateLastModifiedUtc { get { - return true; + // This will result in a situation where images are never cached, but again, this is a prototype + return DateTime.UtcNow; } } + + public override bool IsConfiguredToProcess(BaseEntity entity, ImageType imageType, int imageIndex) + { + return true; + } } } diff --git a/MediaBrowser.Controller/Drawing/ImageProcessor.cs b/MediaBrowser.Controller/Drawing/ImageProcessor.cs index f9b6366c65..7ee4ef7348 100644 --- a/MediaBrowser.Controller/Drawing/ImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/ImageProcessor.cs @@ -14,19 +14,18 @@ namespace MediaBrowser.Controller.Drawing /// /// Processes an image by resizing to target dimensions /// - /// The stream containing the source image + /// The entity that owns the image + /// The image type + /// The image index (currently only used with backdrops) /// The stream to save the new image to /// Use if a fixed width is required. Aspect ratio will be preserved. /// Use if a fixed height is required. Aspect ratio will be preserved. /// Use if a max width is required. Aspect ratio will be preserved. /// Use if a max height is required. Aspect ratio will be preserved. /// Quality level, from 0-100. Currently only applies to JPG. The default value should suffice. - /// The entity that owns the image - /// The image type - /// The image index (currently only used with backdrops) - public static void ProcessImage(Stream sourceImageStream, Stream toStream, int? width, int? height, int? maxWidth, int? maxHeight, int? quality, BaseEntity entity, ImageType imageType, int imageIndex) + public static void ProcessImage(BaseEntity entity, ImageType imageType, int imageIndex, Stream toStream, int? width, int? height, int? maxWidth, int? maxHeight, int? quality) { - Image originalImage = Image.FromStream(sourceImageStream); + Image originalImage = Image.FromFile(GetImagePath(entity, imageType, imageIndex)); // Determine the output size based on incoming parameters Size newSize = DrawingUtils.Resize(originalImage.Size, width, height, maxWidth, maxHeight); @@ -79,9 +78,42 @@ namespace MediaBrowser.Controller.Drawing originalImage.Dispose(); } + public static string GetImagePath(BaseEntity entity, ImageType imageType, int imageIndex) + { + var item = entity as BaseItem; + + if (item != null) + { + if (imageType == ImageType.Logo) + { + return item.LogoImagePath; + } + if (imageType == ImageType.Backdrop) + { + return item.BackdropImagePaths.ElementAt(imageIndex); + } + if (imageType == ImageType.Banner) + { + return item.BannerImagePath; + } + if (imageType == ImageType.Art) + { + return item.ArtImagePath; + } + if (imageType == ImageType.Thumbnail) + { + return item.ThumbnailImagePath; + } + } + + return entity.PrimaryImagePath; + } + + /// /// Executes additional image processors that are registered with the Kernel /// + /// The original Image, before re-sizing /// The bitmap holding the original image, after re-sizing /// The graphics surface on which the output is drawn /// The entity that owns the image @@ -89,20 +121,11 @@ namespace MediaBrowser.Controller.Drawing /// The image index (currently only used with backdrops) private static void ExecuteAdditionalImageProcessors(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex) { - var baseItem = entity as BaseItem; - - if (baseItem != null) - { - foreach (var processor in Kernel.Instance.ImageProcessors) - { - processor.ProcessImage(originalImage, bitmap, graphics, baseItem, imageType, imageIndex); - } - } - else + foreach (var processor in Kernel.Instance.ImageProcessors) { - foreach (var processor in Kernel.Instance.ImageProcessors) + if (processor.IsConfiguredToProcess(entity, imageType, imageIndex)) { - processor.ProcessImage(originalImage, bitmap, graphics, entity); + processor.ProcessImage(originalImage, bitmap, graphics, entity, imageType, imageIndex); } } } -- cgit v1.2.3 From 19e202d5e1e107de9ac9bc110422187b8c6899ce Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Tue, 18 Sep 2012 18:50:26 -0400 Subject: Added http server support for etags --- MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 17 +++++++++++++++++ MediaBrowser.Common/Net/Handlers/BaseHandler.cs | 18 +++++++++++++++++- MediaBrowser.Controller/Drawing/BaseImageProcessor.cs | 6 ++++-- 3 files changed, 38 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index c168569cd0..d3aaf27ff1 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -137,6 +137,23 @@ namespace MediaBrowser.Api.HttpHandlers return date; } + protected override async Task GetETag() + { + string tag = string.Empty; + + var entity = await GetSourceEntity().ConfigureAwait(false); + + foreach (var processor in Kernel.Instance.ImageProcessors) + { + if (processor.IsConfiguredToProcess(entity, ImageType, ImageIndex)) + { + tag += processor.ProcessingConfigurationDateLastModifiedUtc.Ticks.ToString(); + } + } + + return tag; + } + private int ImageIndex { get diff --git a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs index 1a014395ae..ab12cb2cf2 100644 --- a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs @@ -192,6 +192,13 @@ namespace MediaBrowser.Common.Net.Handlers ctx.Response.ContentType = await GetContentType().ConfigureAwait(false); + string etag = await GetETag().ConfigureAwait(false); + + if (!string.IsNullOrEmpty(etag)) + { + ctx.Response.Headers["ETag"] = etag; + } + TimeSpan cacheDuration = CacheDuration; DateTime? lastDateModified = await GetLastDateModified().ConfigureAwait(false); @@ -205,7 +212,11 @@ namespace MediaBrowser.Common.Net.Handlers // If the cache hasn't expired yet just return a 304 if (IsCacheValid(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified)) { - StatusCode = 304; + // ETag must also match (if supplied) + if ((etag ?? string.Empty).Equals(ctx.Request.Headers["If-None-Match"] ?? string.Empty)) + { + StatusCode = 304; + } } } } @@ -311,6 +322,11 @@ namespace MediaBrowser.Common.Net.Handlers response.Headers[HttpResponseHeader.LastModified] = lastModified.ToString("r"); } + protected virtual Task GetETag() + { + return Task.FromResult(string.Empty); + } + /// /// Gives subclasses a chance to do any prep work, and also to validate data and set an error status code, if needed /// diff --git a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs index 8fc6564e7e..a1441cf7fe 100644 --- a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs @@ -83,12 +83,14 @@ namespace MediaBrowser.Controller.Drawing } } + private static DateTime testDate = DateTime.UtcNow; + public override DateTime ProcessingConfigurationDateLastModifiedUtc { get { - // This will result in a situation where images are never cached, but again, this is a prototype - return DateTime.UtcNow; + // This will result in a situation where images are only cached throughout a server session, but again, this is a prototype + return testDate; } } -- cgit v1.2.3 From d8c01ded6eb57ba312e1cd62c4fa51dbcce6053a Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Wed, 19 Sep 2012 12:51:37 -0400 Subject: made some improvements to the base http handler --- MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs | 13 +- MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 71 ++-------- .../HttpHandlers/PluginAssemblyHandler.cs | 4 +- .../HttpHandlers/PluginConfigurationHandler.cs | 19 ++- .../HttpHandlers/ServerConfigurationHandler.cs | 19 ++- MediaBrowser.Api/HttpHandlers/WeatherHandler.cs | 16 +-- .../Net/Handlers/BaseEmbeddedResourceHandler.cs | 5 - MediaBrowser.Common/Net/Handlers/BaseHandler.cs | 146 +++++++++------------ .../Net/Handlers/BaseSerializationHandler.cs | 84 ++++++------ .../Net/Handlers/StaticFileHandler.cs | 87 +++++------- .../Drawing/BaseImageProcessor.cs | 102 -------------- MediaBrowser.Controller/Drawing/ImageProcessor.cs | 32 ----- MediaBrowser.Controller/Kernel.cs | 6 - .../MediaBrowser.Controller.csproj | 1 - 14 files changed, 177 insertions(+), 428 deletions(-) delete mode 100644 MediaBrowser.Controller/Drawing/BaseImageProcessor.cs (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs b/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs index 7ad0ed8aa3..96ef606813 100644 --- a/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs @@ -90,14 +90,15 @@ namespace MediaBrowser.Api.HttpHandlers } } - public override Task GetContentType() + protected override Task GetResponseInfo() { - return Task.FromResult(MimeTypes.GetMimeType("." + GetConversionOutputFormat())); - } + ResponseInfo info = new ResponseInfo + { + ContentType = MimeTypes.GetMimeType("." + GetConversionOutputFormat()), + CompressResponse = false + }; - public override bool ShouldCompressResponse(string contentType) - { - return false; + return Task.FromResult(info); } public override Task ProcessRequest(HttpListenerContext ctx) diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index d3aaf27ff1..4aa367fb7e 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -7,7 +7,6 @@ using MediaBrowser.Model.Entities; using System; using System.ComponentModel.Composition; using System.IO; -using System.Linq; using System.Net; using System.Threading.Tasks; @@ -82,76 +81,32 @@ namespace MediaBrowser.Api.HttpHandlers return ImageProcessor.GetImagePath(entity, ImageType, ImageIndex); } - public override async Task GetContentType() - { - if (Kernel.Instance.ImageProcessors.Any(i => i.RequiresTransparency)) - { - return MimeTypes.GetMimeType(".png"); - } - - return MimeTypes.GetMimeType(await GetImagePath().ConfigureAwait(false)); - } - - public override TimeSpan CacheDuration - { - get { return TimeSpan.FromDays(365); } - } - - protected override async Task GetLastDateModified() + protected async override Task GetResponseInfo() { string path = await GetImagePath().ConfigureAwait(false); - DateTime date = File.GetLastWriteTimeUtc(path); + ResponseInfo info = new ResponseInfo + { + CacheDuration = TimeSpan.FromDays(365), + ContentType = MimeTypes.GetMimeType(path) + }; + + DateTime? date = File.GetLastWriteTimeUtc(path); // If the file does not exist it will return jan 1, 1601 // http://msdn.microsoft.com/en-us/library/system.io.file.getlastwritetimeutc.aspx - if (date.Year == 1601) + if (date.Value.Year == 1601) { if (!File.Exists(path)) { - StatusCode = 404; - return null; - } - } - - return await GetMostRecentDateModified(date); - } - - private async Task GetMostRecentDateModified(DateTime imageFileLastDateModified) - { - var date = imageFileLastDateModified; - - var entity = await GetSourceEntity().ConfigureAwait(false); - - foreach (var processor in Kernel.Instance.ImageProcessors) - { - if (processor.IsConfiguredToProcess(entity, ImageType, ImageIndex)) - { - if (processor.ProcessingConfigurationDateLastModifiedUtc > date) - { - date = processor.ProcessingConfigurationDateLastModifiedUtc; - } + info.StatusCode = 404; + date = null; } } - return date; - } - - protected override async Task GetETag() - { - string tag = string.Empty; - - var entity = await GetSourceEntity().ConfigureAwait(false); - - foreach (var processor in Kernel.Instance.ImageProcessors) - { - if (processor.IsConfiguredToProcess(entity, ImageType, ImageIndex)) - { - tag += processor.ProcessingConfigurationDateLastModifiedUtc.Ticks.ToString(); - } - } + info.DateLastModified = date; - return tag; + return info; } private int ImageIndex diff --git a/MediaBrowser.Api/HttpHandlers/PluginAssemblyHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginAssemblyHandler.cs index 88161c1140..47f08c8c32 100644 --- a/MediaBrowser.Api/HttpHandlers/PluginAssemblyHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PluginAssemblyHandler.cs @@ -15,8 +15,8 @@ namespace MediaBrowser.Api.HttpHandlers { return ApiService.IsApiUrlMatch("pluginassembly", request); } - - public override Task GetContentType() + + protected override Task GetResponseInfo() { throw new NotImplementedException(); } diff --git a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs index 95af9a3442..dc363956fd 100644 --- a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs @@ -17,7 +17,7 @@ namespace MediaBrowser.Api.HttpHandlers { return ApiService.IsApiUrlMatch("pluginconfiguration", request); } - + private BasePlugin _plugin; private BasePlugin Plugin { @@ -39,18 +39,15 @@ namespace MediaBrowser.Api.HttpHandlers return Task.FromResult(Plugin.Configuration); } - public override TimeSpan CacheDuration + protected override async Task GetResponseInfo() { - get - { - return TimeSpan.FromDays(7); - } - } + var info = await base.GetResponseInfo().ConfigureAwait(false); - protected override Task GetLastDateModified() - { - return Task.FromResult(Plugin.ConfigurationDateLastModified); - } + info.DateLastModified = Plugin.ConfigurationDateLastModified; + info.CacheDuration = TimeSpan.FromDays(7); + + return info; + } } } diff --git a/MediaBrowser.Api/HttpHandlers/ServerConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/ServerConfigurationHandler.cs index 64ba44ec2f..48c6761b16 100644 --- a/MediaBrowser.Api/HttpHandlers/ServerConfigurationHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ServerConfigurationHandler.cs @@ -16,23 +16,22 @@ namespace MediaBrowser.Api.HttpHandlers { return ApiService.IsApiUrlMatch("serverconfiguration", request); } - + protected override Task GetObjectToSerialize() { return Task.FromResult(Kernel.Instance.Configuration); } - public override TimeSpan CacheDuration + protected override async Task GetResponseInfo() { - get - { - return TimeSpan.FromDays(7); - } - } + var info = await base.GetResponseInfo().ConfigureAwait(false); - protected override Task GetLastDateModified() - { - return Task.FromResult(File.GetLastWriteTimeUtc(Kernel.Instance.ApplicationPaths.SystemConfigurationFilePath)); + info.DateLastModified = + File.GetLastWriteTimeUtc(Kernel.Instance.ApplicationPaths.SystemConfigurationFilePath); + + info.CacheDuration = TimeSpan.FromDays(7); + + return info; } } } diff --git a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs index 90ecae1222..378e89067d 100644 --- a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs @@ -16,7 +16,7 @@ namespace MediaBrowser.Api.HttpHandlers { return ApiService.IsApiUrlMatch("weather", request); } - + protected override Task GetObjectToSerialize() { // If a specific zip code was requested on the query string, use that. Otherwise use the value from configuration @@ -31,15 +31,13 @@ namespace MediaBrowser.Api.HttpHandlers return Kernel.Instance.WeatherProviders.First().GetWeatherInfoAsync(zipCode); } - /// - /// Tell the client to cache the weather info for 15 minutes - /// - public override TimeSpan CacheDuration + protected override async Task GetResponseInfo() { - get - { - return TimeSpan.FromMinutes(15); - } + var info = await base.GetResponseInfo().ConfigureAwait(false); + + info.CacheDuration = TimeSpan.FromMinutes(15); + + return info; } } } diff --git a/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs index 3ce85a688d..579e341fec 100644 --- a/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs @@ -13,11 +13,6 @@ namespace MediaBrowser.Common.Net.Handlers protected string ResourcePath { get; set; } - public override Task GetContentType() - { - return Task.FromResult(MimeTypes.GetMimeType(ResourcePath)); - } - protected override Task WriteResponseToOutputStream(Stream stream) { return GetEmbeddedResourceStream().CopyToAsync(stream); diff --git a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs index ab12cb2cf2..a5058e6caf 100644 --- a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs @@ -112,32 +112,6 @@ namespace MediaBrowser.Common.Net.Handlers } } - /// - /// Gets the MIME type to include in the response headers - /// - public abstract Task GetContentType(); - - /// - /// Gets the status code to include in the response headers - /// - protected int StatusCode { get; set; } - - /// - /// Gets the cache duration to include in the response headers - /// - public virtual TimeSpan CacheDuration - { - get - { - return TimeSpan.FromTicks(0); - } - } - - public virtual bool ShouldCompressResponse(string contentType) - { - return true; - } - private bool ClientSupportsCompression { get @@ -186,22 +160,21 @@ namespace MediaBrowser.Common.Net.Handlers ctx.Response.Headers["Accept-Ranges"] = "bytes"; } - // Set the initial status code - // When serving a range request, we need to return status code 206 to indicate a partial response body - StatusCode = SupportsByteRangeRequests && IsRangeRequest ? 206 : 200; - - ctx.Response.ContentType = await GetContentType().ConfigureAwait(false); + ResponseInfo responseInfo = await GetResponseInfo().ConfigureAwait(false); - string etag = await GetETag().ConfigureAwait(false); - - if (!string.IsNullOrEmpty(etag)) + if (responseInfo.IsResponseValid) { - ctx.Response.Headers["ETag"] = etag; + // Set the initial status code + // When serving a range request, we need to return status code 206 to indicate a partial response body + responseInfo.StatusCode = SupportsByteRangeRequests && IsRangeRequest ? 206 : 200; } - TimeSpan cacheDuration = CacheDuration; + ctx.Response.ContentType = responseInfo.ContentType; - DateTime? lastDateModified = await GetLastDateModified().ConfigureAwait(false); + if (!string.IsNullOrEmpty(responseInfo.Etag)) + { + ctx.Response.Headers["ETag"] = responseInfo.Etag; + } if (ctx.Request.Headers.AllKeys.Contains("If-Modified-Since")) { @@ -210,30 +183,26 @@ namespace MediaBrowser.Common.Net.Handlers if (DateTime.TryParse(ctx.Request.Headers["If-Modified-Since"], out ifModifiedSince)) { // If the cache hasn't expired yet just return a 304 - if (IsCacheValid(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified)) + if (IsCacheValid(ifModifiedSince.ToUniversalTime(), responseInfo.CacheDuration, responseInfo.DateLastModified)) { // ETag must also match (if supplied) - if ((etag ?? string.Empty).Equals(ctx.Request.Headers["If-None-Match"] ?? string.Empty)) + if ((responseInfo.Etag ?? string.Empty).Equals(ctx.Request.Headers["If-None-Match"] ?? string.Empty)) { - StatusCode = 304; + responseInfo.StatusCode = 304; } } } } - await PrepareResponse().ConfigureAwait(false); - - Logger.LogInfo("Responding with status code {0} for url {1}", StatusCode, url); + Logger.LogInfo("Responding with status code {0} for url {1}", responseInfo.StatusCode, url); - if (IsResponseValid) + if (responseInfo.IsResponseValid) { - bool compressResponse = ShouldCompressResponse(ctx.Response.ContentType) && ClientSupportsCompression; - - await ProcessUncachedRequest(ctx, compressResponse, cacheDuration, lastDateModified).ConfigureAwait(false); + await ProcessUncachedRequest(ctx, responseInfo).ConfigureAwait(false); } else { - ctx.Response.StatusCode = StatusCode; + ctx.Response.StatusCode = responseInfo.StatusCode; ctx.Response.SendChunked = false; } } @@ -250,7 +219,7 @@ namespace MediaBrowser.Common.Net.Handlers } } - private async Task ProcessUncachedRequest(HttpListenerContext ctx, bool compressResponse, TimeSpan cacheDuration, DateTime? lastDateModified) + private async Task ProcessUncachedRequest(HttpListenerContext ctx, ResponseInfo responseInfo) { long? totalContentLength = TotalContentLength; @@ -269,22 +238,29 @@ namespace MediaBrowser.Common.Net.Handlers ctx.Response.ContentLength64 = totalContentLength.Value; } + var compressResponse = responseInfo.CompressResponse && ClientSupportsCompression; + // Add the compression header if (compressResponse) { ctx.Response.AddHeader("Content-Encoding", CompressionMethod); } + if (responseInfo.DateLastModified.HasValue) + { + ctx.Response.Headers[HttpResponseHeader.LastModified] = responseInfo.DateLastModified.Value.ToString("r"); + } + // Add caching headers - if (cacheDuration.Ticks > 0) + if (responseInfo.CacheDuration.Ticks > 0) { - CacheResponse(ctx.Response, cacheDuration, lastDateModified); + CacheResponse(ctx.Response, responseInfo.CacheDuration); } // Set the status code - ctx.Response.StatusCode = StatusCode; + ctx.Response.StatusCode = responseInfo.StatusCode; - if (IsResponseValid) + if (responseInfo.IsResponseValid) { // Finally, write the response data Stream outputStream = ctx.Response.OutputStream; @@ -311,28 +287,10 @@ namespace MediaBrowser.Common.Net.Handlers } } - private void CacheResponse(HttpListenerResponse response, TimeSpan duration, DateTime? dateModified) + private void CacheResponse(HttpListenerResponse response, TimeSpan duration) { - DateTime now = DateTime.UtcNow; - - DateTime lastModified = dateModified ?? now; - response.Headers[HttpResponseHeader.CacheControl] = "public, max-age=" + Convert.ToInt32(duration.TotalSeconds); - response.Headers[HttpResponseHeader.Expires] = now.Add(duration).ToString("r"); - response.Headers[HttpResponseHeader.LastModified] = lastModified.ToString("r"); - } - - protected virtual Task GetETag() - { - return Task.FromResult(string.Empty); - } - - /// - /// Gives subclasses a chance to do any prep work, and also to validate data and set an error status code, if needed - /// - protected virtual Task PrepareResponse() - { - return Task.FromResult(null); + response.Headers[HttpResponseHeader.Expires] = DateTime.UtcNow.Add(duration).ToString("r"); } protected abstract Task WriteResponseToOutputStream(Stream stream); @@ -380,20 +338,7 @@ namespace MediaBrowser.Common.Net.Handlers return null; } - protected virtual Task GetLastDateModified() - { - DateTime? value = null; - - return Task.FromResult(value); - } - - private bool IsResponseValid - { - get - { - return StatusCode == 200 || StatusCode == 206; - } - } + protected abstract Task GetResponseInfo(); private Hashtable _formValues; @@ -455,4 +400,31 @@ namespace MediaBrowser.Common.Net.Handlers return formVars; } } + + public class ResponseInfo + { + public string ContentType { get; set; } + public string Etag { get; set; } + public DateTime? DateLastModified { get; set; } + public TimeSpan CacheDuration { get; set; } + public bool CompressResponse { get; set; } + public int StatusCode { get; set; } + + public ResponseInfo() + { + CacheDuration = TimeSpan.FromTicks(0); + + CompressResponse = true; + + StatusCode = 200; + } + + public bool IsResponseValid + { + get + { + return StatusCode == 200 || StatusCode == 206; + } + } + } } \ No newline at end of file diff --git a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs index d60a9ae1f2..53b3ee817f 100644 --- a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs @@ -1,12 +1,12 @@ -using System; +using MediaBrowser.Common.Serialization; +using System; using System.IO; using System.Threading.Tasks; -using MediaBrowser.Common.Serialization; namespace MediaBrowser.Common.Net.Handlers { public abstract class BaseSerializationHandler : BaseHandler - where T : class + where T : class { public SerializationFormat SerializationFormat { @@ -22,61 +22,61 @@ namespace MediaBrowser.Common.Net.Handlers return (SerializationFormat)Enum.Parse(typeof(SerializationFormat), format, true); } } - - public override Task GetContentType() + + protected string ContentType { - switch (SerializationFormat) + get { - case SerializationFormat.Jsv: - return Task.FromResult("text/plain"); - case SerializationFormat.Protobuf: - return Task.FromResult("application/x-protobuf"); - default: - return Task.FromResult(MimeTypes.JsonMimeType); + switch (SerializationFormat) + { + case SerializationFormat.Jsv: + return "text/plain"; + case SerializationFormat.Protobuf: + return "application/x-protobuf"; + default: + return MimeTypes.JsonMimeType; + } } } - private bool _objectToSerializeEnsured; - private T _objectToSerialize; - - private async Task EnsureObjectToSerialize() + protected override async Task GetResponseInfo() { - if (!_objectToSerializeEnsured) + ResponseInfo info = new ResponseInfo { - _objectToSerialize = await GetObjectToSerialize().ConfigureAwait(false); + ContentType = ContentType + }; - if (_objectToSerialize == null) - { - StatusCode = 404; - } + _objectToSerialize = await GetObjectToSerialize().ConfigureAwait(false); - _objectToSerializeEnsured = true; + if (_objectToSerialize == null) + { + info.StatusCode = 404; } + + return info; } - protected abstract Task GetObjectToSerialize(); + private T _objectToSerialize; - protected override Task PrepareResponse() - { - return EnsureObjectToSerialize(); - } + protected abstract Task GetObjectToSerialize(); - protected async override Task WriteResponseToOutputStream(Stream stream) + protected override Task WriteResponseToOutputStream(Stream stream) { - await EnsureObjectToSerialize().ConfigureAwait(false); - - switch (SerializationFormat) + return Task.Run(() => { - case SerializationFormat.Jsv: - JsvSerializer.SerializeToStream(_objectToSerialize, stream); - break; - case SerializationFormat.Protobuf: - ProtobufSerializer.SerializeToStream(_objectToSerialize, stream); - break; - default: - JsonSerializer.SerializeToStream(_objectToSerialize, stream); - break; - } + switch (SerializationFormat) + { + case SerializationFormat.Jsv: + JsvSerializer.SerializeToStream(_objectToSerialize, stream); + break; + case SerializationFormat.Protobuf: + ProtobufSerializer.SerializeToStream(_objectToSerialize, stream); + break; + default: + JsonSerializer.SerializeToStream(_objectToSerialize, stream); + break; + } + }); } } diff --git a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs index 741d2d6c17..11438b164b 100644 --- a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs @@ -33,46 +33,7 @@ namespace MediaBrowser.Common.Net.Handlers } } - private bool _sourceStreamEnsured; - private Stream _sourceStream; - private Stream SourceStream - { - get - { - EnsureSourceStream(); - return _sourceStream; - } - } - - private void EnsureSourceStream() - { - if (!_sourceStreamEnsured) - { - try - { - _sourceStream = File.OpenRead(Path); - } - catch (FileNotFoundException ex) - { - StatusCode = 404; - Logger.LogException(ex); - } - catch (DirectoryNotFoundException ex) - { - StatusCode = 404; - Logger.LogException(ex); - } - catch (UnauthorizedAccessException ex) - { - StatusCode = 403; - Logger.LogException(ex); - } - finally - { - _sourceStreamEnsured = true; - } - } - } + private Stream SourceStream { get; set; } protected override bool SupportsByteRangeRequests { @@ -82,7 +43,7 @@ namespace MediaBrowser.Common.Net.Handlers } } - public override bool ShouldCompressResponse(string contentType) + private bool ShouldCompressResponse(string contentType) { // Can't compress these if (IsRangeRequest) @@ -105,29 +66,41 @@ namespace MediaBrowser.Common.Net.Handlers return SourceStream.Length; } - protected override Task GetLastDateModified() + protected override Task GetResponseInfo() { - DateTime? value = null; - - EnsureSourceStream(); + ResponseInfo info = new ResponseInfo + { + ContentType = MimeTypes.GetMimeType(Path), + }; - if (SourceStream != null) + try + { + SourceStream = File.OpenRead(Path); + } + catch (FileNotFoundException ex) + { + info.StatusCode = 404; + Logger.LogException(ex); + } + catch (DirectoryNotFoundException ex) { - value = File.GetLastWriteTimeUtc(Path); + info.StatusCode = 404; + Logger.LogException(ex); + } + catch (UnauthorizedAccessException ex) + { + info.StatusCode = 403; + Logger.LogException(ex); } - return Task.FromResult(value); - } + info.CompressResponse = ShouldCompressResponse(info.ContentType); - public override Task GetContentType() - { - return Task.FromResult(MimeTypes.GetMimeType(Path)); - } + if (SourceStream != null) + { + info.DateLastModified = File.GetLastWriteTimeUtc(Path); + } - protected override Task PrepareResponse() - { - EnsureSourceStream(); - return Task.FromResult(null); + return Task.FromResult(info); } protected override Task WriteResponseToOutputStream(Stream stream) diff --git a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs deleted file mode 100644 index a1441cf7fe..0000000000 --- a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs +++ /dev/null @@ -1,102 +0,0 @@ -using MediaBrowser.Controller.Entities; -using MediaBrowser.Model.Entities; -using System; -using System.ComponentModel.Composition; -using System.Drawing; -using System.Drawing.Drawing2D; - -namespace MediaBrowser.Controller.Drawing -{ - /// - /// Provides a base image processor class that plugins can use to process images as they are being writen to http responses - /// Since this is completely modular with MEF, a plugin only needs to have a subclass in their assembly with the following attribute on the class: - /// [Export(typeof(BaseImageProcessor))] - /// This will require a reference to System.ComponentModel.Composition - /// - public abstract class BaseImageProcessor - { - /// - /// Processes an image for a BaseEntity - /// - /// The original Image, before re-sizing - /// The bitmap holding the original image, after re-sizing - /// The graphics surface on which the output is drawn - /// The entity that owns the image - /// The image type - /// The image index (currently only used with backdrops) - public abstract void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex); - - /// - /// If true, the image output format will be forced to png, resulting in an output size that will generally run larger than jpg - /// If false, the original image format is preserved. - /// - public virtual bool RequiresTransparency - { - get - { - return false; - } - } - - /// - /// Determines if the image processor is configured to process the specified entity, image type and image index - /// This will aid http response caching so that we don't invalidate image caches when we don't have to - /// - public abstract bool IsConfiguredToProcess(BaseEntity entity, ImageType imageType, int imageIndex); - - /// - /// This is used for caching purposes, since a configuration change needs to invalidate a user's image cache - /// If the image processor is hosted within a plugin then this should be the plugin ConfigurationDateLastModified - /// - public abstract DateTime ProcessingConfigurationDateLastModifiedUtc { get; } - } - - /// - /// This is demo-ware and should be deleted eventually - /// - //[Export(typeof(BaseImageProcessor))] - public class MyRoundedCornerImageProcessor : BaseImageProcessor - { - public override void ProcessImage(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex) - { - var CornerRadius = 20; - - graphics.Clear(Color.Transparent); - - using (GraphicsPath gp = new GraphicsPath()) - { - gp.AddArc(0, 0, CornerRadius, CornerRadius, 180, 90); - gp.AddArc(0 + bitmap.Width - CornerRadius, 0, CornerRadius, CornerRadius, 270, 90); - gp.AddArc(0 + bitmap.Width - CornerRadius, 0 + bitmap.Height - CornerRadius, CornerRadius, CornerRadius, 0, 90); - gp.AddArc(0, 0 + bitmap.Height - CornerRadius, CornerRadius, CornerRadius, 90, 90); - - graphics.SetClip(gp); - graphics.DrawImage(originalImage, 0, 0, bitmap.Width, bitmap.Height); - } - } - - public override bool RequiresTransparency - { - get - { - return true; - } - } - - private static DateTime testDate = DateTime.UtcNow; - - public override DateTime ProcessingConfigurationDateLastModifiedUtc - { - get - { - // This will result in a situation where images are only cached throughout a server session, but again, this is a prototype - return testDate; - } - } - - public override bool IsConfiguredToProcess(BaseEntity entity, ImageType imageType, int imageIndex) - { - return true; - } - } -} diff --git a/MediaBrowser.Controller/Drawing/ImageProcessor.cs b/MediaBrowser.Controller/Drawing/ImageProcessor.cs index 7ee4ef7348..29e40d17d7 100644 --- a/MediaBrowser.Controller/Drawing/ImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/ImageProcessor.cs @@ -59,17 +59,6 @@ namespace MediaBrowser.Controller.Drawing ImageFormat outputFormat = originalImage.RawFormat; - // Run Kernel image processors - if (Kernel.Instance.ImageProcessors.Any()) - { - ExecuteAdditionalImageProcessors(originalImage, thumbnail, thumbnailGraph, entity, imageType, imageIndex); - - if (Kernel.Instance.ImageProcessors.Any(i => i.RequiresTransparency)) - { - outputFormat = ImageFormat.Png; - } - } - // Write to the output stream SaveImage(outputFormat, thumbnail, toStream, quality); @@ -109,27 +98,6 @@ namespace MediaBrowser.Controller.Drawing return entity.PrimaryImagePath; } - - /// - /// Executes additional image processors that are registered with the Kernel - /// - /// The original Image, before re-sizing - /// The bitmap holding the original image, after re-sizing - /// The graphics surface on which the output is drawn - /// The entity that owns the image - /// The image type - /// The image index (currently only used with backdrops) - private static void ExecuteAdditionalImageProcessors(Image originalImage, Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex) - { - foreach (var processor in Kernel.Instance.ImageProcessors) - { - if (processor.IsConfiguredToProcess(entity, imageType, imageIndex)) - { - processor.ProcessImage(originalImage, bitmap, graphics, entity, imageType, imageIndex); - } - } - } - public static void SaveImage(ImageFormat outputFormat, Image newImage, Stream toStream, int? quality) { // Use special save methods for jpeg and png that will result in a much higher quality image diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 1c11b9fc85..bf03d1af15 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -77,12 +77,6 @@ namespace MediaBrowser.Controller /// internal IBaseItemResolver[] EntityResolvers { get; private set; } - /// - /// Gets the list of currently registered entity resolvers - /// - [ImportMany(typeof(BaseImageProcessor))] - public IEnumerable ImageProcessors { get; private set; } - /// /// Creates a kernel based on a Data path, which is akin to our current programdata path /// diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 131825af35..fd2be689e1 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -59,7 +59,6 @@ - -- cgit v1.2.3