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

Refactor basic store

Browse Source
This commit is contained in:
Kieran
2022-03-07 13:38:53 +00:00
parent 5d07cc93eb
commit 156cec9828
19 changed files with 179 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,11 @@ public class LocalDiskFileMetadataStore : IFileMetadataStore
return GetMeta<TMeta>(id);
}
public ValueTask<VoidFileMeta?> Get(Guid id)
{
return GetMeta<VoidFileMeta>(id);
}
public async ValueTask Set(Guid id, SecretVoidFileMeta meta)
{
var path = MapMeta(id);

13
VoidCat/Services/Files/LocalDiskFileStorage.cs
View File

@@ -30,10 +30,7 @@ public class LocalDiskFileStore : StreamFileStore, IFileStore
public async ValueTask Egress(EgressRequest request, Stream outStream, CancellationToken cts)
{
var path = MapPath(request.Id);
if (!File.Exists(path)) throw new VoidFileNotFoundException(request.Id);
await using var fs = new FileStream(path, FileMode.Open, FileAccess.Read);
await using var fs = await Open(request, cts);
await EgressFromStream(fs, request, outStream, cts);
}
@@ -100,6 +97,14 @@ public class LocalDiskFileStore : StreamFileStore, IFileStore
await _metadataStore.Delete(id);
}
public ValueTask<Stream> Open(EgressRequest request, CancellationToken cts)
{
var path = MapPath(request.Id);
if (!File.Exists(path)) throw new VoidFileNotFoundException(request.Id);
return ValueTask.FromResult<Stream>(new FileStream(path, FileMode.Open, FileAccess.Read));
}
private string MapPath(Guid id) =>
Path.Join(_settings.DataDirectory, FilesDir, id.ToString());
}

46
VoidCat/Services/Files/S3FileMetadataStore.cs
View File

@@ -20,7 +20,33 @@ public class S3FileMetadataStore : IFileMetadataStore
_client = _config.CreateClient();
}
public async ValueTask<TMeta?> Get<TMeta>(Guid id) where TMeta : VoidFileMeta
public ValueTask<TMeta?> Get<TMeta>(Guid id) where TMeta : VoidFileMeta
{
return GetMeta<TMeta>(id);
}
public ValueTask<VoidFileMeta?> Get(Guid id)
{
return GetMeta<VoidFileMeta>(id);
}
public async ValueTask Set(Guid id, SecretVoidFileMeta meta)
{
await _client.PutObjectAsync(new()
{
BucketName = _config.BucketName,
Key = ToKey(id),
ContentBody = JsonConvert.SerializeObject(meta),
ContentType = "application/json"
});
}
public async ValueTask Delete(Guid id)
{
await _client.DeleteObjectAsync(_config.BucketName, ToKey(id));
}
private async ValueTask<TMeta?> GetMeta<TMeta>(Guid id) where TMeta : VoidFileMeta
{
try
{
@@ -48,22 +74,6 @@ public class S3FileMetadataStore : IFileMetadataStore
return default;
}
public async ValueTask Set(Guid id, SecretVoidFileMeta meta)
{
await _client.PutObjectAsync(new()
{
BucketName = _config.BucketName,
Key = ToKey(id),
ContentBody = JsonConvert.SerializeObject(meta),
ContentType = "application/json"
});
}
public async ValueTask Delete(Guid id)
{
await _client.DeleteObjectAsync(_config.BucketName, ToKey(id));
}
private static string ToKey(Guid id) => $"{id}-metadata";
}

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

@@ -40,7 +40,7 @@ public class S3FileStore : StreamFileStore, IFileStore
},
Headers =
{
ContentLength = (long)payload.Meta.Size
ContentLength = (long) payload.Meta.Size
}
};
@@ -50,19 +50,8 @@ public class S3FileStore : StreamFileStore, IFileStore
public async ValueTask Egress(EgressRequest request, Stream outStream, CancellationToken cts)
{
var req = new GetObjectRequest()
{
BucketName = _config.BucketName,
Key = request.Id.ToString()
};
if (request.Ranges.Any())
{
var r = request.Ranges.First();
req.ByteRange = new ByteRange(r.OriginalString);
}
var obj = await _client.GetObjectAsync(req, cts);
await EgressFull(request.Id, obj.ResponseStream, outStream, cts);
await using var stream = await Open(request, cts);
await EgressFull(request.Id, stream, outStream, cts);
}
public async ValueTask<PagedResult<PublicVoidFile>> ListFiles(PagedRequest request)
@@ -124,4 +113,21 @@ public class S3FileStore : StreamFileStore, IFileStore
{
await _client.DeleteObjectAsync(_config.BucketName, id.ToString());
}
public async ValueTask<Stream> Open(EgressRequest request, CancellationToken cts)
{
var req = new GetObjectRequest()
{
BucketName = _config.BucketName,
Key = request.Id.ToString()
};
if (request.Ranges.Any())
{
var r = request.Ranges.First();
req.ByteRange = new ByteRange(r.OriginalString);
}
var obj = await _client.GetObjectAsync(req, cts);
return obj.ResponseStream;
}
}