SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix dozens of issues in new drive system

Browse Source
This commit is contained in:
LittleSheep
2026-01-12 00:04:29 +08:00
parent 6d5303f99c
commit c052f17623
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DysonNetwork.Drive/Index/FileIndexController.cs
View File

@@ -546,6 +546,7 @@ public class FileIndexController(
var fileIndexes = await db.FileIndexes var fileIndexes = await db.FileIndexes
.Where(fi => fi.AccountId == accountId) .Where(fi => fi.AccountId == accountId)
.Include(fi => fi.File) .Include(fi => fi.File)
.ThenInclude(f => f.Object)
.Where(fi => .Where(fi =>
(string.IsNullOrEmpty(path) || fi.Path == FileIndexService.NormalizePath(path)) && (string.IsNullOrEmpty(path) || fi.Path == FileIndexService.NormalizePath(path)) &&
(fi.File.Name.ToLower().Contains(searchTerm) || (fi.File.Name.ToLower().Contains(searchTerm) ||

2
DysonNetwork.Drive/Index/FileIndexService.cs
View File

@@ -141,6 +141,7 @@ public class FileIndexService(AppDatabase db)
return await db.FileIndexes return await db.FileIndexes
.Where(fi => fi.AccountId == accountId && fi.Path == normalizedPath) .Where(fi => fi.AccountId == accountId && fi.Path == normalizedPath)
.Include(fi => fi.File) .Include(fi => fi.File)
.ThenInclude(f => f.Object)
.ToListAsync(); .ToListAsync();
} }
@@ -154,6 +155,7 @@ public class FileIndexService(AppDatabase db)
return await db.FileIndexes return await db.FileIndexes
.Where(fi => fi.FileId == fileId) .Where(fi => fi.FileId == fileId)
.Include(fi => fi.File) .Include(fi => fi.File)
.ThenInclude(f => f.Object)
.ToListAsync(); .ToListAsync();
} }

5
DysonNetwork.Drive/Startup/BroadcastEventHandler.cs
View File

@@ -156,7 +156,10 @@ public class BroadcastEventHandler(
logger.LogInformation("Processing file {FileId} in background...", fileId); logger.LogInformation("Processing file {FileId} in background...", fileId);
var fileToUpdate = await scopedDb.Files.AsNoTracking().FirstAsync(f => f.Id == fileId); var fileToUpdate = await scopedDb.Files
.AsNoTracking()
.Include(f => f.Object)
.FirstAsync(f => f.Id == fileId);
// Find the upload task associated with this file // Find the upload task associated with this file
var baseTask = await scopedDb.Tasks var baseTask = await scopedDb.Tasks