michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1068 from MediaBrowser/master

Browse Source 
3.0.5572.0
This commit is contained in:
Luke 2015-04-03 22:24:58 -04:00
commit 481e6635b4
3 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@ -71,8 +71,21 @@ namespace MediaBrowser.Model.Dto
public int? AnimeSeriesIndex { get; set; } public int? AnimeSeriesIndex { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [supports synchronize].
/// </summary>
/// <value><c>null</c> if [supports synchronize] contains no value, <c>true</c> if [supports synchronize]; otherwise, <c>false</c>.</value>
public bool? SupportsSync { get; set; } public bool? SupportsSync { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this instance has synchronize job.
/// </summary>
/// <value><c>null</c> if [has synchronize job] contains no value, <c>true</c> if [has synchronize job]; otherwise, <c>false</c>.</value>
public bool? HasSyncJob { get; set; } public bool? HasSyncJob { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this instance is synced.
/// </summary>
/// <value><c>null</c> if [is synced] contains no value, <c>true</c> if [is synced]; otherwise, <c>false</c>.</value>
public bool? IsSynced { get; set; }
/// <summary> /// <summary>
/// Gets or sets the DVD season number. /// Gets or sets the DVD season number.

2
MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
View File

@ -394,7 +394,7 @@ namespace MediaBrowser.Server.Implementations.Sync
AddMetadata = false AddMetadata = false
}); });
await SyncJobItems(result.Items, true, progress, cancellationToken).ConfigureAwait(false); await SyncJobItems(result.Items, enableConversion, progress, cancellationToken).ConfigureAwait(false);
} }
public async Task SyncJobItems(SyncJobItem[] items, bool enableConversion, IProgress<double> progress, CancellationToken cancellationToken) public async Task SyncJobItems(SyncJobItem[] items, bool enableConversion, IProgress<double> progress, CancellationToken cancellationToken)