From d379f516c5676affcc28491e58946165e180257c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=AF=9A?= Date: Mon, 21 Apr 2025 17:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ChineseNfoRegistry=20?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E5=A2=9E=E5=BC=BA=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BB=A5=E5=8F=8D=E6=98=A0=E5=AD=A3=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E9=9B=86=E5=8F=B7=E7=9A=84=E6=AF=94=E8=BE=83=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E8=BF=9B=E8=B7=AF=E5=BE=84=E5=92=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Service/Jobs/ChineseNfoRegistry.cs | 48 ++++++++++++++++++++-- src/WebApi/Controllers/NotifyController.cs | 2 +- 2 files changed, 46 insertions(+), 4 deletions(-) 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"]})