Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-09-10 04:05:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extract some logic

Browse Source
This commit is contained in:
Kurt
2020-03-30 13:55:12 -07:00
parent dc0b2e2fe4
commit c56ff63354
3 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
NHSE.Core/Save/Meta/EncryptedFilePair.cs
View File

@@ -77,19 +77,7 @@ public IEnumerable<FileHashRegion> InvalidHashes()
}
}
public string GetString(int offset, int maxLength)
{
var str = Encoding.Unicode.GetString(Data, offset, maxLength * 2);
return StringUtil.TrimFromZero(str);
}
public static byte[] GetBytes(string value, int maxLength)
{
if (value.Length > maxLength)
value = value.Substring(0, maxLength);
else if (value.Length < maxLength)
value = value.PadRight(maxLength, '\0');
return Encoding.Unicode.GetBytes(value);
}
public string GetString(int offset, int maxLength) => StringUtil.GetString(Data, offset, maxLength);
public static byte[] GetBytes(string value, int maxLength) => StringUtil.GetBytes(value, maxLength);
}
}

24
NHSE.Core/Util/StringUtil.cs
View File

@@ -1,4 +1,6 @@
using System.Runtime.CompilerServices;
using System.IO;
using System.Runtime.CompilerServices;
using System.Text;
namespace NHSE.Core
{
@@ -20,5 +22,25 @@ private static string TrimFromFirst(string input, char c)
int index = input.IndexOf(c);
return index < 0 ? input : input.Substring(0, index);
}
public static string GetString(byte[] data, int offset, int maxLength)
{
var str = Encoding.Unicode.GetString(data, offset, maxLength * 2);
return TrimFromZero(str);
}
public static byte[] GetBytes(string value, int maxLength)
{
if (value.Length > maxLength)
value = value.Substring(0, maxLength);
else if (value.Length < maxLength)
value = value.PadRight(maxLength, '\0');
return Encoding.Unicode.GetBytes(value);
}
public static string CleanFileName(string fileName)
{
return string.Concat(fileName.Split(Path.GetInvalidFileNameChars()));
}
}
}

21
NHSE.WinForms/Main.cs
View File

@@ -63,21 +63,30 @@ private void Menu_Open(object sender, EventArgs e)
private static void Open(string path)
{
#if !DEBUG
try
#endif
{
var file = new HorizonSave(path);
Open(file);
var settings = Settings.Default;
settings.LastFilePath = path;
settings.Save();
OpenSaveFile(path);
}
#if !DEBUG
#pragma warning disable CA1031 // Do not catch general exception types
catch (Exception ex)
#pragma warning restore CA1031 // Do not catch general exception types
{
WinFormsUtil.Error(ex.Message);
}
#endif
}
private static void OpenSaveFile(string path)
{
var file = new HorizonSave(path);
Open(file);
var settings = Settings.Default;
settings.LastFilePath = path;
settings.Save();
}
}
}