diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-11 21:55:52 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-11 21:55:52 -0500 |
| commit | 8a2e023e28dd546641571dd24be721397c9ee9e1 (patch) | |
| tree | a8b086e4bf154636393b76481150fc84fc3c21fc /MediaBrowser.Api/BaseApiService.cs | |
| parent | ba4ca10ae29a50ed452ed3d05f885b3fa81595e2 (diff) | |
| parent | 355edfa2020d19b0fba6b09da40de4e66395d4b7 (diff) | |
Merge branch 'dev'
Conflicts:
MediaBrowser.Controller/Entities/BaseItem.cs
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/bower.json
MediaBrowser.WebDashboard/dashboard-ui/strings/html/kk.json
MediaBrowser.WebDashboard/dashboard-ui/strings/html/ru.json
MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/kk.json
MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ru.json
SharedVersion.cs
Diffstat (limited to 'MediaBrowser.Api/BaseApiService.cs')
| -rw-r--r-- | MediaBrowser.Api/BaseApiService.cs | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 7a14ace77..ecab94349 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -198,50 +198,6 @@ namespace MediaBrowser.Api return libraryManager.GetPerson(DeSlugPersonName(name, libraryManager)); } - protected IList<BaseItem> GetAllLibraryItems(string userId, IUserManager userManager, ILibraryManager libraryManager, string parentId, Func<BaseItem,bool> filter) - { - if (!string.IsNullOrEmpty(parentId)) - { - var folder = (Folder)libraryManager.GetItemById(new Guid(parentId)); - - if (!string.IsNullOrWhiteSpace(userId)) - { - var user = userManager.GetUserById(userId); - - if (user == null) - { - throw new ArgumentException("User not found"); - } - - return folder - .GetRecursiveChildren(user, filter) - .ToList(); - } - - return folder - .GetRecursiveChildren(filter); - } - if (!string.IsNullOrWhiteSpace(userId)) - { - var user = userManager.GetUserById(userId); - - if (user == null) - { - throw new ArgumentException("User not found"); - } - - return userManager - .GetUserById(userId) - .RootFolder - .GetRecursiveChildren(user, filter) - .ToList(); - } - - return libraryManager - .RootFolder - .GetRecursiveChildren(filter); - } - /// <summary> /// Deslugs an artist name by finding the correct entry in the library /// </summary> |