CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-06-08 21:45:14 +12:00
Code Issues Projects Releases Wiki Activity

Fixed OneClick Installs path sanitation

Browse source
This commit is contained in:
Assistant 2019-07-10 14:53:14 -07:00
parent ebf30ac9db
commit 5eb916a67c
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ModAssistant/Classes/OneClickInstaller.cs
View file

@ -71,8 +71,15 @@ namespace ModAssistant
return;
}
string directory = Path.Combine(BeatSaberPath, CustomSongsFolder, Response.key + " (" + Response.metadata.songName + " - " + Response.metadata.levelAuthorName + ")").Trim(Path.GetInvalidPathChars());
string zip = Path.Combine(BeatSaberPath, CustomSongsFolder, Response.hash) + ".zip";
string directory = Path.Combine(
BeatSaberPath,
CustomSongsFolder,
String.Concat(
(Response.key + " (" + Response.metadata.songName + " - " + Response.metadata.levelAuthorName + ")")
.Split(Utils.Constants.IllegalCharacters)
)
);
DownloadAsset(BeatSaverURLPrefix + Response.downloadURL, CustomSongsFolder, Response.hash + ".zip");

28
ModAssistant/Classes/Utils.cs
View file

@ -28,6 +28,14 @@ namespace ModAssistant
public const string BeatModsURL = "https://beatmods.com";
public const string BeatModsModsOptions = "mod?status=approved";
public const string MD5Spacer = " ";
public static readonly char[] IllegalCharacters = new char[]
{
'<', '>', ':', '/', '\\', '|', '?', '*', '"',
'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', '\u0006', '\u0007',
'\u0008', '\u0009', '\u000a', '\u000b', '\u000c', '\u000d', '\u000e', '\u000d',
'\u000f', '\u0010', '\u0011', '\u0012', '\u0013', '\u0014', '\u0015', '\u0016',
'\u0017', '\u0018', '\u0019', '\u001a', '\u001b', '\u001c', '\u001d', '\u001f',
};
}
public static class GameVersions
@ -37,7 +45,7 @@ namespace ModAssistant
{"3708884", "0.13.2"},
{"3844832", "1.0.0" },
{"3861357", "1.0.1" },
{"3901511", "1.1.0" }
{"3901511", "1.1.0" },
};
}
@ -307,24 +315,6 @@ namespace ModAssistant
}
return null;
}
/*
public static string GetManualDir()
{
CommonOpenFileDialog dialog = new CommonOpenFileDialog()
{
IsFolderPicker = true,
Multiselect = false,
Title = "Select your Beat Saber installation folder"
};
if (dialog.ShowDialog() == CommonFileDialogResult.Ok)
{
return dialog.FileName;
}
return null;
}*/
public static string GetManualDir()
{