starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 01:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed dashboard caching option

Browse Source
This commit is contained in:
Luke Pulverenti
2013-03-24 22:41:27 -04:00
parent 2bdd9cc1f2
commit 8b32e3292a
4 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,13 +43,46 @@ namespace MediaBrowser.Server.Implementations.HttpServer
/// <returns>System.Object.</returns>
public object GetResult(object content, string contentType, IDictionary<string, string> responseHeaders = null)
{
var result = new HttpResult(content, contentType);
return GetHttpResult(content, contentType, responseHeaders);
}
/// <summary>
/// Gets the HTTP result.
/// </summary>
/// <param name="content">The content.</param>
/// <param name="contentType">Type of the content.</param>
/// <param name="responseHeaders">The response headers.</param>
/// <returns>IHasOptions.</returns>
private IHasOptions GetHttpResult(object content, string contentType, IDictionary<string, string> responseHeaders = null)
{
IHasOptions result;
var stream = content as Stream;
if (stream != null)
{
result = new StreamWriter(stream, contentType, _logger);
}
else
{
var bytes = content as byte[];
if (bytes != null)
{
result = new StreamWriter(bytes, contentType, _logger);
}
else
{
result = new HttpResult(content, contentType);
}
}
if (responseHeaders != null)
{
AddResponseHeaders(result, responseHeaders);
}
return result;
}
@@ -376,7 +409,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (isHeadRequest)
{
return new HttpResult(new byte[] { }, contentType);
return GetHttpResult(new byte[] { }, contentType);
}
return new StreamWriter(stream, contentType, _logger);
@@ -384,7 +417,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (isHeadRequest)
{
return new HttpResult(new byte[] { }, contentType);
return GetHttpResult(new byte[] { }, contentType);
}
string content;