alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-26 12:07:01 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into NetworkPR2

Browse Source
This commit is contained in:
BaronGreenback
2020-11-16 16:27:37 +00:00
committed by GitHub
parent e2769671a7 dc0e353b96
commit d66f88672c
255 changed files with 2073 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
View File

@@ -139,23 +139,21 @@ namespace Emby.Server.Implementations.AppBase
/// </summary>
/// <typeparam name="T">Class to register.</typeparam>
public virtual void RegisterConfiguration<T>()
where T : IConfigurationFactory
{
if (!typeof(IConfigurationFactory).IsAssignableFrom(typeof(T)))
{
throw new ArgumentException("Parameter does not implement IConfigurationFactory");
}
IConfigurationFactory factory = (IConfigurationFactory)Activator.CreateInstance(typeof(T));
IConfigurationFactory factory = Activator.CreateInstance<T>();
if (_configurationFactories == null)
{
_configurationFactories = new IConfigurationFactory[] { factory };
_configurationFactories = new[] { factory };
}
else
{
var list = _configurationFactories.ToList<IConfigurationFactory>();
list.Add(factory);
_configurationFactories = list.ToArray();
var oldLen = _configurationFactories.Length;
var arr = new IConfigurationFactory[oldLen + 1];
_configurationFactories.CopyTo(arr, 0);
arr[oldLen] = factory;
_configurationFactories = arr;
}
_configurationStores = _configurationFactories

6
Emby.Server.Implementations/AppBase/ConfigurationHelper.cs
View File

@@ -3,6 +3,7 @@
using System;
using System.IO;
using System.Linq;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Model.Serialization;
namespace Emby.Server.Implementations.AppBase
@@ -35,7 +36,7 @@ namespace Emby.Server.Implementations.AppBase
}
catch (Exception)
{
configuration = Activator.CreateInstance(type);
configuration = Activator.CreateInstance(type) ?? throw new ArgumentException($"Provided path ({type}) is not valid.", nameof(type));
}
using var stream = new MemoryStream(buffer?.Length ?? 0);
@@ -48,8 +49,9 @@ namespace Emby.Server.Implementations.AppBase
// If the file didn't exist before, or if something has changed, re-save
if (buffer == null || !newBytes.AsSpan(0, newBytesLen).SequenceEqual(buffer))
{
Directory.CreateDirectory(Path.GetDirectoryName(path));
var directory = Path.GetDirectoryName(path) ?? throw new ArgumentException($"Provided path ({path}) is not valid.", nameof(path));
Directory.CreateDirectory(directory);
// Save it after load in case we got new items
using (var fs = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
{