Disable main window until DLLs are ready
Other code changes
This commit is contained in:
Jeddunk
parent
092c8f3277
commit
bf7f309ea6
8 changed files with 199 additions and 121 deletions
|
|
@ -68,21 +68,24 @@ namespace auto_creamapi.Model
|
|||
|
||||
private static void UpdateCache()
|
||||
{
|
||||
MyLogger.Log.Information("Updating cache...");
|
||||
var updateNeeded = DateTime.Now.Subtract(File.GetCreationTimeUtc(CachePath)).TotalDays >= 1;
|
||||
string cacheString;
|
||||
if (updateNeeded)
|
||||
{
|
||||
MyLogger.Log.Information("Updating cache...");
|
||||
MyLogger.Log.Information("Getting content from API...");
|
||||
var client = new HttpClient();
|
||||
var httpCall = client.GetAsync(SteamUri);
|
||||
var response = httpCall.Result;
|
||||
var readAsStringAsync = response.Content.ReadAsStringAsync();
|
||||
var responseBody = readAsStringAsync.Result;
|
||||
MyLogger.Log.Information("Got content from API successfully. Writing to file...");
|
||||
|
||||
/*var writeAllTextAsync = File.WriteAllTextAsync(CachePath, responseBody, Encoding.UTF8);
|
||||
writeAllTextAsync.RunSynchronously();*/
|
||||
File.WriteAllText(CachePath, responseBody, Encoding.UTF8);
|
||||
cacheString = responseBody;
|
||||
MyLogger.Log.Information("Cache written to file successfully.");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -205,7 +208,7 @@ namespace auto_creamapi.Model
|
|||
}
|
||||
else
|
||||
{
|
||||
MyLogger.Log.Error($"Could not find game: {steamApp}");
|
||||
MyLogger.Log.Error($"Could not get DLC: Invalid Steam App");
|
||||
}
|
||||
|
||||
return dlcList;
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ namespace auto_creamapi.Model
|
|||
|
||||
private void ResetConfigData()
|
||||
{
|
||||
Config.AppId = 0;
|
||||
Config.AppId = -1;
|
||||
Config.Language = "";
|
||||
Config.UnlockAll = false;
|
||||
Config.ExtraProtection = false;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ using System.Security.Cryptography;
|
|||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Threading;
|
||||
using auto_creamapi.Services;
|
||||
using auto_creamapi.Utils;
|
||||
using SharpCompress.Archives;
|
||||
using SharpCompress.Common;
|
||||
|
|
@ -55,20 +56,19 @@ namespace auto_creamapi.Model
|
|||
private bool _x64Exists;
|
||||
|
||||
private CreamDllModel()
|
||||
{
|
||||
}
|
||||
|
||||
public async Task Initialize()
|
||||
{
|
||||
if (!(File.Exists("steam_api.dll") && File.Exists("steam_api64.dll")))
|
||||
{
|
||||
MyLogger.Log.Information("Missing files, trying to download...");
|
||||
new Action(async() => await DownloadDll(Secrets.ForumUsername, Secrets.ForumPassword))();
|
||||
var task = DownloadCreamApiService.DownloadAndExtract(Secrets.ForumUsername, Secrets.ForumPassword);
|
||||
await task;
|
||||
task.Wait();
|
||||
}
|
||||
else
|
||||
{
|
||||
Init();
|
||||
}
|
||||
}
|
||||
|
||||
private void Init()
|
||||
{
|
||||
|
||||
_creamDlls.Add(X86Arch, new CreamDll("steam_api.dll", "steam_api_o.dll"));
|
||||
_creamDlls.Add(X64Arch, new CreamDll("steam_api64.dll", "steam_api64_o.dll"));
|
||||
|
||||
|
|
@ -83,103 +83,6 @@ namespace auto_creamapi.Model
|
|||
}
|
||||
}
|
||||
|
||||
private async Task DownloadDll(string username, string password)
|
||||
{
|
||||
var wnd = new DownloadWindow();
|
||||
wnd.Show();
|
||||
var container = new CookieContainer();
|
||||
var handler = new HttpClientHandler {CookieContainer = container};
|
||||
var client = new HttpClient(handler);
|
||||
var formContent = new FormUrlEncodedContent(new[]
|
||||
{
|
||||
new KeyValuePair<string, string>("username", username),
|
||||
new KeyValuePair<string, string>("password", password),
|
||||
new KeyValuePair<string, string>("redirect", "./ucp.php?mode=login"),
|
||||
new KeyValuePair<string, string>("login", "login")
|
||||
});
|
||||
var response1 = await client.PostAsync("https://cs.rin.ru/forum/ucp.php?mode=login", formContent);
|
||||
MyLogger.Log.Debug($"Login Status Code: {response1.EnsureSuccessStatusCode().StatusCode.ToString()}");
|
||||
var cookie = container.GetCookies(new Uri("https://cs.rin.ru/forum/ucp.php?mode=login"))
|
||||
.FirstOrDefault(c => c.Name.Contains("_sid"));
|
||||
MyLogger.Log.Debug($"Login Cookie: {cookie}");
|
||||
var response2 = await client.GetAsync("https://cs.rin.ru/forum/viewtopic.php?t=70576");
|
||||
MyLogger.Log.Debug(
|
||||
$"Download Page Status Code: {response2.EnsureSuccessStatusCode().StatusCode.ToString()}");
|
||||
var content = response2.Content.ReadAsStringAsync();
|
||||
var contentResult = await content;
|
||||
|
||||
var expression =
|
||||
new Regex(".*<a href=\"\\.(?<url>\\/download\\/file\\.php\\?id=.*)\">(?<filename>.*)<\\/a>.*");
|
||||
using var reader = new StringReader(contentResult);
|
||||
string line;
|
||||
var archiveFileList = new Dictionary<string, string>();
|
||||
while ((line = await reader.ReadLineAsync()) != null)
|
||||
{
|
||||
var match = expression.Match(line);
|
||||
// ReSharper disable once InvertIf
|
||||
if (match.Success)
|
||||
{
|
||||
archiveFileList.Add(match.Groups["filename"].Value,
|
||||
$"https://cs.rin.ru/forum{match.Groups["url"].Value}");
|
||||
MyLogger.Log.Debug(archiveFileList.LastOrDefault().Key);
|
||||
}
|
||||
}
|
||||
|
||||
/*foreach (var (filename, url) in archiveFileList)
|
||||
{
|
||||
MyLogger.Log.Information($"Downloading file: {filename}");
|
||||
var fileResponse = await client.GetAsync(url);
|
||||
var download = fileResponse.Content.ReadAsByteArrayAsync();
|
||||
await File.WriteAllBytesAsync(filename, await download);
|
||||
}*/
|
||||
MyLogger.Log.Debug("Choosing first element from list...");
|
||||
var (filename, url) = archiveFileList.FirstOrDefault();
|
||||
MyLogger.Log.Information("Start download...");
|
||||
wnd.FilenameLabel.Content = filename;
|
||||
/*var fileResponse = await client.GetAsync(url);
|
||||
var download = fileResponse.Content.ReadAsByteArrayAsync();
|
||||
await File.WriteAllBytesAsync(filename, await download);
|
||||
MyLogger.Log.Information($"Download success? {download.IsCompletedSuccessfully}");*/
|
||||
var progress = new Progress<ICopyProgress>(
|
||||
x =>
|
||||
{
|
||||
wnd.PercentLabel.Content = x.PercentComplete.ToString("P");
|
||||
wnd.ProgressBar.Dispatcher.Invoke(() => wnd.ProgressBar.Value = x.PercentComplete,
|
||||
DispatcherPriority.Background);
|
||||
});
|
||||
await using (var fileStream = File.OpenWrite(filename))
|
||||
{
|
||||
var task = client.GetAsync(url, fileStream, progress);
|
||||
var response = await task;
|
||||
/*if (task.IsCompletedSuccessfully)
|
||||
{
|
||||
wnd.PercentLabel.Content = "100,00%";
|
||||
wnd.ProgressBar.Value = 1;
|
||||
}*/
|
||||
}
|
||||
|
||||
MyLogger.Log.Information("Start extraction...");
|
||||
var options = new ReaderOptions {Password = "cs.rin.ru"};
|
||||
var archive = ArchiveFactory.Open(filename, options);
|
||||
var expression1 = new Regex(@"nonlog_build\\steam_api(?:64)?\.dll");
|
||||
foreach (var entry in archive.Entries)
|
||||
{
|
||||
// ReSharper disable once InvertIf
|
||||
if (!entry.IsDirectory && expression1.IsMatch(entry.Key))
|
||||
{
|
||||
MyLogger.Log.Debug(entry.Key);
|
||||
entry.WriteToDirectory(Directory.GetCurrentDirectory(), new ExtractionOptions
|
||||
{
|
||||
ExtractFullPath = false,
|
||||
Overwrite = true
|
||||
});
|
||||
}
|
||||
}
|
||||
MyLogger.Log.Information("Extraction done!");
|
||||
wnd.Close();
|
||||
Init();
|
||||
}
|
||||
|
||||
public void Save()
|
||||
{
|
||||
if (_x86Exists) CopyDll(X86Arch);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue