Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-04 03:27:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed watched indicator for folders

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-07 21:17:41 -04:00
parent 0934a9ca76
commit a23309eb9b
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MediaBrowser.Controller/Dto/DtoBuilder.cs
View File

@ -167,21 +167,16 @@ namespace MediaBrowser.Controller.Dto
/// <param name="fields">The fields.</param> /// <param name="fields">The fields.</param>
private async Task AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields) private async Task AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields)
{ {
if (fields.Contains(ItemFields.UserData))
{
var userData = await _userDataRepository.GetUserData(user.Id, item.GetUserDataKey()).ConfigureAwait(false);
dto.UserData = GetUserItemDataDto(userData);
}
if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferencesId)) if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferencesId))
{ {
dto.DisplayPreferencesId = ((Folder)item).GetDisplayPreferencesId(user.Id).ToString(); dto.DisplayPreferencesId = ((Folder)item).GetDisplayPreferencesId(user.Id).ToString();
} }
var addUserData = fields.Contains(ItemFields.UserData);
if (item.IsFolder) if (item.IsFolder)
{ {
if (fields.Contains(ItemFields.ItemCounts)) if (fields.Contains(ItemFields.ItemCounts) || addUserData)
{ {
var folder = (Folder)item; var folder = (Folder)item;
@ -191,6 +186,18 @@ namespace MediaBrowser.Controller.Dto
await SetSpecialCounts(folder, user, dto, _userDataRepository).ConfigureAwait(false); await SetSpecialCounts(folder, user, dto, _userDataRepository).ConfigureAwait(false);
} }
} }
if (addUserData)
{
var userData = await _userDataRepository.GetUserData(user.Id, item.GetUserDataKey()).ConfigureAwait(false);
dto.UserData = GetUserItemDataDto(userData);
if (item.IsFolder)
{
dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
}
}
} }
/// <summary> /// <summary>
@ -567,7 +574,7 @@ namespace MediaBrowser.Controller.Dto
// Incrememt totalPercentPlayed // Incrememt totalPercentPlayed
if (userdata != null) if (userdata != null)
{ {
if (userdata.PlayCount > 0) if (userdata.Played)
{ {
totalPercentPlayed += 100; totalPercentPlayed += 100;
} }