add watch external for recently aired episodes

insomniachi · Mar 20, 2024 · ec5c8f0 · ec5c8f0
1 parent dd86751
commit ec5c8f0
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/Totoro.Core/ViewModels/Discover/RecentEpisodesViewModel.cs b/Totoro.Core/ViewModels/Discover/RecentEpisodesViewModel.cs
@@ -81,10 +81,9 @@ private async Task LoadPage(int page)
             }
 
             IsEpisodesLoading = true;
-            List<IAiredAnimeEpisode> results = [];
             try
             {
-                results = await Provider.AiredAnimeEpisodeProvider.GetRecentlyAiredEpisodes().ToListAsync();
+                var results = await Provider.AiredAnimeEpisodeProvider.GetRecentlyAiredEpisodes(page).ToListAsync();
                 _episodesCache.AddOrUpdate(results);
             }
             catch(Exception ex) 

diff --git a/Totoro.WinUI/Helpers/Converters.cs b/Totoro.WinUI/Helpers/Converters.cs
@@ -306,7 +306,7 @@ private static PluginOptions GetOptions<T>(string pluginName)
     [GeneratedRegex(@"(?'Type'.+)\sDub(?'Season'\d+)")]
     private static partial Regex DubRegex();
 
-    private static ICommand WatchExternal { get; set; } = ReactiveCommand.Create<object>(async param =>
+    public static ICommand WatchExternal { get; set; } = ReactiveCommand.Create<object>(async param =>
     {
         switch (param)
         {
@@ -315,6 +315,11 @@ private static PluginOptions GetOptions<T>(string pluginName)
                     await App.GetService<ExternalMediaPlayerLauncher>().Initialize(anime, providerType, App.GetService<ISettings>().DefaultMediaPlayer);
                 }
                 break;
+            case (IAiredAnimeEpisode episode, string providerType):
+                {
+                    App.GetService<ExternalMediaPlayerLauncher>().Initialize(episode, providerType, App.GetService<ISettings>().DefaultMediaPlayer);
+                }
+                break;
         }
     });
 }
diff --git a/Totoro.WinUI/Services/ExternalMediaPlayerLauncher.cs b/Totoro.WinUI/Services/ExternalMediaPlayerLauncher.cs
@@ -67,6 +67,17 @@ public async Task Initialize(AnimeModel anime, string providerType, string media
             EpisodeModels.SelectEpisode(currentEp);
         }
 
+        public void Initialize(IAiredAnimeEpisode episode, string providerType, string mediaPlayerType)
+        {
+            ProviderType = providerType;
+            Provider = PluginFactory<AnimeProvider>.Instance.CreatePlugin(providerType);
+            _mediaPlayer = PluginFactory<INativeMediaPlayer>.Instance.CreatePlugin(mediaPlayerType);
+            _videoStreamResolver = _videoStreamResolverFactory.CreateAnimDLResolver(ProviderType, episode.Url);
+            EpisodeModels = EpisodeModelCollection.FromEpisode(episode.Episode);
+            _title = $"{episode.Title} - {episode.EpisodeString.PadLeft(2, '0')}";
+            EpisodeModels.SelectEpisode(episode.Episode);
+        }
+
         private async Task<(ICatalogItem Sub, ICatalogItem Dub)> SearchProvider(string title)
         {
             var results = await Provider.Catalog.Search(title).ToListAsync();

diff --git a/Totoro.WinUI/Views/DiscoverSections/RecentEpisodesSection.xaml b/Totoro.WinUI/Views/DiscoverSections/RecentEpisodesSection.xaml
@@ -9,6 +9,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pc="using:Totoro.Plugins.Anime.Contracts"
     xmlns:uc="using:Totoro.WinUI.UserControls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
     <Grid>
@@ -60,6 +61,15 @@
                         <ItemsView.ItemTemplate>
                             <DataTemplate x:DataType="pc:IAiredAnimeEpisode">
                                 <ItemContainer Height="320">
+                                    <ItemContainer.ContextFlyout>
+                                        <MenuFlyout>
+                                            <MenuFlyoutItem
+                                                Click="WatchExternalClicked"
+                                                Icon="{ui:FontIcon Glyph=&#xEC15;}"
+                                                Tag="{x:Bind}"
+                                                Text="WatchExternal" />
+                                        </MenuFlyout>
+                                    </ItemContainer.ContextFlyout>
                                     <Grid x:Name="MainGrid" CornerRadius="3">
                                         <Grid.RowDefinitions>
                                             <RowDefinition />

diff --git a/Totoro.WinUI/Views/DiscoverSections/RecentEpisodesSection.xaml.cs b/Totoro.WinUI/Views/DiscoverSections/RecentEpisodesSection.xaml.cs
@@ -1,5 +1,8 @@
 using Totoro.Core.ViewModels.Discover;
 using ReactiveMarbles.ObservableEvents;
+using Totoro.Plugins.Anime.Contracts;
+using Microsoft.UI.Xaml.Controls;
+using Totoro.WinUI.Helpers;
 
 namespace Totoro.WinUI.Views.DiscoverSections;
 
@@ -19,4 +22,10 @@ public RecentEpisodesSection()
             .InvokeCommand(ViewModel.SelectEpisode);
         });
     }
+
+    private void WatchExternalClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        var episode = (IAiredAnimeEpisode)((MenuFlyoutItem)sender).Tag;
+        Converters.WatchExternal.Execute(new Tuple<IAiredAnimeEpisode, string>(episode, ViewModel.SelectedProvider.Name));
+    }
 }