diff --git a/Patcher/_port/Patcher/PatchClient/Assets/Styles.axaml b/Patcher/_port/Patcher/PatchClient/Assets/Styles.axaml
index 63e2d9a..7a7c3d2 100644
--- a/Patcher/_port/Patcher/PatchClient/Assets/Styles.axaml
+++ b/Patcher/_port/Patcher/PatchClient/Assets/Styles.axaml
@@ -10,4 +10,29 @@
+
+
+
+
diff --git a/Patcher/_port/Patcher/PatchClient/Models/LineItemProgress.cs b/Patcher/_port/Patcher/PatchClient/Models/LineItemProgress.cs
index 4fcf225..36264b9 100644
--- a/Patcher/_port/Patcher/PatchClient/Models/LineItemProgress.cs
+++ b/Patcher/_port/Patcher/PatchClient/Models/LineItemProgress.cs
@@ -6,6 +6,13 @@ namespace PatchClient.Models
{
public class LineItemProgress : ReactiveObject
{
+ private bool _Completed = false;
+ public bool Completed
+ {
+ get => _Completed;
+ set => this.RaiseAndSetIfChanged(ref _Completed, value);
+ }
+
private int total = 0;
private string _Info = "";
@@ -22,9 +29,13 @@ namespace PatchClient.Models
set => this.RaiseAndSetIfChanged(ref _Progress, value);
}
- public void UpdateProgress(int Count)
+ public void UpdateProgress(int RemainingCount)
{
- Progress = (int)Math.Floor((double)Count / total * 100);
+ if (Completed) return; //this doesn't work right ... need to look at it.
+
+ Progress = (int)Math.Floor((double)RemainingCount / total * 100);
+
+ if (Progress == 100) Completed = true;
}
public LineItemProgress(LineItem Item)
diff --git a/Patcher/_port/Patcher/PatchClient/ViewModels/PatcherViewModel.cs b/Patcher/_port/Patcher/PatchClient/ViewModels/PatcherViewModel.cs
index d12b0fd..75a910a 100644
--- a/Patcher/_port/Patcher/PatchClient/ViewModels/PatcherViewModel.cs
+++ b/Patcher/_port/Patcher/PatchClient/ViewModels/PatcherViewModel.cs
@@ -4,11 +4,8 @@ using PatcherUtils;
using Splat;
using System;
using ReactiveUI;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Threading.Tasks;
-using Avalonia.Controls.ApplicationLifetimes;
using System.Collections.ObjectModel;
namespace PatchClient.ViewModels
@@ -26,11 +23,11 @@ namespace PatchClient.ViewModels
set => this.RaiseAndSetIfChanged(ref _ProgressMessage, value);
}
- private int _PatchProgress;
- public int PatchProgress
+ private int _PatchPercent;
+ public int PatchPercent
{
- get => _PatchProgress;
- set => this.RaiseAndSetIfChanged(ref _PatchProgress, value);
+ get => _PatchPercent;
+ set => this.RaiseAndSetIfChanged(ref _PatchPercent, value);
}
private string _PatchMessage;
@@ -44,7 +41,7 @@ namespace PatchClient.ViewModels
public PatcherViewModel()
{
- Test();
+ RunPatcher();
}
[Obsolete]
@@ -63,7 +60,7 @@ namespace PatchClient.ViewModels
for (int i = 0; i <= 100; i++)
{
System.Threading.Thread.Sleep(20);
- PatchProgress = i;
+ PatchPercent = i;
ProgressMessage = $"Patching @ {i}%";
foreach(var item in LineItems)
@@ -72,7 +69,7 @@ namespace PatchClient.ViewModels
}
}
- navigator.SelectedViewModel = new MessageViewModel("Patch completed without issues");
+ //navigator.SelectedViewModel = new MessageViewModel("Patch completed without issues");
});
}
@@ -92,7 +89,7 @@ namespace PatchClient.ViewModels
{
if (bp.Run())
{
- navigator.SelectedViewModel = new MessageViewModel("Patch completed without issues");
+ //navigator.SelectedViewModel = new MessageViewModel("Patch completed without issues");
}
else
{
@@ -110,8 +107,11 @@ namespace PatchClient.ViewModels
{
foreach (LineItem item in AdditionalLineItems)
{
+ if (item.ItemValue <= 0) continue;
+
if(initLineItemProgress)
{
+
LineItems.Add(new LineItemProgress(item));
}
@@ -120,14 +120,14 @@ namespace PatchClient.ViewModels
initLineItemProgress = false;
- PatchProgress = Progress;
+ PatchPercent = Percent;
if (!string.IsNullOrWhiteSpace(Message))
{
PatchMessage = Message;
}
- ProgressMessage = $"Patching @ {Percent}%";
+ ProgressMessage = $"Patching: {Progress} / {Total} - {Percent}%";
}
}
}
diff --git a/Patcher/_port/Patcher/PatchClient/Views/PatcherView.axaml b/Patcher/_port/Patcher/PatchClient/Views/PatcherView.axaml
index 438b89c..128539f 100644
--- a/Patcher/_port/Patcher/PatchClient/Views/PatcherView.axaml
+++ b/Patcher/_port/Patcher/PatchClient/Views/PatcherView.axaml
@@ -7,10 +7,13 @@
x:Class="PatchClient.Views.PatcherView">
+
+
+
@@ -19,7 +22,7 @@
-
+
-
+
+
-
+
diff --git a/Patcher/_port/Patcher/Patcher/.gitignore b/Patcher/_port/Patcher/Patcher/.gitignore
deleted file mode 100644
index 8afdcb6..0000000
--- a/Patcher/_port/Patcher/Patcher/.gitignore
+++ /dev/null
@@ -1,454 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
-# User-specific files
-*.rsuser
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-[Ww][Ii][Nn]32/
-[Aa][Rr][Mm]/
-[Aa][Rr][Mm]64/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-[Ll]ogs/
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# Tye
-.tye/
-
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_h.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*_wpftmp.csproj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!?*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
-*.mdf
-*.ldf
-*.ndf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-
-##
-## Visual studio for Mac
-##
-
-
-# globs
-Makefile.in
-*.userprefs
-*.usertasks
-config.make
-config.status
-aclocal.m4
-install-sh
-autom4te.cache/
-*.tar.gz
-tarballs/
-test-results/
-
-# Mac bundle stuff
-*.dmg
-*.app
-
-# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
-# Windows thumbnail cache files
-Thumbs.db
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-##
-## Visual Studio Code
-##
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
diff --git a/Patcher/_port/Patcher/Patcher/App.axaml b/Patcher/_port/Patcher/Patcher/App.axaml
deleted file mode 100644
index 1d91d6f..0000000
--- a/Patcher/_port/Patcher/Patcher/App.axaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/Patcher/_port/Patcher/Patcher/App.axaml.cs b/Patcher/_port/Patcher/Patcher/App.axaml.cs
deleted file mode 100644
index 498821c..0000000
--- a/Patcher/_port/Patcher/Patcher/App.axaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-using Patcher.ViewModels;
-using Patcher.Views;
-
-namespace Patcher
-{
- public class App : Application
- {
- public override void Initialize()
- {
- AvaloniaXamlLoader.Load(this);
- }
-
- public override void OnFrameworkInitializationCompleted()
- {
- if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
- {
- desktop.MainWindow = new MainWindow
- {
- DataContext = new MainWindowViewModel(),
- };
- }
-
- base.OnFrameworkInitializationCompleted();
- }
- }
-}
diff --git a/Patcher/_port/Patcher/Patcher/Assets/avalonia-logo.ico b/Patcher/_port/Patcher/Patcher/Assets/avalonia-logo.ico
deleted file mode 100644
index da8d49f..0000000
Binary files a/Patcher/_port/Patcher/Patcher/Assets/avalonia-logo.ico and /dev/null differ
diff --git a/Patcher/_port/Patcher/Patcher/Patcher.csproj b/Patcher/_port/Patcher/Patcher/Patcher.csproj
deleted file mode 100644
index 18cefed..0000000
--- a/Patcher/_port/Patcher/Patcher/Patcher.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
- WinExe
- net5.0
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Patcher/_port/Patcher/Patcher/Program.cs b/Patcher/_port/Patcher/Patcher/Program.cs
deleted file mode 100644
index b9d241c..0000000
--- a/Patcher/_port/Patcher/Patcher/Program.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.ReactiveUI;
-using System;
-
-namespace Patcher
-{
- class Program
- {
- // Initialization code. Don't use any Avalonia, third-party APIs or any
- // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
- // yet and stuff might break.
- [STAThread]
- public static void Main(string[] args) => BuildAvaloniaApp()
- .StartWithClassicDesktopLifetime(args);
-
- // Avalonia configuration, don't remove; also used by visual designer.
- public static AppBuilder BuildAvaloniaApp()
- => AppBuilder.Configure()
- .UsePlatformDetect()
- .LogToTrace()
- .UseReactiveUI();
- }
-}
diff --git a/Patcher/_port/Patcher/Patcher/ViewLocator.cs b/Patcher/_port/Patcher/Patcher/ViewLocator.cs
deleted file mode 100644
index cf3c0c9..0000000
--- a/Patcher/_port/Patcher/Patcher/ViewLocator.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Patcher.ViewModels;
-using System;
-
-namespace Patcher
-{
- public class ViewLocator : IDataTemplate
- {
- public IControl Build(object data)
- {
- var name = data.GetType().FullName!.Replace("ViewModel", "View");
- var type = Type.GetType(name);
-
- if (type != null)
- {
- return (Control)Activator.CreateInstance(type)!;
- }
- else
- {
- return new TextBlock { Text = "Not Found: " + name };
- }
- }
-
- public bool Match(object data)
- {
- return data is ViewModelBase;
- }
- }
-}
diff --git a/Patcher/_port/Patcher/Patcher/ViewModels/MainWindowViewModel.cs b/Patcher/_port/Patcher/Patcher/ViewModels/MainWindowViewModel.cs
deleted file mode 100644
index 4240ed5..0000000
--- a/Patcher/_port/Patcher/Patcher/ViewModels/MainWindowViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Patcher.ViewModels
-{
- public class MainWindowViewModel : ViewModelBase
- {
- public string Greeting => "Welcome to Avalonia!";
- }
-}
diff --git a/Patcher/_port/Patcher/Patcher/ViewModels/ViewModelBase.cs b/Patcher/_port/Patcher/Patcher/ViewModels/ViewModelBase.cs
deleted file mode 100644
index e5bc50e..0000000
--- a/Patcher/_port/Patcher/Patcher/ViewModels/ViewModelBase.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Patcher.ViewModels
-{
- public class ViewModelBase : ReactiveObject
- {
- }
-}
diff --git a/Patcher/_port/Patcher/Patcher/Views/MainWindow.axaml b/Patcher/_port/Patcher/Patcher/Views/MainWindow.axaml
deleted file mode 100644
index b6c4edf..0000000
--- a/Patcher/_port/Patcher/Patcher/Views/MainWindow.axaml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/Patcher/_port/Patcher/Patcher/Views/MainWindow.axaml.cs b/Patcher/_port/Patcher/Patcher/Views/MainWindow.axaml.cs
deleted file mode 100644
index c4e536f..0000000
--- a/Patcher/_port/Patcher/Patcher/Views/MainWindow.axaml.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Patcher.Views
-{
- public partial class MainWindow : Window
- {
- public MainWindow()
- {
- InitializeComponent();
-#if DEBUG
- this.AttachDevTools();
-#endif
- }
-
- private void InitializeComponent()
- {
- AvaloniaXamlLoader.Load(this);
- }
- }
-}