Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-21 17:24:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #121 from NotOfficer/master

Browse Source 
Some (big) improvements
This commit is contained in:
Valentin 2020-10-10 22:56:44 +02:00 committed by GitHub
commit 06becf043b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FModel/Creator/Texts/Text.cs
View File

@ -157,6 +157,9 @@ namespace FModel.Creator.Texts
{
_NAME_TEXT_SIZE = 45;
string text = icon.DisplayName;
if (string.IsNullOrEmpty(text)) return;
SKTextAlign side = SKTextAlign.Center;
int x = icon.Width / 2;
int y = _STARTER_TEXT_POSITION + _NAME_TEXT_SIZE;
@ -223,11 +226,12 @@ namespace FModel.Creator.Texts
public static void DrawDescription(SKCanvas c, IBase icon)
{
if (!string.IsNullOrEmpty(icon.Description)) return;
int maxLine = 4;
_BOTTOM_TEXT_SIZE = 15;
string text = icon.Description;
if (string.IsNullOrEmpty(text)) return;
int maxLine = 4;
ETextSide side = ETextSide.Center;
switch ((EIconDesign)Properties.Settings.Default.AssetsIconDesign)
{
@ -262,6 +266,8 @@ namespace FModel.Creator.Texts
public static void DrawToBottom(SKCanvas c, BaseIcon icon, ETextSide side, string text)
{
if (string.IsNullOrEmpty(text)) return;
SKPaint shortDescriptionPaint = new SKPaint
{
IsAntialias = true,

16
FModel/Grabber/Manifests/ManifestGrabber.cs
View File

@ -1,5 +1,7 @@
using EpicManifestParser.Objects;
using FModel.Utils;
using System;
using System.Threading.Tasks;
@ -11,7 +13,8 @@ namespace FModel.Grabber.Manifests
{
if (IsExpired())
{
OAuth auth = await Endpoints.GetOAuthInfo();
OAuth auth = await Endpoints.GetOAuthInfo().ConfigureAwait(false);
if (auth != null)
{
Properties.Settings.Default.AccessToken = auth.AccessToken;
@ -20,19 +23,14 @@ namespace FModel.Grabber.Manifests
}
}
string ret = await Endpoints.GetStringEndpoint("https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/public/assets/v2/platform/Windows/namespace/fn/catalogItem/4fe75bbc5a674f4f9b356b5c90567da5/app/Fortnite/label/Live", Properties.Settings.Default.AccessToken);
if (!string.IsNullOrEmpty(ret)) return new ManifestInfo(ret);
else return null;
string ret = await Endpoints.GetStringEndpoint("https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/public/assets/v2/platform/Windows/namespace/fn/catalogItem/4fe75bbc5a674f4f9b356b5c90567da5/app/Fortnite/label/Live", Properties.Settings.Default.AccessToken).ConfigureAwait(false);
return string.IsNullOrEmpty(ret) ? null : new ManifestInfo(ret);
}
private static bool IsExpired()
{
long currentTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
if ((currentTime - 60000) >= Properties.Settings.Default.LauncherExpiration)
{
return true;
}
return false;
return currentTime - 60000 >= Properties.Settings.Default.LauncherExpiration;
}
}
}

32
FModel/Grabber/Paks/PaksGrabber.cs
View File

@ -1,18 +1,21 @@
using FModel.Logger;
using FModel.Utils;
using FModel.ViewModels.MenuItem;
using FModel.Windows.Launcher;
using PakReader.Pak;
using System;
using System;
using System.Collections.ObjectModel;
using System.IO;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media.Imaging;
using EpicManifestParser.Objects;
using System.Text.RegularExpressions;
using FModel.Grabber.Manifests;
using FModel.Logger;
using FModel.Utils;
using FModel.ViewModels.MenuItem;
using FModel.Windows.Launcher;
using PakReader.Pak;
namespace FModel.Grabber.Paks
{
@ -44,7 +47,20 @@ namespace FModel.Grabber.Paks
if (Properties.Settings.Default.PakPath.EndsWith(".manifest"))
{
ManifestInfo manifestInfo = await ManifestGrabber.TryGetLatestManifestInfo().ConfigureAwait(false);
byte[] manifestData = await manifestInfo.DownloadManifestDataAsync().ConfigureAwait(false);
DirectoryInfo chunksDir = Directory.CreateDirectory(Path.Combine(Properties.Settings.Default.OutputPath, "PakChunks"));
string manifestPath = Path.Combine(chunksDir.FullName, manifestInfo.Filename);
byte[] manifestData;
if (File.Exists(manifestPath))
{
manifestData = await File.ReadAllBytesAsync(manifestPath);
}
else
{
manifestData = await manifestInfo.DownloadManifestDataAsync().ConfigureAwait(false);
await File.WriteAllBytesAsync(manifestPath, manifestData).ConfigureAwait(false);
}
Manifest manifest = new Manifest(manifestData, new ManifestOptions
{
ChunkBaseUri = new Uri("http://download.epicgames.com/Builds/Fortnite/CloudDir/ChunksV3/", UriKind.Absolute),

34
FModel/PakReader/ReaderExtensions.cs
View File

@ -1,18 +1,19 @@
using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Text;
namespace PakReader
{
static class ReaderExtensions
{
public static string ReadFString(this BinaryReader reader)
public static unsafe string ReadFString(this BinaryReader reader)
{
// > 0 for ANSICHAR, < 0 for UCS2CHAR serialization
var SaveNum = reader.ReadInt32();
bool LoadUCS2Char = SaveNum < 0;
if (LoadUCS2Char)
if (SaveNum == 0) return null;
// > 0 for ANSICHAR, < 0 for UCS2CHAR serialization
if (SaveNum < 0)
{
// If SaveNum cannot be negated due to integer overflow, Ar is corrupted.
if (SaveNum == int.MinValue)
@ -21,27 +22,22 @@ namespace PakReader
}
SaveNum = -SaveNum;
}
if (SaveNum == 0) return null;
var dataBytes = reader.ReadBytes(SaveNum * sizeof(char));
// 1 byte is removed because of null terminator (\0)
if (LoadUCS2Char)
{
ushort[] data = new ushort[SaveNum];
for (int i = 0; i < SaveNum; i++)
fixed (byte* pData = dataBytes)
{
data[i] = reader.ReadUInt16();
}
unsafe
{
fixed (ushort* dataPtr = &data[0])
return new string((char*)dataPtr, 0, data.Length - 1);
return new string((char*)pData, 0, SaveNum - 1); // 1 byte is removed because of null terminator (\0)
}
}
else
{
return Encoding.UTF8.GetString(reader.ReadBytes(SaveNum).AsSpan(..^1));
var dataBytes = reader.ReadBytes(SaveNum);
fixed (byte* pData = dataBytes)
{
return new string((sbyte*)pData, 0, SaveNum - 1); // 1 byte is removed because of null terminator (\0)
}
}
}