Merge pull request #15 from MediaBrowser/dev

Dev

1 files changed, 4 insertions, 111 deletions

diff --git a/MediaBrowser.Api/Library/LibraryStructureService.cs b/MediaBrowser.Api/Library/LibraryStructureService.cs
index 244dcf09f..3cf0d5d93 100644
--- a/MediaBrowser.Api/Library/LibraryStructureService.cs
+++ b/MediaBrowser.Api/Library/LibraryStructureService.cs
@@ -190,75 +190,7 @@ namespace MediaBrowser.Api.Library
         /// <param name="request">The request.</param>
         public void Post(AddVirtualFolder request)
         {
-            if (string.IsNullOrWhiteSpace(request.Name))
-            {
-                throw new ArgumentNullException("request");
-            }
-
-            var name = _fileSystem.GetValidFilename(request.Name);
-
-            var rootFolderPath = _appPaths.DefaultUserViewsPath;
-
-            var virtualFolderPath = Path.Combine(rootFolderPath, name);
-            while (_fileSystem.DirectoryExists(virtualFolderPath))
-            {
-                name += "1";
-                virtualFolderPath = Path.Combine(rootFolderPath, name);
-            }
-
-            if (request.Paths != null)
-            {
-                var invalidpath = request.Paths.FirstOrDefault(i => !_fileSystem.DirectoryExists(i));
-                if (invalidpath != null)
-                {
-                    throw new ArgumentException("The specified path does not exist: " + invalidpath + ".");
-                }
-            }
-            
-            _libraryMonitor.Stop();
-
-            try
-            {
-				_fileSystem.CreateDirectory(virtualFolderPath);
-
-                if (!string.IsNullOrEmpty(request.CollectionType))
-                {
-                    var path = Path.Combine(virtualFolderPath, request.CollectionType + ".collection");
-
-                    using (File.Create(path))
-                    {
-
-                    }
-                }
-
-                if (request.Paths != null)
-                {
-                    foreach (var path in request.Paths)
-                    {
-                        LibraryHelpers.AddMediaPath(_fileSystem, name, path, _appPaths);
-                    }
-                }
-            }
-            finally
-            {
-                Task.Run(() =>
-                {
-                    // No need to start if scanning the library because it will handle it
-                    if (request.RefreshLibrary)
-                    {
-                        _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None);
-                    }
-                    else
-                    {
-                        // Need to add a delay here or directory watchers may still pick up the changes
-                        var task = Task.Delay(1000);
-                        // Have to block here to allow exceptions to bubble
-                        Task.WaitAll(task);
-                        
-                        _libraryMonitor.Start();
-                    }
-                });
-            }
+            _libraryManager.AddVirtualFolder(request.Name, request.CollectionType, request.Paths, request.RefreshLibrary);
         }
 
         /// <summary>
@@ -336,46 +268,7 @@ namespace MediaBrowser.Api.Library
         /// <param name="request">The request.</param>
         public void Delete(RemoveVirtualFolder request)
         {
-            if (string.IsNullOrWhiteSpace(request.Name))
-            {
-                throw new ArgumentNullException("request");
-            }
-
-            var rootFolderPath = _appPaths.DefaultUserViewsPath;
-
-            var path = Path.Combine(rootFolderPath, request.Name);
-
-			if (!_fileSystem.DirectoryExists(path))
-            {
-                throw new DirectoryNotFoundException("The media folder does not exist");
-            }
-
-            _libraryMonitor.Stop();
-
-            try
-            {
-                _fileSystem.DeleteDirectory(path, true);
-            }
-            finally
-            {
-                Task.Run(() =>
-                {
-                    // No need to start if scanning the library because it will handle it
-                    if (request.RefreshLibrary)
-                    {
-                        _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None);
-                    }
-                    else
-                    {
-                        // Need to add a delay here or directory watchers may still pick up the changes
-                        var task = Task.Delay(1000);
-                        // Have to block here to allow exceptions to bubble
-                        Task.WaitAll(task);
-
-                        _libraryMonitor.Start();
-                    }
-                });
-            }
+            _libraryManager.RemoveVirtualFolder(request.Name, request.RefreshLibrary);
         }
 
         /// <summary>
@@ -393,7 +286,7 @@ namespace MediaBrowser.Api.Library
 
             try
             {
-                LibraryHelpers.AddMediaPath(_fileSystem, request.Name, request.Path, _appPaths);
+                _libraryManager.AddMediaPath(request.Name, request.Path);
             }
             finally
             {
@@ -432,7 +325,7 @@ namespace MediaBrowser.Api.Library
 
             try
             {
-                LibraryHelpers.RemoveMediaPath(_fileSystem, request.Name, request.Path, _appPaths);
+                _libraryManager.RemoveMediaPath(request.Name, request.Path);
             }
             finally
             {