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

Modularising more and moving installer stuff into one page.

Browse Source
This commit is contained in:
Unnoen 2022-01-17 04:38:54 +11:00
parent 2ada4621b8
commit 94e2449c1f
No known key found for this signature in database
GPG Key ID: 8F8E42252BA20553
11 changed files with 263 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Wabbajack.App.Blazor/Components/InfoBlock.razor
View File

@ -1,12 +1,18 @@
<div id="info-block">
<div class="title">@Title</div>
<div class="subtitle">@Subtitle</div>
<div class="comment">@Comment</div>
<div class="description">@Description</div>
@if (Supertitle != string.Empty)
{
<span class="supertitle">@Supertitle</span>
}
<span class="title">@Title</span>
<span class="subtitle">@Subtitle</span>
<span class="comment">@Comment</span>
<span class="description">@Description</span>
</div>
@code {
[Parameter]
public string Supertitle { get; set; } = string.Empty;
[Parameter]
public string Title { get; set; }

30
Wabbajack.App.Blazor/Components/InfoBlock.razor.scss
View File

@ -1,27 +1,39 @@
#info-block {
width: 50%;
height: fit-content;
display: flex;
width: 100%;
height: 100%;
flex-direction: column;
justify-content: center;
align-content: center;
margin: 1rem;
.title {
font-size: 5rem;
.supertitle {
margin-left: 0.5rem;
font-size: 1.5rem;
font-weight: 100;
}
.title {
font-size: 4rem;
font-weight: 100;
margin-top: -1rem;
margin-bottom: -0.5rem;
}
.subtitle {
margin-left: 10px;
margin-left: 0.5rem;
font-size: 2rem;
font-weight: 100;
}
.comment {
margin-left: 20px;
margin-left: 1rem;
color: rgba(255, 255, 255, 0.75);
}
.description {
margin-left: 20px;
margin-top: 20px;
margin-left: 1.5rem;
margin-top: 0.5rem;
color: rgba(255, 255, 255, 0.5);
}
}

35
Wabbajack.App.Blazor/Components/InfoImage.razor Normal file
View File

@ -0,0 +1,35 @@
<div id="info-image">
<div class="image">
<img src="@Image" alt="">
</div>
@if (!string.IsNullOrEmpty(Title))
{
<span class="title">@Title</span>
}
@if (!string.IsNullOrEmpty(Subtitle))
{
<span class="subtitle">@Subtitle</span>
}
@if (!string.IsNullOrEmpty(Description))
{
<span class="description">@Description</span>
}
</div>
@code {
[Parameter]
public string Image { get; set; }
[Parameter]
public string Title { get; set; }
[Parameter]
public string Subtitle { get; set; }
[Parameter]
public string Description { get; set; }
}

40
Wabbajack.App.Blazor/Components/InfoImage.razor.scss Normal file
View File

@ -0,0 +1,40 @@
#info-image {
display: flex;
width: 100%;
flex-direction: column;
justify-content: center;
align-content: center;
margin: 1rem;
.mod-feature {
margin-left: -10px;
font-size: 2rem;
font-weight: 100;
}
.image {
overflow: hidden;
img {
width: 100%;
height: 100%;
object-fit: contain;
}
}
.title {
font-size: 2rem;
font-weight: 100;
}
.subtitle {
font-size: 1.1rem;
font-weight: 100;
margin-left: 0.5rem;
}
.description {
margin-top: 0.5rem;
margin-left: 1rem;
color: rgba(255, 255, 255, 0.75);
}
}

1
Wabbajack.App.Blazor/Components/SideBar.razor.scss
View File

@ -9,6 +9,7 @@
justify-content: space-between;
align-items: center;
border-right: 1px solid #404040;
backdrop-filter: brightness(0.8);
.logo {
padding: 0.5rem;

2
Wabbajack.App.Blazor/MainWindow.xaml
View File

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:Wabbajack.App.Blazor"
xmlns:blazor="clr-namespace:Microsoft.AspNetCore.Components.WebView.Wpf;assembly=Microsoft.AspNetCore.Components.WebView.Wpf"
mc:Ignorable="d"
Title="MainWindow" Height="750" Width="1200" MinHeight="600" MinWidth="900">
Title="MainWindow" Height="750" Width="1200" MinHeight="750" MinWidth="1200">
<Grid Background="#121212">
<blazor:BlazorWebView HostPage="wwwroot\index.html" Services="{StaticResource services}" x:Name="blazorWebView1">
<blazor:BlazorWebView.RootComponents>

41
Wabbajack.App.Blazor/Pages/Configure.razor
View File

@ -1,20 +1,41 @@
@page "/configure"
@using Wabbajack.App.Blazor.Store
@namespace Wabbajack.App.Blazor.Pages
<div id="content">
<div class="image" style="background-image: url('@Image');"></div>
<div class="image">
<img src="@Image" alt="">
</div>
@* <div class="image" style="background-image: url('@Image');"></div> *@
<div class="list">
@if (Name != string.Empty)
@if (!string.IsNullOrEmpty(ModList.Name))
{
<InfoBlock Title="@Name" Subtitle="@Author" Comment="@Version.ToString()" Description="@Description"/>
if (_installState.Value.CurrentInstallState != InstallState.InstallStateEnum.Installing)
{
<InfoBlock Title="@ModList.Name" Subtitle="@ModList.Author" Comment="@ModList.Version.ToString()" Description="@ModList.Description"/>
}
else if (_installState.Value.CurrentInstallState == InstallState.InstallStateEnum.Installing)
{
<InfoBlock Supertitle="Installing..." Title="@ModList.Name" Subtitle="@StatusText" Description="@ModList.Description"/>
}
}
@* <div class="modlist-image" style="background-image: url('@Image');"></div> *@
@if (!string.IsNullOrEmpty(Image))
{
if (_installState.Value.CurrentInstallState == InstallState.InstallStateEnum.Configuration)
{
<InfoImage Image="@Image"/>
} else if (_installState.Value.CurrentInstallState == InstallState.InstallStateEnum.Installing)
{
<InfoImage Image="@Image" Title="Some Mod Title" Subtitle="Author and others" Description="This mod adds something cool but I'm not going to tell you anything."/>
}
}
<div class="modlist-image" style="background-image: url('@Image');"></div>
</div>
<div class="settings">
<div class="locations">
<div class="labels">
<span>Target Modlist</span>
<span>Installation Location</span>
<span>Install Location</span>
<span>Download Location</span>
</div>
<div class="paths">
@ -26,7 +47,7 @@
</div>
<div class="options">
<label class="option">
Overwrite Existing Installation
Overwrite Installation
<input type="checkbox" checked="checked">
<span class="checkmark"></span>
</label>
@ -34,13 +55,13 @@
<label class="option">
<input type="checkbox">
<span class="checkmark"></span>
Enable NTFS Compression
NTFS Compression
</label>
<label class="option">
<input type="checkbox">
<span class="checkmark"></span>
Do a sweet trick once the modlist has finished installing
Do a sweet trick
</label>
<label class="option">
@ -49,6 +70,8 @@
Something else
</label>
</div>
<div class="install">
<img src="images/icons/play.svg" @onclick="Install" alt="Browse Gallery">
</div>
</div>
<div class="install" @onclick="NavigateInstall">Install</div>
</div>

107
Wabbajack.App.Blazor/Pages/Configure.razor.cs
View File

@ -3,43 +3,45 @@ using System.Diagnostics;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using Fluxor;
using Microsoft.AspNetCore.Components;
using Microsoft.WindowsAPICodePack.Dialogs;
using Wabbajack.App.Blazor.Store;
using Wabbajack.DTOs;
using Wabbajack.DTOs.JsonConverters;
using Wabbajack.Installer;
using Wabbajack.Paths;
using Ookii.Dialogs.Wpf;
using Wabbajack.App.Blazor.Utility;
using Wabbajack.Downloaders.GameFile;
using Wabbajack.Hashing.xxHash64;
using Wabbajack.Services.OSIntegrated;
namespace Wabbajack.App.Blazor.Pages
{
public partial class Configure
{
[Inject] private NavigationManager NavigationManager { get; set; }
[Inject] private IState<InstallState> _installState { get; set; }
[Inject] private DTOSerializer _dtos { get; set; }
[Inject] private IDispatcher _dispatcher { get; set; }
[Inject] private NavigationManager NavigationManager { get; set; }
[Inject] private IState<InstallState> _installState { get; set; }
[Inject] private DTOSerializer _dtos { get; set; }
[Inject] private IDispatcher _dispatcher { get; set; }
[Inject] private IServiceProvider _serviceProvider { get; set; }
[Inject] private SystemParametersConstructor _parametersConstructor { get; set; }
[Inject] private IGameLocator _gameLocator { get; set; }
[Inject] private SettingsManager _settingsManager { get; set; }
private string Name { get; set; } = "";
private string Author { get; set; } = "";
private string Description { get; set; } = "";
private Version Version { get; set; } = Version.Parse("0.0.0");
private string Image { get; set; } = "";
private ModList ModList { get; set; }
private string Image { get; set; }
private ModList ModList { get; set; } = new(); // Init a new modlist so we can listen for changes in Blazor components.
private AbsolutePath ModListPath { get; set; }
private AbsolutePath InstallPath { get; set; }
private AbsolutePath DownloadPath { get; set; }
private string StatusText { get; set; }
private const string InstallSettingsPrefix = "install-settings-";
protected override async Task OnInitializedAsync()
{
// var Location = KnownFolders.EntryPoint.Combine("downloaded_mod_lists", machineURL).WithExtension(Ext.Wabbajack);
await CheckValidInstallPath();
await base.OnInitializedAsync();
}
@ -50,12 +52,17 @@ namespace Wabbajack.App.Blazor.Pages
ModListPath = (AbsolutePath)_installState.Value.CurrentModListPath;
ModList = await StandardInstaller.LoadFromFile(_dtos, ModListPath);
_dispatcher.Dispatch(new UpdateInstallState(InstallState.InstallStateEnum.Configuration, ModList, ModListPath, null, null));
Name = _installState.Value.CurrentModList.Name;
Author = _installState.Value.CurrentModList.Author;
Description = _installState.Value.CurrentModList.Description;
Version = _installState.Value.CurrentModList.Version;
ModListPath = (AbsolutePath)_installState.Value.CurrentModListPath;
string hex = (await ModListPath.ToString().Hash()).ToHex();
var prevSettings = await _settingsManager.Load<SavedInstallSettings>(InstallSettingsPrefix + hex);
if (prevSettings.ModListLocation == ModListPath)
{
ModListPath = prevSettings.ModListLocation;
InstallPath = prevSettings.InstallLocation;
DownloadPath = prevSettings.DownloadLoadction;
//ModlistMetadata = metadata ?? prevSettings.Metadata;
}
Stream image = await StandardInstaller.ModListImageStream(ModListPath);
await using var reader = new MemoryStream();
@ -76,7 +83,7 @@ namespace Wabbajack.App.Blazor.Pages
Debug.Print(ex.Message);
}
}
private async void SelectDownloadFolder()
{
try
@ -90,11 +97,59 @@ namespace Wabbajack.App.Blazor.Pages
Debug.Print(ex.Message);
}
}
private void NavigateInstall()
private async Task Install()
{
_dispatcher.Dispatch(new UpdateInstallState(InstallState.InstallStateEnum.Configuration, ModList, ModListPath, InstallPath, DownloadPath));
NavigationManager.NavigateTo("installing");
_dispatcher.Dispatch(new UpdateInstallState(InstallState.InstallStateEnum.Installing, ModList, ModListPath, InstallPath, DownloadPath));
Task.Run(BeginInstall);
}
private async Task BeginInstall()
{
string postfix = (await ModListPath.ToString().Hash()).ToHex();
await _settingsManager.Save(InstallSettingsPrefix + postfix, new SavedInstallSettings
{
ModListLocation = ModListPath,
InstallLocation = InstallPath,
DownloadLoadction = DownloadPath
});
try
{
var installer = StandardInstaller.Create(_serviceProvider, new InstallerConfiguration
{
Game = ModList.GameType,
Downloads = DownloadPath,
Install = InstallPath,
ModList = ModList,
ModlistArchive = ModListPath,
SystemParameters = _parametersConstructor.Create(),
GameFolder = _gameLocator.GameLocation(ModList.GameType)
});
installer.OnStatusUpdate = update =>
{
if (StatusText != update.StatusText)
{
StatusText = update.StatusText;
InvokeAsync(StateHasChanged);
}
};
await installer.Begin(CancellationToken.None);
}
catch (Exception ex)
{
Debug.Print(ex.Message);
}
}
}
internal class SavedInstallSettings
{
public AbsolutePath ModListLocation { get; set; }
public AbsolutePath InstallLocation { get; set; }
public AbsolutePath DownloadLoadction { get; set; }
public ModlistMetadata Metadata { get; set; }
}
}

74
Wabbajack.App.Blazor/Pages/Configure.razor.scss
View File

@ -1,18 +1,19 @@
@import "../Shared/Globals.scss";
$checkbox-background: white;
$checkbox-background-hover: grey;
$checkbox-background-checked: purple;
$checkbox-background: rgba(255, 255, 255, 0.2);
$checkbox-background-hover: darkgrey;
$checkbox-background-checked: $accent-color;
$checkbox-size: 0.75rem;
@mixin path-span {
display: block;
height: 2rem;
width: 100%;
border: solid 1px red;
padding: 0.25rem;
margin: 0.25rem;
white-space: pre;
cursor: pointer;
text-overflow: ellipsis;
overflow: hidden;
}
#content {
@ -28,43 +29,35 @@ $checkbox-background-checked: purple;
position: absolute;
width: calc(100% - #{$sidebar-width});
height: calc(100% - #{$header-height});
background-repeat: no-repeat;
background-size: cover;
background-position: center;
filter: blur(25px) brightness(50%);
z-index: -1;
img {
width: 100%;
height: 100%;
object-fit: cover;
}
}
.list {
display: flex;
flex: 1;
width: 100%;
align-items: center;
.modlist-image {
background-repeat: no-repeat;
background-size: contain;
background-position: center;
width: 50%;
height: 100%;
margin: 2rem;
}
overflow: hidden;
}
.settings {
font-size: 0.9rem;
font-size: 0.85rem;
display: flex;
align-items: center;
width: 100%;
margin-top: 2rem;
margin-bottom: 2rem;
padding-left: 2rem;
padding-right: 2rem;
padding: 1rem;
backdrop-filter: brightness(0.5);
.locations {
display: flex;
flex-direction: row;
flex: 1;
overflow: hidden;
.labels {
span {
@ -75,9 +68,11 @@ $checkbox-background-checked: purple;
.paths {
flex: 1;
margin-left: 1rem;
overflow: hidden;
span {
@include path-span;
border: solid 1px rgba(255, 255, 255, 0.3);
}
}
}
@ -86,7 +81,6 @@ $checkbox-background-checked: purple;
display: flex;
flex-flow: row wrap;
flex-direction: column;
border: solid 1px red;
margin-left: 2rem;
.option {
@ -113,10 +107,10 @@ $checkbox-background-checked: purple;
&:after {
display: block;
left: 0.5rem;
top: 0.25rem;
width: 0.25rem;
height: 0.65rem;
left: calc(0.5 * #{$checkbox-size});
top: calc(0.25 * #{$checkbox-size});
width: calc(0.25 * #{$checkbox-size});
height: calc(0.65 * #{$checkbox-size});
border: solid white;
border-width: 0 3px 3px 0;
transform: rotate(45deg);
@ -128,8 +122,8 @@ $checkbox-background-checked: purple;
position: absolute;
top: 0;
left: 0;
height: 1.5rem;
width: 1.5rem;
height: calc(1.5 * #{$checkbox-size});
width: calc(1.5 * #{$checkbox-size});
background-color: $checkbox-background;
&:after {
@ -140,12 +134,18 @@ $checkbox-background-checked: purple;
}
}
}
}
.install {
width: 300px;
height: 50px;
background-color: green;
cursor: pointer;
.install {
display: flex;
flex-direction: column;
align-items: center;
margin: 0.5rem;
cursor: pointer;
img {
width: 5rem;
height: 5rem;
}
}
}
}

6
Wabbajack.App.Blazor/Pages/SelectInstall.razor.scss
View File

@ -1,4 +1,4 @@
$install-icon-size: 200px;
$install-icon-size: 15rem;
#content {
display: flex;
@ -35,8 +35,8 @@
.modlist {
img {
height: 75px;
width: 125px;
height: 4rem;
width: auto;
border: solid 1px red;
}

2
Wabbajack.App.Blazor/Shared/MainLayout.razor.scss
View File

@ -16,5 +16,5 @@
#page {
margin-top: $header-height;
height: calc(100% - #{$sidebar-width});
height: calc(100% - #{$header-height});
}