Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-09-21 14:51:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc updates

Browse source 
Reuse some code in netutil for fetching stream (provide useragent for
all uses)
make sav4ranch use dynamicly read offsets to handle both variants
(quicker) #2248
This commit is contained in:
Kurt 2019-01-25 16:51:58 -08:00
parent 095ec241ae
commit a7323ef484
2 changed files with 23 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
PKHeX.Core/Saves/Storage/SAV4Ranch.cs
View file

@ -6,9 +6,6 @@ namespace PKHeX.Core
{
public sealed class SAV4Ranch : BulkStorage
{
private const int SIZE_MII = 0x28;
private const int SIZE_MIILINK = 0x2C;
public override int SIZE_STORED => 0x88 + 0x1C;
protected override int SIZE_PARTY => SIZE_STORED;
@ -28,7 +25,7 @@ namespace PKHeX.Core
public SAV4Ranch(byte[] data) : base(data, typeof(PK4), 0)
{
Personal = PersonalTable.Pt;
Version = GameVersion.DPPt;
Version = Data.Length == SaveUtil.SIZE_G4RANCH_PLAT ? GameVersion.Pt : GameVersion.DP;
HeldItems = Legal.HeldItems_Pt;
OT = GetString(0x770, 0x12);
@ -57,18 +54,13 @@ namespace PKHeX.Core
* uint32_t name4;
*/
var miiCountOffset = Data.Length == SaveUtil.SIZE_G4RANCH_PLAT ? 0x268C : 0x22AC;
var miiCount = BigEndian.ToInt32(Data, miiCountOffset);
var miiLinkCountOffset = miiCountOffset + 4 + (SIZE_MII * miiCount) + 4;
var miiLinkCount = BigEndian.ToInt32(Data, miiLinkCountOffset);
var pkCountOffset = miiLinkCountOffset + 4 + (SIZE_MIILINK * miiLinkCount) + 4;
var pkCountOffset = BigEndian.ToInt32(Data, 0x34) + 4;
SlotCount = BigEndian.ToInt32(Data, pkCountOffset);
BoxCount = (int)Math.Ceiling((decimal)SlotCount / SlotsPerBox);
Box = pkCountOffset + 4;
FinalCountOffset = pkCountOffset + 4 + (SIZE_STORED * SlotCount);
FinalCountOffset = BigEndian.ToInt32(Data, 0x3C);
FinalCount = BigEndian.ToInt32(Data, FinalCountOffset);
}

45
PKHeX.WinForms/Util/NetUtil.cs
View file

@ -9,19 +9,14 @@ namespace PKHeX.WinForms
{
public static class NetUtil
{
private static Regex LatestGitTagRegex = new Regex("\\\"tag_name\"\\s*\\:\\s*\\\"([0-9]+\\.[0-9]+\\.[0-9]+)\\\""); // Match `"tag_name": "18.12.02"`. Group 1 is `18.12.02`
private static readonly Regex LatestGitTagRegex = new Regex("\\\"tag_name\"\\s*\\:\\s*\\\"([0-9]+\\.[0-9]+\\.[0-9]+)\\\""); // Match `"tag_name": "18.12.02"`. Group 1 is `18.12.02`
public static string GetStringFromURL(string webURL)
{
try
{
HttpWebRequest httpWebRequest = (HttpWebRequest)WebRequest.Create(webURL);
// The GitHub API will fail if no user agent is provided
httpWebRequest.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36";
HttpWebResponse httpWebResponse = (HttpWebResponse)httpWebRequest.GetResponse();
var reader = new StreamReader(httpWebResponse.GetResponseStream());
var stream = GetStreamFromURL(webURL);
var reader = new StreamReader(stream);
return reader.ReadToEnd();
}
catch (Exception e)
@ -31,13 +26,22 @@ namespace PKHeX.WinForms
}
}
private static Stream GetStreamFromURL(string webURL)
{
var httpWebRequest = (HttpWebRequest)WebRequest.Create(webURL);
// The GitHub API will fail if no user agent is provided
httpWebRequest.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36";
var httpWebResponse = httpWebRequest.GetResponse();
return httpWebResponse.GetResponseStream();
}
public static Image GetImageFromURL(string webURL)
{
try
{
HttpWebRequest httpWebRequest = (HttpWebRequest)WebRequest.Create(webURL);
HttpWebResponse httpWebResponse = (HttpWebResponse)httpWebRequest.GetResponse();
Stream stream = httpWebResponse.GetResponseStream();
var stream = GetStreamFromURL(webURL);
return stream != null ? Image.FromStream(stream) : null;
}
catch (Exception e)
@ -46,34 +50,25 @@ namespace PKHeX.WinForms
return null;
}
}
/// <summary>
/// Gets the latest version of PKHeX according to the Github API
/// </summary>
/// <returns>A version representing the latest available version of PKHeX, or null if the latest version could not be determined</returns>
public static Version GetLatestPKHeXVersion()
{
var apiEndpoint = "https://api.github.com/repos/kwsch/pkhex/releases/latest";
const string apiEndpoint = "https://api.github.com/repos/kwsch/pkhex/releases/latest";
var responseJson = GetStringFromURL(apiEndpoint);
if (string.IsNullOrEmpty(responseJson))
{
return null;
}
// Using a regex to get the tag to avoid importing an entire JSON parsing library
var tagMatch = LatestGitTagRegex.Match(responseJson);
if (!tagMatch.Success)
{
return null;
}
var tagString = tagMatch.Groups[1].Value;
if (!Version.TryParse(tagString, out var latestVersion))
{
return null;
}
return latestVersion;
var tagString = tagMatch.Groups[1].Value;
return !Version.TryParse(tagString, out var latestVersion) ? null : latestVersion;
}
}
}