From f0a3c19a3c7c19e18fed64a20783161fa6d75517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D1=83=D1=80=D0=BD=D0=B0=D1=82=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <sevenhill@live.ru>
Date: Wed, 18 Feb 2026 14:49:20 +0300
Subject: [PATCH] qwen edit

---
 BookReader/ViewModels/BookshelfViewModel.cs   | 39 ++++++++++++++++++
 .../ViewModels/CalibreLibraryViewModel.cs     | 26 +++++++++++-
 BookReader/Views/BookshelfPage.xaml           | 41 ++++++++++++-------
 BookReader/Views/CalibreLibraryPage.xaml      | 41 ++++++++++++++++---
 4 files changed, 126 insertions(+), 21 deletions(-)

diff --git a/BookReader/ViewModels/BookshelfViewModel.cs b/BookReader/ViewModels/BookshelfViewModel.cs
index 11f25fa..b190fee 100644
--- a/BookReader/ViewModels/BookshelfViewModel.cs
+++ b/BookReader/ViewModels/BookshelfViewModel.cs
@@ -19,6 +19,12 @@ public partial class BookshelfViewModel : BaseViewModel
     [ObservableProperty]
     private bool _isEmpty;
 
+    [ObservableProperty]
+    private bool _isRefreshing;
+
+    [ObservableProperty]
+    private string _searchText = string.Empty;
+
     public BookshelfViewModel(
         IDatabaseService databaseService,
         IBookParserService bookParserService,
@@ -43,6 +49,17 @@ public partial class BookshelfViewModel : BaseViewModel
         try
         {
             var books = await _databaseService.GetAllBooksAsync();
+            
+            // Применяем фильтр поиска если есть
+            if (!string.IsNullOrWhiteSpace(SearchText))
+            {
+                var searchLower = SearchText.ToLowerInvariant();
+                books = books.Where(b => 
+                    b.Title.ToLowerInvariant().Contains(searchLower) || 
+                    b.Author.ToLowerInvariant().Contains(searchLower)
+                ).ToList();
+            }
+            
             Books.Clear();
             foreach (var book in books)
             {
@@ -60,6 +77,28 @@ public partial class BookshelfViewModel : BaseViewModel
         }
     }
 
+    [RelayCommand]
+    public async Task RefreshBooksAsync()
+    {
+        if (IsRefreshing) return;
+        IsRefreshing = true;
+
+        try
+        {
+            await LoadBooksAsync();
+        }
+        finally
+        {
+            IsRefreshing = false;
+        }
+    }
+
+    [RelayCommand]
+    public async Task SearchAsync()
+    {
+        await LoadBooksAsync();
+    }
+
     [RelayCommand]
     public async Task AddBookFromFileAsync()
     {
diff --git a/BookReader/ViewModels/CalibreLibraryViewModel.cs b/BookReader/ViewModels/CalibreLibraryViewModel.cs
index 2e40bcf..7b1a736 100644
--- a/BookReader/ViewModels/CalibreLibraryViewModel.cs
+++ b/BookReader/ViewModels/CalibreLibraryViewModel.cs
@@ -26,6 +26,12 @@ public partial class CalibreLibraryViewModel : BaseViewModel
     [ObservableProperty]
     private string _downloadStatus = string.Empty;
 
+    [ObservableProperty]
+    private bool _isRefreshing;
+
+    [ObservableProperty]
+    private string _connectionErrorMessage = string.Empty;
+
     private int _currentPage;
 
     public CalibreLibraryViewModel(
@@ -67,6 +73,7 @@ public partial class CalibreLibraryViewModel : BaseViewModel
         if (IsBusy || !IsConfigured) return;
         IsBusy = true;
         _currentPage = 0;
+        ConnectionErrorMessage = string.Empty;
 
         try
         {
@@ -79,7 +86,8 @@ public partial class CalibreLibraryViewModel : BaseViewModel
         }
         catch (Exception ex)
         {
-            await _navigationService.DisplayAlertAsync("Error", $"Failed to load library: {ex.Message}", "OK");
+            ConnectionErrorMessage = "No connection to Calibre server";
+            System.Diagnostics.Debug.WriteLine($"Error loading Calibre library: {ex.Message}");
         }
         finally
         {
@@ -87,6 +95,22 @@ public partial class CalibreLibraryViewModel : BaseViewModel
         }
     }
 
+    [RelayCommand]
+    public async Task RefreshBooksAsync()
+    {
+        if (IsRefreshing || !IsConfigured) return;
+        IsRefreshing = true;
+
+        try
+        {
+            await LoadBooksAsync();
+        }
+        finally
+        {
+            IsRefreshing = false;
+        }
+    }
+
     [RelayCommand]
     public async Task LoadMoreBooksAsync()
     {
diff --git a/BookReader/Views/BookshelfPage.xaml b/BookReader/Views/BookshelfPage.xaml
index 1f95a66..d77893d 100644
--- a/BookReader/Views/BookshelfPage.xaml
+++ b/BookReader/Views/BookshelfPage.xaml
@@ -30,10 +30,20 @@
         </Grid>
     </Shell.TitleView>
 
-    <Grid RowDefinitions="*,Auto" BackgroundColor="#3E2723">
+    <Grid RowDefinitions="Auto,*,Auto" BackgroundColor="#3E2723">
+
+        <!-- Search Bar -->
+        <SearchBar Grid.Row="0"
+                   Text="{Binding SearchText}"
+                   SearchCommand="{Binding SearchCommand}"
+                   Placeholder="Search by title or author..."
+                   PlaceholderColor="#A1887F"
+                   TextColor="White"
+                   BackgroundColor="#4E342E"
+                   Margin="10,5" />
 
         <!-- Bookshelf Background -->
-        <Grid Grid.Row="0">
+        <Grid Grid.Row="1">
             <!-- Empty state -->
             <VerticalStackLayout IsVisible="{Binding IsEmpty}"
                                  VerticalOptions="Center"
@@ -54,18 +64,20 @@
                        HorizontalTextAlignment="Center" />
             </VerticalStackLayout>
 
-            <!-- Book Collection -->
-            <CollectionView ItemsSource="{Binding Books}"
-                            IsVisible="{Binding IsEmpty, Converter={StaticResource InvertedBoolConverter}}"
-                            SelectionMode="None"
-                            Margin="10">
+            <!-- Book Collection with PullToRefresh -->
+            <RefreshView Command="{Binding RefreshBooksCommand}"
+                         IsRefreshing="{Binding IsRefreshing}"
+                         IsVisible="{Binding IsEmpty, Converter={StaticResource InvertedBoolConverter}}">
+                <CollectionView ItemsSource="{Binding Books}"
+                                SelectionMode="None"
+                                Margin="10">
 
-                <CollectionView.ItemsLayout>
-                    <GridItemsLayout Orientation="Vertical"
-                                     Span="3"
-                                     HorizontalItemSpacing="10"
-                                     VerticalItemSpacing="15" />
-                </CollectionView.ItemsLayout>
+                    <CollectionView.ItemsLayout>
+                        <GridItemsLayout Orientation="Vertical"
+                                         Span="3"
+                                         HorizontalItemSpacing="10"
+                                         VerticalItemSpacing="15" />
+                    </CollectionView.ItemsLayout>
 
                 <CollectionView.ItemTemplate>
                     <DataTemplate x:DataType="models:Book">
@@ -144,6 +156,7 @@
                     </DataTemplate>
                 </CollectionView.ItemTemplate>
             </CollectionView>
+            </RefreshView>
 
             <!-- Loading Indicator -->
             <ActivityIndicator IsRunning="{Binding IsBusy}"
@@ -156,7 +169,7 @@
         </Grid>
 
         <!-- Bottom Shelf / Action Bar -->
-        <Grid Grid.Row="1"
+        <Grid Grid.Row="2"
               BackgroundColor="#4E342E"
               Padding="15,10"
               ColumnDefinitions="*,Auto,Auto">
diff --git a/BookReader/Views/CalibreLibraryPage.xaml b/BookReader/Views/CalibreLibraryPage.xaml
index 0a1fd28..cf5bd91 100644
--- a/BookReader/Views/CalibreLibraryPage.xaml
+++ b/BookReader/Views/CalibreLibraryPage.xaml
@@ -38,6 +38,32 @@
                     HorizontalOptions="Center" />
         </VerticalStackLayout>
 
+        <!-- Connection Error Message (Offline Mode) -->
+        <VerticalStackLayout Grid.Row="0"
+                             IsVisible="{Binding IsConfigured}"
+                             Padding="30"
+                             Spacing="15"
+                             VerticalOptions="Center">
+            <Label Text="⚠️ Connection failed"
+                   FontSize="20"
+                   TextColor="#FF7043"
+                   HorizontalOptions="Center"
+                   IsVisible="{Binding ConnectionErrorMessage, Converter={StaticResource IsNotNullOrEmptyConverter}}" />
+            <Label Text="{Binding ConnectionErrorMessage}"
+                   FontSize="14"
+                   TextColor="#B0B0B0"
+                   HorizontalOptions="Center"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ConnectionErrorMessage, Converter={StaticResource IsNotNullOrEmptyConverter}}" />
+            <Button Text="🔄 Retry"
+                    BackgroundColor="#5D4037"
+                    TextColor="White"
+                    CornerRadius="8"
+                    Command="{Binding RefreshBooksCommand}"
+                    HorizontalOptions="Center"
+                    IsVisible="{Binding ConnectionErrorMessage, Converter={StaticResource IsNotNullOrEmptyConverter}}" />
+        </VerticalStackLayout>
+
         <!-- Search Bar -->
         <SearchBar Grid.Row="1"
                    IsVisible="{Binding IsConfigured}"
@@ -49,12 +75,14 @@
                    SearchCommand="{Binding SearchCommand}" />
 
         <!-- Book List -->
-        <CollectionView Grid.Row="2"
-                         IsVisible="{Binding IsConfigured}"
-                         ItemsSource="{Binding Books}"
-                         SelectionMode="None"
-                         RemainingItemsThreshold="5"
-                         RemainingItemsThresholdReachedCommand="{Binding LoadMoreBooksCommand}">
+        <RefreshView Grid.Row="2"
+                     IsVisible="{Binding ConnectionErrorMessage, Converter={StaticResource InvertedBoolConverter}}"
+                     Command="{Binding RefreshBooksCommand}"
+                     IsRefreshing="{Binding IsRefreshing}">
+            <CollectionView ItemsSource="{Binding Books}"
+                            SelectionMode="None"
+                            RemainingItemsThreshold="5"
+                            RemainingItemsThresholdReachedCommand="{Binding LoadMoreBooksCommand}">
 
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="models:CalibreBook">
@@ -113,6 +141,7 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
+        </RefreshView>
 
         <!-- Status Bar -->
         <Grid Grid.Row="3"