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

Revert "Trying to fix the edit"

Browse Source 
This reverts commit 38e61b828bf6a1d28b7a7188c25d962f2220e323.
This commit is contained in:
Zoe Roux 2020-05-31 21:43:44 +02:00
parent 5f030b281f
commit b9e040673c
8 changed files with 47 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ namespace Kyoo.Controllers
//Register values
void Register(object obj);
Task Edit(object obj, bool resetOld);
void RegisterShowLinks(Library library, Collection collection, Show show);
Task SaveChanges();
// Validate values

2
Kyoo.Common/Models/Show.cs
View File

@ -7,7 +7,7 @@ namespace Kyoo.Models
{
public class Show : IOnMerge
{
[NotMergableAttribute] [JsonIgnore] public long ID { get; set; }
[JsonIgnore] public long ID { get; set; }
public string Slug { get; set; }
public string Title { get; set; }

9
Kyoo.Common/Utility.cs
View File

@ -99,10 +99,7 @@ namespace Kyoo
if (second == null)
return first;
Type type = first.GetType();
if (second.GetType() != type && second.GetType().IsAssignableFrom(type))
type = second.GetType();
Type type = typeof(T);
foreach (PropertyInfo property in type.GetProperties().Where(x => x.CanRead && x.CanWrite))
{
if (Attribute.GetCustomAttribute(property, typeof(NotMergableAttribute)) != null)
@ -134,10 +131,10 @@ namespace Kyoo
public static T Nullify<T>(T obj)
{
Type type = obj.GetType();
Type type = typeof(T);
foreach (PropertyInfo property in type.GetProperties())
{
if (!property.CanWrite || Attribute.GetCustomAttribute(property, typeof(NotMergableAttribute)) != null)
if (!property.CanWrite)
continue;
object defaultValue = property.PropertyType.IsValueType

75
Kyoo/Controllers/LibraryManager.cs
View File

@ -191,6 +191,20 @@ namespace Kyoo.Controllers
});
}
public void RegisterShowLinks(Library library, Collection collection, Show show)
{
if (collection != null)
{
_database.LibraryLinks.AddIfNotExist(new LibraryLink {Library = library, Collection = collection},
x => x.Library == library && x.Collection == collection && x.ShowID == null);
_database.CollectionLinks.AddIfNotExist(new CollectionLink { Collection = collection, Show = show},
x => x.Collection == collection && x.Show == show);
}
else
_database.LibraryLinks.AddIfNotExist(new LibraryLink {Library = library, Show = show},
x => x.Library == library && x.Collection == null && x.Show == show);
}
public Task SaveChanges()
{
return SaveChanges(0);
@ -226,12 +240,11 @@ namespace Kyoo.Controllers
if (resetOld)
Utility.Nullify(existing);
_database.ChangeTracker.DetectChanges();
Utility.Merge(existing, obj);
ValidateRootEntry(_database.Entry(existing), entry => entry.State != EntityState.Added);
_database.ChangeTracker.DetectChanges();
ValidateRootEntry(_database.Entry(existing), entry => entry.State != EntityState.Unchanged
&& entry.State != EntityState.Deleted);
await _database.SaveChangesAsync();
}
finally
@ -264,14 +277,12 @@ namespace Kyoo.Controllers
}
}
private void ValidateRootEntry(EntityEntry entry, Func<EntityEntry, bool> shouldRun, object parentObject = null)
private void ValidateRootEntry(EntityEntry entry, Func<EntityEntry, bool> shouldRun)
{
if (!shouldRun.Invoke(entry))
return;
foreach (NavigationEntry navigation in entry.Navigations)
{
if (!navigation.Metadata.IsCollection() && ReferenceEquals(navigation.CurrentValue, parentObject))
continue;
ValidateNavigation(navigation);
if (navigation.CurrentValue == null)
continue;
@ -279,14 +290,10 @@ namespace Kyoo.Controllers
{
IEnumerable entities = (IEnumerable)navigation.CurrentValue;
foreach (object childEntry in entities)
{
if (ReferenceEquals(childEntry, parentObject))
continue;
ValidateRootEntry(_database.Entry(childEntry), shouldRun, entry.Entity);
}
ValidateRootEntry(_database.Entry(childEntry), shouldRun);
}
else
ValidateRootEntry(_database.Entry(navigation.CurrentValue), shouldRun, entry.Entity);
ValidateRootEntry(_database.Entry(navigation.CurrentValue), shouldRun);
}
}
@ -328,7 +335,7 @@ namespace Kyoo.Controllers
return list.Select(x =>
{
T tmp = Validate(x);
if (!ReferenceEquals(x, tmp))
if (tmp != x)
_database.Entry(x).State = EntityState.Detached;
return tmp ?? x;
})/*.GroupBy(GetSlug).Select(x => x.First()).Where(x => x != null)*/.ToList();
@ -338,41 +345,13 @@ namespace Kyoo.Controllers
{
return obj switch
{
Library library => _database.Libraries
.Include(x => x.Links)
.Include(x => x.Providers)
.FirstOrDefault(x => x.Slug == library.Slug),
Collection collection => _database.Collections
.Include(x => x.Links)
.FirstOrDefault(x => x.Slug == collection.Slug),
Show show => _database.Shows
.Include(x => x.Seasons)
.Include(x => x.Episodes)
.Include(x => x.People)
.Include(x => x.GenreLinks)
.Include(x => x.Studio)
.Include(x => x.ExternalIDs)
.FirstOrDefault(x => x.Slug == show.Slug),
Season season => _database.Seasons
.Include(x => x.Episodes)
.Include(x => x.ExternalIDs)
.Include(x => x.Show)
.FirstOrDefault(x => x.Show.Slug == season.Show.Slug && x.SeasonNumber == season.SeasonNumber),
Episode episode => _database.Episodes
.Include(x => x.Season)
.Include(x => x.Show)
.Include(x => x.ExternalIDs)
.Include(x => x.Tracks)
.FirstOrDefault(x => x.EpisodeNumber == episode.EpisodeNumber
&& x.SeasonNumber == episode.SeasonNumber
&& x.Show.Slug == episode.Show.Slug),
Studio studio => _database.Studios
.Include(x => x.Shows)
.FirstOrDefault(x => x.Slug == studio.Slug),
People people => _database.Peoples
.Include(x => x.Roles)
.Include(x => x.ExternalIDs)
.FirstOrDefault(x => x.Slug == people.Slug),
Library library => GetLibrary(library.Slug),
Collection collection => GetCollection(collection.Slug),
Show show => GetShow(show.Slug),
Season season => GetSeason(season.Show.Slug, season.SeasonNumber),
Episode episode => GetEpisode(episode.Show.Slug, episode.SeasonNumber, episode.EpisodeNumber),
Studio studio => GetStudio(studio.Slug),
People people => GetPeople(people.Slug),
Genre genre => GetGenre(genre.Slug),
ProviderID provider => GetProvider(provider.Name),
_ => null

7
Kyoo/Controllers/ProviderManager.cs
View File

@ -76,12 +76,9 @@ namespace Kyoo.Controllers
return collection;
}
public async Task<Show> CompleteShow(Show old, Library library)
public async Task<Show> CompleteShow(Show show, Library library)
{
Show show = await GetMetadata(provider => provider.GetShowByID(old), library, $"the show {old.Title}");
show.GenreLinks = show.GenreLinks?.GroupBy(x => x.Genre.Slug).Select(x => x.First()).ToList();
show.People = show.People?.GroupBy(x => x.Slug).Select(x => x.First()).ToList();
return show;
return await GetMetadata(provider => provider.GetShowByID(show), library, $"the show {show.Title}");
}
public async Task<Show> SearchShow(string showName, bool isMovie, Library library)

6
Kyoo/Startup.cs
View File

@ -51,9 +51,9 @@ namespace Kyoo
services.AddDbContext<DatabaseContext>(options =>
{
options.UseLazyLoadingProxies()
.UseNpgsql(_configuration.GetConnectionString("Database"))
.EnableSensitiveDataLogging();
//.UseLoggerFactory(LoggerFactory.Create(builder => builder.AddConsole()));
.UseNpgsql(_configuration.GetConnectionString("Database"));
// .EnableSensitiveDataLogging()
// .UseLoggerFactory(LoggerFactory.Create(builder => builder.AddConsole()));
});
services.AddDbContext<IdentityDatabase>(options =>

73
Kyoo/Tasks/Crawler.cs
View File

@ -142,12 +142,8 @@ namespace Kyoo.Controllers
long absoluteNumber = long.TryParse(match.Groups["Absolute"].Value, out tmp) ? tmp : -1;
Collection collection = await GetCollection(libraryManager, collectionName, library);
if (collection != null)
libraryManager.Register(collection);
bool isMovie = seasonNumber == -1 && episodeNumber == -1 && absoluteNumber == -1;
Show show = await GetShow(libraryManager, collection, showName, showPath, isMovie, library);
Show show = await GetShow(libraryManager, showName, showPath, isMovie, library);
if (isMovie)
libraryManager.Register(await GetMovie(show, path));
else
@ -156,6 +152,9 @@ namespace Kyoo.Controllers
Episode episode = await GetEpisode(libraryManager, show, season, episodeNumber, absoluteNumber, path, library);
libraryManager.Register(episode);
}
if (collection != null)
libraryManager.Register(collection);
libraryManager.RegisterShowLinks(library, collection, show);
Console.WriteLine($"Registering episode at: {path}");
await libraryManager.SaveChanges();
}
@ -163,19 +162,14 @@ namespace Kyoo.Controllers
private async Task<Collection> GetCollection(ILibraryManager libraryManager, string collectionName, Library library)
{
if (string.IsNullOrEmpty(collectionName))
return default;
return await Task.FromResult<Collection>(null);
Collection name = libraryManager.GetCollection(Utility.ToSlug(collectionName));
if (name != null)
return name;
return await _metadataProvider.GetCollectionFromName(collectionName, library);
}
private async Task<Show> GetShow(ILibraryManager libraryManager,
Collection collection,
string showTitle,
string showPath,
bool isMovie,
Library library)
private async Task<Show> GetShow(ILibraryManager libraryManager, string showTitle, string showPath, bool isMovie, Library library)
{
Show show = libraryManager.GetShowByPath(showPath);
if (show != null)
@ -185,15 +179,6 @@ namespace Kyoo.Controllers
show.People = await _metadataProvider.GetPeople(show, library);
await _thumbnailsManager.Validate(show.People);
await _thumbnailsManager.Validate(show);
if (collection != null)
{
libraryManager.Register(new LibraryLink {Library = library, Collection = collection});
libraryManager.Register(new CollectionLink { Collection = collection, Show = show});
}
else
libraryManager.Register(new LibraryLink {Library = library, Show = show});
return show;
}
@ -211,20 +196,9 @@ namespace Kyoo.Controllers
return season;
}
private async Task<Episode> GetEpisode(ILibraryManager libraryManager,
Show show,
Season season,
long episodeNumber,
long absoluteNumber,
string episodePath,
Library library)
private async Task<Episode> GetEpisode(ILibraryManager libraryManager, Show show, Season season, long episodeNumber, long absoluteNumber, string episodePath, Library library)
{
Episode episode = await _metadataProvider.GetEpisode(show,
episodePath,
season?.SeasonNumber ?? -1,
episodeNumber,
absoluteNumber,
library);
Episode episode = await _metadataProvider.GetEpisode(show, episodePath, season?.SeasonNumber ?? -1, episodeNumber, absoluteNumber, library);
if (season == null)
season = await GetSeason(libraryManager, show, episode.SeasonNumber, library);
episode.Season = season;
@ -249,8 +223,7 @@ namespace Kyoo.Controllers
private async Task<IEnumerable<Track>> GetTracks(Episode episode)
{
IEnumerable<Track> tracks = await _transcoder.GetTrackInfo(episode.Path);
List<Track> epTracks = tracks.Where(x => x.Type != StreamType.Subtitle)
.Concat(GetExtractedSubtitles(episode)).ToList();
List<Track> epTracks = tracks.Where(x => x.Type != StreamType.Subtitle).Concat(GetExtractedSubtitles(episode)).ToList();
if (epTracks.Count(x => !x.IsExternal) < tracks.Count())
epTracks.AddRange(await _transcoder.ExtractSubtitles(episode.Path));
episode.Tracks = epTracks;
@ -289,33 +262,7 @@ namespace Kyoo.Controllers
return tracks;
}
private static readonly string[] VideoExtensions =
{
".webm",
".mkv",
".flv",
".vob",
".ogg",
".ogv",
".avi",
".mts",
".m2ts",
".ts",
".mov",
".qt",
".asf",
".mp4",
".m4p",
".m4v",
".mpg",
".mp2",
".mpeg",
".mpe",
".mpv",
".m2v",
".3gp",
".3g2"
};
private static readonly string[] VideoExtensions = { ".webm", ".mkv", ".flv", ".vob", ".ogg", ".ogv", ".avi", ".mts", ".m2ts", ".ts", ".mov", ".qt", ".asf", ".mp4", ".m4p", ".m4v", ".mpg", ".mp2", ".mpeg", ".mpe", ".mpv", ".m2v", ".3gp", ".3g2" };
private static bool IsVideo(string filePath)
{

2
Kyoo/Tasks/ReScan.cs
View File

@ -62,8 +62,6 @@ namespace Kyoo.Tasks
edited.ID = old.ID;
edited.Slug = old.Slug;
edited.Path = old.Path;
edited.Seasons = old.Seasons;
edited.Episodes = old.Episodes;
await libraryManager.Edit(edited, true);
await _thumbnailsManager.Validate(edited, true);
}