diff --git a/src/Service/Jobs/ChineseNfoRegistry.cs b/src/Service/Jobs/ChineseNfoRegistry.cs index 46be52e..06ad3e4 100644 --- a/src/Service/Jobs/ChineseNfoRegistry.cs +++ b/src/Service/Jobs/ChineseNfoRegistry.cs @@ -105,9 +105,12 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry if (!tv.Contains(latestPath)) { - _logger.LogInformation("ChineseNfoRegistry.Job() tv is not contains path"); continue; } + else + { + _logger.LogInformation("ChineseNfoRegistry.Job() tv is contains path"); + } } try @@ -150,8 +153,22 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry foreach (var season in seasonNfos) { + var seasonNumber = Path.GetFileName(season).Split("Season ", StringSplitOptions.None)[1]; + try { + if (!string.IsNullOrEmpty(requestSeasonNumber)) + { + if (seasonNumber != requestSeasonNumber) + { + continue; + } + else + { + _logger.LogInformation("ChineseNfoRegistry.Job() seasonNumber is equal"); + } + } + await HandleSeason(tv, season); } catch (Exception e) @@ -167,6 +184,23 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry { try { + var split = $"S{(seasonNumber.Length == 1 ? $"0{seasonNumber}" : seasonNumber)}E"; + var episodeNumber = Path.GetFileName(episode) + .Split(split, StringSplitOptions.None)[1] + .Split(" - ", StringSplitOptions.None)[0]; + + if (!string.IsNullOrEmpty(requestEpisodeNumber)) + { + if (episodeNumber != requestEpisodeNumber) + { + continue; + } + else + { + _logger.LogInformation("ChineseNfoRegistry.Job() episodeNumber is equal"); + } + } + await HandleEpisode(tv, season, episode); } catch (Exception e) @@ -367,7 +401,11 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry { if (seasonNumber != int.Parse(requestSeasonNumber)) { - _logger.LogInformation("ChineseNfoRegistry.Job() seasonNumber is not equal"); + return; + } + else + { + _logger.LogInformation("ChineseNfoRegistry.Job() seasonNumber is equal"); return; } } @@ -522,7 +560,11 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry { if (seasonNumber != int.Parse(requestSeasonNumber) || episodeNumber != int.Parse(requestEpisodeNumber)) { - _logger.LogInformation("ChineseNfoRegistry.Job() episodeNumber is not equal"); + return; + } + else + { + _logger.LogInformation("ChineseNfoRegistry.Job() episodeNumber is equal"); return; } } diff --git a/src/WebApi/Controllers/NotifyController.cs b/src/WebApi/Controllers/NotifyController.cs index 06afe69..357ee13 100644 --- a/src/WebApi/Controllers/NotifyController.cs +++ b/src/WebApi/Controllers/NotifyController.cs @@ -302,7 +302,7 @@ public class NotifyController : BaseController if (jsonObj["release"] != null) { - var gb = (jsonObj["release"]!.ToObject() / 1024M / 1024M / 1024M).ToString("0.##"); + var gb = jsonObj["release"]!.ToObject(); notify += @$" 索引器: {jsonObj["release"]!["indexer"]} 发布组: {jsonObj["release"]!["releaseGroup"]}({jsonObj["release"]!["quality"] ?? jsonObj["downloadInfo"]!["quality"]})