starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-22 16:54:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Created IConfigurationManager

Browse Source
This commit is contained in:
LukePulverenti
2013-03-04 00:43:06 -05:00
parent 401b56c732
commit 2ca4b7d03a
106 changed files with 1343 additions and 2437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MediaBrowser.Api/SystemService.cs
View File

@@ -1,7 +1,8 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Implementations.HttpServer;
using MediaBrowser.Common.Kernel;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.System;
@@ -72,13 +73,19 @@ namespace MediaBrowser.Api
/// </summary>
private readonly IApplicationHost _appHost;
/// <summary>
/// The _configuration manager
/// </summary>
private readonly IServerConfigurationManager _configurationManager;
/// <summary>
/// Initializes a new instance of the <see cref="SystemService" /> class.
/// </summary>
/// <param name="jsonSerializer">The json serializer.</param>
/// <param name="appHost">The app host.</param>
/// <param name="configurationManager">The configuration manager.</param>
/// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
public SystemService(IJsonSerializer jsonSerializer, IApplicationHost appHost)
public SystemService(IJsonSerializer jsonSerializer, IApplicationHost appHost, IServerConfigurationManager configurationManager)
: base()
{
if (jsonSerializer == null)
@@ -91,6 +98,7 @@ namespace MediaBrowser.Api
}
_appHost = appHost;
_configurationManager = configurationManager;
_jsonSerializer = jsonSerializer;
}
@@ -101,7 +109,7 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns>
public object Get(GetSystemInfo request)
{
var result = Kernel.GetSystemInfo();
var result = Kernel.Instance.GetSystemInfo();
return ToOptimizedResult(result);
}
@@ -113,13 +121,11 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns>
public object Get(GetConfiguration request)
{
var kernel = (Kernel)Kernel;
var dateModified = File.GetLastWriteTimeUtc(_configurationManager.ApplicationPaths.SystemConfigurationFilePath);
var dateModified = File.GetLastWriteTimeUtc(Kernel.ApplicationPaths.SystemConfigurationFilePath);
var cacheKey = (_configurationManager.ApplicationPaths.SystemConfigurationFilePath + dateModified.Ticks).GetMD5();
var cacheKey = (Kernel.ApplicationPaths.SystemConfigurationFilePath + dateModified.Ticks).GetMD5();
return ToOptimizedResultUsingCache(cacheKey, dateModified, null, () => kernel.Configuration);
return ToOptimizedResultUsingCache(cacheKey, dateModified, null, () => _configurationManager.Configuration);
}
/// <summary>
@@ -131,7 +137,7 @@ namespace MediaBrowser.Api
Task.Run(async () =>
{
await Task.Delay(100);
Kernel.PerformPendingRestart();
Kernel.Instance.PerformPendingRestart();
});
}
@@ -156,9 +162,7 @@ namespace MediaBrowser.Api
{
var serverConfig = _jsonSerializer.DeserializeFromStream<ServerConfiguration>(request.RequestStream);
var kernel = (Kernel)Kernel;
kernel.UpdateConfiguration(serverConfig);
_configurationManager.ReplaceConfiguration(serverConfig);
}
}
}