alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-01 11:52:52 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #1578 from Bond-009/httpresponse

Browse Source 
Replace custom code with Asp.Net Core code
This commit is contained in:
dkanada
2019-08-09 23:26:10 -07:00
committed by GitHub
parent f8ad6655fb 0116190050
commit b5f3f28f41
18 changed files with 372 additions and 1252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
MediaBrowser.Api/Devices/DeviceService.cs
View File

@@ -133,8 +133,21 @@ namespace MediaBrowser.Api.Devices
var album = Request.QueryString["Album"];
var id = Request.QueryString["Id"];
var name = Request.QueryString["Name"];
var req = Request.Response.HttpContext.Request;
if (Request.ContentType.IndexOf("multi", StringComparison.OrdinalIgnoreCase) == -1)
if (req.HasFormContentType)
{
var file = req.Form.Files.Count == 0 ? null : req.Form.Files[0];
return _deviceManager.AcceptCameraUpload(deviceId, file.OpenReadStream(), new LocalFileInfo
{
MimeType = file.ContentType,
Album = album,
Name = name,
Id = id
});
}
else
{
return _deviceManager.AcceptCameraUpload(deviceId, request.RequestStream, new LocalFileInfo
{
@@ -144,18 +157,6 @@ namespace MediaBrowser.Api.Devices
Id = id
});
}
else
{
var file = Request.Files.Length == 0 ? null : Request.Files[0];
return _deviceManager.AcceptCameraUpload(deviceId, file.InputStream, new LocalFileInfo
{
MimeType = file.ContentType,
Album = album,
Name = name,
Id = id
});
}
}
}
}

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@@ -1019,7 +1019,7 @@ namespace MediaBrowser.Api.Playback
foreach (var item in responseHeaders)
{
Request.Response.AddHeader(item.Key, item.Value);
Request.Response.Headers.Add(item.Key, item.Value);
}
}