修复综合搜索结果为空的问题 (#962)

Richasy · Dec 28, 2024 · d6fc086 · d6fc086
1 parent 9f4514d
commit d6fc086
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 64 deletions.
diff --git a/src/Desktop/BiliCopilot.UI/Controls/Components/VideoCardControl/VideoCardControl.xaml b/src/Desktop/BiliCopilot.UI/Controls/Components/VideoCardControl/VideoCardControl.xaml
@@ -504,46 +504,59 @@
                                     Grid.Row="1"
                                     HorizontalAlignment="Left"
                                     Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.Title}" />
-                                <StackPanel
-                                    Grid.Row="2"
-                                    Orientation="Horizontal"
-                                    Spacing="12">
-                                    <StackPanel
-                                        VerticalAlignment="Center"
-                                        Orientation="Horizontal"
-                                        Spacing="4"
-                                        ToolTipService.ToolTip="{ext:Locale Name=PlayCount}">
-                                        <ic:SymbolIcon
+                                <Grid Grid.Row="2">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Orientation="Horizontal" Spacing="12">
+                                        <StackPanel
                                             VerticalAlignment="Center"
-                                            FontSize="10"
-                                            Foreground="{ThemeResource AccentTextFillColorTertiaryBrush}"
-                                            Symbol="PlayCircle" />
-                                        <TextBlock
+                                            Orientation="Horizontal"
+                                            Spacing="4"
+                                            ToolTipService.ToolTip="{ext:Locale Name=PlayCount}">
+                                            <ic:SymbolIcon
+                                                VerticalAlignment="Center"
+                                                FontSize="10"
+                                                Foreground="{ThemeResource AccentTextFillColorTertiaryBrush}"
+                                                Symbol="PlayCircle" />
+                                            <TextBlock
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.PlayCount, Converter={StaticResource CountConverter}}"
+                                                TextLineBounds="Tight" />
+                                        </StackPanel>
+                                        <StackPanel
                                             VerticalAlignment="Center"
-                                            Foreground="{ThemeResource TextFillColorTertiaryBrush}"
-                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                            Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.PlayCount, Converter={StaticResource CountConverter}}"
-                                            TextLineBounds="Tight" />
+                                            Orientation="Horizontal"
+                                            Spacing="4"
+                                            ToolTipService.ToolTip="{ext:Locale Name=DanmakuCount}"
+                                            Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.DanmakuCount, Converter={StaticResource ObjectToVisibilityConverter}}">
+                                            <ic:SymbolIcon
+                                                VerticalAlignment="Center"
+                                                FontSize="10"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Symbol="TextBulletList" />
+                                            <TextBlock
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.DanmakuCount, Converter={StaticResource CountConverter}}"
+                                                TextLineBounds="Tight" />
+                                        </StackPanel>
                                     </StackPanel>
-                                    <StackPanel
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        HorizontalAlignment="Right"
                                         VerticalAlignment="Center"
-                                        Orientation="Horizontal"
-                                        Spacing="4"
-                                        ToolTipService.ToolTip="{ext:Locale Name=DanmakuCount}"
-                                        Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.DanmakuCount, Converter={StaticResource ObjectToVisibilityConverter}}">
-                                        <ic:SymbolIcon
-                                            VerticalAlignment="Center"
-                                            FontSize="10"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Symbol="TextBulletList" />
-                                        <TextBlock
-                                            VerticalAlignment="Center"
-                                            Foreground="{ThemeResource TextFillColorTertiaryBrush}"
-                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                            Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.DanmakuCount, Converter={StaticResource CountConverter}}"
-                                            TextLineBounds="Tight" />
-                                    </StackPanel>
-                                </StackPanel>
+                                        Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                        Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.PublishRelativeTime}"
+                                        TextTrimming="CharacterEllipsis"
+                                        TextWrapping="NoWrap"
+                                        Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.PublishRelativeTime, Converter={StaticResource ObjectToVisibilityConverter}}" />
+                                </Grid>
                             </Grid>
                         </Grid>
                     </base:CardControl>

diff --git a/...ponents/VideoSearchSectionDetailViewModel/VideoSearchSectionDetailViewModel.Properties.cs b/...ponents/VideoSearchSectionDetailViewModel/VideoSearchSectionDetailViewModel.Properties.cs
@@ -19,7 +19,7 @@ public sealed partial class VideoSearchSectionDetailViewModel
     private readonly ILogger<VideoSearchSectionDetailViewModel> _logger;
 
     private bool _canRequest;
-    private string _offset;
+    private int? _currentPage;
     private string _keyword;
     private bool _isPreventLoadMore;
 

diff --git a/...wModels/Components/VideoSearchSectionDetailViewModel/VideoSearchSectionDetailViewModel.cs b/...wModels/Components/VideoSearchSectionDetailViewModel/VideoSearchSectionDetailViewModel.cs
@@ -26,14 +26,14 @@ public VideoSearchSectionDetailViewModel(
     {
         _service = service;
         _logger = this.Get<ILogger<VideoSearchSectionDetailViewModel>>();
-        Sorts = Enum.GetValues<ComprehensiveSearchSortType>().ToList();
+        Sorts = [.. Enum.GetValues<ComprehensiveSearchSortType>()];
     }
 
     /// <inheritdoc/>
     public void Initialize(string keyword, SearchPartition partition)
     {
         Clear();
-        Sort = ComprehensiveSearchSortType.Play;
+        Sort = ComprehensiveSearchSortType.Default;
         _keyword = keyword;
     }
 
@@ -47,10 +47,10 @@ public void Clear()
         this.Get<DispatcherQueue>().TryEnqueue(DispatcherQueuePriority.Low, Items.Clear);
     }
 
-    internal void SetFirstPageData(IReadOnlyList<VideoInformation> videos, string initialOffset)
+    internal void SetFirstPageData(IReadOnlyList<VideoInformation> videos, int? initialOffset)
     {
         _canRequest = true;
-        _offset = initialOffset;
+        _currentPage = initialOffset;
         this.Get<DispatcherQueue>().TryEnqueue(DispatcherQueuePriority.Low, () =>
         {
             Items.Clear();
@@ -81,17 +81,17 @@ internal void SetFirstPageData(IReadOnlyList<VideoInformation> videos, string in
     [RelayCommand]
     private async Task LoadItemsAsync()
     {
-        if (!_canRequest || IsEmpty || _isPreventLoadMore || IsLoading)
+        if (!_canRequest || IsEmpty || _isPreventLoadMore || IsLoading || _currentPage == null)
         {
             return;
         }
 
         try
         {
             IsLoading = true;
-            var (videos, _, nextOffset) = await _service.GetComprehensiveSearchResultAsync(_keyword, _offset, Sort);
-            _offset = nextOffset;
-            _canRequest = !string.IsNullOrEmpty(_offset);
+            var (videos, nextOffset) = await _service.GetComprehensiveSearchResultAsync(_keyword, _currentPage, Sort);
+            _currentPage = nextOffset;
+            _canRequest = _currentPage != null;
             foreach (var item in videos)
             {
                 if (Items.Any(p => p.Data.Equals(item)))
@@ -122,6 +122,7 @@ private async Task RefreshAsync()
         this.Get<DispatcherQueue>().TryEnqueue(DispatcherQueuePriority.Low, async () =>
         {
             var keyword = _keyword;
+            _currentPage = 1;
             Clear();
             _keyword = keyword;
             _canRequest = true;

diff --git a/src/Desktop/BiliCopilot.UI/ViewModels/View/SearchPageViewModel/SearchPageViewModel.cs b/src/Desktop/BiliCopilot.UI/ViewModels/View/SearchPageViewModel/SearchPageViewModel.cs
@@ -83,23 +83,16 @@ private async Task SearchAsync(string keyword)
         try
         {
             IsSearching = true;
-            var (videos, partitions, nextVideoOffset) = await _service.GetComprehensiveSearchResultAsync(keyword, sort: Richasy.BiliKernel.Models.ComprehensiveSearchSortType.Play);
-            var sections = new List<ISearchSectionDetailViewModel>()
+            var (videos, nextVideoOffset) = await _service.GetComprehensiveSearchResultAsync(keyword);
+            var sections = new List<ISearchSectionDetailViewModel>
             {
                 CreateVideoSection(videos, nextVideoOffset),
+                CreateSection(SearchSectionType.Anime),
+                CreateSection(SearchSectionType.Cinema),
+                CreateSection(SearchSectionType.Live),
+                CreateSection(SearchSectionType.User),
+                CreateSection(SearchSectionType.Article),
             };
-            if (partitions is not null)
-            {
-                foreach (var section in partitions)
-                {
-                    var sec = CreateSection(section);
-                    if (sec is not null)
-                    {
-                        sections.Add(sec);
-                    }
-                }
-            }
-
             Sections = [.. sections];
             SelectSection(Sections.FirstOrDefault());
             SectionInitialized?.Invoke(this, EventArgs.Empty);
@@ -129,17 +122,16 @@ private void SelectSection(ISearchSectionDetailViewModel section)
         section.TryFirstLoadCommand.Execute(default);
     }
 
-    private VideoSearchSectionDetailViewModel CreateVideoSection(IReadOnlyList<VideoInformation> videos, string offset)
+    private VideoSearchSectionDetailViewModel CreateVideoSection(IReadOnlyList<VideoInformation> videos, int? page)
     {
         var newSection = new VideoSearchSectionDetailViewModel(_service);
         newSection.Initialize(Keyword, new SearchPartition(0, ResourceToolkit.GetLocalizedString(StringNames.Video)));
-        newSection.SetFirstPageData(videos, offset);
+        newSection.SetFirstPageData(videos, page);
         return newSection;
     }
 
-    private ISearchSectionDetailViewModel CreateSection(SearchPartition partition)
+    private ISearchSectionDetailViewModel CreateSection(SearchSectionType type)
     {
-        var type = (SearchSectionType)partition.Id;
         var sectionDetail = type switch
         {
             SearchSectionType.Anime or SearchSectionType.Cinema => (ISearchSectionDetailViewModel)new PgcSearchSectionDetailViewModel(_service),
@@ -149,6 +141,16 @@ private ISearchSectionDetailViewModel CreateSection(SearchPartition partition)
             _ => default
         };
 
+        var partition = type switch
+        {
+            SearchSectionType.Anime => new SearchPartition(7, ResourceToolkit.GetLocalizedString(StringNames.Anime)),
+            SearchSectionType.Cinema => new SearchPartition(8, ResourceToolkit.GetLocalizedString(StringNames.Cinema)),
+            SearchSectionType.Live => new SearchPartition(4, ResourceToolkit.GetLocalizedString(StringNames.Live)),
+            SearchSectionType.User => new SearchPartition(2, ResourceToolkit.GetLocalizedString(StringNames.User)),
+            SearchSectionType.Article => new SearchPartition(6, ResourceToolkit.GetLocalizedString(StringNames.Article)),
+            _ => default
+        };
+
         sectionDetail?.Initialize(Keyword, partition);
         return sectionDetail;
     }

diff --git a/src/Libs/bili-kernel b/src/Libs/bili-kernel
+4 −4		src/Authorizers/Authorizers.Tv/Core/TvAuthorizeClient.cs
+10 −0		src/BiliKernel.Abstractions/Bili/BiliApis.cs
+1 −1		src/BiliKernel.Abstractions/Bili/Search/ISearchService.cs
+5 −0		src/BiliKernel.Abstractions/Models/BiliDeviceType.cs
+17 −14		src/BiliKernel.Core/Authenticator/BiliAuthenticator.Extension.cs
+6 −1		src/BiliKernel.Core/Authenticator/BiliAuthenticator.cs
+5 −5		src/Services/Services.Article/Core/ArticleDiscoveryClient.cs
+2 −2		src/Services/Services.Article/Core/ArticleOpeartionClient.cs
+3 −3		src/Services/Services.Comment/Core/CommentClient.cs
+2 −2		src/Services/Services.Media/Core/DanmakuClient.cs
+3 −3		src/Services/Services.Media/Core/LiveDiscoveryClient.cs
+4 −4		src/Services/Services.Media/Core/PgcClient.cs
+18 −18		src/Services/Services.Media/Core/PlayerClient.cs
+1 −1		src/Services/Services.Media/Core/SubtitleClient.cs
+5 −5		src/Services/Services.Media/Core/VideoDiscoveryClient.cs
+32 −0		src/Services/Services.Search/Core/Adapters/VideoAdapter.cs
+88 −0		src/Services/Services.Search/Core/Models/SearchPartitionResponse.cs
+34 −19		src/Services/Services.Search/Core/SearchClient.cs
+2 −2		src/Services/Services.Search/SearchService.cs
+1 −0		src/Services/Services.Search/SourceGenerationContext.cs
+15 −15		src/Services/Services.User/Core/MyClient.cs
+2 −2		src/Services/Services.User/Core/ViewHistoryClient.cs
+4 −4		src/Services/Services.User/Core/ViewLaterClient.cs