klevze
c412469773
Implements the suggestions from the last review pass:
- Add AmiReel.Tests (MSTest), covering the pure logic in Models/ and
Services/: SupportedVideoFormats, AppSettings normalization,
UserFacingErrors.Summarize, the new FfmpegProgressParser/
FfmpegOutputFilter, RenderPipeline.Validate, BuildProgressMessage, and
MoveSourceVideos. 59 tests, all passing. UI code-behind and anything that
spawns an actual FFmpeg process are left to manual/integration testing.
Exclude AmiReel.Tests\**\*.cs from AmiReel.csproj's default item glob —
it's a subfolder of the app project now, so without the exclude the app
itself was compiling the MSTest-only test files.
- Extract the FFmpeg version/library-banner boilerplate list that
ProcessRunner (live log filter) and UserFacingErrors (error summarizer)
had each duplicated into a shared FfmpegOutputFilter.IsBoilerplateLine;
each caller keeps its own remaining context-specific checks on top.
Also extract ProcessRunner's line-parsing regexes into a standalone
FfmpegProgressParser so it's directly unit-testable without spawning a
process.
- Convert AppSettings and RenderSettings from positional record
constructors to named `required` init properties. Both records had
runs of same-typed consecutive parameters (three string timing fields
in AppSettings; three doubles then five ints in RenderSettings) that a
positional constructor would let get silently transposed at a call site
without the compiler catching it. Update the two call sites
(MainPage.xaml.cs) to object-initializer syntax.
- Add Properties/AssemblyInfo.cs with InternalsVisibleTo("AmiReel.Tests")
and make Validate/BuildProgressMessage/IsNoise internal so tests can
reach them directly instead of only through process-spawning entry
points.
- README: document `dotnet test`, and note that Package.appxmanifest's
Identity is a local-dev placeholder that needs a real publisher/cert
before MSIX distribution.
Verified: dotnet build (solution + test project) is 0 warnings/errors,
dotnet test is 59/59 passing, and the app still launches unchanged.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
93 lines
3.6 KiB
C#
93 lines
3.6 KiB
C#
using System.Diagnostics;
|
|
using System.Text;
|
|
using System.IO;
|
|
|
|
namespace AmiReel.Services;
|
|
|
|
public sealed class ProcessRunner
|
|
{
|
|
public async Task<string> RunAsync(
|
|
string executable,
|
|
IEnumerable<string> arguments,
|
|
Action<string>? log,
|
|
Action<TimeSpan>? position,
|
|
CancellationToken token,
|
|
bool allowFailure = false,
|
|
Action<FfmpegOutputLine>? outputHandler = null)
|
|
{
|
|
ProcessStartInfo start = new()
|
|
{
|
|
FileName = executable,
|
|
UseShellExecute = false,
|
|
CreateNoWindow = true,
|
|
RedirectStandardError = true,
|
|
RedirectStandardOutput = true,
|
|
StandardErrorEncoding = Encoding.UTF8,
|
|
StandardOutputEncoding = Encoding.UTF8
|
|
};
|
|
foreach (string argument in arguments)
|
|
start.ArgumentList.Add(argument);
|
|
|
|
using Process process = new() { StartInfo = start, EnableRaisingEvents = true };
|
|
StringBuilder output = new();
|
|
process.Start();
|
|
|
|
Task stdout = PumpAsync(process.StandardOutput, output, log, position, token, outputHandler);
|
|
Task stderr = PumpAsync(process.StandardError, output, log, position, token, outputHandler);
|
|
using CancellationTokenRegistration registration = token.Register(() =>
|
|
{
|
|
try { if (!process.HasExited) process.Kill(true); } catch { }
|
|
});
|
|
|
|
await Task.WhenAll(stdout, stderr, process.WaitForExitAsync(token));
|
|
if (process.ExitCode != 0 && !allowFailure)
|
|
throw new InvalidOperationException($"Process exited with code {process.ExitCode}.\n{output}");
|
|
return output.ToString();
|
|
}
|
|
|
|
private static async Task PumpAsync(
|
|
StreamReader reader, StringBuilder output, Action<string>? log,
|
|
Action<TimeSpan>? position, CancellationToken token, Action<FfmpegOutputLine>? outputHandler)
|
|
{
|
|
while (await reader.ReadLineAsync(token) is { } line)
|
|
{
|
|
output.AppendLine(line);
|
|
FfmpegOutputLine parsed = FfmpegProgressParser.Parse(line);
|
|
if (!IsNoise(parsed))
|
|
log?.Invoke(line);
|
|
if (parsed.Time is { } time)
|
|
position?.Invoke(time);
|
|
outputHandler?.Invoke(parsed);
|
|
}
|
|
}
|
|
|
|
internal static bool IsNoise(FfmpegOutputLine output)
|
|
{
|
|
string line = output.Line.TrimStart();
|
|
if (string.IsNullOrWhiteSpace(line))
|
|
return true;
|
|
|
|
if (line.StartsWith("frame=", StringComparison.OrdinalIgnoreCase))
|
|
return true;
|
|
|
|
if (output.Frame is not null || output.Time is not null)
|
|
return true;
|
|
|
|
if (line.StartsWith("ERROR:", StringComparison.OrdinalIgnoreCase)
|
|
|| line.StartsWith("WARNING:", StringComparison.OrdinalIgnoreCase)
|
|
|| line.Contains("skipped", StringComparison.OrdinalIgnoreCase)
|
|
|| line.Contains("could not", StringComparison.OrdinalIgnoreCase)
|
|
|| line.Contains("failed", StringComparison.OrdinalIgnoreCase)
|
|
|| line.Contains("not found", StringComparison.OrdinalIgnoreCase)
|
|
|| line.Contains("Output file is empty", StringComparison.OrdinalIgnoreCase))
|
|
return false;
|
|
|
|
return FfmpegOutputFilter.IsBoilerplateLine(line)
|
|
|| line.StartsWith("Side data:", StringComparison.OrdinalIgnoreCase)
|
|
|| line.StartsWith("encoder :", StringComparison.OrdinalIgnoreCase)
|
|
|| line.StartsWith("title :", StringComparison.OrdinalIgnoreCase)
|
|
|| line.StartsWith("CPB properties:", StringComparison.OrdinalIgnoreCase)
|
|
|| line.StartsWith("[", StringComparison.OrdinalIgnoreCase);
|
|
}
|
|
}
|