Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-24 02:02:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for datetimes

Browse Source
This commit is contained in:
Zoe Roux 2023-11-24 00:46:16 +01:00
parent 0ff74d331f
commit 07afbdaa4b
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
back/src/Kyoo.Abstractions/Models/Utils/Filter.cs
View File

@ -17,11 +17,13 @@
// along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using Kyoo.Abstractions.Models.Attributes;
using Sprache;
namespace Kyoo.Abstractions.Models.Utils;
@ -115,9 +117,12 @@ public abstract record Filter<T> : Filter
return property.Then(prop =>
{
PropertyInfo? propInfo = typeof(T).GetProperty(prop, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance);
Type[] types = typeof(T).GetCustomAttribute<OneOfAttribute>()?.Types ?? new[] { typeof(T) };
PropertyInfo? propInfo = types
.Select(x => x.GetProperty(prop, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance))
.FirstOrDefault();
if (propInfo == null)
throw new ValidationException($"The given filter {property} is invalid.");
throw new ValidationException($"The given filter '{prop}' is invalid.");
Parser<object> value;
@ -149,14 +154,25 @@ public abstract record Filter<T> : Filter
throw new ValidationException($"Invalid enum value. Unexpected {x}");
});
}
// TODO: Support arrays
else if (propInfo.PropertyType == typeof(DateTime))
{
value =
from year in Parse.Digit.Repeat(4).Text().Select(int.Parse)
from yd in Parse.Char('-')
from mouth in Parse.Digit.Repeat(2).Text().Select(int.Parse)
from md in Parse.Char('-')
from day in Parse.Digit.Repeat(2).Text().Select(int.Parse)
select new DateTime(year, mouth, day) as object;
}
else if (typeof(IEnumerable).IsAssignableFrom(propInfo.PropertyType))
throw new ValidationException("Can't filter a list with a default comparator, use the 'in' filter.");
else
throw new ValidationException("Unfilterable field found");
return
from eq in op
from val in value
select apply(prop, val);
select apply(propInfo.Name, val);
});
}

4
back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs
View File

@ -113,7 +113,7 @@ namespace Kyoo.Core.Controllers
return _Sort(query, sortBy, false).ThenBy(x => x.Id);
}
protected static Expression<Func<T, bool>> ParseFilter(Filter<T>? filter)
protected Expression<Func<T, bool>> ParseFilter(Filter<T>? filter)
{
if (filter == null)
return x => true;
@ -259,7 +259,7 @@ namespace Kyoo.Core.Controllers
}
else
GetRandomSortKeys(seed, out xkey, out rkey);
BinaryExpression lastCompare = ApiHelper.StringCompatibleExpression(comparer, xkey, rkey);
BinaryExpression lastCompare = null;//ApiHelper.StringCompatibleExpression(comparer, xkey, rkey);
// Comparing a value with null always return false for nulls so we must add nulls to the results manually.
// Postgres sorts them after values so we will do the same