Added more comments.
This commit is contained in:
parent
7a6063ed41
commit
616caca2b7
|
@ -271,9 +271,10 @@ namespace Emby.Server.Implementations
|
||||||
_fileSystemManager = fileSystem;
|
_fileSystemManager = fileSystem;
|
||||||
|
|
||||||
ConfigurationManager = new ServerConfigurationManager(ApplicationPaths, LoggerFactory, _xmlSerializer, _fileSystemManager);
|
ConfigurationManager = new ServerConfigurationManager(ApplicationPaths, LoggerFactory, _xmlSerializer, _fileSystemManager);
|
||||||
|
// Have to migrate settings here as migration subsystem not yet initialised.
|
||||||
MigrateNetworkConfiguration();
|
MigrateNetworkConfiguration();
|
||||||
|
|
||||||
// Have to pre-register the NetworkConfigurationFactory.
|
// Have to pre-register the NetworkConfigurationFactory, as the configuration sub-system is not yet initialised.
|
||||||
ConfigurationManager.RegisterConfiguration<NetworkConfigurationFactory>();
|
ConfigurationManager.RegisterConfiguration<NetworkConfigurationFactory>();
|
||||||
NetManager = new NetworkManager((IServerConfigurationManager)ConfigurationManager, LoggerFactory.CreateLogger<NetworkManager>());
|
NetManager = new NetworkManager((IServerConfigurationManager)ConfigurationManager, LoggerFactory.CreateLogger<NetworkManager>());
|
||||||
|
|
||||||
|
@ -301,6 +302,10 @@ namespace Emby.Server.Implementations
|
||||||
ApplicationUserAgent = Name.Replace(' ', '-') + "/" + ApplicationVersionString;
|
ApplicationUserAgent = Name.Replace(' ', '-') + "/" + ApplicationVersionString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Temporary function to migration network settings out of system.xml and into network.xml.
|
||||||
|
/// TODO: remove at the point when a fixed migration path has been decided upon.
|
||||||
|
/// </summary>
|
||||||
private void MigrateNetworkConfiguration()
|
private void MigrateNetworkConfiguration()
|
||||||
{
|
{
|
||||||
string path = Path.Combine(ConfigurationManager.CommonApplicationPaths.ConfigurationDirectoryPath, "network.xml");
|
string path = Path.Combine(ConfigurationManager.CommonApplicationPaths.ConfigurationDirectoryPath, "network.xml");
|
||||||
|
|
|
@ -54,6 +54,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns an unused UDP port number in the range specified.
|
/// Returns an unused UDP port number in the range specified.
|
||||||
|
/// Temporarily placed here until future network PR merged.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="range">Upper and Lower boundary of ports to select.</param>
|
/// <param name="range">Upper and Lower boundary of ports to select.</param>
|
||||||
/// <returns>System.Int32.</returns>
|
/// <returns>System.Int32.</returns>
|
||||||
|
@ -78,7 +79,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
var mediaSource = OriginalMediaSource;
|
var mediaSource = OriginalMediaSource;
|
||||||
|
|
||||||
var uri = new Uri(mediaSource.Path);
|
var uri = new Uri(mediaSource.Path);
|
||||||
// Temporary Code to reduce PR size.
|
// Temporary code to reduce PR size. This will be updated by a future network pr.
|
||||||
var localPort = GetUdpPortFromRange((49152, 65535));
|
var localPort = GetUdpPortFromRange((49152, 65535));
|
||||||
|
|
||||||
Directory.CreateDirectory(Path.GetDirectoryName(TempFilePath));
|
Directory.CreateDirectory(Path.GetDirectoryName(TempFilePath));
|
||||||
|
|
|
@ -4,7 +4,8 @@ using System.Reflection;
|
||||||
namespace Jellyfin.Api.Migrations
|
namespace Jellyfin.Api.Migrations
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A static class for reflection type functions. Temporary until web changed.
|
/// A static class for copying matching properties from one object to another.
|
||||||
|
/// TODO: remove at the point when a fixed migration path has been decided upon.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class ClassMigrationHelper
|
public static class ClassMigrationHelper
|
||||||
{
|
{
|
||||||
|
@ -15,17 +16,17 @@ namespace Jellyfin.Api.Migrations
|
||||||
/// <param name="destination">The destination.</param>
|
/// <param name="destination">The destination.</param>
|
||||||
public static void CopyProperties(this object source, object destination)
|
public static void CopyProperties(this object source, object destination)
|
||||||
{
|
{
|
||||||
// If any this null throw an exception
|
// If any this null throw an exception.
|
||||||
if (source == null || destination == null)
|
if (source == null || destination == null)
|
||||||
{
|
{
|
||||||
throw new Exception("Source or/and Destination Objects are null");
|
throw new Exception("Source or/and Destination Objects are null");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Getting the Types of the objects
|
// Getting the Types of the objects.
|
||||||
Type typeDest = destination.GetType();
|
Type typeDest = destination.GetType();
|
||||||
Type typeSrc = source.GetType();
|
Type typeSrc = source.GetType();
|
||||||
|
|
||||||
// Iterate the Properties of the source instance and populate them from their desination counterparts.
|
// Iterate the Properties of the source instance and populate them from their destination counterparts.
|
||||||
PropertyInfo[] srcProps = typeSrc.GetProperties();
|
PropertyInfo[] srcProps = typeSrc.GetProperties();
|
||||||
foreach (PropertyInfo srcProp in srcProps)
|
foreach (PropertyInfo srcProp in srcProps)
|
||||||
{
|
{
|
||||||
|
@ -62,7 +63,7 @@ namespace Jellyfin.Api.Migrations
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Passed all tests, lets set the value
|
// Passed all tests, lets set the value.
|
||||||
targetProperty.SetValue(destination, srcProp.GetValue(source, null), null);
|
targetProperty.SetValue(destination, srcProp.GetValue(source, null), null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user