alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 09:34:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

a little more kernel consolidation

Browse Source
This commit is contained in:
Luke Pulverenti
2013-06-03 14:15:35 -04:00
parent 59118a2ddb
commit 08d9004d8f
12 changed files with 98 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Controller/Drawing/ImageManager.cs
View File

@@ -25,6 +25,13 @@ namespace MediaBrowser.Controller.Drawing
/// </summary>
public class ImageManager
{
/// <summary>
/// Gets the list of currently registered image processors
/// Image processors are specialized metadata providers that run after the normal ones
/// </summary>
/// <value>The image enhancers.</value>
public IEnumerable<IImageEnhancer> ImageEnhancers { get; set; }
/// <summary>
/// Gets the image size cache.
/// </summary>
@@ -120,7 +127,7 @@ namespace MediaBrowser.Controller.Drawing
originalImagePath = await GetCroppedImage(originalImagePath, dateModified).ConfigureAwait(false);
}
var supportedEnhancers = _kernel.ImageEnhancers.Where(i =>
var supportedEnhancers = ImageEnhancers.Where(i =>
{
try
{
@@ -621,7 +628,7 @@ namespace MediaBrowser.Controller.Drawing
var dateModified = GetImageDateModified(item, imagePath);
var supportedEnhancers = _kernel.ImageEnhancers.Where(i =>
var supportedEnhancers = ImageEnhancers.Where(i =>
{
try
{

2
MediaBrowser.Controller/Dto/DtoBuilder.cs
View File

@@ -182,7 +182,7 @@ namespace MediaBrowser.Controller.Dto
return;
}
var supportedEnhancers = Kernel.Instance.ImageEnhancers.Where(i =>
var supportedEnhancers = Kernel.Instance.ImageManager.ImageEnhancers.Where(i =>
{
try
{

12
MediaBrowser.Controller/IServerApplicationHost.cs
View File

@@ -13,5 +13,17 @@ namespace MediaBrowser.Controller
/// </summary>
/// <returns>SystemInfo.</returns>
SystemInfo GetSystemInfo();
/// <summary>
/// Gets the name of the web application.
/// </summary>
/// <value>The name of the web application.</value>
string WebApplicationName { get; }
/// <summary>
/// Gets the HTTP server URL prefix.
/// </summary>
/// <value>The HTTP server URL prefix.</value>
string HttpServerUrlPrefix { get; }
}
}

47
MediaBrowser.Controller/Kernel.cs
View File

@@ -1,8 +1,5 @@
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Localization;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.MediaInfo;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Weather;
using System.Collections.Generic;
@@ -31,58 +28,18 @@ namespace MediaBrowser.Controller
/// <value>The FFMPEG controller.</value>
public FFMpegManager FFMpegManager { get; set; }
/// <summary>
/// Gets the name of the web application that can be used for url building.
/// All api urls will be of the form {protocol}://{host}:{port}/{appname}/...
/// </summary>
/// <value>The name of the web application.</value>
public string WebApplicationName
{
get { return "mediabrowser"; }
}
/// <summary>
/// Gets the HTTP server URL prefix.
/// </summary>
/// <value>The HTTP server URL prefix.</value>
public virtual string HttpServerUrlPrefix
{
get
{
return "http://+:" + _configurationManager.Configuration.HttpServerPortNumber + "/" + WebApplicationName + "/";
}
}
/// <summary>
/// Gets the list of Localized string files
/// </summary>
/// <value>The string files.</value>
public IEnumerable<LocalizedStringData> StringFiles { get; set; }
/// <summary>
/// Gets the list of currently registered weather prvoiders
/// </summary>
/// <value>The weather providers.</value>
public IEnumerable<IWeatherProvider> WeatherProviders { get; set; }
/// <summary>
/// Gets the list of currently registered image processors
/// Image processors are specialized metadata providers that run after the normal ones
/// </summary>
/// <value>The image enhancers.</value>
public IEnumerable<IImageEnhancer> ImageEnhancers { get; set; }
private readonly IServerConfigurationManager _configurationManager;
/// <summary>
/// Creates a kernel based on a Data path, which is akin to our current programdata path
/// </summary>
/// <param name="configurationManager">The configuration manager.</param>
public Kernel(IServerConfigurationManager configurationManager)
public Kernel()
{
Instance = this;
_configurationManager = configurationManager;
}
}
}

11
MediaBrowser.Controller/Localization/LocalizedStrings.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
@@ -13,7 +14,13 @@ namespace MediaBrowser.Controller.Localization
public class LocalizedStrings
{
public static IServerApplicationPaths ApplicationPaths;
/// <summary>
/// Gets the list of Localized string files
/// </summary>
/// <value>The string files.</value>
public static IEnumerable<LocalizedStringData> StringFiles { get; set; }
/// <summary>
/// The base prefix
/// </summary>
@@ -42,7 +49,7 @@ namespace MediaBrowser.Controller.Localization
{
_appPaths = appPaths;
foreach (var stringObject in Kernel.Instance.StringFiles)
foreach (var stringObject in StringFiles)
{
AddStringData(LoadFromFile(GetFileName(stringObject),stringObject.GetType()));
}