nother text change

This commit is contained in:
NicoAICP 2020-06-23 17:41:09 +02:00
parent 76ea94a24a
commit fb75ebadc6
2 changed files with 11 additions and 10 deletions

View file

@ -1584,13 +1584,13 @@ namespace UWUVCI_AIO_WPF
gameName = gameName.Replace("|", " ");
Regex reg = new Regex("[^a-zA-Z0-9 é -]");
//string outputPath = Path.Combine(Properties.Settings.Default.InjectionPath, gameName);
string outputPath = Path.Combine(Properties.Settings.Default.OutPath, $"[LOADIINE] {reg.Replace(gameName,"")} [{mvvm.prodcode}]");
mvvm.foldername = $"[LOADIINE] {reg.Replace(gameName, "")} [{mvvm.prodcode}]";
string outputPath = Path.Combine(Properties.Settings.Default.OutPath, $"[LOADIINE]{reg.Replace(gameName,"")} [{mvvm.prodcode}]");
mvvm.foldername = $"[LOADIINE]{reg.Replace(gameName, "")} [{mvvm.prodcode}]";
int i = 0;
while (Directory.Exists(outputPath))
{
outputPath = Path.Combine(Properties.Settings.Default.OutPath, $"[LOADIINE] {reg.Replace(gameName, "")} [{mvvm.prodcode}]_{i}");
mvvm.foldername = $"[LOADIINE] {reg.Replace(gameName, "")} [{mvvm.prodcode}]_{i}";
outputPath = Path.Combine(Properties.Settings.Default.OutPath, $"[LOADIINE]{reg.Replace(gameName, "")} [{mvvm.prodcode}]_{i}");
mvvm.foldername = $"[LOADIINE]{reg.Replace(gameName, "")} [{mvvm.prodcode}]_{i}";
i++;
}
@ -1616,15 +1616,16 @@ namespace UWUVCI_AIO_WPF
mvm.msg = "Creating Outputfolder...";
Regex reg = new Regex("[^a-zA-Z0-9 -]");
if (gameName == null || gameName == string.Empty) gameName = "NoName";
gameName = gameName.Replace("|", " ");
//string outputPath = Path.Combine(Properties.Settings.Default.InjectionPath, gameName);
string outputPath = Path.Combine(Properties.Settings.Default.OutPath, $"[WUP] {reg.Replace(gameName,"")}");
mvvm.foldername = $"[WUP] {reg.Replace(gameName, "")}";
string outputPath = Path.Combine(Properties.Settings.Default.OutPath, $"[WUP]{reg.Replace(gameName,"").Replace("|", " ")}");
outputPath = outputPath.Replace("|", " ");
mvvm.foldername = $"[WUP]{reg.Replace(gameName, "").Replace("|"," ")}";
int i = 0;
while (Directory.Exists(outputPath))
{
outputPath = Path.Combine(Properties.Settings.Default.OutPath, $"[WUP] {reg.Replace(gameName,"")}_{i}");
mvvm.foldername = $"[WUP] {reg.Replace(gameName, "")}_{i}";
outputPath = Path.Combine(Properties.Settings.Default.OutPath, $"[WUP]{reg.Replace(gameName,"").Replace("|", " ")}_{i}");
mvvm.foldername = $"[WUP]{reg.Replace(gameName, "").Replace("|", " ")}_{i}";
i++;
}

View file

@ -255,7 +255,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
if(injctSize >= new DriveInfo(driveletter).AvailableFreeSpace)
{
long div = injctSize - new DriveInfo(driveletter).AvailableFreeSpace + 1048576;
Custom_Message cm = new Custom_Message("Insufficient Space", $" You do not have enough space on the selected drive. \n Please make sure you have atleast {FormatBytes(div)} free on the drive! ");
Custom_Message cm = new Custom_Message("Insufficient Space", $" You do not have enough space on the selected drive. \n Please make sure you have at least {FormatBytes(div)} free! ");
try
{
cm.Owner = (FindResource("mvm") as MainViewModel).mw;