mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-05-25 10:07:15 +01:00
Added an api call to pull down user configuration
This commit is contained in:
parent
0a48b5e31a
commit
6c7175e33d
@@ -3,7 +3,7 @@
|
||||
namespace MediaBrowser.Common.Configuration
|
||||
{
|
||||
/// <summary>
|
||||
/// Serves as a common base class for the Server and UI Configurations
|
||||
/// Serves as a common base class for the Server and UI application Configurations
|
||||
/// </summary>
|
||||
public class BaseConfiguration
|
||||
{
|
||||
|
||||
37
MediaBrowser.Common/Configuration/ConfigurationController.cs
Normal file
37
MediaBrowser.Common/Configuration/ConfigurationController.cs
Normal file
@@ -0,0 +1,37 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.IO;
|
||||
using MediaBrowser.Common.Json;
|
||||
|
||||
namespace MediaBrowser.Common.Configuration
|
||||
{
|
||||
public class ConfigurationController<TConfigurationType>
|
||||
where TConfigurationType : BaseConfiguration, new ()
|
||||
{
|
||||
/// <summary>
|
||||
/// The path to the configuration file
|
||||
/// </summary>
|
||||
public string Path { get; set; }
|
||||
|
||||
public TConfigurationType Configuration { get; set; }
|
||||
|
||||
public void Reload()
|
||||
{
|
||||
if (!File.Exists(Path))
|
||||
{
|
||||
Configuration = new TConfigurationType();
|
||||
}
|
||||
else
|
||||
{
|
||||
Configuration = JsonSerializer.DeserializeFromFile<TConfigurationType>(Path);
|
||||
}
|
||||
}
|
||||
|
||||
public void Save()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
21
MediaBrowser.Common/Configuration/UserConfiguration.cs
Normal file
21
MediaBrowser.Common/Configuration/UserConfiguration.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MediaBrowser.Common.Configuration
|
||||
{
|
||||
/// <summary>
|
||||
/// This holds settings that can be personalized on a per-user, per-device basis.
|
||||
/// </summary>
|
||||
public class UserConfiguration
|
||||
{
|
||||
public int RecentItemDays { get; set; }
|
||||
|
||||
public UserConfiguration()
|
||||
{
|
||||
RecentItemDays = 14;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,8 @@ namespace MediaBrowser.Common.Kernel
|
||||
/// <summary>
|
||||
/// Represents a shared base kernel for both the UI and server apps
|
||||
/// </summary>
|
||||
public abstract class BaseKernel<TConfigurationType>
|
||||
public abstract class BaseKernel<TConfigurationContorllerType, TConfigurationType>
|
||||
where TConfigurationContorllerType : ConfigurationController<TConfigurationType>, new()
|
||||
where TConfigurationType : BaseConfiguration, new()
|
||||
{
|
||||
/// <summary>
|
||||
@@ -23,7 +24,7 @@ namespace MediaBrowser.Common.Kernel
|
||||
/// <summary>
|
||||
/// Gets the current configuration
|
||||
/// </summary>
|
||||
public TConfigurationType Configuration { get; private set; }
|
||||
public TConfigurationContorllerType ConfigurationController { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Both the UI and server will have a built-in HttpServer.
|
||||
@@ -38,19 +39,12 @@ namespace MediaBrowser.Common.Kernel
|
||||
/// </summary>
|
||||
protected KernelContext KernelContext { get { return KernelContext.Server; } }
|
||||
|
||||
protected virtual string HttpServerUrlPrefix
|
||||
{
|
||||
get
|
||||
{
|
||||
return "http://+:" + Configuration.HttpServerPortNumber + "/mediabrowser/";
|
||||
}
|
||||
}
|
||||
|
||||
public BaseKernel()
|
||||
{
|
||||
ProgramDataPath = GetProgramDataPath();
|
||||
|
||||
PluginController = new PluginController() { PluginsPath = Path.Combine(ProgramDataPath, "Plugins") };
|
||||
ConfigurationController = new TConfigurationContorllerType() { Path = Path.Combine(ProgramDataPath, "config.js") };
|
||||
|
||||
Logger.LoggerInstance = new FileLogger(Path.Combine(ProgramDataPath, "Logs"));
|
||||
}
|
||||
@@ -67,7 +61,6 @@ namespace MediaBrowser.Common.Kernel
|
||||
/// <summary>
|
||||
/// Gets the path to the application's ProgramDataFolder
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private string GetProgramDataPath()
|
||||
{
|
||||
string programDataPath = ConfigurationManager.AppSettings["ProgramDataPath"];
|
||||
@@ -94,9 +87,9 @@ namespace MediaBrowser.Common.Kernel
|
||||
private void ReloadConfiguration()
|
||||
{
|
||||
// Deserialize config
|
||||
Configuration = GetConfiguration(ProgramDataPath);
|
||||
ConfigurationController.Reload();
|
||||
|
||||
Logger.LoggerInstance.LogSeverity = Configuration.LogSeverity;
|
||||
Logger.LoggerInstance.LogSeverity = ConfigurationController.Configuration.LogSeverity;
|
||||
}
|
||||
|
||||
private void ReloadHttpServer()
|
||||
@@ -106,7 +99,7 @@ namespace MediaBrowser.Common.Kernel
|
||||
HttpServer.Dispose();
|
||||
}
|
||||
|
||||
HttpServer = new HttpServer("http://+:" + Configuration.HttpServerPortNumber + "/mediabrowser/");
|
||||
HttpServer = new HttpServer("http://+:" + ConfigurationController.Configuration.HttpServerPortNumber + "/mediabrowser/");
|
||||
}
|
||||
|
||||
protected virtual void ReloadPlugins()
|
||||
|
||||
@@ -48,6 +48,8 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Configuration\BaseConfiguration.cs" />
|
||||
<Compile Include="Configuration\ConfigurationController.cs" />
|
||||
<Compile Include="Configuration\UserConfiguration.cs" />
|
||||
<Compile Include="Events\GenericItemEventArgs.cs" />
|
||||
<Compile Include="Json\JsonSerializer.cs" />
|
||||
<Compile Include="Kernel\BaseKernel.cs" />
|
||||
|
||||
Reference in New Issue
Block a user