feat(ui): color and acknowledge pinned log errors
Add independent AppLog message types and explicit Class 1/2 severity. Wrap and color log rows, pin Class 1 above Class 2, and let acknowledgement return entries to the current-launch timeline without changing file format or rotation. Ref: https://logtape.org/manual/levels
This commit is contained in:
@@ -9,11 +9,15 @@ public partial class MainViewModel
|
||||
{
|
||||
private const int VisibleLogEntryLimit = 500;
|
||||
private readonly ObservableCollection<AppLogEntry> _currentLaunchLogEntries = new();
|
||||
private readonly ObservableCollection<AppLogEntry> _pinnedLogEntries = new();
|
||||
private DispatcherTimer? _currentLaunchLogTimer;
|
||||
private long _lastCurrentLaunchLogSequence;
|
||||
private bool _isLogsTabSelected;
|
||||
|
||||
public ObservableCollection<AppLogEntry> CurrentLaunchLogEntries => _currentLaunchLogEntries;
|
||||
public ObservableCollection<AppLogEntry> PinnedLogEntries => _pinnedLogEntries;
|
||||
public bool HasPinnedLogEntries => _pinnedLogEntries.Count > 0;
|
||||
public RelayCommand<AppLogEntry> AcknowledgeLogEntryCommand => new(AcknowledgeLogEntry);
|
||||
|
||||
public bool IsLiveChatTabSelected
|
||||
{
|
||||
@@ -41,12 +45,19 @@ public partial class MainViewModel
|
||||
|
||||
private void InitializeCurrentLaunchLogs()
|
||||
{
|
||||
foreach (var entry in AppLog.SnapshotCurrentLaunch()
|
||||
.OrderByDescending(entry => entry.Sequence)
|
||||
.Take(VisibleLogEntryLimit))
|
||||
_currentLaunchLogEntries.Add(entry);
|
||||
var entries = AppLog.SnapshotCurrentLaunch()
|
||||
.OrderByDescending(entry => entry.Sequence)
|
||||
.Take(VisibleLogEntryLimit)
|
||||
.ToArray();
|
||||
foreach (var entry in entries)
|
||||
{
|
||||
if (entry.ErrorClass.HasValue)
|
||||
InsertPinnedLogEntry(entry);
|
||||
else
|
||||
_currentLaunchLogEntries.Add(entry);
|
||||
}
|
||||
|
||||
_lastCurrentLaunchLogSequence = _currentLaunchLogEntries.FirstOrDefault()?.Sequence ?? 0;
|
||||
_lastCurrentLaunchLogSequence = entries.FirstOrDefault()?.Sequence ?? 0;
|
||||
_currentLaunchLogTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(250) };
|
||||
_currentLaunchLogTimer.Tick += (_, _) => RefreshCurrentLaunchLogs();
|
||||
}
|
||||
@@ -83,13 +94,51 @@ public partial class MainViewModel
|
||||
|
||||
foreach (var entry in newEntries)
|
||||
{
|
||||
_currentLaunchLogEntries.Insert(0, entry);
|
||||
if (_currentLaunchLogEntries.Count > VisibleLogEntryLimit)
|
||||
_currentLaunchLogEntries.RemoveAt(_currentLaunchLogEntries.Count - 1);
|
||||
if (entry.ErrorClass.HasValue)
|
||||
InsertPinnedLogEntry(entry);
|
||||
else
|
||||
InsertChronologicalLogEntry(entry);
|
||||
_lastCurrentLaunchLogSequence = entry.Sequence;
|
||||
}
|
||||
}
|
||||
|
||||
private void InsertPinnedLogEntry(AppLogEntry entry)
|
||||
{
|
||||
var index = 0;
|
||||
while (index < _pinnedLogEntries.Count)
|
||||
{
|
||||
var current = _pinnedLogEntries[index];
|
||||
var currentClass = (int)current.ErrorClass!.Value;
|
||||
var entryClass = (int)entry.ErrorClass!.Value;
|
||||
if (currentClass < entryClass
|
||||
|| (currentClass == entryClass && current.Sequence > entry.Sequence))
|
||||
index++;
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
_pinnedLogEntries.Insert(index, entry);
|
||||
OnPropertyChanged(nameof(HasPinnedLogEntries));
|
||||
}
|
||||
|
||||
private void AcknowledgeLogEntry(AppLogEntry? entry)
|
||||
{
|
||||
if (entry?.ErrorClass == null || !_pinnedLogEntries.Remove(entry)) return;
|
||||
InsertChronologicalLogEntry(entry);
|
||||
OnPropertyChanged(nameof(HasPinnedLogEntries));
|
||||
}
|
||||
|
||||
private void InsertChronologicalLogEntry(AppLogEntry entry)
|
||||
{
|
||||
var index = 0;
|
||||
while (index < _currentLaunchLogEntries.Count
|
||||
&& _currentLaunchLogEntries[index].Sequence > entry.Sequence)
|
||||
index++;
|
||||
_currentLaunchLogEntries.Insert(index, entry);
|
||||
if (_currentLaunchLogEntries.Count > VisibleLogEntryLimit)
|
||||
_currentLaunchLogEntries.RemoveAt(_currentLaunchLogEntries.Count - 1);
|
||||
}
|
||||
|
||||
private void StopCurrentLaunchLogFeed()
|
||||
=> _currentLaunchLogTimer?.Stop();
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ public partial class MainViewModel : ViewModelBase
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AppLog.Write(ex, "Recording: failed to prepare output path");
|
||||
AppLog.Write(ex, "Recording: failed to prepare output path", AppLogErrorClass.Class2);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -45,7 +45,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
|
||||
if (!File.Exists(startPath))
|
||||
{
|
||||
AppLog.Write($"Recording: output not found for rename: {startPath}");
|
||||
AppLog.Write($"Recording: output not found for rename: {startPath}",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
return;
|
||||
}
|
||||
_recordLength = _liveElapsed;
|
||||
@@ -64,7 +65,7 @@ public partial class MainViewModel : ViewModelBase
|
||||
switch (result.Outcome)
|
||||
{
|
||||
case RecordingSaveOutcome.Saved:
|
||||
AppLog.Write($"Recording saved: {result.FinalPath}");
|
||||
AppLog.WriteSuccess($"Recording saved: {result.FinalPath}");
|
||||
_notifications.Info("Recording saved",
|
||||
Path.GetFileName(result.FinalPath!) +
|
||||
" — you can rename it in your videos folder at any time.");
|
||||
@@ -77,7 +78,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
case RecordingSaveOutcome.DiscardFailed:
|
||||
// A "discarded" recording still sitting on disk is worse than no
|
||||
// report at all — name the file and the folder so it can be found.
|
||||
AppLog.Write($"Recording discard failed: {startPath}");
|
||||
AppLog.Write($"Recording discard failed: {startPath}",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
_notifications.Error("Recording discarded?",
|
||||
$"Could not delete {Path.GetFileName(startPath)} — it is still in {dir}.");
|
||||
break;
|
||||
@@ -85,7 +87,7 @@ public partial class MainViewModel : ViewModelBase
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AppLog.Write(ex, "Recording: rename-on-stop failed");
|
||||
AppLog.Write(ex, "Recording: rename-on-stop failed", AppLogErrorClass.Class2);
|
||||
_notifications.Error("Recording saved",
|
||||
$"The recording was written but couldn't be renamed: {Path.GetFileName(startPath)}");
|
||||
}
|
||||
|
||||
@@ -159,7 +159,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
var stream = await _youtubeStream.GetOrCreateReusableStreamAsync();
|
||||
if (stream == null)
|
||||
{
|
||||
AppLog.Write("Reusable stream unavailable; check the OAuth session");
|
||||
AppLog.Write("Reusable stream unavailable; check the OAuth session",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
_notifications.Error("Couldn't go live",
|
||||
"The reusable stream is unavailable — check the YouTube sign-in and try again.");
|
||||
StopStream(); // full rollback — audio loop + recording + pills, no Error-status zombie
|
||||
@@ -174,12 +175,13 @@ public partial class MainViewModel : ViewModelBase
|
||||
_broadcastSeenLive = false;
|
||||
if (_currentBroadcastId == null)
|
||||
{
|
||||
AppLog.Write("Broadcast creation failed; check the OAuth session");
|
||||
AppLog.Write("Broadcast creation failed; check the OAuth session",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
_notifications.Error("Couldn't go live", "YouTube rejected the broadcast — check the sign-in and try again.");
|
||||
StopStream(); // full rollback
|
||||
return;
|
||||
}
|
||||
AppLog.Write($"Broadcast created: {_currentBroadcastId}");
|
||||
AppLog.WriteSuccess($"Broadcast created: {_currentBroadcastId}");
|
||||
OnPropertyChanged(nameof(CurrentBroadcastId));
|
||||
|
||||
// ⛔ THE BINDING — the call whose absence is why nothing ever went live
|
||||
@@ -198,7 +200,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
var bindError = await _youtubeStream.BindBroadcastAsync(_currentBroadcastId, stream.Id);
|
||||
if (bindError != null)
|
||||
{
|
||||
AppLog.Write($"Stream binding failed: {bindError}");
|
||||
AppLog.Write($"Stream binding failed: {bindError}",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
// Show the real reason. "Check the sign-in" would be wrong for five of the
|
||||
// six documented bind failures, and would hide our own ordering bug behind
|
||||
// a plausible excuse — see BindFailureMessage.
|
||||
@@ -216,7 +219,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AppLog.Write($"Go-live preparation failed: {ex.Message}");
|
||||
AppLog.Write($"Go-live preparation failed: {ex.Message}",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
_notifications.Error("Couldn't go live", ex.Message);
|
||||
StopStream(); // full rollback — a created broadcast (if any) gets the close-out
|
||||
return;
|
||||
@@ -242,12 +246,14 @@ public partial class MainViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
AppLog.Write("Could not retrieve liveChatId; chat polling disabled");
|
||||
AppLog.Write("Could not retrieve liveChatId; chat polling disabled",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
}
|
||||
}
|
||||
catch (Exception chatEx)
|
||||
{
|
||||
AppLog.Write($"Chat start failed (non-fatal): {chatEx.Message}");
|
||||
AppLog.Write($"Chat start failed (non-fatal): {chatEx.Message}",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
}
|
||||
|
||||
// TASK 41: a test broadcast hands its session to the Test drawer once
|
||||
@@ -285,7 +291,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
var health = await _youtubeStream.GetStreamHealthAsync(_reusableStream.Id);
|
||||
if (health == null)
|
||||
{
|
||||
AppLog.Write("Stream health poll failed; check the OAuth session");
|
||||
AppLog.Write("Stream health poll failed; check the OAuth session",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
return;
|
||||
}
|
||||
CurrentHealth.HealthStatus = health.HealthStatus;
|
||||
@@ -303,7 +310,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AppLog.Write($"Stream health poll failed: {ex.Message}");
|
||||
AppLog.Write($"Stream health poll failed: {ex.Message}",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -375,7 +383,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
{
|
||||
var closeOutError = await _youtubeStream.EndBroadcastAsync(endedBroadcastId);
|
||||
if (closeOutError != null)
|
||||
AppLog.Write($"End close-out: {closeOutError} — enableAutoStop will finish the broadcast");
|
||||
AppLog.Write($"End close-out: {closeOutError} — enableAutoStop will finish the broadcast",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
}
|
||||
|
||||
_currentBroadcastId = null;
|
||||
@@ -435,7 +444,7 @@ public partial class MainViewModel : ViewModelBase
|
||||
// with IsRecording=true and no encoder (first real launch proved it). The
|
||||
// failure now runs the NORMAL stop path on the UI thread (pills off, audio
|
||||
// loop closed, recording finalized, close-out if live), then explains itself.
|
||||
AppLog.Write($"Frame pump failed: {message}");
|
||||
AppLog.Write($"Frame pump failed: {message}", AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
void Handle()
|
||||
{
|
||||
var live = IsLive;
|
||||
@@ -567,7 +576,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
_notifications.Info("Broadcast deleted", "The broadcast was removed from YouTube.");
|
||||
break;
|
||||
case PrivateBroadcastOutcome.DeleteFailed:
|
||||
AppLog.Write($"Private broadcast delete failed: {broadcastId}: {error}");
|
||||
AppLog.Write($"Private broadcast delete failed: {broadcastId}: {error}",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class2);
|
||||
_notifications.Error("Couldn't delete the broadcast",
|
||||
$"{error}. It's still on YouTube as a private video — you can delete it in YouTube Studio.");
|
||||
break;
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ areas' docs in their own rows keeps this index small to read.
|
||||
| `MainViewModel.Streaming.cs` | Go-live/record + health + quality tiers + session UI. **Stream state:** `StreamStatus`/`StreamVisibility` setters + `_streamStatus` field, `IsOffline`/`IsLive`/`IsLivePrivate`. **Go-live flow:** `StartSession` (routes by pill state) → `BeginRecordOnly` (signed-out local recording) or `BeginGoLive` (GoLive dialog → captures title/description/visibility + `BroadcastForm.CaptureGoLive` → `PrepareAndStartLiveAsync`: reusable stream → `CreateBroadcast` (stores `_currentBroadcastId`) → empty-metadata warn → chat poll start (liveChatId) → `_framePump.StartAsync()` + health poll; failures → `StreamStatus.Error`, never a crash); `StartRecordFile` (auto-named `ty-…-0000.mp4`) + `FinalizeRecordingAsync` (rename modal, `UniquePath`); `StopStream` (posts Offline, stops chat/audio pipe/pump, clears `_currentBroadcastId`; session/token deliberately NOT cleared — sign-out stays explicit). **Health:** `CurrentHealth`/`ResetHealth`/`ApplyHealth`/`OnFramePumpHealthUpdated` (marshal `FramePump.HealthUpdated` off the stderr thread), `PollHealthAsync`/`OnHealthPollTick`/`ApplyHealthIssue` (report-by-exception banner `HealthIssueBanner`/`HealthIssueBackground` via `StreamHealthReporter`). **Session timer:** `_liveTimer` (ctor-wired) `UpdateSessionTimer`/`OnLiveTimerTick`/`LiveElapsedText`/`_recDotPulse`. **Start/End UI:** mode switch `RecordPillOn`/`OnAirPillOn`, top-bar worlds (`ShowIdleWorld`/`ShowRecordAction`/`ShowStreamActions`/`ShowSignInButton`/`ShowAvatarButton`, reality line `RunningVisible`/`RunningText`/`RunningDotBrush`, Test gate `ShowTestButton`/`CanStartTest` — `RaiseTopBarModes()`), `ShowPrimaryStartButton`/`CanStartSession`/`ShowEndStreamButton`/`EndButtonText`, REC sign `RecDotBrush`/`RecTextBrush`/`RecDotOpacity`/`OnAirBrush`, live window tokens `WindowTitle`/`TopBarBackground`/`PreviewGlow*` via `UpdateLiveVisuals`; `ChooseRecordFolder`/`ResetRecordFolder`/`_recordFolder`/`RecordFolderDisplay`/`DefaultRecordFolder`. **Resolution dropdown:** `QualityOptions`/`SelectedQuality`/`ResolutionHelp`/`ApplyStreamQuality` + `OutputRect*`/`DimRects`/`IsOutputCropped`/`ResolutionBadgeText` over the 1920×1080 master; **TASK 57:** the tier change also resolves every scene's camera placement (the vertical tier brings the vertical placements in, 16:9 restores the desktop layout — see `MainViewModel.Webcam.cs`). **Pipeline bits:** `_framePump`/`_liveTimer`/`_healthPollTimer` fields, `BuildEncoderOptions`. Commands `StartStreamCommand`/`EndStreamCommand`/`ChooseRecordFolderCommand`/`ResetRecordFolderCommand`. Broadcast pull-out: `CurrentBroadcastId`/`BroadcastForm`. **TASK 57 (Unit 2):** the tier change also raises `CanToggleClipShape` (the circle option disappears in the vertical Chat layout). |
|
||||
| `MainViewModel.Overlays.cs` | Settings/bug/feature/about panels + creator-hub links: panel state `IsSettingsOpen`/`IsBugOpen`/`IsFeatureOpen`/`IsAboutOpen` (via `SetPanel` → `IsAnyOverlayOpen`), `IsLicensesOpen` (flips `IsHubVisible`), `OverlayTitle`, `ShowOverlay` (one-panel exclusivity), `ShowAbout` (returns to the About hub) + `ShowLicenses` (loads shipped `THIRD-PARTY-NOTICES.txt` into `LicensesText` in-app); bug/feature report `BugReportText`/`BugReportEmail`/`FeatureRequestText`/`FeatureRequestEmail` + `SubmitBug`/`SubmitFeature`/`ComposeEmail`/`OpenUrl`; About hub consts `ChannelUrl`/`MastodonUrl`/`CoffeeUrl` + `PremiumUrl` (`https://llamacasty.com`, opens only when explicitly clicked) + `IsPremiumAvailable` + `SupportEmail` + `AppVersionLabel`; commands `OpenSettingsCommand`/`OpenBugCommand`/`OpenFeatureCommand`/`OpenAboutCommand`/`CloseOverlayCommand`/`SubmitBugCommand`/`SubmitFeatureCommand`/`OpenChannelCommand`/`OpenMastodonCommand`/`OpenCoffeeCommand`/`OpenPremiumCommand`/`OpenLicensesCommand`. A locked quality selection opens About without changing the tier. Ctor command assignments stay in core. |
|
||||
| `MainViewModel.Chat.cs` | Chat overlay + preview pipeline: `ChatMessages` (500-message cap; clear-on-fade), `OnChatMessageReceived` (marshal `_youtubeChat.MessageReceived` onto the dispatcher, switch previews mock→real, then feed **both** component layers), fade `_chatFadeTimer`/`ResetChatFadeTimer` (shortest `ChatFadeSeconds` across chat layers); live render `RenderChatBox` (called from `ResolveOutputFrame`, stays in core) + preview render `UpdateChatBoxPreview` (bitmap onto `chatBox.VideoImageSource`); mock preview `MockChatMessages`/`StartMockChatPreview`/`StopMockChatPreview`/`RunMockChatPreviewAsync`/`_mockChatCts`; `UpdateActiveChatBoxPreviews` (wires Chat* property-change subscriptions + first render); `CanAddYouTubeChat` (one-per-layout gate), `ShowChatInactiveMessage` (`!IsLive`). **Alerts (TASK 43):** same facade for the native alert box — `_alertLayer` (`AlertOverlayLayer`), `RenderAlertBox`/`UpdateAlertBoxPreview`, `UpdateActiveAlertBoxPreviews`, `CanAddAlerts` (one alert zone per layout). Ctor wiring (`MessageReceived` hookup, `new ChatBoxRenderer()`, `new AlertRenderer()`, `LoadLayout` preview start, `_youtubeChat.Dispose` + `_alertLayer.Dispose`) stays in core. |
|
||||
| `MainViewModel.Logs.cs` | Non-edit left-panel tab state and the bounded current-launch log collection; refreshes the process-local AppLog snapshot while Logs is selected and stops its dispatcher timer on shutdown. |
|
||||
| `MainViewModel.Logs.cs` | Non-edit left-panel tab state and bounded current-launch log collections; refreshes the process-local AppLog snapshot while Logs is selected, pins Class 1 before Class 2 until acknowledged, then returns entries to the LIFO timeline; stops its dispatcher timer on shutdown. |
|
||||
| `GoLiveViewModel.cs` | Start Stream dialog: **account row** (saved channel shown with Change Account, or Sign in to YouTube; Start gated on `IsSignedIn`/`IsBusy`) + title/description + **locked Visibility (always "Private" — ship step 7, no dropdown)**, start/cancel requests |
|
||||
| **About hub (TASK 11, in `MainViewModel.Overlays.cs`)** | the About overlay is the in-app creator hub: `ChannelUrl`/`MastodonUrl`/`CoffeeUrl` (public consts, live) + `PremiumUrl` (tabled billing seam — TASK 12 → the greyed "Unlock Premium" button lights up when filled); `OpenLicensesCommand` → `ShowLicenses()` loads the shipped `THIRD-PARTY-NOTICES.txt` into `LicensesText` and sets `IsLicensesOpen` (in-app scrolling panel, never the OS viewer); `BackToAbout_Click` in `MainWindow.xaml.cs` flips it off. |
|
||||
| `ReuseImageViewModel.cs` | Add Image dialog: candidate list (`ReuseImageCandidate`), reuse/new/cancel |
|
||||
|
||||
Reference in New Issue
Block a user