Mirrors/UWUVCI-AIO-WPF
2
0
Fork 0
mirror of https://github.com/stuff-by-3-random-dudes/UWUVCI-AIO-WPF synced 2024-11-10 05:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Paths and awaited async function

Browse source
This commit is contained in:
ZestyTS 2022-08-04 18:23:01 -07:00
parent 969bb3656b
commit 81c6269a3d
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UWUVCI AIO WPF/Classes/KeyFile.cs
View file

@ -33,7 +33,7 @@ namespace UWUVCI_AIO_WPF.Classes
public static void ExportFile(List<TKeys> precomp, GameConsoles console) public static void ExportFile(List<TKeys> precomp, GameConsoles console)
{ {
CheckAndFixFolder("bin\\keys"); CheckAndFixFolder("bin\\keys");
Stream createConfigStream = new FileStream($@"bin\keys\{console.ToString().ToLower()}.vck", FileMode.Create, FileAccess.Write); Stream createConfigStream = new FileStream(Path.Combine(Directory.GetCurrentDirectory(), $@"bin\keys\{console.ToString().ToLower()}.vck"), FileMode.Create, FileAccess.Write);
GZipStream compressedStream = new GZipStream(createConfigStream, CompressionMode.Compress); GZipStream compressedStream = new GZipStream(createConfigStream, CompressionMode.Compress);
IFormatter formatter = new BinaryFormatter(); IFormatter formatter = new BinaryFormatter();
formatter.Serialize(compressedStream, precomp); formatter.Serialize(compressedStream, precomp);

16
UWUVCI AIO WPF/Models/MainViewModel.cs
View file

@ -1994,7 +1994,7 @@ namespace UWUVCI_AIO_WPF
} }
private void CreateSettingIfNotExist(List<GameBases> l, GameConsoles console) private void CreateSettingIfNotExist(List<GameBases> l, GameConsoles console)
{ {
string file = $@"bin\keys\{console.ToString().ToLower()}.vck"; string file = Path.Combine(Directory.GetCurrentDirectory(), $@"bin\keys\{console.ToString().ToLower()}.vck");
if (!File.Exists(file)) if (!File.Exists(file))
{ {
List<TKeys> temp = new List<TKeys>(); List<TKeys> temp = new List<TKeys>();
@ -2014,7 +2014,7 @@ namespace UWUVCI_AIO_WPF
} }
private void FixupKeys(List<GameBases> l, GameConsoles console) private void FixupKeys(List<GameBases> l, GameConsoles console)
{ {
string file = $@"bin\keys\{console.ToString().ToLower()}.vck"; string file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"bin\keys\{console.ToString().ToLower()}.vck");
var save = KeyFile.ReadBasesFromKeyFile(file); var save = KeyFile.ReadBasesFromKeyFile(file);
List<TKeys> temp = new List<TKeys>(); List<TKeys> temp = new List<TKeys>();
foreach (TKeys a in save) foreach (TKeys a in save)
@ -2045,10 +2045,10 @@ namespace UWUVCI_AIO_WPF
} }
private void UpdateKeyFile(List<GameBases> l, GameConsoles console) private void UpdateKeyFile(List<GameBases> l, GameConsoles console)
{ {
string file = $@"bin\keys\{console.ToString().ToLower()}.vck"; string file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"bin\keys\{console.ToString().ToLower()}.vck");
if (File.Exists(file)) if (File.Exists(file))
{ {
List<TKeys> keys = KeyFile.ReadBasesFromKeyFile($@"bin\keys\{console.ToString().ToLower()}.vck"); List<TKeys> keys = KeyFile.ReadBasesFromKeyFile(file);
List<TKeys> newTK = new List<TKeys>(); List<TKeys> newTK = new List<TKeys>();
foreach (GameBases gb in l) foreach (GameBases gb in l)
{ {
@ -2169,7 +2169,8 @@ namespace UWUVCI_AIO_WPF
} }
public bool isKeySet(GameBases bases) public bool isKeySet(GameBases bases)
{ {
var temp = KeyFile.ReadBasesFromKeyFile($@"bin\keys\{GetConsoleOfBase(bases).ToString().ToLower()}.vck"); string file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"bin\keys\{GetConsoleOfBase(bases).ToString().ToLower()}.vck");
var temp = KeyFile.ReadBasesFromKeyFile(file);
foreach (TKeys t in temp) foreach (TKeys t in temp)
{ {
if (t.Base.Name == bases.Name && t.Base.Region == bases.Region) if (t.Base.Name == bases.Name && t.Base.Region == bases.Region)
@ -2215,7 +2216,8 @@ namespace UWUVCI_AIO_WPF
} }
public TKeys getTkey(GameBases bases) public TKeys getTkey(GameBases bases)
{ {
var temp = KeyFile.ReadBasesFromKeyFile($@"bin\keys\{GetConsoleOfBase(bases).ToString().ToLower()}.vck"); string file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"bin\keys\{GetConsoleOfBase(bases).ToString().ToLower()}.vck");
var temp = KeyFile.ReadBasesFromKeyFile(file);
foreach (TKeys t in temp) foreach (TKeys t in temp)
if (t.Base.Name == bases.Name && t.Base.Region == bases.Region) if (t.Base.Name == bases.Name && t.Base.Region == bases.Region)
@ -2229,7 +2231,7 @@ namespace UWUVCI_AIO_WPF
ValidatePathsStillExist(); ValidatePathsStillExist();
if (Task.Run(() => CheckForInternetConnectionAsync()).GetAwaiter().GetResult()) if (Task.Run(() => CheckForInternetConnectionAsync()).GetAwaiter().GetResult())
{ {
Task.Run(() => { Injection.Download(this); }); Task.Run(() => Injection.Download(this)).GetAwaiter();
DownloadWait dw = new DownloadWait("Downloading Base - Please Wait", "", this); DownloadWait dw = new DownloadWait("Downloading Base - Please Wait", "", this);
try try