Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port SlideShowVM

Browse Source
This commit is contained in:
Timothy Baldridge 2021-12-27 09:24:45 -07:00
parent 648ee949c3
commit 7048854f12
3 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Wabbajack.App.Wpf/View Models/CPUDisplayVM.cs
View File

@ -1,11 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ReactiveUI.Fody.Helpers; using ReactiveUI.Fody.Helpers;
using Wabbajack.Common;
using Wabbajack.Lib; using Wabbajack.Lib;
using Wabbajack.RateLimiter;
namespace Wabbajack namespace Wabbajack
{ {
@ -26,12 +22,12 @@ namespace Wabbajack
{ {
} }
public CPUDisplayVM(CPUStatus cpu) public CPUDisplayVM(IJob cpu)
{ {
AbsorbStatus(cpu); AbsorbStatus(cpu);
} }
public void AbsorbStatus(CPUStatus cpu) public void AbsorbStatus(IJob cpu)
{ {
bool starting = cpu.IsWorking && !IsWorking; bool starting = cpu.IsWorking && !IsWorking;
if (starting) if (starting)
@ -39,7 +35,7 @@ namespace Wabbajack
StartTime = DateTime.Now; StartTime = DateTime.Now;
} }
ID = cpu.ID; ID = cpu.;
Msg = cpu.Msg; Msg = cpu.Msg;
ProgressPercent = cpu.ProgressPercent; ProgressPercent = cpu.ProgressPercent;
IsWorking = cpu.IsWorking; IsWorking = cpu.IsWorking;

18
Wabbajack.App.Wpf/View Models/SlideShow.cs
View File

@ -1,10 +1,14 @@
using System; using System;
using System.Linq;
using System.Reactive; using System.Reactive;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using DynamicData; using DynamicData;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using ReactiveUI; using ReactiveUI;
using ReactiveUI.Fody.Helpers; using ReactiveUI.Fody.Helpers;
using Wabbajack.Common;
using Wabbajack.DTOs.DownloadStates; using Wabbajack.DTOs.DownloadStates;
using Wabbajack.Lib; using Wabbajack.Lib;
using Wabbajack.Lib.Extensions; using Wabbajack.Lib.Extensions;
@ -34,7 +38,7 @@ namespace Wabbajack.View_Models
public const int PreloadAmount = 4; public const int PreloadAmount = 4;
public SlideShow(InstallerVM appState) public SlideShow(InstallerVM appState, ServiceProvider provider)
{ {
Installer = appState; Installer = appState;
@ -85,15 +89,15 @@ namespace Wabbajack.View_Models
return modList.SourceModList.Archives return modList.SourceModList.Archives
.Select(m => m.State) .Select(m => m.State)
.OfType<IMetaState>() .OfType<IMetaState>()
.Where(x => x.URL != default && x.ImageURL != default) .Where(x => x.LinkUrl != default && x.ImageURL != default)
.DistinctBy(x => x.URL) .DistinctBy(x => x.LinkUrl)
// Shuffle it // Shuffle it
.Shuffle(_random) .Shuffle(_random)
.AsObservableChangeSet(x => x.URL); .AsObservableChangeSet(x => x.LinkUrl);
}) })
// Switch to the new list after every ModList change // Switch to the new list after every ModList change
.Switch() .Switch()
.Transform(mod => new ModVM(mod)) .Transform(mod => new ModVM(provider.GetService<ILogger<ModVM>>(), mod))
.DisposeMany() .DisposeMany()
// Filter out any NSFW slides if we don't want them // Filter out any NSFW slides if we don't want them
.AutoRefreshOnObservable(slide => this.WhenAny(x => x.ShowNSFW)) .AutoRefreshOnObservable(slide => this.WhenAny(x => x.ShowNSFW))
@ -122,10 +126,10 @@ namespace Wabbajack.View_Models
VisitURLCommand = ReactiveCommand.Create( VisitURLCommand = ReactiveCommand.Create(
execute: () => execute: () =>
{ {
UIUtils.OpenWebsite(TargetMod.State.URL); UIUtils.OpenWebsite(TargetMod.State.LinkUrl);
return Unit.Default; return Unit.Default;
}, },
canExecute: this.WhenAny(x => x.TargetMod.State.URL) canExecute: this.WhenAny(x => x.TargetMod.State.LinkUrl)
.Select(x => .Select(x =>
{ {
//var regex = new Regex("^(http|https):\\/\\/"); //var regex = new Regex("^(http|https):\\/\\/");

22
Wabbajack.Common/IEnumerableExtensions.cs
View File

@ -11,6 +11,28 @@ public static class IEnumerableExtensions
{ {
foreach (var i in coll) f(i); foreach (var i in coll) f(i);
} }
#region Shuffle
/// https://stackoverflow.com/questions/5807128/an-extension-method-on-ienumerable-needed-for-shuffling
public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> source, Random rng)
{
return source.ShuffleIterator(rng);
}
private static IEnumerable<T> ShuffleIterator<T>(
this IEnumerable<T> source, Random rng)
{
var buffer = source.ToList();
for (int i = 0; i < buffer.Count; i++)
{
int j = rng.Next(i, buffer.Count);
yield return buffer[j];
buffer[j] = buffer[i];
}
}
#endregion
public static IEnumerable<TOut> TryKeep<TIn, TOut>(this IEnumerable<TIn> coll, Func<TIn, (bool, TOut)> fn) public static IEnumerable<TOut> TryKeep<TIn, TOut>(this IEnumerable<TIn> coll, Func<TIn, (bool, TOut)> fn)