aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.LocalMetadata/BaseXmlProvider.cs')
-rw-r--r--MediaBrowser.LocalMetadata/BaseXmlProvider.cs24
1 files changed, 14 insertions, 10 deletions
diff --git a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
index 25778d036..74e3b61ca 100644
--- a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
@@ -1,7 +1,6 @@
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Logging;
using System;
using System.IO;
using System.Threading;
@@ -14,11 +13,13 @@ namespace MediaBrowser.LocalMetadata
{
protected IFileSystem FileSystem;
- public async Task<LocalMetadataResult<T>> GetMetadata(ItemInfo info, CancellationToken cancellationToken)
+ public async Task<LocalMetadataResult<T>> GetMetadata(ItemInfo info,
+ IDirectoryService directoryService,
+ CancellationToken cancellationToken)
{
var result = new LocalMetadataResult<T>();
- var file = GetXmlFile(info, new DirectoryService(new NullLogger()));
+ var file = GetXmlFile(info, directoryService);
if (file == null)
{
@@ -27,8 +28,6 @@ namespace MediaBrowser.LocalMetadata
var path = file.FullName;
- //await XmlProviderUtils.XmlParsingResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
-
try
{
result.Item = new T();
@@ -44,10 +43,6 @@ namespace MediaBrowser.LocalMetadata
{
result.HasMetadata = false;
}
- finally
- {
- //XmlProviderUtils.XmlParsingResourcePool.Release();
- }
return result;
}
@@ -77,13 +72,22 @@ namespace MediaBrowser.LocalMetadata
{
get
{
- return "Media Browser Xml";
+ return XmlProviderUtils.Name;
}
}
+
}
static class XmlProviderUtils
{
+ public static string Name
+ {
+ get
+ {
+ return "Media Browser Xml";
+ }
+ }
+
internal static readonly SemaphoreSlim XmlParsingResourcePool = new SemaphoreSlim(4, 4);
}
}