diff --git a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs index 831d562d6..0e7131f91 100644 --- a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs +++ b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs @@ -133,7 +133,7 @@ namespace Ombi.Schedule.Jobs.Ombi } Ctx.WriteLine("Starting Download"); - await DownloadAsync(download.Url, zipDir); + await DownloadAsync(download.Url, zipDir, c); Ctx.WriteLine("Finished Download"); } catch (Exception e) @@ -195,10 +195,15 @@ namespace Ombi.Schedule.Jobs.Ombi } } - public static async Task DownloadAsync(string requestUri, string filename) + public static async Task DownloadAsync(string requestUri, string filename, PerformContext ctx) { using (var client = new WebClient()) { + ctx.WriteProgressBar(); + client.DownloadProgressChanged += (s, e) => + { + ctx.WriteProgressBar(e.ProgressPercentage); + }; await client.DownloadFileTaskAsync(requestUri, filename); } } diff --git a/src/Ombi/ClientApp/app/login/login.component.html b/src/Ombi/ClientApp/app/login/login.component.html index 9458b07fc..3d8d08d22 100644 --- a/src/Ombi/ClientApp/app/login/login.component.html +++ b/src/Ombi/ClientApp/app/login/login.component.html @@ -9,7 +9,7 @@ include the remember me checkbox
-
+

diff --git a/src/Ombi/ClientApp/app/login/login.component.scss b/src/Ombi/ClientApp/app/login/login.component.scss index f5353b197..6fb148b74 100644 --- a/src/Ombi/ClientApp/app/login/login.component.scss +++ b/src/Ombi/ClientApp/app/login/login.component.scss @@ -23,6 +23,11 @@ landingDiv { background-size: cover; } +img.center { + display: block; + margin: 0 auto; +} + img.bg { /* Set rules to fill background */ min-height: 100%; diff --git a/src/Ombi/ClientApp/app/requests/request.component.html b/src/Ombi/ClientApp/app/requests/request.component.html index d7ad3ecc1..8b9ef976c 100644 --- a/src/Ombi/ClientApp/app/requests/request.component.html +++ b/src/Ombi/ClientApp/app/requests/request.component.html @@ -5,10 +5,10 @@ diff --git a/src/Ombi/ClientApp/app/requests/request.component.ts b/src/Ombi/ClientApp/app/requests/request.component.ts index ab4150443..347479dd7 100644 --- a/src/Ombi/ClientApp/app/requests/request.component.ts +++ b/src/Ombi/ClientApp/app/requests/request.component.ts @@ -8,9 +8,13 @@ export class RequestComponent { public showMovie = true; public showTv = false; - public selectTab() { - this.showMovie = !this.showMovie; - this.showTv = !this.showTv; + public selectMovieTab() { + this.showMovie = true; + this.showTv = false; } + public selectTvTab() { + this.showMovie = false; + this.showTv = true; + } } diff --git a/src/Ombi/ClientApp/app/settings/settingsmenu.component.html b/src/Ombi/ClientApp/app/settings/settingsmenu.component.html index b27e0bd04..3a5048468 100644 --- a/src/Ombi/ClientApp/app/settings/settingsmenu.component.html +++ b/src/Ombi/ClientApp/app/settings/settingsmenu.component.html @@ -1,4 +1,6 @@  -
  • +
  • TV
    • @@ -62,12 +64,11 @@ -
  • +
  • System
      -
    • About
    • Update
    • Logs (Not available)
    • Scheduled Jobs (Not available)
      • diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs index 1db038f70..1aca98b63 100644 --- a/src/Ombi/Startup.cs +++ b/src/Ombi/Startup.cs @@ -168,6 +168,7 @@ namespace Ombi app.UseAuthentication(); //ApiKeyMiddlewear(app, serviceProvider); + app.UseSwagger(); app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1"); diff --git a/src/Ombi/StartupExtensions.cs b/src/Ombi/StartupExtensions.cs index c109d8d1b..97611d627 100644 --- a/src/Ombi/StartupExtensions.cs +++ b/src/Ombi/StartupExtensions.cs @@ -24,7 +24,7 @@ namespace Ombi { Version = "v1", Title = "Ombi Api", - Description = "The API for Ombi, most of these calls require an auth token that you can get from calling POST:\"/connect/token/\" with the body of: \n {\n\"username\":\"YOURUSERNAME\",\n\"password\":\"YOURPASSWORD\"\n} \n" + + Description = "The API for Ombi, most of these calls require an auth token that you can get from calling POST:\"/api/v1/token\" with the body of: \n {\n\"username\":\"YOURUSERNAME\",\n\"password\":\"YOURPASSWORD\"\n} \n" + "You can then use the returned token in the JWT Token field e.g. \"Bearer Token123xxff\"", Contact = new Contact { @@ -44,20 +44,31 @@ namespace Ombi { Console.WriteLine(e); } - c.AddSecurityDefinition("Bearer", new ApiKeyScheme() + c.AddSecurityDefinition("Bearer", new JwtBearer { Description = "JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"", Name = "Authorization", In = "header", - Type = "apiKey" + Type = "apiKey", }); - - c.AddSecurityDefinition("Authentication", new ApiKeyScheme()); + c.OperationFilter(); c.DescribeAllParametersInCamelCase(); }); } + public class JwtBearer : SecurityScheme + { + public string Name { get; set; } + + public string In { get; set; } + + public JwtBearer() + { + this.Type = "bearer"; + } + } + public static void AddAppSettingsValues(this IServiceCollection services, IConfigurationRoot configuration) { services.Configure(configuration.GetSection("ApplicationSettings"));