github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-29 19:18:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not delete the Emby Information every time we run, let's keep the content now.

Browse source
This commit is contained in:
Jamie Rees 2018-06-29 21:55:36 +01:00
parent a4da4d0cc5
commit 207d5c8d60
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs
View file

@ -68,8 +68,8 @@ namespace Ombi.Schedule.Jobs.Emby
if (!ValidateSettings(server)) if (!ValidateSettings(server))
return; return;
await _repo.ExecuteSql("DELETE FROM EmbyEpisode"); //await _repo.ExecuteSql("DELETE FROM EmbyEpisode");
await _repo.ExecuteSql("DELETE FROM EmbyContent"); //await _repo.ExecuteSql("DELETE FROM EmbyContent");
var movies = await _api.GetAllMovies(server.ApiKey,0, 200, server.AdministratorId, server.FullUri); var movies = await _api.GetAllMovies(server.ApiKey,0, 200, server.AdministratorId, server.FullUri);
var totalCount = movies.TotalRecordCount; var totalCount = movies.TotalRecordCount;
@ -103,12 +103,14 @@ namespace Ombi.Schedule.Jobs.Emby
processed++; processed++;
if (string.IsNullOrEmpty(tvShow.ProviderIds?.Tvdb)) if (string.IsNullOrEmpty(tvShow.ProviderIds?.Tvdb))
{ {
Log.Error("Provider Id on tv {0} is null", tvShow.Name); _logger.LogInformation("Provider Id on tv {0} is null", tvShow.Name);
continue; continue;
} }
var existingTv = await _repo.GetByEmbyId(tvShow.Id); var existingTv = await _repo.GetByEmbyId(tvShow.Id);
if (existingTv == null) if (existingTv == null)
{
_logger.LogDebug("Adding new TV Show {0}", tvShow.Name);
mediaToAdd.Add(new EmbyContent mediaToAdd.Add(new EmbyContent
{ {
TvDbId = tvShow.ProviderIds?.Tvdb, TvDbId = tvShow.ProviderIds?.Tvdb,
@ -120,6 +122,11 @@ namespace Ombi.Schedule.Jobs.Emby
Url = EmbyHelper.GetEmbyMediaUrl(tvShow.Id), Url = EmbyHelper.GetEmbyMediaUrl(tvShow.Id),
AddedAt = DateTime.UtcNow AddedAt = DateTime.UtcNow
}); });
}
else
{
_logger.LogDebug("We already have TV Show {0}", tvShow.Name);
}
} }
// Get the next batch // Get the next batch
tv = await _api.GetAllShows(server.ApiKey, processed + 1, 200, server.AdministratorId, server.FullUri); tv = await _api.GetAllShows(server.ApiKey, processed + 1, 200, server.AdministratorId, server.FullUri);
@ -137,6 +144,8 @@ namespace Ombi.Schedule.Jobs.Emby
var existingMovie = await _repo.GetByEmbyId(movieInfo.Id); var existingMovie = await _repo.GetByEmbyId(movieInfo.Id);
if (existingMovie == null) if (existingMovie == null)
{
_logger.LogDebug("Adding new movie {0}", movieInfo.Name);
content.Add(new EmbyContent content.Add(new EmbyContent
{ {
ImdbId = movieInfo.ProviderIds.Imdb, ImdbId = movieInfo.ProviderIds.Imdb,
@ -147,6 +156,12 @@ namespace Ombi.Schedule.Jobs.Emby
Url = EmbyHelper.GetEmbyMediaUrl(movieInfo.Id), Url = EmbyHelper.GetEmbyMediaUrl(movieInfo.Id),
AddedAt = DateTime.UtcNow, AddedAt = DateTime.UtcNow,
}); });
}
else
{
// we have this
_logger.LogDebug("We already have movie {0}", movieInfo.Name);
}
} }
private bool ValidateSettings(EmbyServers server) private bool ValidateSettings(EmbyServers server)

8
src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs
View file

@ -76,7 +76,7 @@ namespace Ombi.Schedule.Jobs.Emby
var allEpisodes = await _api.GetAllEpisodes(server.ApiKey, 0, 200, server.AdministratorId, server.FullUri); var allEpisodes = await _api.GetAllEpisodes(server.ApiKey, 0, 200, server.AdministratorId, server.FullUri);
var total = allEpisodes.TotalRecordCount; var total = allEpisodes.TotalRecordCount;
var processed = 0; var processed = 0;
var epToAdd = new List<EmbyEpisode>(); var epToAdd = new HashSet<EmbyEpisode>();
while (processed < total) while (processed < total)
{ {
foreach (var ep in allEpisodes.Items) foreach (var ep in allEpisodes.Items)
@ -93,8 +93,12 @@ namespace Ombi.Schedule.Jobs.Emby
} }
var existingEpisode = await _repo.GetEpisodeByEmbyId(ep.Id); var existingEpisode = await _repo.GetEpisodeByEmbyId(ep.Id);
if (existingEpisode == null) // Make sure it's not in the hashset too
var existingInList = epToAdd.Any(x => x.EmbyId == ep.Id);
if (existingEpisode == null && !existingInList)
{ {
_logger.LogDebug("Adding new episode {0} to parent {1}", ep.Name, ep.SeriesName);
// add it // add it
epToAdd.Add(new EmbyEpisode epToAdd.Add(new EmbyEpisode
{ {