ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move VersionStrToInt helper to VersionInfo

This commit is contained in:
YoshiRulz 2020-12-06 07:15:14 +10:00
parent 98e2d494a2
commit 9dcc8f56f4
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/BizHawk.Client.Common/config/ConfigService.cs
View File

@ -36,20 +36,6 @@ namespace BizHawk.Client.Common
public static bool IsFromSameVersion(string filepath, out string msg) public static bool IsFromSameVersion(string filepath, out string msg)
{ {
// "2.5.1" => 0x02050100
static int VersionStrToInt(string s)
{
var a = s.Split('.');
var v = 0;
var i = 0;
while (i < 4)
{
v <<= 8;
if (i < a.Length) v += byte.TryParse(a[i], out var b) ? b : 0;
i++;
}
return v;
}
const string MSGFMT_NEWER = "Your config file ({0}) is from a newer version of EmuHawk, {2} (this is {1}). It may fail to load."; const string MSGFMT_NEWER = "Your config file ({0}) is from a newer version of EmuHawk, {2} (this is {1}). It may fail to load.";
const string MSGFMT_OLDER = "Your config file ({0}) is from an older version of EmuHawk, {2} (this is {1}). It may fail to load."; const string MSGFMT_OLDER = "Your config file ({0}) is from an older version of EmuHawk, {2} (this is {1}). It may fail to load.";
const string MSGFMT_PRE_2_3_3 = "Your config file ({0}) is corrupted, or is from an older version of EmuHawk, predating 2.3.3 (this is {1}). It may fail to load."; const string MSGFMT_PRE_2_3_3 = "Your config file ({0}) is corrupted, or is from an older version of EmuHawk, predating 2.3.3 (this is {1}). It may fail to load.";
@ -81,14 +67,14 @@ namespace BizHawk.Client.Common
} }
else else
{ {
var cfgVersion = VersionStrToInt(cfgVersionStr); var cfgVersion = VersionInfo.VersionStrToInt(cfgVersionStr);
if (cfgVersion < 0x02050000) if (cfgVersion < 0x02050000)
{ {
fmt = MSGFMT_PRE_2_5; fmt = MSGFMT_PRE_2_5;
} }
else else
{ {
var thisVersion = VersionStrToInt(VersionInfo.MainVersion); var thisVersion = VersionInfo.VersionStrToInt(VersionInfo.MainVersion);
fmt = cfgVersion < thisVersion ? MSGFMT_OLDER : MSGFMT_NEWER; fmt = cfgVersion < thisVersion ? MSGFMT_OLDER : MSGFMT_NEWER;
} }
} }

15
src/BizHawk.Common/VersionInfo.cs
View File

@ -34,6 +34,21 @@ namespace BizHawk.Common
} }
} }
/// <summary>"2.5.1" => 0x02050100</summary>
public static int VersionStrToInt(string s)
{
var a = s.Split('.');
var v = 0;
var i = 0;
while (i < 4)
{
v <<= 8;
v += (i < a.Length && byte.TryParse(a[i], out var b)) ? b : 0;
i++;
}
return v;
}
// code copied to avoid depending on code in other projects // code copied to avoid depending on code in other projects
private static string GetExeDirectoryAbsolute() private static string GetExeDirectoryAbsolute()
{ {