Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-09 03:04:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Finishing genre link equality

Browse Source
This commit is contained in:
Zoe Roux 2021-01-29 23:02:07 +01:00
parent 1902740d2f
commit bef687bbb1
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kyoo.Common/Models/Resources/IResource.cs
View File

@ -40,7 +40,7 @@ namespace Kyoo.Models
}
}
public class LinkComparer<T, T1, T2> : IEqualityComparer<T>>
public class LinkComparer<T, T1, T2> : IEqualityComparer<T>
where T : IResourceLink<T1, T2>
where T1 : IResource
where T2 : IResource

42
Kyoo.Common/Utility.cs
View File

@ -207,23 +207,49 @@ namespace Kyoo
return types.Any(x => x.IsGenericType && x.GetGenericTypeDefinition() == genericType);
}
public static Type GetGenericDefinition([NotNull] Type type, [NotNull] Type genericType)
{
if (type == null)
throw new ArgumentNullException(nameof(type));
if (genericType == null)
throw new ArgumentNullException(nameof(genericType));
if (!genericType.IsGenericType)
throw new ArgumentException($"{nameof(genericType)} is not a generic type.");
IEnumerable<Type> types = genericType.IsInterface
? type.GetInterfaces()
: type.GetInheritanceTree();
return types.FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == genericType);
}
public static T RunGenericMethod<T>(
[NotNull] Type owner,
[NotNull] string methodName,
[NotNull] Type type,
params object[] args)
{
return RunGenericMethod<T>(owner, methodName, new[] {type}, args);
}
public static T RunGenericMethod<T>(
[NotNull] Type owner,
[NotNull] string methodName,
[NotNull] Type[] types,
params object[] args)
{
if (owner == null)
throw new ArgumentNullException(nameof(owner));
if (methodName == null)
throw new ArgumentNullException(nameof(methodName));
if (type == null)
throw new ArgumentNullException(nameof(type));
if (types == null)
throw new ArgumentNullException(nameof(types));
if (types.Length < 1)
throw new ArgumentException($"The {nameof(types)} array is empty. At least one type is needed.");
MethodInfo method = owner.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
.SingleOrDefault(x => x.Name == methodName && x.GetParameters().Length == args.Length);
if (method == null)
throw new NullReferenceException($"A method named {methodName} with {args.Length} arguments could not be found on {owner.FullName}");
return (T)method.MakeGenericMethod(type).Invoke(null, args?.ToArray());
return (T)method.MakeGenericMethod(types).Invoke(null, args?.ToArray());
}
public static T RunGenericMethod<T>(
@ -356,11 +382,11 @@ namespace Kyoo
Type type = GetEnumerableType(eno);
if (typeof(IResource).IsAssignableFrom(type))
return ResourceEquals(eno.Cast<IResource>(), ens.Cast<IResource>());
// TODO find a way to run the equality checker with the right check.
// TODO maybe create a GetTypeOfGenericType
// if (IsOfGenericType(type, typeof(IResourceLink<,>)))
// return ResourceEquals(eno.Cast<IResourceLink<,>>())
return RunGenericMethod<bool>(typeof(Enumerable), "SequenceEqual", type, first, second);
Type genericDefinition = GetGenericDefinition(type, typeof(IResourceLink<,>));
if (genericDefinition == null)
return RunGenericMethod<bool>(typeof(Enumerable), "SequenceEqual", type, first, second);
Type[] types = genericDefinition.GetGenericArguments().Prepend(type).ToArray();
return RunGenericMethod<bool>(typeof(Utility), "LinkEquals", types, eno, ens);
}
public static bool ResourceEquals<T>([CanBeNull] T first, [CanBeNull] T second)

2
Kyoo/Controllers/Repositories/GenreRepository.cs
View File

@ -4,9 +4,7 @@ using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using Kyoo.Models;
using Kyoo.Models.Exceptions;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
namespace Kyoo.Controllers
{