mirror of https://github.com/jellyfin/jellyfin.git
update components
This commit is contained in:
parent
fd53e18ee9
commit
a308ab8912
|
@ -219,6 +219,7 @@
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Studios,
|
Studios,
|
||||||
|
|
||||||
|
BasicSyncInfo,
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The synchronize information
|
/// The synchronize information
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -133,7 +133,7 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FillSyncInfo(dto, item, syncJobItems, options, user);
|
FillSyncInfo(dto, item, options, user, syncJobItems);
|
||||||
|
|
||||||
list.Add(dto);
|
list.Add(dto);
|
||||||
}
|
}
|
||||||
|
@ -253,14 +253,16 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
{
|
{
|
||||||
var item = tuple.Item1;
|
var item = tuple.Item1;
|
||||||
|
|
||||||
FillSyncInfo(tuple.Item2, item, syncProgress, options, user);
|
FillSyncInfo(tuple.Item2, item, options, user, syncProgress);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void FillSyncInfo(IHasSyncInfo dto, BaseItem item, DtoOptions options, User user, SyncedItemProgress[] syncProgress)
|
private void FillSyncInfo(IHasSyncInfo dto, BaseItem item, DtoOptions options, User user, SyncedItemProgress[] syncProgress)
|
||||||
{
|
{
|
||||||
if (options.Fields.Contains(ItemFields.SyncInfo))
|
var hasFullSyncInfo = options.Fields.Contains(ItemFields.SyncInfo);
|
||||||
|
|
||||||
|
if (hasFullSyncInfo || options.Fields.Contains(ItemFields.BasicSyncInfo))
|
||||||
{
|
{
|
||||||
var userCanSync = user != null && user.Policy.EnableSync;
|
var userCanSync = user != null && user.Policy.EnableSync;
|
||||||
dto.SupportsSync = userCanSync && _syncManager.SupportsSync(item);
|
dto.SupportsSync = userCanSync && _syncManager.SupportsSync(item);
|
||||||
|
@ -271,6 +273,8 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
dto.HasSyncJob = syncProgress.Any(i => i.Status != SyncJobItemStatus.Synced && string.Equals(i.ItemId, dto.Id, StringComparison.OrdinalIgnoreCase));
|
dto.HasSyncJob = syncProgress.Any(i => i.Status != SyncJobItemStatus.Synced && string.Equals(i.ItemId, dto.Id, StringComparison.OrdinalIgnoreCase));
|
||||||
dto.IsSynced = syncProgress.Any(i => i.Status == SyncJobItemStatus.Synced && string.Equals(i.ItemId, dto.Id, StringComparison.OrdinalIgnoreCase));
|
dto.IsSynced = syncProgress.Any(i => i.Status == SyncJobItemStatus.Synced && string.Equals(i.ItemId, dto.Id, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
|
if (hasFullSyncInfo)
|
||||||
|
{
|
||||||
if (dto.IsSynced.Value)
|
if (dto.IsSynced.Value)
|
||||||
{
|
{
|
||||||
dto.SyncStatus = SyncJobItemStatus.Synced;
|
dto.SyncStatus = SyncJobItemStatus.Synced;
|
||||||
|
@ -282,30 +286,6 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void FillSyncInfo(IHasSyncInfo dto, BaseItem item, SyncedItemProgress[] syncProgress, DtoOptions options, User user)
|
|
||||||
{
|
|
||||||
if (options.Fields.Contains(ItemFields.SyncInfo))
|
|
||||||
{
|
|
||||||
var userCanSync = user != null && user.Policy.EnableSync;
|
|
||||||
dto.SupportsSync = userCanSync && _syncManager.SupportsSync(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dto.SupportsSync ?? false)
|
|
||||||
{
|
|
||||||
dto.HasSyncJob = syncProgress.Any(i => i.Status != SyncJobItemStatus.Synced && string.Equals(i.ItemId, dto.Id, StringComparison.OrdinalIgnoreCase));
|
|
||||||
dto.IsSynced = syncProgress.Any(i => i.Status == SyncJobItemStatus.Synced && string.Equals(i.ItemId, dto.Id, StringComparison.OrdinalIgnoreCase));
|
|
||||||
|
|
||||||
if (dto.IsSynced.Value)
|
|
||||||
{
|
|
||||||
dto.SyncStatus = SyncJobItemStatus.Synced;
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (dto.HasSyncJob.Value)
|
|
||||||
{
|
|
||||||
dto.SyncStatus = syncProgress.Where(i => string.Equals(i.ItemId, dto.Id, StringComparison.OrdinalIgnoreCase)).Select(i => i.Status).Max();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<BaseItemDto> GetBaseItemDtoInternal(BaseItem item, DtoOptions options, Dictionary<string, SyncedItemProgress> syncProgress, User user = null, BaseItem owner = null)
|
private async Task<BaseItemDto> GetBaseItemDtoInternal(BaseItem item, DtoOptions options, Dictionary<string, SyncedItemProgress> syncProgress, User user = null, BaseItem owner = null)
|
||||||
|
|
|
@ -1187,6 +1187,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
// Load these now which will prefetch metadata
|
// Load these now which will prefetch metadata
|
||||||
var dtoOptions = new DtoOptions();
|
var dtoOptions = new DtoOptions();
|
||||||
dtoOptions.Fields.Remove(ItemFields.SyncInfo);
|
dtoOptions.Fields.Remove(ItemFields.SyncInfo);
|
||||||
|
dtoOptions.Fields.Remove(ItemFields.BasicSyncInfo);
|
||||||
await GetRecordings(new RecordingQuery(), dtoOptions, cancellationToken).ConfigureAwait(false);
|
await GetRecordings(new RecordingQuery(), dtoOptions, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
progress.Report(100);
|
progress.Report(100);
|
||||||
|
|
|
@ -646,6 +646,7 @@ namespace MediaBrowser.Server.Implementations.Sync
|
||||||
dtoOptions.Fields.Remove(ItemFields.SeriesGenres);
|
dtoOptions.Fields.Remove(ItemFields.SeriesGenres);
|
||||||
dtoOptions.Fields.Remove(ItemFields.Settings);
|
dtoOptions.Fields.Remove(ItemFields.Settings);
|
||||||
dtoOptions.Fields.Remove(ItemFields.SyncInfo);
|
dtoOptions.Fields.Remove(ItemFields.SyncInfo);
|
||||||
|
dtoOptions.Fields.Remove(ItemFields.BasicSyncInfo);
|
||||||
|
|
||||||
syncedItem.Item = _dtoService().GetBaseItemDto(libraryItem, dtoOptions);
|
syncedItem.Item = _dtoService().GetBaseItemDto(libraryItem, dtoOptions);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue