wip commit

Author: itn3000

src/WEventViewer/MainWindow.axaml.cs

@@ -1,4 +1,7 @@
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using WEventViewer.ViewModel;
 
 namespace WEventViewer;
 
@@ -7,5 +10,15 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
+        WeakReferenceMessenger.Default.Register<MainWindow, OpenLogRequest>(this, async (recpient, req) =>
+        {
+            var vm = new OpenLogWindowViewModel();
+            var dlg = new OpenLogWindow()
+            {
+                DataContext = vm
+            };
+            await dlg.ShowDialog(this);
+            
+        });
     }
 }

src/WEventViewer/Model/EventLogRepository.cs

@@ -47,10 +47,11 @@ internal class EventLogRepository
     {
         List<LogRecord> records = [];
         public IEnumerable<LogRecord> Records => records;
-        public async Task Load(string logName, PathType pathType, string query, CancellationToken token)
+        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)
             {
                 await Task.Yield();
@@ -60,7 +61,13 @@ public async Task Load(string logName, PathType pathType, string query, Cancella
                     break;
                 }
                 lst.Add(record.ToLogRecord());
+                count++;
+                if((count & 0xff) == 0)
+                {
+                    progress?.Report(count);
+                }
             }
+            progress?.Report(count);
             while(!token.IsCancellationRequested)
             {
                 var old = records;

src/WEventViewer/ViewModel/MainWindowViewModel.cs

@@ -4,28 +4,51 @@
 using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Collections;
 using System.Windows.Input;
 using WEventViewer.Model;
+using System.Diagnostics.Eventing.Reader;
+using System.Diagnostics.Eventing;
+using System.Collections.ObjectModel;
 
 namespace WEventViewer.ViewModel
 {
+    class OpenLogRequest(MainWindowViewModel vm, string logName, PathType pathType)
+    {
+        public string LogName => logName;
+        public PathType PathType => pathType;
+    }
     internal class MainWindowViewModel
     {
-        record class OpenLogMessage(MainWindowViewModel vm);
         EventLogRepository? _EventLogRepository;
         public MainWindowViewModel(): this(null)
         {
         }
         public MainWindowViewModel(EventLogRepository repository)
         {
-            OpenCommand = new RelayCommand(() =>
+            _Progress = new Progress<long>(l => LogCount = l);
+            _EventLogRepository = repository;
+            OpenCommand = new RelayCommand(async () =>
             {
-                var ret = WeakReferenceMessenger.Default.Send<OpenLogMessage>(new(this));
+                var ret = WeakReferenceMessenger.Default.Send<OpenLogRequest>(new OpenLogRequest(this, "", PathType.LogName));
+                await _EventLogRepository.Load(ret.LogName, ret.PathType, null, default, _Progress);
             });
-            _EventLogRepository = repository;
         }
+        Progress<long> _Progress;
         public ICommand OpenCommand;
+        long _LogCount;
+        public long LogCount
+        {
+            get => _LogCount;
+            set
+            {
+                _LogCount = value;
+
+            }
+        }
+        public ObservableCollection<LogRecord> LogRecords;
     }
 }

src/WEventViewer/ViewModel/OpenLogWindowViewModel.cs

@@ -1,4 +1,5 @@
 using Avalonia.Data.Converters;
+using CommunityToolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -7,6 +8,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace WEventViewer.ViewModel
 {
@@ -67,7 +69,14 @@ public PathType PathType
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PathType)));
             }
         }
-
+        public OpenLogWindowViewModel()
+        {
+            IsOk = false;
+            OkCommand = new RelayCommand(() => IsOk = true);
+        }
+        public bool IsOk;
+        public ICommand OkCommand;
         public event PropertyChangedEventHandler? PropertyChanged;
+
     }
 }