UI improvements for read past logs feature

Author: Razzmatazzz

TarkovMonitor/Blazor/AppLayout.razor

@@ -12,15 +12,15 @@
 			@CurrentPageTitle
 			<MudSpacer/>
 		</MudAppBar>
-		<MudDrawer @bind-Open="@drawerOpen" Elevation="1" Anchor="Anchor.Left" Variant="@DrawerVariant.Responsive" @OpenChanged="OnOpenChangedHandler">
+		<MudDrawer @bind-Open="@drawerOpen" Elevation="1" Anchor="Anchor.Left" Variant="@DrawerVariant.Responsive">
 			<MudDrawerHeader LinkToIndex="true">
 				<div>
 					<img src="tarkov-dev-logo.svg" width="100%" style="vertical-align: middle;"/>
 					                <MudText Align="Align.Center" Typo="Typo.h6">@LocalizationService.GetString("TarkovMonitor")</MudText>
 				</div>
 			</MudDrawerHeader>
 			<MudNavMenu Color="Color.Secondary" Bordered="true">
-				                <MudNavLink Href="/" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Message">@LocalizationService.GetString("Messages")</MudNavLink>
+				<MudNavLink Href="/" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Message">@LocalizationService.GetString("Messages")</MudNavLink>
                 <MudNavLink Href="/group" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Group">@LocalizationService.GetString("Group")</MudNavLink>
                 <MudNavLink Href="/settings" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Settings">@LocalizationService.GetString("Settings")</MudNavLink>
                 <MudNavLink Href="/sounds" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Speaker">@LocalizationService.GetString("Sounds")</MudNavLink>
@@ -62,9 +62,4 @@
 	{
 		InvokeAsync(StateHasChanged);
 	}
-
-	private void OnOpenChangedHandler()
-	{
-		System.Diagnostics.Debug.WriteLine("OpenChanged");
-	}
 }

TarkovMonitor/Blazor/Components/MessageBoard.razor

@@ -49,8 +49,8 @@
 
 </MudStack>
 
-        @code {
-        // Force refresh every minute to update timestamps
+@code {
+    // Force refresh every minute to update timestamps
     Timer? timer;  
 
     protected override void OnInitialized()
@@ -84,16 +84,16 @@
     {
         switch (type)
         {
-                    case "flea":
-            return LocalizationService.GetString("FleaMarketSale");
-                    case "debug":
-            return LocalizationService.GetString("Debug");
-                    case "exception":
-            return LocalizationService.GetString("Error");
-                    case "update":
-            return LocalizationService.GetString("Update");
-                    case "quest":
-            return LocalizationService.GetString("Quest");
+            case "flea":
+                return LocalizationService.GetString("FleaMarketSale");
+            case "debug":
+                return LocalizationService.GetString("Debug");
+            case "exception":
+                return LocalizationService.GetString("Error");
+            case "update":
+                return LocalizationService.GetString("Update");
+            case "quest":
+                return LocalizationService.GetString("Quest");
             default:
                 return "Info";
         }
@@ -125,6 +125,10 @@
     {
         InvokeAsync(() => StateHasChanged());
         var severity = Severity.Info;
+        if (e.Message.Type == "quest" && GameWatcher.ReadingPastLogs)
+        {
+            return;
+        }
         if (e.Message.Type == "exception")
         {
             severity = Severity.Error;

TarkovMonitor/Blazor/Pages/RawLogs/ForceReadDialog.razor

@@ -1,7 +1,6 @@
 @using System.ComponentModel
 @using Humanizer
 @inject MessageLog messageLog
-@inject GameWatcher eft
 @inject LocalizationService LocalizationService
 
 <MudDialog>
@@ -38,16 +37,28 @@
     </DialogContent>
     <DialogActions>
         <MudButton OnClick="Cancel">@LocalizationService.GetString("Cancel")</MudButton>
-        <MudButton Color="Color.Primary" OnClick="Submit">@LocalizationService.GetString("Ok")</MudButton>
+        <MudButton Color="Color.Primary" OnClick="Submit" Disabled="@SubmitDisabled">@LocalizationService.GetString("Ok")</MudButton>
     </DialogActions>
 </MudDialog>
 @code {
     [CascadingParameter] MudDialogInstance MudDialog { get; set; }
 
     internal GameWatcher customWatcher = new();
-    LogDetails? selectedBreakpoint;
+    LogDetails? _selectedBreakpoint;
+    LogDetails? selectedBreakpoint {
+        get
+        {
+            return _selectedBreakpoint;
+        }
+        set
+        {
+            SubmitDisabled = value == null;
+            _selectedBreakpoint = value;
+        }
+    }
     List<LogDetails>? breakpoints;
     Dictionary<string, TarkovMonitor.TaskStatus> TaskStatuses = new();
+    bool SubmitDisabled { get; set; } = true;
 
     protected override void OnInitialized()
     {
@@ -83,6 +94,8 @@
         {
             messageLog.AddMessage("You must have a valid Tarkov Tracker API token to read past logs.", "exception");
         }
+        SubmitDisabled = true;
+        GameWatcher.ReadingPastLogs = true;
         TaskStatuses.Clear();
         Dictionary<string, TarkovMonitor.TaskStatus> updateTasks = new();
         try
@@ -129,9 +142,13 @@
         }
         catch (Exception ex)
         {
-            messageLog.AddMessage($"Error finding task updates: {ex.Message}", "exception");
+            messageLog.AddMessage($"Error compiling task updates: {ex.Message}", "exception");
             return;
         }
+        finally
+        {
+            GameWatcher.ReadingPastLogs = false;
+        }
         try
         {
             if (updateTasks.Count > 0)

TarkovMonitor/Blazor/Pages/Settings/Settings.razor

@@ -223,6 +223,7 @@
             if (Properties.Settings.Default.language != value)
             {
                 LocalizationService.SetCulture(value);
+                messageLog.AddMessage("Please restart this application to complete the language change.", "warning");
                 //Properties.Settings.Default.language = value; // handled by LocalizationService.SetCulture
                 //Properties.Settings.Default.Save();
                 //InvokeAsync(StateHasChanged); // should be unnecessary since we're handling the OnLanguageChanged event

TarkovMonitor/GameWatcher.cs

@@ -16,6 +16,7 @@ internal class GameWatcher
         private readonly FileSystemWatcher screenshotWatcher;
         private string _logsPath = "";
         public static Profile CurrentProfile { get; set; } = new();
+        public static bool ReadingPastLogs = false;
         public bool InitialLogsRead { get; private set; } = false;
         public string LogsPath { 
             get
@@ -324,9 +325,9 @@ internal void GameWatcher_NewLogData(object? sender, NewLogDataEventArgs e)
                 var logMessages = Regex.Matches(e.Data, logPattern, RegexOptions.Multiline);
 
 #if DEBUG                
-                Debug.WriteLine("===log chunk start===");
-                Debug.WriteLine(e.Data);
-                Debug.WriteLine("===log chunk end===");
+                //Debug.WriteLine("===log chunk start===");
+                //Debug.WriteLine(e.Data);
+                //Debug.WriteLine("===log chunk end===");
 #endif
 
                 foreach (Match logMessage in logMessages)