Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions src/Ytdlp.NET/Ytdlp/Ytdlp.Execute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,33 @@ public async Task<ProcessResult> ExecuteRawAsync(string arguments,
var sanitizedArgs = string.Join(" ", tokens.Select(EscapeArgument));

var runner = CreateRunner();

// ── Wire runner events → Ytdlp public events ──────────────────────────
void OnErrorMessageHandler(object? s, string msg) => ErrorMessage?.Invoke(this, msg);
void OnCommandCompletedHandler(object? s, CommandCompletedEventArgs e) => CommandCompleted?.Invoke(this, e);

runner.ErrorReceived += OnErrorMessageHandler;
runner.CommandCompleted += OnCommandCompletedHandler;

bool captureFullOutput = (onLineReceived == null);

return await runner.ExecuteAsync(
arguments: arguments, // Now we know it's "cleaner"
auth: _auth,
adobePass: _adobePass,
onLineReceived: onLineReceived,
ct: ct,
tuneProcess: tuneProcess,
captureFullOutput: captureFullOutput
);
try
{
return await runner.ExecuteAsync(
arguments: arguments, // Now we know it's "cleaner"
auth: _auth,
adobePass: _adobePass,
onLineReceived: onLineReceived,
ct: ct,
tuneProcess: tuneProcess,
captureFullOutput: captureFullOutput
);
}
finally
{
runner.ErrorReceived -= OnErrorMessageHandler;
runner.CommandCompleted -= OnCommandCompletedHandler;
}
}

/// <summary>
Expand Down
21 changes: 18 additions & 3 deletions src/Ytdlp.NET/Ytdlp/Ytdlp.Probe.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Globalization;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -426,12 +427,21 @@ public async Task<List<SubtitleTrack>> GetSubtitlesAsync(string url, Cancellatio
/// Returns <see langword="null"/> if the process fails, is cancelled, or produces no output.
/// </summary>
private async Task<string?> RunProbeAsync(string arguments, CancellationToken ct = default, bool tuneProcess = true)
{
{
var runner = CreateRunner();

// ── Wire runner events → Ytdlp public events ──────────────────────────
void OnErrorMessageHandler(object? s, string msg) => ErrorMessage?.Invoke(this, msg);
void OnCommandCompletedHandler(object? s, CommandCompletedEventArgs e) => CommandCompleted?.Invoke(this, e);

runner.ErrorReceived += OnErrorMessageHandler;
runner.CommandCompleted += OnCommandCompletedHandler;

try
{
ct.ThrowIfCancellationRequested();

var result = await CreateRunner().ExecuteAsync(
var result = await runner.ExecuteAsync(
arguments,
onLineReceived: null,
ct: ct,
Expand All @@ -452,6 +462,11 @@ public async Task<List<SubtitleTrack>> GetSubtitlesAsync(string url, Cancellatio
_logger.Log(LogType.Error, $"Probe failed: {ex.Message}");
return null;
}
finally
{
runner.ErrorReceived -= OnErrorMessageHandler;
runner.CommandCompleted -= OnCommandCompletedHandler;
}
}


Expand Down
Loading