github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-29 19:18:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some warnings

Browse source
This commit is contained in:
tidusjar 2021-02-12 12:15:37 +00:00
parent 80a3dedf87
commit bb4d8924f4
6 changed files with 89 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/.editorconfig Normal file
View file

@ -0,0 +1,10 @@
[*.cs]
# CS1591: Missing XML comment for publicly visible type or member
dotnet_diagnostic.CS1591.severity = none
# RCS1090: Add call to 'ConfigureAwait' (or vice versa).
dotnet_diagnostic.RCS1090.severity = none
# RCS1036: Remove redundant empty line.
dotnet_diagnostic.RCS1036.severity = none

1
src/Ombi/Attributes/AdminAttribute.cs
View file

@ -8,6 +8,5 @@ namespace Ombi.Attributes
{ {
Roles = "Admin"; Roles = "Admin";
} }
} }
} }

4
src/Ombi/Ombi.csproj
View file

@ -45,6 +45,10 @@
<None Remove="Styles\**" /> <None Remove="Styles\**" />
<None Remove="wwwroot\dist\**" /> <None Remove="wwwroot\dist\**" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="..\.editorconfig" Link=".editorconfig" />
</ItemGroup>
<ItemGroup> <ItemGroup>

155
src/Ombi/Program.cs
View file

@ -49,8 +49,6 @@ namespace Ombi
} }
}); });
Console.WriteLine(HelpOutput(result)); Console.WriteLine(HelpOutput(result));
if (baseUrl.HasValue()) if (baseUrl.HasValue())
{ {
@ -64,82 +62,75 @@ namespace Ombi
demoInstance.Demo = demo; demoInstance.Demo = demo;
instance.StoragePath = storagePath ?? string.Empty; instance.StoragePath = storagePath ?? string.Empty;
var services = new ServiceCollection(); var services = new ServiceCollection();
services.ConfigureDatabases(null); services.ConfigureDatabases(null);
using (var provider = services.BuildServiceProvider()) using var provider = services.BuildServiceProvider();
var settingsDb = provider.GetRequiredService<SettingsContext>();
var ombiDb = provider.GetRequiredService<OmbiContext>();
if (migrate)
{ {
var settingsDb = provider.GetRequiredService<SettingsContext>(); Console.WriteLine("Migrate in progress...");
var ombiDb = provider.GetRequiredService<OmbiContext>();
if (migrate) var migrationTasks = new List<Task>();
{ var externalDb = provider.GetRequiredService<ExternalContext>();
Console.WriteLine("Migrate in progress..."); migrationTasks.Add(settingsDb.Database.MigrateAsync());
migrationTasks.Add(ombiDb.Database.MigrateAsync());
migrationTasks.Add(externalDb.Database.MigrateAsync());
var migrationTasks = new List<Task>(); Task.WaitAll(migrationTasks.ToArray());
var externalDb = provider.GetRequiredService<ExternalContext>();
migrationTasks.Add(settingsDb.Database.MigrateAsync());
migrationTasks.Add(ombiDb.Database.MigrateAsync());
migrationTasks.Add(externalDb.Database.MigrateAsync());
Task.WaitAll(migrationTasks.ToArray()); Console.WriteLine("Migrate complete.");
Environment.Exit(0);
Console.WriteLine("Migrate complete.");
Environment.Exit(0);
}
var config = await settingsDb.ApplicationConfigurations.ToListAsync();
var url = config.FirstOrDefault(x => x.Type == ConfigurationTypes.Url);
var ombiSettingsContent = await settingsDb.Settings.FirstOrDefaultAsync(x => x.SettingsName == "OmbiSettings");
var securityToken = config.FirstOrDefault(x => x.Type == ConfigurationTypes.SecurityToken);
await CheckSecurityToken(securityToken, settingsDb, instance);
if (url == null)
{
url = new ApplicationConfiguration
{
Type = ConfigurationTypes.Url,
Value = "http://*:5000"
};
var strat = settingsDb.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () =>
{
using (var tran = await settingsDb.Database.BeginTransactionAsync())
{
settingsDb.ApplicationConfigurations.Add(url);
await settingsDb.SaveChangesAsync();
await tran.CommitAsync();
}
});
urlValue = url.Value;
}
if (!url.Value.Equals(host))
{
url.Value = UrlArgs;
var strat = settingsDb.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () =>
{
using (var tran = await settingsDb.Database.BeginTransactionAsync())
{
await settingsDb.SaveChangesAsync();
await tran.CommitAsync();
}
});
urlValue = url.Value;
}
else if (string.IsNullOrEmpty(urlValue))
{
urlValue = host;
}
await SortOutBaseUrl(baseUrl, settingsDb, ombiSettingsContent);
Console.WriteLine($"We are running on {urlValue}");
CreateHostBuilder(args).Build().Run();
} }
var config = await settingsDb.ApplicationConfigurations.ToListAsync();
var url = config.FirstOrDefault(x => x.Type == ConfigurationTypes.Url);
var ombiSettingsContent = await settingsDb.Settings.FirstOrDefaultAsync(x => x.SettingsName == "OmbiSettings");
var securityToken = config.FirstOrDefault(x => x.Type == ConfigurationTypes.SecurityToken);
await CheckSecurityToken(securityToken, settingsDb, instance);
if (url == null)
{
url = new ApplicationConfiguration
{
Type = ConfigurationTypes.Url,
Value = "http://*:5000"
};
var strat = settingsDb.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () =>
{
using var tran = await settingsDb.Database.BeginTransactionAsync();
settingsDb.ApplicationConfigurations.Add(url);
await settingsDb.SaveChangesAsync();
await tran.CommitAsync();
});
urlValue = url.Value;
}
if (!url.Value.Equals(host))
{
url.Value = UrlArgs;
var strat = settingsDb.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () =>
{
using var tran = await settingsDb.Database.BeginTransactionAsync();
await settingsDb.SaveChangesAsync();
await tran.CommitAsync();
});
urlValue = url.Value;
}
else if (string.IsNullOrEmpty(urlValue))
{
urlValue = host;
}
await SortOutBaseUrl(baseUrl, settingsDb, ombiSettingsContent);
Console.WriteLine($"We are running on {urlValue}");
CreateHostBuilder(args).Build().Run();
} }
private static async Task CheckSecurityToken(ApplicationConfiguration securityToken, SettingsContext ctx, StartupSingleton instance) private static async Task CheckSecurityToken(ApplicationConfiguration securityToken, SettingsContext ctx, StartupSingleton instance)
@ -154,12 +145,10 @@ namespace Ombi
var strat = ctx.Database.CreateExecutionStrategy(); var strat = ctx.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () => await strat.ExecuteAsync(async () =>
{ {
using (var tran = await ctx.Database.BeginTransactionAsync()) using var tran = await ctx.Database.BeginTransactionAsync();
{ ctx.ApplicationConfigurations.Add(securityToken);
ctx.ApplicationConfigurations.Add(securityToken); await ctx.SaveChangesAsync();
await ctx.SaveChangesAsync(); await tran.CommitAsync();
await tran.CommitAsync();
}
}); });
} }
@ -170,7 +159,7 @@ namespace Ombi
Host.CreateDefaultBuilder(args) Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder => .ConfigureWebHostDefaults(webBuilder =>
{ {
webBuilder.ConfigureKestrel(serverOptions => webBuilder.ConfigureKestrel(_ =>
{ {
// Set properties and call methods on options // Set properties and call methods on options
}); });
@ -204,12 +193,10 @@ namespace Ombi
var strat = settingsDb.Database.CreateExecutionStrategy(); var strat = settingsDb.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () => await strat.ExecuteAsync(async () =>
{ {
using (var tran = await settingsDb.Database.BeginTransactionAsync()) using var tran = await settingsDb.Database.BeginTransactionAsync();
{ settingsDb.Add(ombiSettingsContent);
settingsDb.Add(ombiSettingsContent); await settingsDb.SaveChangesAsync();
await settingsDb.SaveChangesAsync(); await tran.CommitAsync();
await tran.CommitAsync();
}
}); });
} }
var ombiSettings = JsonConvert.DeserializeObject<OmbiSettings>(ombiSettingsContent.Content); var ombiSettings = JsonConvert.DeserializeObject<OmbiSettings>(ombiSettingsContent.Content);

4
src/Ombi/Properties/launchSettings.json
View file

@ -14,7 +14,7 @@
"profiles": { "profiles": {
"IIS Express": { "IIS Express": {
"commandName": "IISExpress", "commandName": "IISExpress",
"commandLineArgs": "--host http://*:3577", "commandLineArgs": "--host http://*:3577" ,
"launchBrowser": true, "launchBrowser": true,
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
@ -22,7 +22,7 @@
}, },
"Ombi": { "Ombi": {
"commandName": "Project", "commandName": "Project",
"commandLineArgs": "--host http://localhost:3577 ", "commandLineArgs": "--host http://localhost:3577 --baseUrl /ombi/",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },

7
src/Ombi/Startup.cs
View file

@ -93,7 +93,7 @@ namespace Ombi
.AddNewtonsoftJson(x => x.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore); .AddNewtonsoftJson(x => x.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore);
services.AddOmbiMappingProfile(); services.AddOmbiMappingProfile();
services.AddAutoMapper(expression => { expression.AddCollectionMappers(); }); services.AddAutoMapper(expression => expression.AddCollectionMappers());
services.RegisterApplicationDependencies(); // Ioc and EF services.RegisterApplicationDependencies(); // Ioc and EF
services.AddSwagger(); services.AddSwagger();
@ -110,10 +110,7 @@ namespace Ombi
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Latest); services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddSignalR(); services.AddSignalR();
services.AddSpaStaticFiles(configuration => services.AddSpaStaticFiles(configuration => configuration.RootPath = "ClientApp/dist");
{
configuration.RootPath = "ClientApp/dist";
});
} }