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

update sync progress display

Browse Source
This commit is contained in:
Luke Pulverenti 2015-02-03 14:37:50 -05:00
parent 0f88525d61
commit 256990ac7b
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Model/Sync/SyncJob.cs
View File

@ -93,6 +93,7 @@ namespace MediaBrowser.Model.Sync
public SyncJob() public SyncJob()
{ {
RequestedItemIds = new List<string>(); RequestedItemIds = new List<string>();
Quality = SyncQuality.High;
} }
} }
} }

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

@ -481,15 +481,30 @@ namespace MediaBrowser.Server.Implementations.Sync
try try
{ {
var lastJobUpdate = DateTime.MinValue;
var innerProgress = new ActionableProgress<double>();
innerProgress.RegisterAction(async pct =>
{
progress.Report(pct);
if ((DateTime.UtcNow - lastJobUpdate).TotalSeconds >= DatabaseProgressUpdateIntervalSeconds)
{
jobItem.Progress = pct / 2;
await _syncRepo.Update(jobItem).ConfigureAwait(false);
await UpdateJobStatus(job).ConfigureAwait(false);
}
});
jobItem.OutputPath = await _mediaEncoder.EncodeVideo(new EncodingJobOptions(streamInfo, profile) jobItem.OutputPath = await _mediaEncoder.EncodeVideo(new EncodingJobOptions(streamInfo, profile)
{ {
OutputDirectory = jobItem.TemporaryPath OutputDirectory = jobItem.TemporaryPath
}, progress, cancellationToken); }, innerProgress, cancellationToken);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
jobItem.Status = SyncJobItemStatus.Queued; jobItem.Status = SyncJobItemStatus.Queued;
jobItem.Progress = 0;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -611,6 +626,8 @@ namespace MediaBrowser.Server.Implementations.Sync
}; };
} }
private const int DatabaseProgressUpdateIntervalSeconds = 2;
private async Task Sync(SyncJobItem jobItem, SyncJob job, Audio item, User user, DeviceProfile profile, bool enableConversion, IProgress<double> progress, CancellationToken cancellationToken) private async Task Sync(SyncJobItem jobItem, SyncJob job, Audio item, User user, DeviceProfile profile, bool enableConversion, IProgress<double> progress, CancellationToken cancellationToken)
{ {
var options = _syncManager.GetAudioOptions(jobItem); var options = _syncManager.GetAudioOptions(jobItem);
@ -640,15 +657,30 @@ namespace MediaBrowser.Server.Implementations.Sync
try try
{ {
var lastJobUpdate = DateTime.MinValue;
var innerProgress = new ActionableProgress<double>();
innerProgress.RegisterAction(async pct =>
{
progress.Report(pct);
if ((DateTime.UtcNow - lastJobUpdate).TotalSeconds >= DatabaseProgressUpdateIntervalSeconds)
{
jobItem.Progress = pct / 2;
await _syncRepo.Update(jobItem).ConfigureAwait(false);
await UpdateJobStatus(job).ConfigureAwait(false);
}
});
jobItem.OutputPath = await _mediaEncoder.EncodeAudio(new EncodingJobOptions(streamInfo, profile) jobItem.OutputPath = await _mediaEncoder.EncodeAudio(new EncodingJobOptions(streamInfo, profile)
{ {
OutputDirectory = jobItem.TemporaryPath OutputDirectory = jobItem.TemporaryPath
}, progress, cancellationToken); }, innerProgress, cancellationToken);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
jobItem.Status = SyncJobItemStatus.Queued; jobItem.Status = SyncJobItemStatus.Queued;
jobItem.Progress = 0;
} }
catch (Exception ex) catch (Exception ex)
{ {