highperfocused/void.cat
1
0
Fork 0
mirror of https://git.v0l.io/Kieran/void.cat.git synced 2025-11-15 07:57:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Kieran
2022-07-25 20:38:58 +01:00
parent 007e11571b
commit ad59bdd96c
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
VoidCat/Controllers/DownloadController.cs
View File

@@ -45,7 +45,7 @@ public class DownloadController : Controller
var voidFile = await SetupDownload(gid); var voidFile = await SetupDownload(gid);
if (voidFile == default) return; if (voidFile == default) return;
var egressReq = new EgressRequest(gid, GetRanges(Request, (long) voidFile!.Metadata!.Size)); var egressReq = new EgressRequest(gid, GetRanges(Request, (long)voidFile!.Metadata!.Size));
if (egressReq.Ranges.Count() > 1) if (egressReq.Ranges.Count() > 1)
{ {
_logger.LogWarning("Multi-range request not supported!"); _logger.LogWarning("Multi-range request not supported!");
@@ -57,10 +57,10 @@ public class DownloadController : Controller
} }
else if (egressReq.Ranges.Count() == 1) else if (egressReq.Ranges.Count() == 1)
{ {
Response.StatusCode = (int) HttpStatusCode.PartialContent; Response.StatusCode = (int)HttpStatusCode.PartialContent;
if (egressReq.Ranges.Sum(a => a.Size) == 0) if (egressReq.Ranges.Sum(a => a.Size) == 0)
{ {
Response.StatusCode = (int) HttpStatusCode.RequestedRangeNotSatisfiable; Response.StatusCode = (int)HttpStatusCode.RequestedRangeNotSatisfiable;
return; return;
} }
} }
@@ -105,7 +105,7 @@ public class DownloadController : Controller
var orderId = Request.Headers.GetHeader("V-OrderId") ?? Request.Query["orderId"]; var orderId = Request.Headers.GetHeader("V-OrderId") ?? Request.Query["orderId"];
if (!await IsOrderPaid(orderId)) if (!await IsOrderPaid(orderId))
{ {
Response.StatusCode = (int) HttpStatusCode.PaymentRequired; Response.StatusCode = (int)HttpStatusCode.PaymentRequired;
return default; return default;
} }
} }

5
VoidCat/Services/Files/S3FileStore.cs
View File

@@ -41,12 +41,12 @@ public class S3FileStore : StreamFileStore, IFileStore
ChecksumSHA256 = payload.Hash != default ? Convert.ToBase64String(payload.Hash!.FromHex()) : null, ChecksumSHA256 = payload.Hash != default ? Convert.ToBase64String(payload.Hash!.FromHex()) : null,
StreamTransferProgress = (s, e) => StreamTransferProgress = (s, e) =>
{ {
_statsCollector.TrackIngress(payload.Id, (ulong) e.IncrementTransferred) _statsCollector.TrackIngress(payload.Id, (ulong)e.IncrementTransferred)
.GetAwaiter().GetResult(); .GetAwaiter().GetResult();
}, },
Headers = Headers =
{ {
ContentLength = (long) payload.Meta.Size ContentLength = (long)payload.Meta.Size
} }
}; };
@@ -145,6 +145,7 @@ public class S3FileStore : StreamFileStore, IFileStore
BucketName = _config.BucketName, BucketName = _config.BucketName,
Key = request.Id.ToString() Key = request.Id.ToString()
}; };
if (request.Ranges.Any()) if (request.Ranges.Any())
{ {
var r = request.Ranges.First(); var r = request.Ranges.First();