Solar/Swarm
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Some drive service changes

Browse Source
This commit is contained in:
LittleSheep
2025-07-27 12:03:41 +08:00
parent 05284760a7
commit e7e6c258e2
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DysonNetwork.Drive/Storage/FileController.cs
View File

@@ -35,6 +35,7 @@ public class FileController(
var file = await fs.GetFileAsync(id);
if (file is null) return NotFound();
if (file.IsMarkedRecycle) return StatusCode(StatusCodes.Status410Gone, "The file has been recycled.");
if (!string.IsNullOrWhiteSpace(file.StorageUrl)) return Redirect(file.StorageUrl);
@@ -149,7 +150,7 @@ public class FileController(
.AsQueryable();
if (pool.HasValue) query = query.Where(e => e.PoolId == pool);
var total = await query.CountAsync();
Response.Headers.Append("X-Total", total.ToString());

52
DysonNetwork.Drive/Storage/FileService.cs
View File

@@ -153,25 +153,26 @@ public class FileService(
IsEncrypted = !string.IsNullOrWhiteSpace(encryptPassword) && pool.PolicyConfig.AllowEncryption
};
var existingFile = await db.Files.AsNoTracking().FirstOrDefaultAsync(f => f.Hash == hash);
file.StorageId = existingFile?.StorageId ?? file.Id;
if (existingFile is not null)
{
file.FileMeta = existingFile.FileMeta;
file.HasCompression = existingFile.HasCompression;
file.SensitiveMarks = existingFile.SensitiveMarks;
file.MimeType = existingFile.MimeType;
file.UploadedAt = existingFile.UploadedAt;
file.PoolId = existingFile.PoolId;
db.Files.Add(file);
await db.SaveChangesAsync();
// Since the file content is a duplicate, we can delete the new upload and we are done.
await stream.DisposeAsync();
await store.DeleteFileAsync(file.Id, CancellationToken.None);
return file;
}
// TODO: Enable the feature later
// var existingFile = await db.Files.AsNoTracking().FirstOrDefaultAsync(f => f.Hash == hash);
// file.StorageId = existingFile?.StorageId ?? file.Id;
//
// if (existingFile is not null)
// {
// file.FileMeta = existingFile.FileMeta;
// file.HasCompression = existingFile.HasCompression;
// file.SensitiveMarks = existingFile.SensitiveMarks;
// file.MimeType = existingFile.MimeType;
// file.UploadedAt = existingFile.UploadedAt;
// file.PoolId = existingFile.PoolId;
//
// db.Files.Add(file);
// await db.SaveChangesAsync();
// // Since the file content is a duplicate, we can delete the new upload and we are done.
// await stream.DisposeAsync();
// await store.DeleteFileAsync(file.Id, CancellationToken.None);
// return file;
// }
// Extract metadata on the current thread for a faster initial response
if (!pool.PolicyConfig.NoMetadata)
@@ -540,11 +541,11 @@ public class FileService(
public async Task DeleteFileAsync(CloudFile file)
{
await DeleteFileDataAsync(file);
db.Remove(file);
await db.SaveChangesAsync();
await _PurgeCacheAsync(file.Id);
await DeleteFileDataAsync(file);
}
public async Task DeleteFileDataAsync(CloudFile file)
@@ -559,17 +560,10 @@ public class FileService(
.ToListAsync();
// Check if any of these files are referenced
var anyReferenced = false;
if (sameOriginFiles.Count != 0)
{
anyReferenced = await db.FileReferences
.Where(r => sameOriginFiles.Contains(r.FileId))
.AnyAsync();
}
return;
// If any other file with the same storage ID is referenced, don't delete the actual file data
if (anyReferenced) return;
var dest = await GetRemoteStorageConfig(file.PoolId.Value);
if (dest is null) throw new InvalidOperationException($"No remote storage configured for pool {file.PoolId}");
var client = CreateMinioClient(dest);