Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-11-03 19:17:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the loader

Browse Source
This commit is contained in:
Zoe Roux 2021-02-19 22:22:57 +01:00
parent 3e0c0db79c
commit 56c7339816
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kyoo.Common/Controllers/ILibraryManager.cs
View File

@ -65,6 +65,10 @@ namespace Kyoo.Controllers
where T : class, IResource where T : class, IResource
where T2 : class; where T2 : class;
Task Load<T, T2>([NotNull] T obj, Expression<Func<T, IEnumerable<T2>>> member)
where T : class, IResource
where T2 : class;
// Library Items relations // Library Items relations
Task<ICollection<LibraryItem>> GetItemsFromLibrary(int id, Task<ICollection<LibraryItem>> GetItemsFromLibrary(int id,
Expression<Func<LibraryItem, bool>> where = null, Expression<Func<LibraryItem, bool>> where = null,

10
Kyoo.Common/Controllers/Implementations/ALibraryManager.cs
View File

@ -239,7 +239,15 @@ namespace Kyoo.Controllers
where T : class, IResource where T : class, IResource
where T2 : class where T2 : class
{ {
return Task.CompletedTask; // TODO figure out why setting this method as abstract prevent the app from loading this assembly.
throw new NotImplementedException();
}
public virtual Task Load<T, T2>(T obj, Expression<Func<T, IEnumerable<T2>>> member)
where T : class, IResource
where T2 : class
{
throw new NotImplementedException();
} }
public Task<ICollection<Library>> GetLibraries(Expression<Func<Library, bool>> where = null, public Task<ICollection<Library>> GetLibraries(Expression<Func<Library, bool>> where = null,

22
Kyoo.CommonAPI/LibraryManager.cs
View File

@ -1,10 +1,8 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking;
namespace Kyoo.Controllers namespace Kyoo.Controllers
{ {
@ -39,22 +37,22 @@ namespace Kyoo.Controllers
_database = database; _database = database;
} }
public override Task Load<T, T2>(T obj, Expression<Func<T, IEnumerable<T2>>> member)
{
if (obj == null)
throw new ArgumentNullException(nameof(obj));
if (!Utility.IsPropertyExpression(member) || member == null)
throw new ArgumentException($"{nameof(member)} is not a property.");
return _database.Entry(obj).Collection(member).LoadAsync();
}
public override Task Load<T, T2>(T obj, Expression<Func<T, T2>> member) public override Task Load<T, T2>(T obj, Expression<Func<T, T2>> member)
{ {
if (obj == null) if (obj == null)
throw new ArgumentNullException(nameof(obj)); throw new ArgumentNullException(nameof(obj));
if (!Utility.IsPropertyExpression(member) || member == null) if (!Utility.IsPropertyExpression(member) || member == null)
throw new ArgumentException($"{nameof(member)} is not a property."); throw new ArgumentException($"{nameof(member)} is not a property.");
return _database.Entry(obj).Reference(member).LoadAsync();
EntityEntry<T> entry = _database.Entry(obj);
if (!typeof(IEnumerable).IsAssignableFrom(typeof(T2)))
return entry.Reference(member).LoadAsync();
// TODO This is totally the wrong thing. We should run entry.Collection<T>(collectionMember).LoadAsync()
// TODO where collectionMember would be member with T2 replaced by it's inner type (IEnumerable<T3>)
Type collectionType = Utility.GetGenericDefinition(typeof(T2), typeof(IEnumerable<>));
return Utility.RunGenericMethod<CollectionEntry>(entry, "Collection", collectionType, member).LoadAsync();
} }
} }
} }