wip commit

Author: itn3000

src/WEventViewer/MainWindow.axaml

@@ -12,7 +12,7 @@
   <StackPanel Orientation="Vertical">
     <Menu DockPanel.Dock="Top">
       <MenuItem Header="_File">
-        <MenuItem Header="_Open" Command="{Binding $parent.$parent.$parent.$parent.OpenCommand}"/>
+        <MenuItem Header="_Open" Command="{Binding $parent.$parent.$parent.DataContext.OpenCommand}"/>
       </MenuItem>
       <MenuItem Header="_About"/>
     </Menu>

src/WEventViewer/MainWindow.axaml.cs

@@ -10,6 +10,7 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
+        DataContext = new MainWindowViewModel();
         WeakReferenceMessenger.Default.Register<MainWindow, OpenLogRequest>(this, async (recpient, req) =>
         {
             var vm = new OpenLogWindowViewModel();
@@ -18,7 +19,8 @@ public MainWindow()
                 DataContext = vm
             };
             await dlg.ShowDialog(this);
-            
+            req.PathType = vm.PathType;
+            req.LogName = vm.LogName;
         });
     }
 }

src/WEventViewer/Model/EventLogRepository.cs

@@ -7,6 +7,7 @@
 using System.Diagnostics.Eventing.Reader;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Collections.ObjectModel;
 
 namespace WEventViewer.Model
 {
@@ -45,11 +46,14 @@ public static LogRecord ToLogRecord(this EventRecord record)
     }
     internal class EventLogRepository
     {
-        List<LogRecord> records = [];
-        public IEnumerable<LogRecord> Records => records;
+        ObservableCollection<LogRecord> records = [];
+        public ObservableCollection<LogRecord> Records => records;
+        public void Clear()
+        {
+            records.Clear();
+        }
         public async Task Load(string logName, PathType pathType, string? query, CancellationToken token, IProgress<long> progress)
         {
-            var lst = new List<LogRecord>();
             using var evreader = new EventLogReader(new EventLogQuery(logName, pathType, query));
             long count = 0;
             while(!token.IsCancellationRequested)
@@ -60,23 +64,14 @@ public async Task Load(string logName, PathType pathType, string? query, Cancell
                 {
                     break;
                 }
-                lst.Add(record.ToLogRecord());
+                records.Add(record.ToLogRecord());
                 count++;
                 if((count & 0xff) == 0)
                 {
                     progress?.Report(count);
                 }
             }
             progress?.Report(count);
-            while(!token.IsCancellationRequested)
-            {
-                var old = records;
-                var exchanged = Interlocked.CompareExchange(ref records, lst, old);
-                if(exchanged == old)
-                {
-                    break;
-                }
-            }
         }
     }
 }

src/WEventViewer/ViewModel/MainWindowViewModel.cs

@@ -13,30 +13,41 @@
 using System.Diagnostics.Eventing.Reader;
 using System.Diagnostics.Eventing;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 
 namespace WEventViewer.ViewModel
 {
-    class OpenLogRequest(MainWindowViewModel vm, string logName, PathType pathType)
+    class OpenLogRequest
     {
-        public string LogName => logName;
-        public PathType PathType => pathType;
+        public string? LogName { get; set; }
+        public PathType PathType { get; set; }
     }
     internal class MainWindowViewModel
     {
         EventLogRepository? _EventLogRepository;
-        public MainWindowViewModel(): this(null)
-        {
-        }
-        public MainWindowViewModel(EventLogRepository repository)
+        public MainWindowViewModel()
         {
             _Progress = new Progress<long>(l => LogCount = l);
-            _EventLogRepository = repository;
+            _EventLogRepository = new EventLogRepository();
+            _EventLogRepository.Records.CollectionChanged += Records_CollectionChanged;
             OpenCommand = new RelayCommand(async () =>
             {
-                var ret = WeakReferenceMessenger.Default.Send<OpenLogRequest>(new OpenLogRequest(this, "", PathType.LogName));
-                await _EventLogRepository.Load(ret.LogName, ret.PathType, null, default, _Progress);
+                var ret = WeakReferenceMessenger.Default.Send<OpenLogRequest>(new OpenLogRequest());
+                if(ret.LogName != null)
+                {
+                    await _EventLogRepository.Load(ret.LogName, ret.PathType, null, default, _Progress);
+                }
             });
         }
+
+        private void Records_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            if(_EventLogRepository != null)
+            {
+                LogCount = _EventLogRepository.Records.Count;
+            }
+        }
+
         Progress<long> _Progress;
         public ICommand OpenCommand;
         long _LogCount;
@@ -49,6 +60,6 @@ public long LogCount
 
             }
         }
-        public ObservableCollection<LogRecord> LogRecords;
+        public ObservableCollection<LogRecord> LogRecords => _EventLogRepository.Records;
     }
 }