Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Timothy Baldridge
2021-11-10 16:56:52 -07:00
parent 2661450e28
commit a2da07eff3
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Wabbajack.Compiler.Test/Startup.cs
View File

@ -19,7 +19,6 @@ public class Startup
}); });
service.AddScoped<ModListHarness>(); service.AddScoped<ModListHarness>();
service.AddSingleton<Configuration>();
} }
public void Configure(ILoggerFactory loggerFactory, ITestOutputHelperAccessor accessor) public void Configure(ILoggerFactory loggerFactory, ITestOutputHelperAccessor accessor)

29
Wabbajack.Services.OSIntegrated/ServiceExtensions.cs
View File

@ -64,6 +64,22 @@ public static class ServiceExtensions
return ((int) s.MaxTasks, s.MaxThroughput); return ((int) s.MaxTasks, s.MaxThroughput);
}; };
} }
// Settings
service.AddSingleton(s => new Configuration
{
EncryptedDataLocation = KnownFolders.WabbajackAppLocal.Combine("encrypted"),
ModListsDownloadLocation = KnownFolders.EntryPoint.Combine("downloaded_mod_lists"),
SavedSettingsLocation = KnownFolders.WabbajackAppLocal.Combine("saved_settings"),
LogLocation = KnownFolders.EntryPoint.Combine("logs"),
ImageCacheLocation = KnownFolders.WabbajackAppLocal.Combine("image_cache")
});
service.AddSingleton<SettingsManager>();
service.AddSingleton<ResourceSettingsManager>();
// Resources
service.AddAllSingleton<IResource, IResource<DownloadDispatcher>>(s => service.AddAllSingleton<IResource, IResource<DownloadDispatcher>>(s =>
new Resource<DownloadDispatcher>("Downloads", GetSettings(s, "Downloads"))); new Resource<DownloadDispatcher>("Downloads", GetSettings(s, "Downloads")));
@ -86,7 +102,6 @@ public static class ServiceExtensions
// Networking // Networking
service.AddSingleton<HttpClient>(); service.AddSingleton<HttpClient>();
service.AddAllSingleton<IHttpDownloader, SingleThreadedDownloader>(); service.AddAllSingleton<IHttpDownloader, SingleThreadedDownloader>();
service.AddSingleton<Configuration>();
service.AddSingleton<Client>(); service.AddSingleton<Client>();
service.AddSingleton<WriteOnlyClient>(); service.AddSingleton<WriteOnlyClient>();
@ -135,19 +150,7 @@ public static class ServiceExtensions
Version = version Version = version
}); });
// Settings
service.AddSingleton(s => new Configuration
{
EncryptedDataLocation = KnownFolders.WabbajackAppLocal.Combine("encrypted"),
ModListsDownloadLocation = KnownFolders.EntryPoint.Combine("downloaded_mod_lists"),
SavedSettingsLocation = KnownFolders.WabbajackAppLocal.Combine("saved_settings"),
LogLocation = KnownFolders.EntryPoint.Combine("logs"),
ImageCacheLocation = KnownFolders.WabbajackAppLocal.Combine("image_cache")
});
service.AddSingleton<SettingsManager>();
service.AddSingleton<ResourceSettingsManager>();
return service; return service;
} }