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

⏪ Rollback some changes in drive

Browse Source
This commit is contained in:
LittleSheep
2026-01-01 23:37:51 +08:00
parent 683fbf1a68
commit 50a3c2d038
2 changed files with 47 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DysonNetwork.Drive/AppDatabase.cs
View File

@@ -27,7 +27,6 @@ public class AppDatabase(
public DbSet<SnCloudFileIndex> FileIndexes { get; set; } public DbSet<SnCloudFileIndex> FileIndexes { get; set; }
public DbSet<PersistentTask> Tasks { get; set; } = null!; public DbSet<PersistentTask> Tasks { get; set; } = null!;
public DbSet<PersistentUploadTask> UploadTasks { get; set; } = null!; // Backward compatibility
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{ {
@@ -42,18 +41,6 @@ public class AppDatabase(
base.OnConfiguring(optionsBuilder); base.OnConfiguring(optionsBuilder);
} }
public static void ConfigureOptions(IServiceProvider serviceProvider, DbContextOptionsBuilder optionsBuilder)
{
var configuration = serviceProvider.GetRequiredService<IConfiguration>();
optionsBuilder.UseNpgsql(
configuration.GetConnectionString("App"),
opt => opt
.ConfigureDataSource(optSource => optSource.EnableDynamicJson())
.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery)
.UseNodaTime()
).UseSnakeCaseNamingConvention();
}
protected override void OnModelCreating(ModelBuilder modelBuilder) protected override void OnModelCreating(ModelBuilder modelBuilder)
{ {
base.OnModelCreating(modelBuilder); base.OnModelCreating(modelBuilder);

13
DysonNetwork.Drive/Startup/ServiceCollectionExtensions.cs
View File

@@ -9,9 +9,11 @@ namespace DysonNetwork.Drive.Startup;
public static class ServiceCollectionExtensions public static class ServiceCollectionExtensions
{ {
public static IServiceCollection AddAppServices(this IServiceCollection services, IConfiguration configuration) extension(IServiceCollection services)
{ {
services.AddDbContextPool<AppDatabase>(AppDatabase.ConfigureOptions); public IServiceCollection AddAppServices(IConfiguration configuration)
{
services.AddDbContext<AppDatabase>();
services.AddHttpContextAccessor(); services.AddHttpContextAccessor();
services.AddHttpClient(); services.AddHttpClient();
@@ -37,20 +39,20 @@ public static class ServiceCollectionExtensions
return services; return services;
} }
public static IServiceCollection AddAppAuthentication(this IServiceCollection services) public IServiceCollection AddAppAuthentication()
{ {
services.AddAuthorization(); services.AddAuthorization();
return services; return services;
} }
public static IServiceCollection AddAppFlushHandlers(this IServiceCollection services) public IServiceCollection AddAppFlushHandlers()
{ {
services.AddSingleton<FlushBufferService>(); services.AddSingleton<FlushBufferService>();
return services; return services;
} }
public static IServiceCollection AddAppBusinessServices(this IServiceCollection services) public IServiceCollection AddAppBusinessServices()
{ {
services.AddScoped<Storage.FileService>(); services.AddScoped<Storage.FileService>();
services.AddScoped<Storage.FileReferenceService>(); services.AddScoped<Storage.FileReferenceService>();
@@ -63,4 +65,5 @@ public static class ServiceCollectionExtensions
return services; return services;
} }
}
} }