Browse Source

fix errors

pull/2641/head
Jason Dove 9 months ago
parent
commit
207ed23c0b
No known key found for this signature in database
  1. 6
      ErsatzTV.Application/Troubleshooting/Commands/ArchiveTroubleshootingResultsHandler.cs
  2. 6
      ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs

6
ErsatzTV.Application/Troubleshooting/Commands/ArchiveTroubleshootingResultsHandler.cs

@ -25,6 +25,12 @@ public class ArchiveTroubleshootingResultsHandler(ILocalFileSystem localFileSyst @@ -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);

6
ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs

@ -788,7 +788,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService @@ -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 @@ -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);

Loading…
Cancel
Save