CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-05-18 03:12:18 +12:00
Code Issues Projects Releases Wiki Activity

improved filetype detection

Browse source
This commit is contained in:
Assistant 2020-05-19 19:09:03 -06:00
parent 9622cef810
commit 145c350c14
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ModAssistant/Classes/External Interfaces/BeatSaver.cs
View file

@ -6,6 +6,7 @@ using System.Net;
using System.Net.Http.Headers;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using System.Windows;
using static ModAssistant.Http;
@ -113,9 +114,6 @@ namespace ModAssistant.API
}
}
[DllImport("msvcrt.dll", CallingConvention = CallingConvention.Cdecl)]
static extern int memcmp(byte[] b1, byte[] b2, long count);
public static async Task<string> InstallMap(BeatSaverApiResponseMap Map, bool showNotification = true)
{
string zip = Path.Combine(Utils.BeatSaberPath, CustomSongsFolder, Map.hash) + ".zip";
@ -136,23 +134,11 @@ namespace ModAssistant.API
if (File.Exists(zip))
{
byte[] zipMagicNumber = { 80, 75, 3, 4 };
byte[] magicNumber = new byte[4];
string mimeType = MimeMapping.GetMimeMapping(zip);
MessageBox.Show(mimeType);
try
{
using (FileStream fs = new FileStream(zip, FileMode.Open, FileAccess.Read))
{
fs.Read(magicNumber, 0, magicNumber.Length);
fs.Close();
}
}
catch
{
return null;
}
if (!(magicNumber.Length == zipMagicNumber.Length && memcmp(magicNumber, zipMagicNumber, magicNumber.Length) == 0))
if (!mimeType.StartsWith("application/x-zip"))
{
ModAssistant.Utils.Log($"Failed extracting BeatSaver map: {zip} \n| Content: {string.Join("\n", File.ReadAllLines(zip))}", "ERROR");
throw new Exception("File not a zip.");