diff --git a/src/Interface/Jobs/IChineseNfoRegistry.cs b/src/Interface/Jobs/IChineseNfoRegistry.cs index 95bfdfe..5d8deb7 100644 --- a/src/Interface/Jobs/IChineseNfoRegistry.cs +++ b/src/Interface/Jobs/IChineseNfoRegistry.cs @@ -3,7 +3,7 @@ namespace Interface.Jobs; public interface IChineseNfoRegistry { void Job( - string? tmdbId = null, + string? path = null, string? seasonNumber = null, string? episodeNumber = null, bool ignoreLocked = false, diff --git a/src/Service/Jobs/ChineseNfoRegistry.cs b/src/Service/Jobs/ChineseNfoRegistry.cs index e77c474..18e2dc9 100644 --- a/src/Service/Jobs/ChineseNfoRegistry.cs +++ b/src/Service/Jobs/ChineseNfoRegistry.cs @@ -49,7 +49,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } public async void Job( - string? tmdbId = null, + string? path = null, string? seasonNumber = null, string? episodeNumber = null, bool ignoreLocked = false, @@ -58,7 +58,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry { try { - await JobExecute(tmdbId, seasonNumber, episodeNumber, ignoreLocked, ignoreCompleted); + await JobExecute(path, seasonNumber, episodeNumber, ignoreLocked, ignoreCompleted); } catch (Exception e) { @@ -67,9 +67,9 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } private async Task JobExecute( - string? tmdbId = null, - string? seasonNumber = null, - string? episodeNumber = null, + string? requestPath = null, + string? requestSeasonNumber = null, + string? requestEpisodeNumber = null, bool ignoreLocked = false, bool ignoreCompleted = false) { @@ -95,8 +95,19 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry return; } + + foreach (var tv in tvNfos) { + if (!string.IsNullOrEmpty(requestPath)) + { + if (!tv.Contains(requestPath)) + { + _logger.LogInformation("ChineseNfoRegistry.Job() tv is not contains path"); + continue; + } + } + try { await HandleTv(tv); @@ -326,6 +337,18 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry return; } + if (!string.IsNullOrEmpty(requestPath)) + { + if (!string.IsNullOrEmpty(requestSeasonNumber)) + { + if (seasonNumber != int.Parse(requestSeasonNumber)) + { + _logger.LogInformation("ChineseNfoRegistry.Job() seasonNumber is not equal"); + return; + } + } + } + var seasonInfo = await GetTmdbSeason(seasonNfo, tmdbId, seasonNumber); if (seasonInfo == null) @@ -473,6 +496,21 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry return; } + if (!string.IsNullOrEmpty(requestPath)) + { + if (!string.IsNullOrEmpty(requestSeasonNumber)) + { + if (!string.IsNullOrEmpty(requestEpisodeNumber)) + { + if (seasonNumber != int.Parse(requestSeasonNumber) || episodeNumber != int.Parse(requestEpisodeNumber)) + { + _logger.LogInformation("ChineseNfoRegistry.Job() episodeNumber is not equal"); + return; + } + } + } + } + var episodeInfo = await GetTmdbEpisode(episodeNfo, tmdbId, seasonNumber, episodeNumber); if (episodeInfo == null) diff --git a/src/WebApi/Controllers/JobTriggerController.cs b/src/WebApi/Controllers/JobTriggerController.cs index ead000d..ddb5a16 100644 --- a/src/WebApi/Controllers/JobTriggerController.cs +++ b/src/WebApi/Controllers/JobTriggerController.cs @@ -116,15 +116,19 @@ public class JobTriggerController : BaseController var json = JsonNode.Parse(text); + var eventType = json?["eventType"]?.ToString(); + + if (eventType != "Download") + { + return "OK"; + } + var tmdbId = json?["series"]?["tmdbId"]?.ToString(); var seasonNumber = json?["episodes"]?[0]?["seasonNumber"]?.ToString(); var episodeNumber = json?["episodes"]?[0]?["episodeNumber"]?.ToString(); var path = json?["series"]?["path"]?.ToString(); - var eventType = json?["eventType"]?.ToString(); - await WxNotify.SendCommonAsync($"SonarrChangedConvertChineseNfo: {tmdbId}, {seasonNumber}, {episodeNumber}, {path}, {eventType}"); - - _chineseNfoRegistry.Job(ignoreLocked: true, ignoreCompleted: true); + _chineseNfoRegistry.Job(path: path, seasonNumber: seasonNumber, episodeNumber: episodeNumber, ignoreLocked: true, ignoreCompleted: true); return "OK"; }