From bb4d8924f43976c56c8b1b49a8931f1a14f9ea5e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 12 Feb 2021 12:15:37 +0000 Subject: [PATCH] Fixed some warnings --- src/.editorconfig | 10 ++ src/Ombi/Attributes/AdminAttribute.cs | 1 - src/Ombi/Ombi.csproj | 4 + src/Ombi/Program.cs | 139 +++++++++++------------- src/Ombi/Properties/launchSettings.json | 4 +- src/Ombi/Startup.cs | 7 +- 6 files changed, 81 insertions(+), 84 deletions(-) create mode 100644 src/.editorconfig diff --git a/src/.editorconfig b/src/.editorconfig new file mode 100644 index 000000000..d5aa43a0a --- /dev/null +++ b/src/.editorconfig @@ -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 diff --git a/src/Ombi/Attributes/AdminAttribute.cs b/src/Ombi/Attributes/AdminAttribute.cs index d92d5d52c..fc2e9332d 100644 --- a/src/Ombi/Attributes/AdminAttribute.cs +++ b/src/Ombi/Attributes/AdminAttribute.cs @@ -8,6 +8,5 @@ namespace Ombi.Attributes { Roles = "Admin"; } - } } \ No newline at end of file diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj index 6ea4049d1..4ae2c07ee 100644 --- a/src/Ombi/Ombi.csproj +++ b/src/Ombi/Ombi.csproj @@ -45,6 +45,10 @@ + + + + diff --git a/src/Ombi/Program.cs b/src/Ombi/Program.cs index f639acf33..1b358ea4b 100644 --- a/src/Ombi/Program.cs +++ b/src/Ombi/Program.cs @@ -49,8 +49,6 @@ namespace Ombi } }); - - Console.WriteLine(HelpOutput(result)); if (baseUrl.HasValue()) { @@ -64,82 +62,75 @@ namespace Ombi demoInstance.Demo = demo; instance.StoragePath = storagePath ?? string.Empty; - var services = new ServiceCollection(); services.ConfigureDatabases(null); - using (var provider = services.BuildServiceProvider()) - { - var settingsDb = provider.GetRequiredService(); - var ombiDb = provider.GetRequiredService(); + using var provider = services.BuildServiceProvider(); + var settingsDb = provider.GetRequiredService(); + var ombiDb = provider.GetRequiredService(); - if (migrate) - { - Console.WriteLine("Migrate in progress..."); + if (migrate) + { + Console.WriteLine("Migrate in progress..."); - var migrationTasks = new List(); - var externalDb = provider.GetRequiredService(); - migrationTasks.Add(settingsDb.Database.MigrateAsync()); - migrationTasks.Add(ombiDb.Database.MigrateAsync()); - migrationTasks.Add(externalDb.Database.MigrateAsync()); + var migrationTasks = new List(); + var externalDb = provider.GetRequiredService(); + migrationTasks.Add(settingsDb.Database.MigrateAsync()); + migrationTasks.Add(ombiDb.Database.MigrateAsync()); + migrationTasks.Add(externalDb.Database.MigrateAsync()); - Task.WaitAll(migrationTasks.ToArray()); + 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) + 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 { - 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(); - } - }); + 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; - } + urlValue = url.Value; + } - if (!url.Value.Equals(host)) + if (!url.Value.Equals(host)) + { + url.Value = UrlArgs; + var strat = settingsDb.Database.CreateExecutionStrategy(); + await strat.ExecuteAsync(async () => { - 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(); - } - }); + using var tran = await settingsDb.Database.BeginTransactionAsync(); + await settingsDb.SaveChangesAsync(); + await tran.CommitAsync(); + }); - urlValue = url.Value; - } - else if (string.IsNullOrEmpty(urlValue)) - { - urlValue = host; - } + urlValue = url.Value; + } + else if (string.IsNullOrEmpty(urlValue)) + { + urlValue = host; + } - await SortOutBaseUrl(baseUrl, settingsDb, ombiSettingsContent); + await SortOutBaseUrl(baseUrl, settingsDb, ombiSettingsContent); - Console.WriteLine($"We are running on {urlValue}"); + Console.WriteLine($"We are running on {urlValue}"); - CreateHostBuilder(args).Build().Run(); - } + CreateHostBuilder(args).Build().Run(); } private static async Task CheckSecurityToken(ApplicationConfiguration securityToken, SettingsContext ctx, StartupSingleton instance) @@ -154,12 +145,10 @@ namespace Ombi var strat = ctx.Database.CreateExecutionStrategy(); await strat.ExecuteAsync(async () => { - using (var tran = await ctx.Database.BeginTransactionAsync()) - { - ctx.ApplicationConfigurations.Add(securityToken); - await ctx.SaveChangesAsync(); - await tran.CommitAsync(); - } + using var tran = await ctx.Database.BeginTransactionAsync(); + ctx.ApplicationConfigurations.Add(securityToken); + await ctx.SaveChangesAsync(); + await tran.CommitAsync(); }); } @@ -170,7 +159,7 @@ namespace Ombi Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => { - webBuilder.ConfigureKestrel(serverOptions => + webBuilder.ConfigureKestrel(_ => { // Set properties and call methods on options }); @@ -204,12 +193,10 @@ namespace Ombi var strat = settingsDb.Database.CreateExecutionStrategy(); await strat.ExecuteAsync(async () => { - using (var tran = await settingsDb.Database.BeginTransactionAsync()) - { - settingsDb.Add(ombiSettingsContent); - await settingsDb.SaveChangesAsync(); - await tran.CommitAsync(); - } + using var tran = await settingsDb.Database.BeginTransactionAsync(); + settingsDb.Add(ombiSettingsContent); + await settingsDb.SaveChangesAsync(); + await tran.CommitAsync(); }); } var ombiSettings = JsonConvert.DeserializeObject(ombiSettingsContent.Content); diff --git a/src/Ombi/Properties/launchSettings.json b/src/Ombi/Properties/launchSettings.json index ab355f92a..0116bc6e8 100644 --- a/src/Ombi/Properties/launchSettings.json +++ b/src/Ombi/Properties/launchSettings.json @@ -14,7 +14,7 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "commandLineArgs": "--host http://*:3577", + "commandLineArgs": "--host http://*:3577" , "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -22,7 +22,7 @@ }, "Ombi": { "commandName": "Project", - "commandLineArgs": "--host http://localhost:3577 ", + "commandLineArgs": "--host http://localhost:3577 --baseUrl /ombi/", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs index 959eec8e0..b52be0528 100644 --- a/src/Ombi/Startup.cs +++ b/src/Ombi/Startup.cs @@ -93,7 +93,7 @@ namespace Ombi .AddNewtonsoftJson(x => x.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore); services.AddOmbiMappingProfile(); - services.AddAutoMapper(expression => { expression.AddCollectionMappers(); }); + services.AddAutoMapper(expression => expression.AddCollectionMappers()); services.RegisterApplicationDependencies(); // Ioc and EF services.AddSwagger(); @@ -110,10 +110,7 @@ namespace Ombi services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Latest); services.AddSignalR(); - services.AddSpaStaticFiles(configuration => - { - configuration.RootPath = "ClientApp/dist"; - }); + services.AddSpaStaticFiles(configuration => configuration.RootPath = "ClientApp/dist"); }