Upload FastSeekWpf/MainWindow.xaml.cs

FastSeekWpf/MainWindow.xaml.cs

@@ -64,10 +64,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         if (_initialized) return;
         _initialized = true;
 
-        Task.Run(async () =>
-        {
-            await InitializeAsync();
-        });
+        Task.Run(async () => await InitializeAsync());
     }
 
     private async Task InitializeAsync()
@@ -84,6 +81,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         }
 
         // Try cache first
+        bool needFullScan = true;
         var cache = CacheManager.LoadCache();
         if (cache != null)
         {
@@ -95,6 +93,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
 
             // Delta catch-up
             var checkpoints = new List<JournalCheckpoint>(cache.Checkpoints);
+            bool deltaOk = true;
             foreach (var drive in _drives)
             {
                 var cp = checkpoints.FirstOrDefault(c => c.DriveLetter == drive.Letter);
@@ -111,24 +110,34 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                         }
                         _watchers.Add(watcher);
                     }
-                    catch
+                    catch (Exception ex)
                     {
-                        CacheManager.ClearCache();
-                        // Fall through to full scan
-                        goto fullscan;
+                        Debug.WriteLine($"Delta catch-up failed: {ex.Message}");
+                        deltaOk = false;
+                        break;
                     }
                 }
             }
 
-            // Apply delta events
-            while (_eventQueue.TryDequeue(out var evt))
+            if (deltaOk)
             {
-                ApplyEvent(evt);
+                needFullScan = false;
+                // Apply delta events
+                while (_eventQueue.TryDequeue(out var evt))
+                {
+                    ApplyEvent(evt);
+                }
+            }
+            else
+            {
+                CacheManager.ClearCache();
+                _watchers.Clear();
+                _eventQueue.Clear();
             }
         }
-        else
+
+        if (needFullScan)
         {
-        fullscan:
             lock (_indexLock)
             {
                 _index = new IndexStore();
@@ -186,13 +195,9 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                 processed++;
                 if (processed > 100) break; // Batch limit
             }
-            if (processed > 0)
+            if (processed > 50)
             {
-                // Save cache periodically
-                if (processed > 50)
-                {
-                    CacheManager.SaveCache(_index);
-                }
+                CacheManager.SaveCache(_index);
             }
             Thread.Sleep(100);
         }
@@ -307,41 +312,46 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         var query = SearchBox.Text.Trim();
         if (string.IsNullOrEmpty(query))
         {
-            Results = new List<ResultItem>();
-            UpdateVisibility();
+            Dispatcher.Invoke(() =>
+            {
+                Results = new List<ResultItem>();
+                UpdateVisibility();
+            });
             return;
         }
 
+        List<SearchResult> results;
         lock (_indexLock)
         {
-            var results = SearchEngine.Search(_index, query, 50, _caseSensitive, _excludedDirs);
-            var items = results.Select((r, i) => new ResultItem
-            {
-                FullPath = r.FullPath,
-                DisplayName = Path.GetFileNameWithoutExtension(r.FullPath),
-                IsSelected = i == 0,
-                IsHovered = false,
-                Kind = r.Kind,
-                IconGlyph = GetIconGlyph(r.Kind),
-                BadgeLabel = GetBadgeLabel(r.Kind),
-                BadgeColor = GetBadgeColor(r.Kind)
-            }).ToList();
-
-            Dispatcher.Invoke(() =>
-            {
-                _selectedIndex = 0;
-                Results = items;
-                UpdateVisibility();
-                StatusText.Text = $"{items.Count} results";
-            });
+            results = SearchEngine.Search(_index, query, 50, _caseSensitive, _excludedDirs);
         }
+
+        var items = results.Select((r, i) => new ResultItem
+        {
+            FullPath = r.FullPath,
+            DisplayName = Path.GetFileNameWithoutExtension(r.FullPath),
+            IsSelected = i == 0,
+            IsHovered = false,
+            Kind = r.Kind,
+            IconGlyph = GetIconGlyph(r.Kind),
+            BadgeLabel = GetBadgeLabel(r.Kind),
+            BadgeColor = GetBadgeColor(r.Kind)
+        }).ToList();
+
+        Dispatcher.Invoke(() =>
+        {
+            _selectedIndex = 0;
+            Results = items;
+            UpdateVisibility();
+            StatusText.Text = $"{items.Count} results";
+        });
     }
 
     private void UpdateVisibility()
     {
         bool hasResults = Results.Count > 0;
         SepLine.Visibility = hasResults ? Visibility.Visible : Visibility.Collapsed;
-        ResultsList.Visibility = hasResults ? Visibility.Visible : Visibility.Collapsed;
+        ResultsScroll.Visibility = hasResults ? Visibility.Visible : Visibility.Collapsed;
         StatusBar.Visibility = Visibility.Visible;
     }
 
@@ -349,12 +359,20 @@ public partial class MainWindow : Window, INotifyPropertyChanged
     {
         if (Results.Count == 0 || newIndex < 0 || newIndex >= Results.Count) return;
 
-        var items = new List<ResultItem>(Results);
-        if (_selectedIndex >= 0 && _selectedIndex < items.Count)
-            items[_selectedIndex] = items[_selectedIndex] with { IsSelected = false };
-        items[newIndex] = items[newIndex] with { IsSelected = true };
+        // Use new list to trigger PropertyChanged
+        var items = Results.Select((r, i) => r with
+        {
+            IsSelected = i == newIndex,
+            IsHovered = i == newIndex
+        }).ToList();
         _selectedIndex = newIndex;
         Results = items;
+
+        // Scroll selected item into view
+        if (ResultsList.ItemContainerGenerator.ContainerFromIndex(newIndex) is FrameworkElement container)
+        {
+            container.BringIntoView();
+        }
     }
 
     // -- Mouse --
@@ -381,11 +399,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         }
     }
 
-    private void ResultItem_Up(object sender, MouseButtonEventArgs e)
-    {
-        // Double-click handled separately if needed
-    }
-
     private void OpenResult(bool folderOnly)
     {
         if (Results.Count == 0 || _selectedIndex < 0 || _selectedIndex >= Results.Count) return;