diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
3 files changed, 26 insertions, 88 deletions
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs index 2928363e3..36a8d3526 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs @@ -283,26 +283,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints return new[] { user.RootFolder as T }; } - // Need to find what user collection folder this belongs to - if (item.Parent is AggregateFolder) - { - if (item.LocationType == LocationType.FileSystem) - { - return collections.Where(i => i.PhysicalLocations.Contains(item.Path)).Cast<T>(); - } - } - - // If it's a user root, return it only if it's the right one - if (item is UserRootFolder) - { - if (item.Id == user.RootFolder.Id) - { - return new[] { item }; - } - - return new T[] { }; - } - // Return it only if it's in the user's library if (includeIfNotFound || allRecursiveChildren.ContainsKey(item.Id)) { diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index c2044476a..5bc1ff45a 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -153,12 +153,6 @@ namespace MediaBrowser.Server.Implementations.Library } } - /// <summary> - /// The _user root folders - /// </summary> - private readonly ConcurrentDictionary<string, UserRootFolder> _userRootFolders = - new ConcurrentDictionary<string, UserRootFolder>(); - private readonly IFileSystem _fileSystem; /// <summary> @@ -586,7 +580,7 @@ namespace MediaBrowser.Server.Implementations.Library var flattenFolderDepth = isPhysicalRoot ? 2 : 0; var fileSystemDictionary = FileData.GetFilteredFileSystemEntries(directoryService, args.Path, _fileSystem, _logger, args, flattenFolderDepth: flattenFolderDepth, resolveShortcuts: isPhysicalRoot || args.IsVf); - + // Need to remove subpaths that may have been resolved from shortcuts // Example: if \\server\movies exists, then strip out \\server\movies\action if (isPhysicalRoot) @@ -701,20 +695,18 @@ namespace MediaBrowser.Server.Implementations.Library return rootFolder; } - /// <summary> - /// Gets the user root folder. - /// </summary> - /// <param name="userRootPath">The user root path.</param> - /// <returns>UserRootFolder.</returns> - public UserRootFolder GetUserRootFolder(string userRootPath) + private UserRootFolder _userRootFolder; + public Folder GetUserRootFolder() { - return _userRootFolders.GetOrAdd(userRootPath, key => RetrieveItem(userRootPath.GetMBId(typeof(UserRootFolder))) as UserRootFolder ?? - (UserRootFolder)ResolvePath(new DirectoryInfo(userRootPath))); - } + if (_userRootFolder == null) + { + var userRootPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath; - public Person GetPersonSync(string name) - { - return GetItemByName<Person>(ConfigurationManager.ApplicationPaths.PeoplePath, name); + _userRootFolder = RetrieveItem(userRootPath.GetMBId(typeof(UserRootFolder))) as UserRootFolder ?? + (UserRootFolder)ResolvePath(new DirectoryInfo(userRootPath)); + } + + return _userRootFolder; } /// <summary> @@ -1001,7 +993,7 @@ namespace MediaBrowser.Server.Implementations.Library // Just run the scheduled task so that the user can see it _taskManager.QueueScheduledTask<RefreshMediaLibraryTask>(); } - + /// <summary> /// Validates the media library internal. /// </summary> @@ -1035,19 +1027,15 @@ namespace MediaBrowser.Server.Implementations.Library progress.Report(1); - foreach (var folder in _userManager.Users.Select(u => u.RootFolder).Distinct()) - { - await ValidateCollectionFolders(folder, cancellationToken).ConfigureAwait(false); - } + var userRoot = GetUserRootFolder(); + await userRoot.RefreshMetadata(cancellationToken).ConfigureAwait(false); + + await userRoot.ValidateChildren(new Progress<double>(), cancellationToken, new MetadataRefreshOptions(), recursive: false).ConfigureAwait(false); progress.Report(2); var innerProgress = new ActionableProgress<double>(); - innerProgress.RegisterAction(pct => progress.Report(2 + pct * .13)); - - innerProgress = new ActionableProgress<double>(); - innerProgress.RegisterAction(pct => progress.Report(2 + pct * .73)); // Now validate the entire media library @@ -1119,22 +1107,6 @@ namespace MediaBrowser.Server.Implementations.Library } /// <summary> - /// Validates only the collection folders for a User and goes no further - /// </summary> - /// <param name="userRootFolder">The user root folder.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>Task.</returns> - private async Task ValidateCollectionFolders(UserRootFolder userRootFolder, CancellationToken cancellationToken) - { - _logger.Info("Validating collection folders within {0}", userRootFolder.Path); - await userRootFolder.RefreshMetadata(cancellationToken).ConfigureAwait(false); - - cancellationToken.ThrowIfCancellationRequested(); - - await userRootFolder.ValidateChildren(new Progress<double>(), cancellationToken, new MetadataRefreshOptions(), recursive: false).ConfigureAwait(false); - } - - /// <summary> /// Gets the default view. /// </summary> /// <returns>IEnumerable{VirtualFolderInfo}.</returns> @@ -1150,7 +1122,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <returns>IEnumerable{VirtualFolderInfo}.</returns> public IEnumerable<VirtualFolderInfo> GetVirtualFolders(User user) { - return GetView(user.RootFolderPath); + return GetDefaultVirtualFolders(); } /// <summary> @@ -1399,7 +1371,7 @@ namespace MediaBrowser.Server.Implementations.Library { await _providerManagerFactory().SaveMetadata(item, updateReason).ConfigureAwait(false); } - + item.DateLastSaved = DateTime.UtcNow; _logger.Debug("Saving {0} to database.", item.Path ?? item.Name); diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs index ce76dd21b..8654a26ce 100644 --- a/MediaBrowser.Server.Implementations/Library/UserManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs @@ -332,29 +332,15 @@ namespace MediaBrowser.Server.Implementations.Library await UserRepository.DeleteUser(user, CancellationToken.None).ConfigureAwait(false); - if (user.Configuration.UseCustomLibrary) + var path = user.ConfigurationFilePath; + + try + { + File.Delete(path); + } + catch (IOException ex) { - var path = user.RootFolderPath; - - try - { - Directory.Delete(path, true); - } - catch (IOException ex) - { - _logger.ErrorException("Error deleting directory {0}", ex, path); - } - - path = user.ConfigurationFilePath; - - try - { - File.Delete(path); - } - catch (IOException ex) - { - _logger.ErrorException("Error deleting file {0}", ex, path); - } + _logger.ErrorException("Error deleting file {0}", ex, path); } // Force this to be lazy loaded again |