From 7a1485a94d982019f468c6f860667396e4f9fd8a Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 27 Apr 2020 03:20:50 +0200 Subject: [PATCH] Cleaning up --- Kyoo/Controllers/LibraryManager.cs | 7 ++----- Kyoo/Startup.cs | 3 ++- Kyoo/Tasks/Crawler.cs | 7 +++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Kyoo/Controllers/LibraryManager.cs b/Kyoo/Controllers/LibraryManager.cs index 457e84ff..4e8b92f6 100644 --- a/Kyoo/Controllers/LibraryManager.cs +++ b/Kyoo/Controllers/LibraryManager.cs @@ -480,11 +480,8 @@ namespace Kyoo.Controllers { if (episode == null) return 0; - episode.ExternalIDs = new List(); - episode.Show.ExternalIDs = new List(); - episode.Season.ExternalIDs = new List(); - if (_database.Entry(episode).State == EntityState.Detached) - _database.Episodes.Add(episode); + // if (!_database.Entry(episode).IsKeySet) + _database.Episodes.Add(episode); _database.SaveChanges(); return episode.ID; } diff --git a/Kyoo/Startup.cs b/Kyoo/Startup.cs index 93ab615e..caf4030c 100644 --- a/Kyoo/Startup.cs +++ b/Kyoo/Startup.cs @@ -52,7 +52,8 @@ namespace Kyoo services.AddDbContext(options => { options.UseLazyLoadingProxies() - .UseSqlite(_configuration.GetConnectionString("Database")); + .UseSqlite(_configuration.GetConnectionString("Database")) + .EnableSensitiveDataLogging(); //.UseLoggerFactory(LoggerFactory.Create(builder => builder.AddConsole())); }); diff --git a/Kyoo/Tasks/Crawler.cs b/Kyoo/Tasks/Crawler.cs index 9c400cae..0f4a33dc 100644 --- a/Kyoo/Tasks/Crawler.cs +++ b/Kyoo/Tasks/Crawler.cs @@ -156,9 +156,11 @@ namespace Kyoo.Controllers return default; Season season = _libraryManager.GetSeason(show.Slug, seasonNumber); if (season == null) + { season = await _metadataProvider.GetSeason(show, seasonNumber, library); + season.ExternalIDs = _libraryManager.ValidateExternalIDs(season.ExternalIDs); + } season.Show = show; - season.ExternalIDs = _libraryManager.ValidateExternalIDs(season.ExternalIDs); return season; } @@ -167,6 +169,8 @@ namespace Kyoo.Controllers Episode episode = await _metadataProvider.GetEpisode(show, episodePath, season?.SeasonNumber ?? -1, episodeNumber, absoluteNumber, library); if (season == null) season = await GetSeason(show, episode.SeasonNumber, library); + else + episode.ExternalIDs = _libraryManager.ValidateExternalIDs(episode.ExternalIDs); episode.Season = season; if (season == null) { @@ -174,7 +178,6 @@ namespace Kyoo.Controllers return null; } - episode.ExternalIDs = _libraryManager.ValidateExternalIDs(episode.ExternalIDs); await _thumbnailsManager.Validate(episode); await GetTracks(episode); return episode;