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

update sync progress display

Browse Source
This commit is contained in:
Luke Pulverenti 2015-10-02 14:30:27 -04:00
parent 713083b34a
commit e76e8bb96c
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Api/Sync/SyncService.cs
View File

@ -244,7 +244,15 @@ namespace MediaBrowser.Api.Sync
var task = _syncManager.ReportSyncJobItemTransferBeginning(request.Id);
Task.WaitAll(task);
return ToStaticFileResult(jobItem.OutputPath);
return ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions
{
Path = jobItem.OutputPath,
OnError = () =>
{
var failedTask = _syncManager.ReportSyncJobItemTransferFailed(request.Id);
Task.WaitAll(failedTask);
}
});
}
public object Get(GetSyncDialogOptions request)

1
MediaBrowser.Controller/Net/StaticResultOptions.cs
View File

@ -19,6 +19,7 @@ namespace MediaBrowser.Controller.Net
public IDictionary<string, string> ResponseHeaders { get; set; }
public Action OnComplete { get; set; }
public Action OnError { get; set; }
public StaticResultOptions()
{

3
MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
View File

@ -476,7 +476,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
return new StreamWriter(stream, contentType, _logger)
{
OnComplete = options.OnComplete
OnComplete = options.OnComplete,
OnError = options.OnError
};
}

6
MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
View File

@ -36,6 +36,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
}
public Action OnComplete { get; set; }
public Action OnError { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="StreamWriter" /> class.
@ -102,6 +103,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{
Logger.ErrorException("Error streaming data", ex);
if (OnError != null)
{
OnError();
}
throw;
}
finally