diff --git a/src/Service/Jobs/ChineseNfoRegistry.cs b/src/Service/Jobs/ChineseNfoRegistry.cs index cea8a55..0d20b0f 100644 --- a/src/Service/Jobs/ChineseNfoRegistry.cs +++ b/src/Service/Jobs/ChineseNfoRegistry.cs @@ -48,7 +48,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry Schedule(() => Job(ignoreLocked: true, ignoreCompleted: true)).ToRunEvery(1).Days(); } - public async void Job( + public void Job( string? path = null, string? seasonNumber = null, string? episodeNumber = null, @@ -58,7 +58,17 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry { try { - await JobExecute(path, seasonNumber, episodeNumber, ignoreLocked, ignoreCompleted); + var lockAll = "lock-all"; + lock (lockAll) + { + var lockKey = $"{path}-{seasonNumber}-{episodeNumber}"; + + lock (lockKey) + { + JobExecute(path, seasonNumber, episodeNumber, ignoreLocked, ignoreCompleted).Wait(); + } + } + } catch (Exception e) { @@ -102,7 +112,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry if (!string.IsNullOrEmpty(requestPath)) { var latestPath = Path.GetFileName(requestPath) ?? string.Empty; - + if (!tv.Contains(latestPath)) { continue; @@ -130,7 +140,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry foreach (var seasonNumber in sseasonsNumbers) { - var seasonNfo = Path.Combine(Path.GetDirectoryName(tv) ?? string.Empty,$"Season {seasonNumber}", "season.nfo"); + var seasonNfo = Path.Combine(Path.GetDirectoryName(tv) ?? string.Empty, $"Season {seasonNumber}", "season.nfo"); await File.WriteAllTextAsync(seasonNfo, string.Format( """ @@ -188,10 +198,10 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry var episodeNumber = Path.GetFileName(episode) .Split(split, StringSplitOptions.None)[1] .Split(" - ", StringSplitOptions.None)[0]; - + if (!string.IsNullOrEmpty(requestEpisodeNumber)) { - if (int.Parse(episodeNumber).ToString() != requestEpisodeNumber) + if (int.Parse(episodeNumber).ToString() != requestEpisodeNumber) { continue; } diff --git a/src/WebApi/Controllers/JobTriggerController.cs b/src/WebApi/Controllers/JobTriggerController.cs index 0be2b9d..eacf082 100644 --- a/src/WebApi/Controllers/JobTriggerController.cs +++ b/src/WebApi/Controllers/JobTriggerController.cs @@ -16,6 +16,8 @@ public class JobTriggerController : BaseController private readonly IChineseNfoRegistry _chineseNfoRegistry; private readonly IDiskMonitorRegistry _diskMonitorRegistry; + private readonly ILogger _logger; + /// /// ctor /// @@ -27,7 +29,8 @@ public class JobTriggerController : BaseController IStartupRegistry startupRegistry, IShutdownRegistry shutdownRegistry, IChineseNfoRegistry chineseNfoRegistry, - IDiskMonitorRegistry diskMonitorRegistry) + IDiskMonitorRegistry diskMonitorRegistry, + ILogger logger) { _logTotalNotifyJobRegistry = logTotalNotifyJobRegistry; _diskActionMonitorRegistry = diskActionMonitorRegistry; @@ -37,6 +40,7 @@ public class JobTriggerController : BaseController _shutdownRegistry = shutdownRegistry; _chineseNfoRegistry = chineseNfoRegistry; _diskMonitorRegistry = diskMonitorRegistry; + _logger = logger; } [HttpGet] @@ -127,6 +131,13 @@ public class JobTriggerController : BaseController var episodeNumber = json?["episodes"]?[0]?["episodeNumber"]?.ToString(); var path = json?["series"]?["path"]?.ToString(); + _logger.LogInformation("SonarrChangedConvertChineseNfo() path: {path}, seasonNumber: {seasonNumber}, episodeNumber: {episodeNumber}", path, seasonNumber, episodeNumber); + + if (string.IsNullOrEmpty(path) || string.IsNullOrEmpty(seasonNumber) || string.IsNullOrEmpty(episodeNumber)) + { + return "OK"; + } + _chineseNfoRegistry.Job(path: path, seasonNumber: seasonNumber, episodeNumber: episodeNumber, ignoreLocked: true, ignoreCompleted: true); return "OK";