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

Merge UpdateChecker.ParseVersion into VersionInfo.VersionStrToInt

This commit is contained in:
YoshiRulz 2020-12-06 07:35:12 +10:00
parent 66e0d4b214
commit 877c11d5f9
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ namespace BizHawk.Client.Common
else
{
var cfgVersion = VersionInfo.VersionStrToInt(cfgVersionStr);
if (cfgVersion < 0x02050000)
if (cfgVersion < 0x02050000U)
{
fmt = MSGFMT_PRE_2_5;
}

25
src/BizHawk.Client.EmuHawk/UpdateChecker.cs
View File

@ -55,8 +55,8 @@ namespace BizHawk.Client.EmuHawk
public static bool IsNewVersionAvailable =>
AutoCheckEnabled
&& LatestVersion != IgnoreVersion
&& ParseVersion(VersionInfo.MainVersion) != 0 // Avoid notifying if current version string is invalid
&& ParseVersion(LatestVersion) > ParseVersion(VersionInfo.MainVersion);
&& VersionInfo.VersionStrToInt(VersionInfo.MainVersion) != 0U // Avoid notifying if current version string is invalid
&& VersionInfo.VersionStrToInt(LatestVersion) > VersionInfo.VersionStrToInt(VersionInfo.MainVersion);
public static void IgnoreNewVersion()
{
@ -100,26 +100,7 @@ namespace BizHawk.Client.EmuHawk
private static string ValidateVersionNumberString(string versionNumber)
{
return versionNumber != null && ParseVersion(versionNumber) != 0 ? versionNumber : "";
}
// Major version goes in the first 16 bits, and so on, up to 4 parts
private static ulong ParseVersion(string str)
{
string[] split = str.Split('.');
if (split.Length > 4) return 0;
ulong version = 0;
for (int i = 0; i < split.Length; i++)
{
if (!ushort.TryParse(split[i], out var versionPart))
{
return 0;
}
version |= (ulong)versionPart << (48 - (i * 16));
}
return version;
return versionNumber != null && VersionInfo.VersionStrToInt(versionNumber) != 0U ? versionNumber : "";
}
private static void OnCheckComplete()

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

@ -42,15 +42,15 @@ namespace BizHawk.Common
=> DeveloperBuild ? $"GIT {GIT_BRANCH}#{GIT_SHORTHASH}" : $"Version {MainVersion}";
/// <summary>"2.5.1" => 0x02050100</summary>
public static int VersionStrToInt(string s)
public static uint VersionStrToInt(string s)
{
var a = s.Split('.');
var v = 0;
var v = 0U;
var i = 0;
while (i < 4)
{
v <<= 8;
v += (i < a.Length && byte.TryParse(a[i], out var b)) ? b : 0;
v += (i < a.Length && byte.TryParse(a[i], out var b)) ? b : 0U;
i++;
}
return v;