From 3288df0f258d5af9be0fd4a2751dd803a3b18bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=AF=9A?= Date: Thu, 17 Apr 2025 18:46:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ChineseNfoRegistry=20?= =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E7=9A=84=20JobExecute=20=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=80=89=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=20TMDB=20ID=E3=80=81=E5=AD=A3?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E9=9B=86=E5=8F=B7=EF=BC=9B=E6=94=B9=E8=BF=9B?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E6=9B=BF=E4=BB=A3=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E8=BE=93=E5=87=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Service/Jobs/ChineseNfoRegistry.cs | 33 ++++++++++--------- .../Controllers/JobTriggerController.cs | 5 +++ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/Service/Jobs/ChineseNfoRegistry.cs b/src/Service/Jobs/ChineseNfoRegistry.cs index 7c8619b..e77c474 100644 --- a/src/Service/Jobs/ChineseNfoRegistry.cs +++ b/src/Service/Jobs/ChineseNfoRegistry.cs @@ -58,7 +58,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry { try { - await JobExecute(ignoreLocked, ignoreCompleted); + await JobExecute(tmdbId, seasonNumber, episodeNumber, ignoreLocked, ignoreCompleted); } catch (Exception e) { @@ -67,8 +67,11 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } private async Task JobExecute( - bool ignoreLocked, - bool ignoreCompleted) + string? tmdbId = null, + string? seasonNumber = null, + string? episodeNumber = null, + bool ignoreLocked = false, + bool ignoreCompleted = false) { var tvFolder = _configuration["ChineseNfo:TvFolder"]; @@ -631,7 +634,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry if (!response.IsSuccessStatusCode) { - Console.WriteLine($"{requestUrl} & {path} & {response.StatusCode}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbTv() 接口调用失败 {requestUrl} & {path} & {response.StatusCode}", requestUrl, path, response.StatusCode); return null; } @@ -648,7 +651,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } catch (Exception e) { - Console.WriteLine($"{requestUrl} & {path} \r {e}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbTv() 接口调用失败 {requestUrl} & {path} \r {e}", requestUrl, path, e); return null; } } @@ -682,7 +685,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry if (!response.IsSuccessStatusCode) { - Console.WriteLine($"{requestUrl} & {path} & {response.StatusCode}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbPerson() 接口调用失败 {requestUrl} & {path} & {response.StatusCode}", requestUrl, path, response.StatusCode); return null; } @@ -700,7 +703,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } catch (Exception e) { - Console.WriteLine($"{requestUrl} & {path} \r {e}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbPerson() 接口调用失败 {requestUrl} & {path} \r {e}", requestUrl, path, e); return null; } } @@ -733,7 +736,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry if (!response.IsSuccessStatusCode) { - Console.WriteLine($"{requestUrl} & {path} & {response.StatusCode}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbPersonSearch() 接口调用失败 {requestUrl} & {path} & {response.StatusCode}", requestUrl, path, response.StatusCode); return null; } @@ -761,7 +764,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } catch (Exception e) { - Console.WriteLine($"{requestUrl} & {path} \r {e}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbPersonSearch() 接口调用失败 {requestUrl} & {path} \r {e}", requestUrl, path, e); return null; } } @@ -778,7 +781,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry if (!response.IsSuccessStatusCode) { - Console.WriteLine($"{requestUrl} & {path} & {response.StatusCode}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbImage() 接口调用失败 {requestUrl} & {path} & {response.StatusCode}", requestUrl, path, response.StatusCode); return null; } @@ -786,7 +789,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } catch (Exception e) { - Console.WriteLine($"{requestUrl} & {path} \r {e}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbImage() 接口调用失败 {requestUrl} & {path} \r {e}", requestUrl, path, e); return null; } } @@ -822,7 +825,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry if (!response.IsSuccessStatusCode) { - Console.WriteLine($"{requestUrl} & {path} & {response.StatusCode}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbSeason() 接口调用失败 {requestUrl} & {path} & {response.StatusCode}", requestUrl, path, response.StatusCode); return null; } @@ -838,7 +841,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } catch (Exception e) { - Console.WriteLine($"{requestUrl} & {path} \r {e}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbSeason() 接口调用失败 {requestUrl} & {path} \r {e}", requestUrl, path, e); return null; } } @@ -875,7 +878,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry if (!response.IsSuccessStatusCode) { - Console.WriteLine($"{requestUrl} & {path} & {response.StatusCode}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbEpisode() 接口调用失败 {requestUrl} & {path} & {response.StatusCode}", requestUrl, path, response.StatusCode); return null; } @@ -891,7 +894,7 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry } catch (Exception e) { - Console.WriteLine($"{requestUrl} & {path} \r {e}"); + _logger.LogError("ChineseNfoRegistry.GetTmdbEpisode() 接口调用失败 {requestUrl} & {path} \r {e}", requestUrl, path, e); return null; } } diff --git a/src/WebApi/Controllers/JobTriggerController.cs b/src/WebApi/Controllers/JobTriggerController.cs index 107654d..bbf8e30 100644 --- a/src/WebApi/Controllers/JobTriggerController.cs +++ b/src/WebApi/Controllers/JobTriggerController.cs @@ -1,4 +1,5 @@ using System.Text.Json.Nodes; +using Core; using Interface.Jobs; using Microsoft.AspNetCore.Mvc; @@ -118,6 +119,10 @@ public class JobTriggerController : BaseController 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(tmdbId: tmdbId, seasonNumber: seasonNumber, episodeNumber: episodeNumber);