aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.LocalMetadata
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-10-25 14:32:58 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-10-25 14:32:58 -0400
commitd74e3b2dea894a7cdc3defac418069081dd2ae22 (patch)
tree9618eea91bf12790b51eeb0138a01f1641968043 /MediaBrowser.LocalMetadata
parentc8a735bcb1ba71e9501d18b3044aa30793ff97ee (diff)
connect updates
Diffstat (limited to 'MediaBrowser.LocalMetadata')
-rw-r--r--MediaBrowser.LocalMetadata/BaseXmlProvider.cs7
-rw-r--r--MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs3
2 files changed, 6 insertions, 4 deletions
diff --git a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
index 25778d036..5eb067dcd 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)
{
diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
index cd9b78201..31329e6d7 100644
--- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
@@ -33,7 +33,8 @@ namespace MediaBrowser.LocalMetadata.Images
{
var parentPath = Path.GetDirectoryName(item.Path);
- var parentPathFiles = directoryService.GetFileSystemEntries(parentPath);
+ var parentPathFiles = directoryService.GetFileSystemEntries(parentPath)
+ .ToList();
var nameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(item.Path);