Skip to content

Commit d8d4119

Browse files
committed
Optimize: 优化log输出
1 parent b7676ae commit d8d4119

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

MediaInfoKeeper.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<Description>MediaInfoKeeper Emby plugin</Description>
55
<PackageTags>emby;plugin;pms;media;server;</PackageTags>
66
<BaseOutputPath>Build\bin\</BaseOutputPath>
7-
<AssemblyVersion>1.6.5.1</AssemblyVersion>
8-
<FileVersion>1.6.5.1</FileVersion>
7+
<AssemblyVersion>1.6.5.2</AssemblyVersion>
8+
<FileVersion>1.6.5.2</FileVersion>
99
<Version>1.6.5</Version>
1010
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1111
</PropertyGroup>

Plugin.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ private void OnUserDataSaved(object sender, UserDataSaveEventArgs e)
557557
}
558558

559559
var userName = e.User?.Name ?? "unknown";
560-
logger.Info($"收藏事件: 用户={userName}, 条目={(item.Path ?? item.Name ?? item.Id.ToString())}");
560+
logger.Info($"收藏事件: 用户={userName}, 条目={(item.FileName ?? item.Path ?? item.Id.ToString())}");
561561

562562
var canExtract = this.Options.MainPage?.ExtractMediaInfoOnFavorite == true &&
563563
(item is Episode || item is Season || item is Series);

ScheduledTask/ExtractMediaInfoTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private List<BaseItem> FetchScopedItems()
7474

7575
private async Task ProcessItemAsync(BaseItem item, string source, CancellationToken cancellationToken)
7676
{
77-
var displayName = item.Path ?? item.Name;
77+
var displayName = item.FileName ?? item.Path;
7878

7979
if (!Plugin.LibraryService.IsItemInScope(item))
8080
{

ScheduledTask/ExtractRecentMediaInfoTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private List<BaseItem> FetchRecentScopedItems()
7878

7979
private async Task ProcessItemAsync(BaseItem item, string source, CancellationToken cancellationToken)
8080
{
81-
var displayName = item.Path ?? item.Name;
81+
var displayName = item.FileName ?? item.Path;
8282

8383
if (!Plugin.LibraryService.IsItemInScope(item))
8484
{

ScheduledTask/RefreshRecentMetadataTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public async Task Execute(CancellationToken cancellationToken, IProgress<double>
5353
foreach (var item in items)
5454
{
5555
var created = item.DateCreated == default ? "unknown" : item.DateCreated.ToString("u");
56-
this.logger.Info($"[{current + 1}/{total}] 刷新 {item.Path ?? item.Name} 入库日期 = {created}");
56+
this.logger.Info($"[{current + 1}/{total}] 刷新 {item.FileName ?? item.Path} 入库日期 = {created}");
5757

5858
if (cancellationToken.IsCancellationRequested)
5959
{

Services/IntroSkip/IntroSkipChapterApi.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void UpdateIntro(Episode item, SessionInfo session, long introStartPositi
9595
}
9696

9797
logger.Info("片头标记已更新,用户: " + session.UserName + ",条目: " +
98-
(item.Path ?? item.Name));
98+
(item.FileName ?? item.Path));
9999
}
100100

101101
public void UpdateCredits(Episode item, SessionInfo session, long creditsDurationTicks)
@@ -138,7 +138,7 @@ public void UpdateCredits(Episode item, SessionInfo session, long creditsDuratio
138138
}
139139

140140
logger.Info("片尾标记已更新,用户: " + session.UserName + ",条目: " +
141-
(item.Path ?? item.Name));
141+
(item.FileName ?? item.Path));
142142
}
143143

144144
private static bool IsMarkerAddedByMik(ChapterInfo chapter)

Services/MediaInfoService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private bool SerializeMediaInfo(BaseItem item, IDirectoryService directoryServic
131131
{
132132
if (!TryGetTmdbId(item, out var tmdbId))
133133
{
134-
this.logger.Info($"{source} 跳过保存 - 无 TMDB ID: {item.Path ?? item.Name ?? item.Id.ToString()}");
134+
this.logger.Info($"{source} 跳过保存 - 无 TMDB ID: {item.FileName ?? item.Path ?? item.Id.ToString()}");
135135
return false;
136136
}
137137

@@ -283,7 +283,7 @@ public async Task<MediaInfoRestoreResult> DeserializeMediaInfo(BaseItem item, ID
283283
}
284284
else
285285
{
286-
this.logger.Info($"{source} 未找到 JSON: {item.Name ?? item.Path}");
286+
this.logger.Info($"{source} 未找到 JSON: {item.FileName ?? item.Path}");
287287
}
288288

289289
return MediaInfoRestoreResult.Failed;

Services/MetadataProvidersWatcher.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private static bool CanRefreshPrefix(object __instance, MethodBase __originalMet
102102

103103
if (IsVideoImageProviderWithEpisode(__args, out var item))
104104
{
105-
logger?.Info($"MetadataProvidersWatcher 检测到元数据变动 InternalId:{item.InternalId},Name:{item.Name ?? string.Empty}");
105+
logger?.Info($"MetadataProvidersWatcher 检测到元数据变动 InternalId:{item.InternalId},Name:{item.FileName ?? item.Path}");
106106
TriggerMediaInfoRestore(item);
107107
}
108108
return true;
@@ -143,7 +143,7 @@ private static void TriggerMediaInfoRestore(BaseItem item)
143143
{
144144
try
145145
{
146-
logger?.Info($"{item.Path ?? string.Empty} 10s之后开始恢复媒体信息");
146+
logger?.Info($"{item.FileName ?? item.Path} 10s之后开始恢复媒体信息");
147147
await Task.Delay(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
148148
var directoryService = new DirectoryService(logger, fileSystem);
149149
await mediaInfoService

Services/MovieDbTitlePatch.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ private static void ProcessMainInfoMoviePrefix(
417417
var item = resultItem.Item;
418418
logger?.Debug(
419419
"TMDB Movie ProcessMainInfo: item={0}, firstLanguage={1}, preferredCountry={2}, currentName='{3}'",
420-
item.Path ?? item.Name ?? item.Id.ToString(),
420+
item.FileName ?? item.Path ?? item.Id.ToString(),
421421
isFirstLanguage,
422422
preferredCountryCode ?? string.Empty,
423423
item.Name ?? string.Empty);
@@ -524,13 +524,13 @@ private static void IsCompletePostfix(BaseItem item, ref bool __result, bool __s
524524
if (BlockMovieDbNonFallbackLanguage(item.Overview))
525525
{
526526
item.Overview = null;
527-
logger?.Debug("TMDB IsCompletePostfix: 清空非回退语言简介 item={0}", item.Path ?? item.Name ?? item.Id.ToString());
527+
logger?.Debug("TMDB IsCompletePostfix: 清空非回退语言简介 item={0}", item.FileName ?? item.Path ?? item.Id.ToString());
528528
}
529529

530530
if (!string.IsNullOrWhiteSpace(item.Tagline))
531531
{
532532
item.Tagline = null;
533-
logger?.Debug("TMDB IsCompletePostfix: 清空 Tagline item={0}", item.Path ?? item.Name ?? item.Id.ToString());
533+
logger?.Debug("TMDB IsCompletePostfix: 清空 Tagline item={0}", item.FileName ?? item.Path ?? item.Id.ToString());
534534
}
535535
}
536536

@@ -552,7 +552,7 @@ private static void SeriesImportDataPrefix(
552552
var item = seriesResult.Item;
553553
logger?.Debug(
554554
"TMDB Series ImportData: item={0}, firstLanguage={1}, preferredCountry={2}, currentName='{3}'",
555-
item.Path ?? item.Name ?? item.Id.ToString(),
555+
item.FileName ?? item.Path ?? item.Id.ToString(),
556556
isFirstLanguage,
557557
preferredCountryCode ?? string.Empty,
558558
item.Name ?? string.Empty);
@@ -738,7 +738,7 @@ private static void SeasonImportDataPrefix(
738738
{
739739
logger?.Debug(
740740
"TMDB Season ImportData: item={0}, season={1}, firstLanguage={2}, currentName='{3}'",
741-
item.Path ?? item.Name ?? item.Id.ToString(),
741+
item.FileName ?? item.Path ?? item.Id.ToString(),
742742
seasonNumber,
743743
isFirstLanguage,
744744
item.Name ?? string.Empty);
@@ -786,7 +786,7 @@ private static void EpisodeImportDataPrefix(
786786
var item = result.Item;
787787
logger?.Debug(
788788
"TMDB Episode ImportData: item={0}, firstLanguage={1}, currentName='{2}'",
789-
item.Path ?? item.Name ?? item.Id.ToString(),
789+
item.FileName ?? item.Path ?? item.Id.ToString(),
790790
isFirstLanguage,
791791
item.Name ?? string.Empty);
792792

0 commit comments

Comments
 (0)