lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Eric Reed 2013-11-04 13:17:03 -05:00
commit e89a0d080b
6 changed files with 140 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
MediaBrowser.Api/Library/LibraryHelpers.cs
View File

@ -1,7 +1,6 @@
using MediaBrowser.Common.IO;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.IO;
using System;
using System.IO;
using System.Linq;
@ -22,95 +21,6 @@ namespace MediaBrowser.Api.Library
/// </summary>
private const string ShortcutFileSearch = "*" + ShortcutFileExtension;
/// <summary>
/// Adds the virtual folder.
/// </summary>
/// <param name="fileSystem">The file system.</param>
/// <param name="name">The name.</param>
/// <param name="collectionType">Type of the collection.</param>
/// <param name="user">The user.</param>
/// <param name="appPaths">The app paths.</param>
/// <exception cref="System.ArgumentException">There is already a media collection with the name + name + .</exception>
public static void AddVirtualFolder(IFileSystem fileSystem, string name, string collectionType, User user, IServerApplicationPaths appPaths)
{
name = fileSystem.GetValidFilename(name);
var rootFolderPath = user != null ? user.RootFolderPath : appPaths.DefaultUserViewsPath;
var virtualFolderPath = Path.Combine(rootFolderPath, name);
if (Directory.Exists(virtualFolderPath))
{
throw new ArgumentException("There is already a media collection with the name " + name + ".");
}
Directory.CreateDirectory(virtualFolderPath);
if (!string.IsNullOrEmpty(collectionType))
{
var path = Path.Combine(virtualFolderPath, collectionType + ".collection");
File.Create(path);
}
}
/// <summary>
/// Removes the virtual folder.
/// </summary>
/// <param name="name">The name.</param>
/// <param name="user">The user.</param>
/// <param name="appPaths">The app paths.</param>
/// <exception cref="System.IO.DirectoryNotFoundException">The media folder does not exist</exception>
public static void RemoveVirtualFolder(string name, User user, IServerApplicationPaths appPaths)
{
var rootFolderPath = user != null ? user.RootFolderPath : appPaths.DefaultUserViewsPath;
var path = Path.Combine(rootFolderPath, name);
if (!Directory.Exists(path))
{
throw new DirectoryNotFoundException("The media folder does not exist");
}
Directory.Delete(path, true);
}
/// <summary>
/// Renames the virtual folder.
/// </summary>
/// <param name="name">The name.</param>
/// <param name="newName">The new name.</param>
/// <param name="user">The user.</param>
/// <param name="appPaths">The app paths.</param>
/// <exception cref="System.IO.DirectoryNotFoundException">The media collection does not exist</exception>
/// <exception cref="System.ArgumentException">There is already a media collection with the name + newPath + .</exception>
public static void RenameVirtualFolder(string name, string newName, User user, IServerApplicationPaths appPaths)
{
var rootFolderPath = user != null ? user.RootFolderPath : appPaths.DefaultUserViewsPath;
var currentPath = Path.Combine(rootFolderPath, name);
var newPath = Path.Combine(rootFolderPath, newName);
if (!Directory.Exists(currentPath))
{
throw new DirectoryNotFoundException("The media collection does not exist");
}
if (!string.Equals(currentPath, newPath, StringComparison.OrdinalIgnoreCase) && Directory.Exists(newPath))
{
throw new ArgumentException("There is already a media collection with the name " + newPath + ".");
}
//Only make a two-phase move when changing capitalization
if (string.Equals(currentPath, newPath, StringComparison.OrdinalIgnoreCase))
{
//Create an unique name
var temporaryName = Guid.NewGuid().ToString();
var temporaryPath = Path.Combine(rootFolderPath, temporaryName);
Directory.Move(currentPath,temporaryPath);
currentPath = temporaryPath;
}
Directory.Move(currentPath, newPath);
}
/// <summary>
/// Deletes a shortcut from within a virtual folder, within either the default view or a user view
/// </summary>

106
MediaBrowser.Api/Library/LibraryStructureService.cs
View File

@ -3,9 +3,11 @@ using MediaBrowser.Controller;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@ -188,6 +190,7 @@ namespace MediaBrowser.Api.Library
private readonly IDirectoryWatchers _directoryWatchers;
private readonly IFileSystem _fileSystem;
private readonly ILogger _logger;
/// <summary>
/// Initializes a new instance of the <see cref="LibraryStructureService"/> class.
@ -196,7 +199,7 @@ namespace MediaBrowser.Api.Library
/// <param name="userManager">The user manager.</param>
/// <param name="libraryManager">The library manager.</param>
/// <exception cref="System.ArgumentNullException">appPaths</exception>
public LibraryStructureService(IServerApplicationPaths appPaths, IUserManager userManager, ILibraryManager libraryManager, IDirectoryWatchers directoryWatchers, IFileSystem fileSystem)
public LibraryStructureService(IServerApplicationPaths appPaths, IUserManager userManager, ILibraryManager libraryManager, IDirectoryWatchers directoryWatchers, IFileSystem fileSystem, ILogger logger)
{
if (appPaths == null)
{
@ -208,6 +211,7 @@ namespace MediaBrowser.Api.Library
_libraryManager = libraryManager;
_directoryWatchers = directoryWatchers;
_fileSystem = fileSystem;
_logger = logger;
}
/// <summary>
@ -239,19 +243,40 @@ namespace MediaBrowser.Api.Library
/// <param name="request">The request.</param>
public void Post(AddVirtualFolder request)
{
_directoryWatchers.Stop();
var name = _fileSystem.GetValidFilename(request.Name);
string rootFolderPath;
try
{
if (string.IsNullOrEmpty(request.UserId))
{
LibraryHelpers.AddVirtualFolder(_fileSystem, request.Name, request.CollectionType, null, _appPaths);
rootFolderPath = _appPaths.DefaultUserViewsPath;
}
else
{
var user = _userManager.GetUserById(new Guid(request.UserId));
LibraryHelpers.AddVirtualFolder(_fileSystem, request.Name, request.CollectionType, user, _appPaths);
rootFolderPath = user.RootFolderPath;
}
var virtualFolderPath = Path.Combine(rootFolderPath, name);
if (Directory.Exists(virtualFolderPath))
{
throw new ArgumentException("There is already a media collection with the name " + name + ".");
}
_directoryWatchers.Stop();
_directoryWatchers.TemporarilyIgnore(virtualFolderPath);
try
{
Directory.CreateDirectory(virtualFolderPath);
if (!string.IsNullOrEmpty(request.CollectionType))
{
var path = Path.Combine(virtualFolderPath, request.CollectionType + ".collection");
File.Create(path);
}
// Need to add a delay here or directory watchers may still pick up the changes
@ -262,6 +287,7 @@ namespace MediaBrowser.Api.Library
finally
{
_directoryWatchers.Start();
_directoryWatchers.RemoveTempIgnore(virtualFolderPath);
}
if (request.RefreshLibrary)
@ -276,21 +302,50 @@ namespace MediaBrowser.Api.Library
/// <param name="request">The request.</param>
public void Post(RenameVirtualFolder request)
{
_directoryWatchers.Stop();
string rootFolderPath;
try
{
if (string.IsNullOrEmpty(request.UserId))
{
LibraryHelpers.RenameVirtualFolder(request.Name, request.NewName, null, _appPaths);
rootFolderPath = _appPaths.DefaultUserViewsPath;
}
else
{
var user = _userManager.GetUserById(new Guid(request.UserId));
LibraryHelpers.RenameVirtualFolder(request.Name, request.NewName, user, _appPaths);
rootFolderPath = user.RootFolderPath;
}
var currentPath = Path.Combine(rootFolderPath, request.Name);
var newPath = Path.Combine(rootFolderPath, request.NewName);
if (!Directory.Exists(currentPath))
{
throw new DirectoryNotFoundException("The media collection does not exist");
}
if (!string.Equals(currentPath, newPath, StringComparison.OrdinalIgnoreCase) && Directory.Exists(newPath))
{
throw new ArgumentException("There is already a media collection with the name " + newPath + ".");
}
_directoryWatchers.Stop();
_directoryWatchers.TemporarilyIgnore(currentPath);
_directoryWatchers.TemporarilyIgnore(newPath);
try
{
// Only make a two-phase move when changing capitalization
if (string.Equals(currentPath, newPath, StringComparison.OrdinalIgnoreCase))
{
//Create an unique name
var temporaryName = Guid.NewGuid().ToString();
var temporaryPath = Path.Combine(rootFolderPath, temporaryName);
Directory.Move(currentPath, temporaryPath);
currentPath = temporaryPath;
}
Directory.Move(currentPath, newPath);
// 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
@ -299,6 +354,8 @@ namespace MediaBrowser.Api.Library
finally
{
_directoryWatchers.Start();
_directoryWatchers.RemoveTempIgnore(currentPath);
_directoryWatchers.RemoveTempIgnore(newPath);
}
if (request.RefreshLibrary)
@ -313,29 +370,42 @@ namespace MediaBrowser.Api.Library
/// <param name="request">The request.</param>
public void Delete(RemoveVirtualFolder request)
{
_directoryWatchers.Stop();
string rootFolderPath;
try
{
if (string.IsNullOrEmpty(request.UserId))
{
LibraryHelpers.RemoveVirtualFolder(request.Name, null, _appPaths);
rootFolderPath = _appPaths.DefaultUserViewsPath;
}
else
{
var user = _userManager.GetUserById(new Guid(request.UserId));
LibraryHelpers.RemoveVirtualFolder(request.Name, user, _appPaths);
rootFolderPath = user.RootFolderPath;
}
var path = Path.Combine(rootFolderPath, request.Name);
if (!Directory.Exists(path))
{
throw new DirectoryNotFoundException("The media folder does not exist");
}
_directoryWatchers.Stop();
_directoryWatchers.TemporarilyIgnore(path);
try
{
Directory.Delete(path, true);
// Need to add a delay here or directory watchers may still pick up the changes
var task = Task.Delay(1000);
var delayTask = Task.Delay(1000);
// Have to block here to allow exceptions to bubble
Task.WaitAll(task);
Task.WaitAll(delayTask);
}
finally
{
_directoryWatchers.Start();
_directoryWatchers.RemoveTempIgnore(path);
}
if (request.RefreshLibrary)

3
MediaBrowser.Api/LibraryService.cs
View File

@ -495,8 +495,7 @@ namespace MediaBrowser.Api
{
try
{
await
parent.ValidateChildren(new Progress<double>(), CancellationToken.None)
await parent.ValidateChildren(new Progress<double>(), CancellationToken.None)
.ConfigureAwait(false);
}
catch (Exception ex)

6
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -1347,12 +1347,14 @@ namespace MediaBrowser.Controller.Entities
try
{
if (LocationType == LocationType.Remote && string.Equals(Path, path, StringComparison.OrdinalIgnoreCase))
var locationType = LocationType;
if (locationType == LocationType.Remote && string.Equals(Path, path, StringComparison.OrdinalIgnoreCase))
{
return this;
}
if (LocationType != LocationType.Virtual && ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase))
if (locationType != LocationType.Virtual && ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase))
{
return this;
}

3
MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs
View File

@ -358,8 +358,6 @@ namespace MediaBrowser.Server.Implementations.IO
var tempIgnorePaths = _tempIgnoredPaths.Keys.ToList();
if (e.ChangeType == WatcherChangeTypes.Changed)
{
// If the parent of an ignored path has a change event, ignore that too
if (tempIgnorePaths.Any(i =>
{
@ -391,7 +389,6 @@ namespace MediaBrowser.Server.Implementations.IO
{
return;
}
}
if (tempIgnorePaths.Contains(e.FullPath, StringComparer.OrdinalIgnoreCase))
{

16
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -1430,10 +1430,22 @@ namespace MediaBrowser.Server.Implementations.Library
.OfType<CollectionFolder>()
.Where(i =>
{
var locationType = i.LocationType;
if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
{
return false;
}
if (string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase))
{
return true;
}
try
{
return i.LocationType != LocationType.Remote && i.LocationType != LocationType.Virtual &&
i.ResolveArgs.PhysicalLocations.Contains(item.Path);
return i.ResolveArgs.PhysicalLocations.Contains(item.Path);
}
catch (IOException ex)
{