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

Fixing the expression convertor for imbricked lambdas

Browse Source
This commit is contained in:
Zoe Roux 2020-09-12 00:49:28 +02:00
parent fb14eb4ef2
commit 75c9d703f7
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Kyoo.Common/Utility.cs
View File

@ -342,26 +342,18 @@ namespace Kyoo
}
internal Expression<TTo> VisitAndConvert()
{
return (Expression<TTo>)RunGenericMethod(
this,
"VisitLambda",
_expression.GetType().GetGenericArguments().First(),
_expression);
}
protected override Expression VisitLambda<T>(Expression<T> node)
{
Type returnType = _expression.Type.GetGenericArguments().Last();
Expression body = node.ReturnType == returnType
? Visit(node.Body)
: Expression.Convert(Visit(node.Body)!, returnType);
Expression body = _expression.ReturnType == returnType
? Visit(_expression.Body)
: Expression.Convert(Visit(_expression.Body)!, returnType);
return Expression.Lambda<TTo>(body!, _newParams);
}
protected override Expression VisitParameter(ParameterExpression node)
{
return _newParams.First(x => x.Name == node.Name);
Console.WriteLine($"Rewritting parameter: {node.Name}");
return _newParams.FirstOrDefault(x => x.Name == node.Name) ?? node;
}
}
}

2
Kyoo.CommonAPI/ApiHelper.cs
View File

@ -23,6 +23,8 @@ namespace Kyoo.CommonApi
public static Expression<Func<T, bool>> ParseWhere<T>(Dictionary<string, string> where,
Expression<Func<T, bool>> defaultWhere = null)
{
return defaultWhere;
if (where == null || where.Count == 0)
return defaultWhere;