TASK 4 ship step 5.5: social bar bug fixes + bar on the live output — direction-snap drag (SocialBarSnap.Decide + ClearValue, local Canvas.Top was overriding the binding), fediverse nodeinfo subdomain probing + load-time heal (settable FediverseSoftware), SocialBarRenderer strip blitted above the flash via a re-read FramePump socialBar seam — 155 tests passing, 0 warnings
This commit is contained in:
@@ -80,6 +80,7 @@ public class MainViewModel : ViewModelBase
|
||||
private Webcam? _webcam;
|
||||
private string? _webcamError;
|
||||
private SocialsConfig? _socials;
|
||||
private VideoFrame? _socialBarFrame;
|
||||
private readonly IMicrophoneEnumerator _microphoneEnumerator;
|
||||
|
||||
// Live audio capture (TASK 4 ship step 4): desktop/game via WASAPI loopback,
|
||||
@@ -872,7 +873,8 @@ public class MainViewModel : ViewModelBase
|
||||
compositorOptions: BuildCompositorOptions,
|
||||
encoderOptions: BuildEncoderOptions,
|
||||
encoderFactory: () => new FfmpegEncoder(new FfmpegLocator()),
|
||||
log: message => AppLog.Write(message));
|
||||
log: message => AppLog.Write(message),
|
||||
socialBar: () => (_socialBarFrame, _socials?.BarPosition ?? SocialBarPosition.Bottom));
|
||||
_framePump.Failed += OnFramePumpFailed;
|
||||
|
||||
LoadLayout();
|
||||
@@ -966,6 +968,8 @@ public class MainViewModel : ViewModelBase
|
||||
ReacquireWebcam();
|
||||
ReacquireScreenCaptures();
|
||||
_socials = _layoutStore.Socials;
|
||||
RenderSocialBarFrame();
|
||||
HealFediverseSoftwareInBackground();
|
||||
OnPropertyChanged(nameof(HasSocials));
|
||||
OnPropertyChanged(nameof(SocialBarVisible));
|
||||
OnPropertyChanged(nameof(SocialBarDotBrush));
|
||||
@@ -1902,6 +1906,83 @@ public class MainViewModel : ViewModelBase
|
||||
|
||||
// ─── Social bar ───
|
||||
|
||||
/// <summary>
|
||||
/// Resolves a missing nodeinfo software name (mastodon, peertube, ...) for every
|
||||
/// fediverse entry that doesn't have one, so the bar shows the instance's real
|
||||
/// logo instead of the generic fediverse glyph. Best-effort: a failed resolution
|
||||
/// leaves the glyph untouched. Returns handle → software for what was resolved —
|
||||
/// the caller applies + persists (the app hops to the dispatcher; a test applies
|
||||
/// directly).
|
||||
/// </summary>
|
||||
public static async Task<Dictionary<string, string>> HealFediverseSoftwareAsync(
|
||||
SocialsConfig socials,
|
||||
ISocialValidator validator,
|
||||
Action<string>? log = null)
|
||||
{
|
||||
var resolved = new Dictionary<string, string>();
|
||||
if (socials == null || validator == null) return resolved;
|
||||
foreach (var entry in socials.Entries)
|
||||
{
|
||||
if (entry.Service != SocialService.Fediverse
|
||||
|| !string.IsNullOrWhiteSpace(entry.FediverseSoftware))
|
||||
continue;
|
||||
if (!SocialServiceIcons.TryParseFediverse(entry.Handle, out _, out var domain))
|
||||
continue;
|
||||
var software = await validator.ResolveFediverseSoftwareAsync(
|
||||
domain, System.Threading.CancellationToken.None);
|
||||
if (string.IsNullOrWhiteSpace(software)) continue;
|
||||
resolved[entry.Handle] = software;
|
||||
log?.Invoke($"Socials heal: {entry.Handle} → {software}");
|
||||
}
|
||||
return resolved;
|
||||
}
|
||||
|
||||
/// <summary>Runs the heal off the UI thread and applies + saves any result.</summary>
|
||||
private void HealFediverseSoftwareInBackground()
|
||||
{
|
||||
var socials = _socials;
|
||||
if (socials == null) return;
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
var resolved = await HealFediverseSoftwareAsync(
|
||||
socials, _socialValidator, m => AppLog.Write(m));
|
||||
if (resolved.Count == 0) return;
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
var current = _socials;
|
||||
if (current == null) return;
|
||||
var applied = false;
|
||||
foreach (var entry in current.Entries)
|
||||
{
|
||||
if (!resolved.TryGetValue(entry.Handle, out var software)) continue;
|
||||
if (entry.FediverseSoftware == software) continue;
|
||||
entry.FediverseSoftware = software;
|
||||
applied = true;
|
||||
}
|
||||
if (applied) NotifySocialsChanged(); // re-renders the bar + saves
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AppLog.Write($"Socials heal failed: {ex.Message}");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Re-rasterizes the social bar strip the output compositor overlays. UI thread
|
||||
/// only (WPF rendering); the resulting frame is immutable, so the frame pump may
|
||||
/// read it from its own thread. Null when the bar is off or empty.
|
||||
/// </summary>
|
||||
private void RenderSocialBarFrame()
|
||||
{
|
||||
_socialBarFrame = _socials != null && _socials.BarEnabled
|
||||
? SocialBarRenderer.Render(_socials.Entries)
|
||||
: null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Opens the Social Media Site Promotion dialog (6 slots, sign-in gate,
|
||||
/// validation). On save the working copy replaces <see cref="_socials"/>.
|
||||
@@ -1925,6 +2006,7 @@ public class MainViewModel : ViewModelBase
|
||||
|
||||
private void NotifySocialsChanged()
|
||||
{
|
||||
RenderSocialBarFrame();
|
||||
OnPropertyChanged(nameof(HasSocials));
|
||||
OnPropertyChanged(nameof(SocialBarVisible));
|
||||
OnPropertyChanged(nameof(SocialBarDotBrush));
|
||||
|
||||
Reference in New Issue
Block a user