From 207ed23c0b0a49b59338c9c4687841b32a60203d Mon Sep 17 00:00:00 2001 From: Jason Dove <1695733+jasongdove@users.noreply.github.com> Date: Wed, 12 Nov 2025 13:20:48 -0600 Subject: [PATCH] fix errors --- .../Commands/ArchiveTroubleshootingResultsHandler.cs | 6 ++++++ ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ErsatzTV.Application/Troubleshooting/Commands/ArchiveTroubleshootingResultsHandler.cs b/ErsatzTV.Application/Troubleshooting/Commands/ArchiveTroubleshootingResultsHandler.cs index 6fb07d345..c363418bd 100644 --- a/ErsatzTV.Application/Troubleshooting/Commands/ArchiveTroubleshootingResultsHandler.cs +++ b/ErsatzTV.Application/Troubleshooting/Commands/ArchiveTroubleshootingResultsHandler.cs @@ -25,6 +25,12 @@ public class ArchiveTroubleshootingResultsHandler(ILocalFileSystem localFileSyst continue; } + if (fileName.Equals("logs.txt", StringComparison.OrdinalIgnoreCase)) + { + zipArchive.CreateEntryFromFile(file, fileName); + continue; + } + if (Path.GetExtension(file).Equals(".json", StringComparison.OrdinalIgnoreCase)) { zipArchive.CreateEntryFromFile(file, fileName); diff --git a/ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs b/ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs index 17d48af5d..cdd5e309e 100644 --- a/ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs +++ b/ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs @@ -788,7 +788,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService _logger.LogDebug("HW accel mode: {HwAccel}", hwAccel); var ffmpegState = new FFmpegState( - false, + channel.Number == ".troubleshooting", HardwareAccelerationMode.None, // no hw accel decode since errors loop hwAccel, VaapiDriverName(hwAccel, vaapiDriver), @@ -836,7 +836,9 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService VaapiDisplayName(hwAccel, vaapiDisplay), VaapiDriverName(hwAccel, vaapiDriver), VaapiDeviceName(hwAccel, vaapiDevice), - FileSystemLayout.FFmpegReportsFolder, + channel.Number == ".troubleshooting" + ? FileSystemLayout.TranscodeTroubleshootingFolder + : FileSystemLayout.FFmpegReportsFolder, FileSystemLayout.FontsCacheFolder, ffmpegPath);