Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
This commit is contained in:
commit
039468f1cd
|
@ -1293,33 +1293,41 @@ namespace MediaBrowser.Controller.Entities
|
|||
|
||||
public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter)
|
||||
{
|
||||
var list = new List<BaseItem>();
|
||||
var result = new Dictionary<Guid, BaseItem>();
|
||||
|
||||
AddChildrenToList(list, true, filter);
|
||||
AddChildrenToList(result, true, true, filter);
|
||||
|
||||
return list;
|
||||
return result.Values.ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds the children to list.
|
||||
/// </summary>
|
||||
/// <param name="list">The list.</param>
|
||||
/// <param name="recursive">if set to <c>true</c> [recursive].</param>
|
||||
/// <param name="filter">The filter.</param>
|
||||
private void AddChildrenToList(List<BaseItem> list, bool recursive, Func<BaseItem, bool> filter)
|
||||
private void AddChildrenToList(Dictionary<Guid,BaseItem> result, bool includeLinkedChildren, bool recursive, Func<BaseItem, bool> filter)
|
||||
{
|
||||
foreach (var child in Children)
|
||||
{
|
||||
if (filter == null || filter(child))
|
||||
{
|
||||
list.Add(child);
|
||||
result[child.Id] = child;
|
||||
}
|
||||
|
||||
if (recursive && child.IsFolder)
|
||||
{
|
||||
var folder = (Folder)child;
|
||||
|
||||
folder.AddChildrenToList(list, true, filter);
|
||||
folder.AddChildrenToList(result, includeLinkedChildren, true, filter);
|
||||
}
|
||||
}
|
||||
|
||||
if (includeLinkedChildren)
|
||||
{
|
||||
foreach (var child in GetLinkedChildren())
|
||||
{
|
||||
if (filter == null || filter(child))
|
||||
{
|
||||
result[child.Id] = child;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -421,7 +421,8 @@ namespace MediaBrowser.Providers.Manager
|
|||
var folder = item as Folder;
|
||||
if (folder != null && folder.SupportsCumulativeRunTimeTicks)
|
||||
{
|
||||
var ticks = folder.GetRecursiveChildren(i => !i.IsFolder).Select(i => i.RunTimeTicks ?? 0).Sum();
|
||||
var items = folder.GetRecursiveChildren(i => !i.IsFolder).ToList();
|
||||
var ticks = items.Select(i => i.RunTimeTicks ?? 0).Sum();
|
||||
|
||||
if (!folder.RunTimeTicks.HasValue || folder.RunTimeTicks.Value != ticks)
|
||||
{
|
||||
|
@ -443,9 +444,10 @@ namespace MediaBrowser.Providers.Manager
|
|||
var folder = item as Folder;
|
||||
if (folder != null && folder.SupportsDateLastMediaAdded)
|
||||
{
|
||||
var date = folder.GetRecursiveChildren(i => !i.IsFolder).Select(i => i.DateCreated).Max();
|
||||
var items = folder.GetRecursiveChildren(i => !i.IsFolder).Select(i => i.DateCreated).ToList();
|
||||
var date = items.Count == 0 ? (DateTime?)null : items.Max();
|
||||
|
||||
if (!folder.DateLastMediaAdded.HasValue || folder.DateLastMediaAdded.Value != date)
|
||||
if ((!folder.DateLastMediaAdded.HasValue && date.HasValue) || folder.DateLastMediaAdded != date)
|
||||
{
|
||||
folder.DateLastMediaAdded = date;
|
||||
updateType = ItemUpdateType.MetadataEdit;
|
||||
|
|
|
@ -176,8 +176,12 @@ namespace MediaBrowser.Providers.Movies
|
|||
var numComplete = 0;
|
||||
|
||||
// Gather all movies into a lookup by tmdb id
|
||||
var allMovies = _libraryManager.RootFolder
|
||||
.GetRecursiveChildren(i => i is Movie && !string.IsNullOrEmpty(i.GetProviderId(MetadataProviders.Tmdb)))
|
||||
var allMovies = _libraryManager.GetItemList(new Controller.Entities.InternalItemsQuery
|
||||
{
|
||||
IncludeItemTypes = new[] {typeof (Movie).Name},
|
||||
Recursive = true
|
||||
|
||||
}).Where(i => !string.IsNullOrEmpty(i.GetProviderId(MetadataProviders.Tmdb)))
|
||||
.ToLookup(i => i.GetProviderId(MetadataProviders.Tmdb));
|
||||
|
||||
foreach (var id in list)
|
||||
|
|
|
@ -536,7 +536,11 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
|
|||
result.ExtractedName = nameWithoutYear;
|
||||
result.ExtractedYear = yearInName;
|
||||
|
||||
var series = _libraryManager.RootFolder.GetRecursiveChildren(i => i is Series)
|
||||
var series = _libraryManager.GetItemList(new Controller.Entities.InternalItemsQuery
|
||||
{
|
||||
IncludeItemTypes = new[] { typeof(Series).Name },
|
||||
Recursive = true
|
||||
})
|
||||
.Cast<Series>()
|
||||
.Select(i => NameUtils.GetMatchScore(nameWithoutYear, yearInName, i))
|
||||
.Where(i => i.Item2 > 0)
|
||||
|
@ -550,9 +554,11 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
|
|||
|
||||
if (info != null)
|
||||
{
|
||||
series = _libraryManager.RootFolder
|
||||
.GetRecursiveChildren(i => i is Series)
|
||||
.Cast<Series>()
|
||||
series = _libraryManager.GetItemList(new Controller.Entities.InternalItemsQuery
|
||||
{
|
||||
IncludeItemTypes = new[] { typeof(Series).Name },
|
||||
Recursive = true
|
||||
}).Cast<Series>()
|
||||
.FirstOrDefault(i => string.Equals(i.Name, info.ItemName, StringComparison.OrdinalIgnoreCase));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||
{
|
||||
public event EventHandler<UserDataSaveEventArgs> UserDataSaved;
|
||||
|
||||
private readonly ConcurrentDictionary<string, UserItemData> _userData = new ConcurrentDictionary<string, UserItemData>();
|
||||
private readonly Dictionary<string, UserItemData> _userData = new Dictionary<string, UserItemData>(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
private readonly ILogger _logger;
|
||||
private readonly IServerConfigurationManager _config;
|
||||
|
@ -66,8 +66,10 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||
|
||||
var newValue = userData;
|
||||
|
||||
// Once it succeeds, put it into the dictionary to make it available to everyone else
|
||||
_userData.AddOrUpdate(GetCacheKey(userId, key), newValue, delegate { return newValue; });
|
||||
lock (_userData)
|
||||
{
|
||||
_userData[GetCacheKey(userId, key)] = newValue;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
@ -154,13 +156,33 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||
throw new ArgumentNullException("key");
|
||||
}
|
||||
|
||||
return _userData.GetOrAdd(GetCacheKey(userId, key), keyName => GetUserDataFromRepository(userId, key));
|
||||
lock (_userData)
|
||||
{
|
||||
var cacheKey = GetCacheKey(userId, key);
|
||||
UserItemData value;
|
||||
if (_userData.TryGetValue(cacheKey, out value))
|
||||
{
|
||||
return value;
|
||||
}
|
||||
|
||||
value = GetUserDataFromRepository(userId, key);
|
||||
_userData[cacheKey] = value;
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
private UserItemData GetUserDataFromRepository(Guid userId, string key)
|
||||
{
|
||||
var data = Repository.GetUserData(userId, key);
|
||||
|
||||
if (data == null)
|
||||
{
|
||||
data = new UserItemData
|
||||
{
|
||||
UserId = userId,
|
||||
Key = key
|
||||
};
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
|
|
|
@ -2056,6 +2056,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||
{
|
||||
var whereClauses = new List<string>();
|
||||
|
||||
if (EnableJoinUserData(query))
|
||||
{
|
||||
whereClauses.Add("UserId=@UserId");
|
||||
}
|
||||
if (query.IsCurrentSchema.HasValue)
|
||||
{
|
||||
if (query.IsCurrentSchema.Value)
|
||||
|
|
|
@ -296,11 +296,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||
}
|
||||
}
|
||||
|
||||
return new UserItemData
|
||||
{
|
||||
UserId = userId,
|
||||
Key = key
|
||||
};
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ using System.Linq;
|
|||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using CommonIO;
|
||||
using MediaBrowser.Model.Entities;
|
||||
|
||||
namespace MediaBrowser.Server.Implementations.ScheduledTasks
|
||||
{
|
||||
|
@ -85,8 +86,13 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
|
|||
/// <returns>Task.</returns>
|
||||
public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
|
||||
{
|
||||
var videos = _libraryManager.RootFolder.GetRecursiveChildren(i => i is Video)
|
||||
.Cast<Video>()
|
||||
var videos = _libraryManager.GetItemList(new InternalItemsQuery
|
||||
{
|
||||
MediaTypes = new[] { MediaType.Video },
|
||||
IsFolder = false,
|
||||
Recursive = true
|
||||
})
|
||||
.OfType<Video>()
|
||||
.ToList();
|
||||
|
||||
var numComplete = 0;
|
||||
|
|
Loading…
Reference in New Issue
Block a user