ToxicMushroom/mare.server
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.server.git synced 2025-12-13 18:04:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

reimplment ReadAsync for BlockFileDataStream/SubStream

Browse source
This commit is contained in:
Stanley Dimant 2024-11-04 11:51:13 +01:00
parent 7acd36bb79
commit c80848fa2e
5 changed files with 128 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/CacheController.cs
View file

@ -36,9 +36,9 @@ public class CacheController : ControllerBase
long requestSize = 0;
List<BlockFileDataSubstream> substreams = new();
foreach (var file in request.FileIds)
foreach (var fileHash in request.FileIds)
{
var fs = await _cachedFileProvider.GetAndDownloadFileStream(file);
var fs = await _cachedFileProvider.DownloadAndGetLocalFileInfo(fileHash).ConfigureAwait(false);
if (fs == null) continue;
substreams.Add(new(fs));

8
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/DistributionController.cs
View file

@ -17,13 +17,13 @@ public class DistributionController : ControllerBase
[HttpGet(MareFiles.Distribution_Get)]
[Authorize(Policy = "Internal")]
public async Task<IActionResult> GetFile(string file)
public async Task<IActionResult> GetFile(string fileHash)
{
_logger.LogInformation($"GetFile:{MareUser}:{file}");
_logger.LogInformation($"GetFile:{MareUser}:{fileHash}");
var fs = await _cachedFileProvider.GetAndDownloadFileStream(file);
var fs = await _cachedFileProvider.DownloadAndGetLocalFileInfo(fileHash);
if (fs == null) return NotFound();
return File(fs, "application/octet-stream");
return PhysicalFile(fs.FullName, "application/octet-stream");
}
}