From eec9e0482525c400e9dc7cb17bc000434adba105 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 13 Feb 2014 00:11:54 -0500
Subject: take photos into the core

---
 MediaBrowser.Controller/Library/ILibraryManager.cs | 15 +++++++++++++--
 MediaBrowser.Controller/Library/ItemResolveArgs.cs |  6 +++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 7c803e651..e5e7db13d 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Entities;
@@ -27,19 +28,29 @@ namespace MediaBrowser.Controller.Library
         /// Resolves a path into a BaseItem
         /// </summary>
         /// <param name="fileInfo">The file info.</param>
+        /// <param name="directoryService">The directory service.</param>
         /// <param name="parent">The parent.</param>
         /// <returns>BaseItem.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        BaseItem ResolvePath(FileSystemInfo fileInfo, Folder parent = null);
+        BaseItem ResolvePath(FileSystemInfo fileInfo, IDirectoryService directoryService, Folder parent = null);
 
+        /// <summary>
+        /// Resolves the path.
+        /// </summary>
+        /// <param name="fileInfo">The file information.</param>
+        /// <param name="parent">The parent.</param>
+        /// <returns>BaseItem.</returns>
+        BaseItem ResolvePath(FileSystemInfo fileInfo, Folder parent = null);
+        
         /// <summary>
         /// Resolves a set of files into a list of BaseItem
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="files">The files.</param>
+        /// <param name="directoryService">The directory service.</param>
         /// <param name="parent">The parent.</param>
         /// <returns>List{``0}.</returns>
-        List<T> ResolvePaths<T>(IEnumerable<FileSystemInfo> files, Folder parent)
+        List<T> ResolvePaths<T>(IEnumerable<FileSystemInfo> files, IDirectoryService directoryService, Folder parent)
             where T : BaseItem;
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index d84e7aa8c..c1fcdc9fe 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Providers;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -18,15 +19,18 @@ namespace MediaBrowser.Controller.Library
         private readonly IServerApplicationPaths _appPaths;
         private readonly ILibraryManager _libraryManager;
 
+        public IDirectoryService DirectoryService { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemResolveArgs" /> class.
         /// </summary>
         /// <param name="appPaths">The app paths.</param>
         /// <param name="libraryManager">The library manager.</param>
-        public ItemResolveArgs(IServerApplicationPaths appPaths, ILibraryManager libraryManager)
+        public ItemResolveArgs(IServerApplicationPaths appPaths, ILibraryManager libraryManager, IDirectoryService directoryService)
         {
             _appPaths = appPaths;
             _libraryManager = libraryManager;
+            DirectoryService = directoryService;
         }
 
         /// <summary>
-- 
cgit v1.2.3