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

ReadmeCommand canExecute implementation. ModList to property

Browse Source
This commit is contained in:
Justin Swanson 2019-10-11 22:07:57 -05:00
parent 2b57e1590c
commit 382f1cda93
4 changed files with 79 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
VS Snippets/guiproprx.snippet Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8" ?>
<CodeSnippets xmlns="http://schemas.microsoft.com/VisualStudio/2005/CodeSnippet">
<CodeSnippet Format="1.0.0">
<Header>
<Title>ReactiveUI - ObservableAsPropertyHelper</Title>
<Shortcut>guiproprx</Shortcut>
<Description>Code snippet for a ReactiveUI ObservableAsPropertyHelper</Description>
<SnippetTypes>
<SnippetType>Expansion</SnippetType>
</SnippetTypes>
</Header>
<Snippet>
<Declarations>
<Literal>
<ID>type</ID>
<ToolTip>Property type</ToolTip>
<Default>int</Default>
</Literal>
<Literal>
<ID>property</ID>
<ToolTip>Property name</ToolTip>
<Default>MyProperty</Default>
</Literal>
</Declarations>
<Code Language="csharp"><![CDATA[private readonly ObservableAsPropertyHelper<$type$> _$property$;
public $type$ $property$ => _$property$.Value;$end$]]>
</Code>
</Snippet>
</CodeSnippet>
</CodeSnippets>

44
Wabbajack/AppState.cs
View File

@ -1,4 +1,4 @@
using ReactiveUI;
using ReactiveUI;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@ -8,6 +8,8 @@ using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net.Http;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Reflection;
using System.Threading;
using System.Windows;
@ -31,19 +33,20 @@ namespace Wabbajack
private string _mo2Folder;
private ModList _modList;
private readonly DateTime _startTime;
public volatile bool Dirty;
private ModList _ModList;
public ModList ModList { get => _ModList; private set => this.RaiseAndSetIfChanged(ref _ModList, value); }
// Command properties
public IReactiveCommand ChangePathCommand => ReactiveCommand.Create(ExecuteChangePath);
public IReactiveCommand ChangeDownloadPathCommand => ReactiveCommand.Create(ExecuteChangeDownloadPath);
public IReactiveCommand BeginCommand => ReactiveCommand.Create(ExecuteBegin);
public IReactiveCommand ShowReportCommand => ReactiveCommand.Create(ShowReport);
public IReactiveCommand VisitNexusSiteCommand => ReactiveCommand.Create(VisitNexusSite);
public IReactiveCommand OpenReadmeCommand => ReactiveCommand.Create(OpenReadmeWindow);
public IReactiveCommand OpenReadmeCommand { get; }
public IReactiveCommand OpenModListPropertiesCommand => ReactiveCommand.Create(OpenModListProperties);
public IReactiveCommand SlideShowNextItemCommand { get; }
@ -73,6 +76,11 @@ namespace Wabbajack
Mode = mode;
Dirty = false;
this.OpenReadmeCommand = ReactiveCommand.Create(
execute: this.OpenReadmeWindow,
canExecute: this.WhenAny(x => x.ModList)
.Select(modList => !string.IsNullOrEmpty(modList?.Readme)));
slideshowThread = new Thread(UpdateLoop)
{
Priority = ThreadPriority.BelowNormal,
@ -185,17 +193,15 @@ namespace Wabbajack
}
}
public bool HasReadme { get; set; }
private void OpenReadmeWindow()
{
if (!UIReady || string.IsNullOrEmpty(_modList.Readme)) return;
if (!UIReady || string.IsNullOrEmpty(this.ModList.Readme)) return;
var text = "";
using (var fs = new FileStream(_modListPath, FileMode.Open, FileAccess.Read, FileShare.Read))
using (var ar = new ZipArchive(fs, ZipArchiveMode.Read))
using (var ms = new MemoryStream())
{
var entry = ar.GetEntry(_modList.Readme);
var entry = ar.GetEntry(this.ModList.Readme);
using (var e = entry.Open())
e.CopyTo(ms);
ms.Seek(0, SeekOrigin.Begin);
@ -204,7 +210,6 @@ namespace Wabbajack
string line;
while ((line = sr.ReadLine()) != null)
text += line+Environment.NewLine;
//text = sr.ReadToEnd();
}
}
@ -335,18 +340,18 @@ namespace Wabbajack
public bool Running { get; set; } = true;
private void ApplyModlistProperties()
{
SplashScreenModName = _modList.Name;
SplashScreenAuthorName = _modList.Author;
_nexusSiteURL = _modList.Website;
SplashScreenSummary = _modList.Description;
if (!string.IsNullOrEmpty(_modList.Image) && _modList.Image.Length == 36)
SplashScreenModName = this.ModList.Name;
SplashScreenAuthorName = this.ModList.Author;
_nexusSiteURL = this.ModList.Website;
SplashScreenSummary = this.ModList.Description;
if (!string.IsNullOrEmpty(this.ModList.Image) && this.ModList.Image.Length == 36)
{
SplashScreenImage = _wabbajackLogo;
using (var fs = new FileStream(_modListPath, FileMode.Open, FileAccess.Read, FileShare.Read))
using (var ar = new ZipArchive(fs, ZipArchiveMode.Read))
using (var ms = new MemoryStream())
{
var entry = ar.GetEntry(_modList.Image);
var entry = ar.GetEntry(this.ModList.Image);
using (var e = entry.Open())
e.CopyTo(ms);
var image = new BitmapImage();
@ -408,12 +413,11 @@ namespace Wabbajack
internal void ConfigureForInstall(string source, ModList modlist)
{
_modList = modlist;
this.ModList = modlist;
_modListPath = source;
HasReadme = !string.IsNullOrEmpty(_modList.Readme);
Mode = TaskMode.INSTALLING;
ModListName = _modList.Name;
HTMLReport = _modList.ReportHTML;
ModListName = this.ModList.Name;
HTMLReport = this.ModList.ReportHTML;
Location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
ApplyModlistProperties();
@ -433,7 +437,7 @@ namespace Wabbajack
if (Mode == TaskMode.INSTALLING)
{
installing = true;
var installer = new Installer(_modListPath, _modList, Location)
var installer = new Installer(_modListPath, this.ModList, Location)
{
DownloadFolder = DownloadLocation
};

24
Wabbajack/Extensions/ReactiveUIExt.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Linq.Expressions;
using System.Reactive.Linq;
using ReactiveUI;
namespace Wabbajack
{
public static class ReactiveUIExt
{
public static IObservable<TRet> WhenAny<TSender, TRet>(
this TSender This,
Expression<Func<TSender, TRet>> property1)
where TSender : class
{
return This.WhenAny(property1, selector: x => x.GetValue());
}
public static IObservable<T> NotNull<T>(this IObservable<T> source)
where T : class
{
return source.Where(u => u != null);
}
}
}

1
Wabbajack/Wabbajack.csproj
View File

@ -222,6 +222,7 @@
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Data.cs" />
<Compile Include="Extensions\ReactiveUIExt.cs" />
<Compile Include="UI\ModlistPropertiesWindow.xaml.cs">
<DependentUpon>ModlistPropertiesWindow.xaml</DependentUpon>
</Compile>