在综合搜索结果中移除非视频搜索结果 (#1311)

Richasy · Jul 5, 2022 · 0318df6 · 0318df6
1 parent 8280e57
commit 0318df6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/src/Adapter/Adapter.Implementation/SearchAdapter.cs b/src/Adapter/Adapter.Implementation/SearchAdapter.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Bili.Adapter.Interfaces;
+using Bili.Models.App.Constants;
 using Bili.Models.BiliBili;
 using Bili.Models.Data.Search;
 using Bili.Models.Data.Video;
@@ -45,7 +46,7 @@ public ComprehensiveSet ConvertToComprehensiveSet(ComprehensiveSearchResultRespo
             var isEnd = response.ItemList == null;
             var videos = isEnd
                 ? new List<VideoInformation>()
-                : response.ItemList.Select(p => _videoAdapter.ConvertToVideoInformation(p)).ToList();
+                : response.ItemList.Where(p => p.Goto == ServiceConstants.Av).Select(p => _videoAdapter.ConvertToVideoInformation(p)).ToList();
             var videoSet = new SearchSet<VideoInformation>(videos, isEnd);
 
             return new ComprehensiveSet(videoSet, metaList);

diff --git a/src/Adapter/Adapter.Implementation/VideoAdapter.cs b/src/Adapter/Adapter.Implementation/VideoAdapter.cs
@@ -235,7 +235,8 @@ public VideoInformation ConvertToVideoInformation(Relate relatedVideo)
         /// <inheritdoc/>
         public VideoInformation ConvertToVideoInformation(VideoSearchItem searchVideo)
         {
-            var title = _textToolkit.ConvertToTraditionalChineseIfNeeded(searchVideo.Title);
+            var title = Regex.Replace(searchVideo.Title, @"<[^<>]+>", string.Empty);
+            title = _textToolkit.ConvertToTraditionalChineseIfNeeded(title);
             var id = searchVideo.Parameter;
             var duration = string.IsNullOrEmpty(searchVideo.Duration)
                 ? 0

diff --git a/src/Lib/Lib.Implementation/SearchProvider/SearchProvider.cs b/src/Lib/Lib.Implementation/SearchProvider/SearchProvider.cs
@@ -158,8 +158,9 @@ public async Task<ComprehensiveSet> GetComprehensiveSearchResultAsync(string key
             var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, Models.App.Constants.ApiConstants.Search.ComprehensiveSearch, queryParameters, Models.Enums.RequestClientType.IOS);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync<ServerResponse<ComprehensiveSearchResultResponse>>(response);
+            var data = _searchAdapter.ConvertToComprehensiveSet(result.Data);
             _comprehensivePageNumber++;
-            return _searchAdapter.ConvertToComprehensiveSet(result.Data);
+            return data;
         }
 
         /// <inheritdoc/>

diff --git a/src/Models/Models.Data/Community/Partition.cs b/src/Models/Models.Data/Community/Partition.cs
@@ -10,6 +10,13 @@ namespace Bili.Models.Data.Community
     /// </summary>
     public sealed class Partition
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Partition"/> class.
+        /// </summary>
+        public Partition()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Partition"/> class.
         /// </summary>

diff --git a/src/ViewModels/ViewModels.Uwp/Search/SearchPageViewModel/SearchPageViewModel.cs b/src/ViewModels/ViewModels.Uwp/Search/SearchPageViewModel/SearchPageViewModel.cs
@@ -139,6 +139,7 @@ private async Task SelectModuleAsync(SearchModuleItemViewModel vm)
             TryClear(CurrentFilters);
             await FakeLoadingAsync();
             CurrentModule = vm;
+            ClearCurrentModule();
             await GetDataAsync();
         }