Episode #3

Author: ajtn123

BangumiNet/ViewModels/EpisodeListViewModel.cs

@@ -1,33 +1,52 @@
 using BangumiNet.Api.V0.Models;
 using ReactiveUI.SourceGenerators;
 using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BangumiNet.ViewModels;
 
 public partial class EpisodeListViewModel : ViewModelBase
 {
-    public EpisodeListViewModel(Paged_Episode? episodes)
+    public EpisodeListViewModel(int? subjectId)
     {
+        SubjectId = subjectId;
         EpisodeViewModels = [];
-        PageItems = [];
-
-        AddEpisodes(episodes);
+        Sources = [];
     }
 
-    public void AddEpisodes(Paged_Episode? episodes)
+    private int lastOffset = 0;
+    /// <param name="offset">分页 offset</param>
+    /// <param name="limit">每页集数</param>
+    /// <returns>是否已取得全部集数</returns>
+    public async Task<bool?> LoadEpisodes(int? offset = null, int limit = 100)
     {
-        if (episodes?.Data != null)
-            for (int i = 0; i < episodes.Data.Count; i++)
-            {
-                if (episodes.Offset is int offset)
-                    if (PageItems.Contains(offset + 1)) continue;
-                    else PageItems.Add(offset + i);
-
-                EpisodeViewModels.Add(new(episodes.Data[i]));
-            }
+        offset ??= lastOffset;
+        if (offset >= EpTotal) return true;
+        lastOffset += limit;
+
+        var epPage = await ApiC.V0.Episodes.GetAsync(config =>
+        {
+            config.QueryParameters.Limit = limit;
+            config.QueryParameters.Offset = 0;
+            config.QueryParameters.Type = null;
+            config.QueryParameters.SubjectId = SubjectId;
+        });
+
+        if (epPage == null) return null;
+        Sources.Add(epPage);
+        EpTotal = epPage.Total;
+
+        if (epPage.Data is { } episodes)
+            for (int i = 0; i < episodes.Count; i++)
+                if (!EpisodeViewModels.Any(x => x.Id == episodes[i].Id))
+                    EpisodeViewModels.Add(new(episodes[i]));
+
+        return EpisodeViewModels.Count >= EpTotal;
     }
 
+    [Reactive] public partial ObservableCollection<Paged_Episode> Sources { get; set; }
     [Reactive] public partial ObservableCollection<EpisodeViewModel> EpisodeViewModels { get; set; }
-
-    public ObservableCollection<int> PageItems { get; }
+    [Reactive] public partial int? SubjectId { get; set; }
+    [Reactive] public partial int? EpTotal { get; set; }
 }

BangumiNet/ViewModels/SubjectViewModel.cs

@@ -97,6 +97,8 @@ public SubjectViewModel(Subject subject)
 
     public void Init()
     {
+        EpisodeListViewModel = new(Id);
+
         OpenInNewWindowCommand = ReactiveCommand.Create(() => new SecondaryWindow() { Content = new SubjectView() { DataContext = this } }.Show());
         SearchGoogleCommand = ReactiveCommand.Create(() => Common.OpenUrlInBrowser(UrlProvider.GoogleQueryBase + WebUtility.UrlEncode(Name)));
         OpenInBrowserCommand = ReactiveCommand.Create(() => Common.OpenUrlInBrowser(Url ?? UrlProvider.BangumiTvSubjectUrlBase + Id));
@@ -112,17 +114,6 @@ public void Init()
         if (Rank == 0) Rank = null;
     }
 
-    public async Task LoadEpisodes()
-    {
-        EpisodeListViewModel = new(await ApiC.V0.Episodes.GetAsync(config =>
-        {
-            config.QueryParameters.Limit = 100;
-            config.QueryParameters.Offset = 0;
-            config.QueryParameters.Type = null;
-            config.QueryParameters.SubjectId = Id;
-        }));
-    }
-
     [Reactive] public partial object? Source { get; set; }
     [Reactive] public bool IsLegacy { get; set; }
     [Reactive] public partial int? CollectionTotal { get; set; }

BangumiNet/Views/EpisodeBadgeView.axaml

@@ -9,7 +9,8 @@
              mc:Ignorable="d" d:DesignWidth="22" d:DesignHeight="22"
              x:DataType="vm:EpisodeViewModel"
              x:Class="BangumiNet.Views.EpisodeBadgeView">
-    <Border Classes="Card" Background="#3F7FFF7F" MinWidth="22" CornerRadius="5">
+    <Border Classes="Card" Background="#3F7FFF7F" MinWidth="22" CornerRadius="5"
+			ToolTip.Tip="{Binding .,Converter={StaticResource NameCnConverter}}">
         <TextBlock Text="{Binding Sort}" HorizontalAlignment="Center"/>
     </Border>
 </UserControl>

BangumiNet/Views/SubjectView.axaml

@@ -32,7 +32,7 @@
                         <TextBlock ToolTip.Tip="在看" IsVisible="{Binding Collection.Doing,Converter={StaticResource NullCvt}}"><ic:FluentIcon Icon="Tv"/><Run Text="{Binding Collection.Doing}"/></TextBlock>
                     </StackPanel>
                     <v:EpisodeListView DataContext="{Binding EpisodeListViewModel}"/>
-                    <TextBlock Text="{Binding Summary}" TextWrapping="Wrap"/>
+                    <TextBlock Text="{Binding Summary}" TextWrapping="Wrap" Margin="0,0,0,5"/>
                     <v:TagListView DataContext="{Binding TagListViewModel}"/>
                     <StackPanel Orientation="Horizontal" Spacing="5">
                         <Button Classes="Icon" Command="{Binding OpenInNewWindowCommand}" Content="{ice:FluentIcon Icon=Open}" ToolTip.Tip="在新窗口显示"/>

BangumiNet/Views/SubjectView.axaml.cs

@@ -19,7 +19,7 @@ public SubjectView()
             if (fullSubject == null) return;
             dataContextChanges += 1;
             var vm = new SubjectViewModel(fullSubject);
-            _ = vm.LoadEpisodes();
+            _ = vm.EpisodeListViewModel?.LoadEpisodes();
             DataContext = vm;
         };
     }