Run download on taskpool, not dispatcher

j2ghz · Aug 15, 2018 · 7b1f45b · 7b1f45b
1 parent 68f801a
commit 7b1f45b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/ModSink.WPF/View/ModpackView.xaml b/src/ModSink.WPF/View/ModpackView.xaml
@@ -13,11 +13,9 @@
         <TextBlock x:Name="TbName" FontSize="32" DockPanel.Dock="Top" Padding="5" />
         <StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="2">
             <TextBlock x:Name="TbSize" />
-            <mah:ToggleSwitch x:Name="ChkInstall"
-                              Margin="15,5"
-                              OffLabel="Download?"
-                              OnLabel="Will be downloaded"
-                              Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" />
+            <ToggleButton 
+                x:Name="ChkInstall"
+                Content="Download"/>
         </StackPanel>
         <ListBox x:Name="LbMods" />
     </DockPanel>

diff --git a/src/ModSink.WPF/View/ModpackView.xaml.cs b/src/ModSink.WPF/View/ModpackView.xaml.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using System.Windows.Controls.Primitives;
 using ModSink.WPF.ViewModel;
 using ReactiveUI;
 
@@ -14,8 +15,7 @@ public ModpackView()
             {
                 this.OneWayBind(ViewModel, vm => vm.Modpack.Name, v => v.TbName.Text).DisposeWith(d);
                 this.OneWayBind(ViewModel, vm => vm.Size, v => v.TbSize.Text).DisposeWith(d);
-                this.OneWayBind(ViewModel, vm => vm.Modpack.Mods, v => v.LbMods.ItemsSource).DisposeWith(d);
-                this.Bind(ViewModel, vm => vm.Modpack.Selected, v => v.ChkInstall.IsChecked).DisposeWith(d);
+                this.BindCommand(ViewModel, vm => vm.Install, v => v.ChkInstall).DisposeWith(d);
             });
         }
     }

diff --git a/src/ModSink.WPF/ViewModel/ModpackViewModel.cs b/src/ModSink.WPF/ViewModel/ModpackViewModel.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Threading.Tasks;
 using Humanizer;
 using Humanizer.Bytes;
 using ModSink.Common.Models.Repo;
@@ -16,8 +17,12 @@ public ModpackViewModel(Modpack modpack)
                     .SelectMany(m => m.Mod.Files)
                     .Select(f => f.Value.Length)
                     .Aggregate((sum, a) => sum + a)).Humanize("G03");
+            Install = ReactiveCommand.CreateFromTask(() => Task.Run(() => Modpack.Selected = true),
+                outputScheduler: RxApp.TaskpoolScheduler);
         }
 
+        public ReactiveCommand Install { get; }
+
         public Modpack Modpack { get; }
 
         public string Size { get; }