From aa63c9e8f29b627b43559e4c9cd51479524b4468 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sun, 5 Jul 2020 23:20:43 +0200 Subject: [PATCH] Cleaning up --- Kyoo.Common/Utility.cs | 4 +--- Kyoo/Controllers/Repositories/ShowRepository.cs | 3 ++- Kyoo/Startup.cs | 2 +- Kyoo/Views/API/ShowsAPI.cs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Kyoo.Common/Utility.cs b/Kyoo.Common/Utility.cs index 31afb1a7..4fe2006e 100644 --- a/Kyoo.Common/Utility.cs +++ b/Kyoo.Common/Utility.cs @@ -277,7 +277,7 @@ namespace Kyoo ? null : Convert.ChangeType(value, propertyType); ConstantExpression valueExpr = Expression.Constant(val, property.PropertyType); - + Expression condition = operand switch { "eq" => Expression.Equal(propertyExpr, valueExpr), @@ -286,8 +286,6 @@ namespace Kyoo "lte" => StringCompatibleExpression(Expression.LessThanOrEqual, propertyExpr, valueExpr), "gt" => StringCompatibleExpression(Expression.GreaterThan, propertyExpr, valueExpr), "gte" => StringCompatibleExpression(Expression.GreaterThanOrEqual, propertyExpr, valueExpr), - // TODO Implement the Like expression - "like" => throw new NotImplementedException("Like not implemented yet"), _ => throw new ArgumentException($"Invalid operand: {operand}") }; diff --git a/Kyoo/Controllers/Repositories/ShowRepository.cs b/Kyoo/Controllers/Repositories/ShowRepository.cs index b6b611cb..30b961f3 100644 --- a/Kyoo/Controllers/Repositories/ShowRepository.cs +++ b/Kyoo/Controllers/Repositories/ShowRepository.cs @@ -92,7 +92,8 @@ namespace Kyoo.Controllers (ParameterExpression)((MemberExpression)sortKey.Body).Expression )); } - query = query.Take(page.Count); + if (page.Count > 0) + query = query.Take(page.Count); return await query.ToListAsync(); } diff --git a/Kyoo/Startup.cs b/Kyoo/Startup.cs index c406472c..4c3984b9 100644 --- a/Kyoo/Startup.cs +++ b/Kyoo/Startup.cs @@ -48,7 +48,7 @@ namespace Kyoo options.UseLazyLoadingProxies() .UseNpgsql(_configuration.GetConnectionString("Database")); // .EnableSensitiveDataLogging() - // .UseLoggerFactory(LoggerFactory.Create(builder => builder.AddConsole())); + //.UseLoggerFactory(LoggerFactory.Create(builder => builder.AddConsole())); }, ServiceLifetime.Transient); services.AddDbContext(options => diff --git a/Kyoo/Views/API/ShowsAPI.cs b/Kyoo/Views/API/ShowsAPI.cs index d89625f8..58f9d504 100644 --- a/Kyoo/Views/API/ShowsAPI.cs +++ b/Kyoo/Views/API/ShowsAPI.cs @@ -48,7 +48,7 @@ namespace Kyoo.Api where.Remove("sortBy"); where.Remove("limit"); where.Remove("afterID"); - if (limit <= 0) + if (limit == 0) limit = 20; ICollection shows;