t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Single file transfer (#26)

Browse Source 
* move to single file transfer for server

* fix cache get

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
This commit is contained in:
rootdarkarchon
2023-08-01 16:48:08 +02:00
committed by GitHub
parent 715bd87907
commit fd0327b2c4
7 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs
View File

@@ -36,7 +36,7 @@ public class RequestController : ControllerBase
[HttpPost]
[Route(MareFiles.Request_Enqueue)]
public async Task<IActionResult> PreRequestFilesAsync([FromBody] List<string> files)
public async Task<IActionResult> PreRequestFilesAsync([FromBody] IEnumerable<string> files)
{
try
{
@@ -47,43 +47,26 @@ public class RequestController : ControllerBase
_cachedFileProvider.DownloadFileWhenRequired(file);
}
return Ok();
}
catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
}
}
Guid g = Guid.NewGuid();
await _requestQueue.EnqueueUser(new(g, MareUser, files.ToList()));
[HttpGet]
[Route(MareFiles.Request_RequestFile)]
public async Task<IActionResult> RequestFile(string file)
{
Guid g = Guid.NewGuid();
try
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
_cachedFileProvider.DownloadFileWhenRequired(file);
return Ok(g);
}
catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
await _requestQueue.EnqueueUser(new(g, MareUser, file));
}
}
[HttpGet]
[Route(MareFiles.Request_Check)]
public async Task<IActionResult> CheckQueueAsync(Guid requestId, string file)
public async Task<IActionResult> CheckQueueAsync(Guid requestId, [FromBody] IEnumerable<string> files)
{
try
{
if (!_requestQueue.StillEnqueued(requestId, MareUser))
await _requestQueue.EnqueueUser(new(requestId, MareUser, file));
await _requestQueue.EnqueueUser(new(requestId, MareUser, files.ToList()));
return Ok();
}
catch (OperationCanceledException) { return BadRequest(); }