Compare commits
No commits in common. "master" and "2.1.3" have entirely different histories.
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
||||
[submodule "SteamStorefrontAPI"]
|
||||
path = SteamStorefrontAPI
|
||||
url = https://git.jeddunk.xyz/jeddunk/SteamStorefrontAPI.git
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.8.34330.188
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.30413.136
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "auto-creamapi", "auto-creamapi\auto-creamapi.csproj", "{26060B32-199E-4366-8FDE-6B1E10E0EF62}"
|
||||
EndProject
|
||||
|
||||
@ -10,7 +10,7 @@ namespace auto_creamapi
|
||||
{
|
||||
protected override void RegisterSetup()
|
||||
{
|
||||
this.RegisterSetupType<Setup>();
|
||||
this.RegisterSetupType<MvxWpfSetup<Core.App>>();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
@ -20,7 +19,6 @@ namespace auto_creamapi.Converters
|
||||
protected override string Convert(ObservableCollection<SteamApp> value, Type targetType, object parameter,
|
||||
CultureInfo culture)
|
||||
{
|
||||
if (value == null) return "";
|
||||
MyLogger.Log.Debug("ListOfDLcToStringConverter: Convert");
|
||||
var dlcListToString = DlcListToString(value);
|
||||
return dlcListToString.GetType() == targetType ? dlcListToString : "";
|
||||
@ -31,32 +29,30 @@ namespace auto_creamapi.Converters
|
||||
{
|
||||
MyLogger.Log.Debug("ListOfDLcToStringConverter: ConvertBack");
|
||||
var stringToDlcList = StringToDlcList(value);
|
||||
return stringToDlcList.GetType() == targetType ? stringToDlcList : [];
|
||||
return stringToDlcList.GetType() == targetType ? stringToDlcList : new ObservableCollection<SteamApp>();
|
||||
}
|
||||
|
||||
private static ObservableCollection<SteamApp> StringToDlcList(string value)
|
||||
{
|
||||
var result = new ObservableCollection<SteamApp>();
|
||||
var expression = new Regex("(?<id>.*) *= *(?<name>.*)");
|
||||
var expression = new Regex(@"(?<id>.*) *= *(?<name>.*)");
|
||||
using var reader = new StringReader(value);
|
||||
string line;
|
||||
while ((line = reader.ReadLine()) != null)
|
||||
{
|
||||
var match = expression.Match(line);
|
||||
if (match.Success)
|
||||
{
|
||||
result.Add(new SteamApp
|
||||
{
|
||||
AppId = int.Parse(match.Groups["id"].Value),
|
||||
Name = match.Groups["name"].Value
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static string DlcListToString(IEnumerable<SteamApp> value)
|
||||
private static string DlcListToString(ObservableCollection<SteamApp> value)
|
||||
{
|
||||
var result = "";
|
||||
//value.ForEach(x => result += $"{x}\n");
|
||||
|
||||
@ -4,7 +4,7 @@ using MvvmCross.ViewModels;
|
||||
|
||||
namespace auto_creamapi.Core
|
||||
{
|
||||
public class MainApplication : MvxApplication
|
||||
public class App : MvxApplication
|
||||
{
|
||||
public override void Initialize()
|
||||
{
|
||||
@ -6,6 +6,6 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
mc:Ignorable="d"
|
||||
Title="Auto-CreamAPI 2" MinWidth="420" MinHeight="640" Width="560" Height="720">
|
||||
Title="Auto-CreamAPI 2" MinWidth="420" MinHeight="600" Width="420" Height="600">
|
||||
<Grid />
|
||||
</views:MvxWindow>
|
||||
@ -1,6 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
@ -25,7 +24,7 @@ namespace auto_creamapi.Services
|
||||
public IEnumerable<SteamApp> GetListOfAppsByName(string name);
|
||||
public SteamApp GetAppByName(string name);
|
||||
public SteamApp GetAppById(int appid);
|
||||
public Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb, bool ignoreUnknown);
|
||||
public Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb);
|
||||
}
|
||||
|
||||
public class CacheService : ICacheService
|
||||
@ -33,7 +32,11 @@ namespace auto_creamapi.Services
|
||||
private const string CachePath = "steamapps.json";
|
||||
private const string SteamUri = "https://api.steampowered.com/ISteamApps/GetAppList/v2/";
|
||||
|
||||
private HashSet<SteamApp> _cache = [];
|
||||
private const string UserAgent =
|
||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) " +
|
||||
"Chrome/87.0.4280.88 Safari/537.36";
|
||||
|
||||
private HashSet<SteamApp> _cache = new HashSet<SteamApp>();
|
||||
|
||||
public async Task Initialize()
|
||||
{
|
||||
@ -42,7 +45,17 @@ namespace auto_creamapi.Services
|
||||
string cacheString;
|
||||
if (updateNeeded)
|
||||
{
|
||||
cacheString = await UpdateCache().ConfigureAwait(false);
|
||||
MyLogger.Log.Information("Getting content from API...");
|
||||
var client = new HttpClient();
|
||||
var httpCall = client.GetAsync(SteamUri);
|
||||
var response = await httpCall.ConfigureAwait(false);
|
||||
var readAsStringAsync = response.Content.ReadAsStringAsync();
|
||||
var responseBody = await readAsStringAsync;
|
||||
MyLogger.Log.Information("Got content from API successfully. Writing to file...");
|
||||
|
||||
await File.WriteAllTextAsync(CachePath, responseBody, Encoding.UTF8);
|
||||
cacheString = responseBody;
|
||||
MyLogger.Log.Information("Cache written to file successfully.");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -50,27 +63,12 @@ namespace auto_creamapi.Services
|
||||
// ReSharper disable once MethodHasAsyncOverload
|
||||
cacheString = File.ReadAllText(CachePath);
|
||||
}
|
||||
|
||||
var steamApps = JsonSerializer.Deserialize<SteamApps>(cacheString);
|
||||
_cache = new HashSet<SteamApp>(steamApps.AppList.Apps);
|
||||
MyLogger.Log.Information("Loaded cache into memory!");
|
||||
}
|
||||
|
||||
private static async Task<string> UpdateCache()
|
||||
{
|
||||
MyLogger.Log.Information("Getting content from API...");
|
||||
var client = new HttpClient();
|
||||
var httpCall = client.GetAsync(SteamUri);
|
||||
var response = await httpCall.ConfigureAwait(false);
|
||||
var readAsStringAsync = response.Content.ReadAsStringAsync();
|
||||
var responseBody = await readAsStringAsync.ConfigureAwait(false);
|
||||
MyLogger.Log.Information("Got content from API successfully. Writing to file...");
|
||||
|
||||
await File.WriteAllTextAsync(CachePath, responseBody, Encoding.UTF8).ConfigureAwait(false);
|
||||
var cacheString = responseBody;
|
||||
MyLogger.Log.Information("Cache written to file successfully.");
|
||||
return cacheString;
|
||||
}
|
||||
|
||||
public IEnumerable<SteamApp> GetListOfAppsByName(string name)
|
||||
{
|
||||
var listOfAppsByName = _cache.Search(x => x.Name)
|
||||
@ -81,84 +79,70 @@ namespace auto_creamapi.Services
|
||||
|
||||
public SteamApp GetAppByName(string name)
|
||||
{
|
||||
MyLogger.Log.Information("Trying to get app {Name}", name);
|
||||
MyLogger.Log.Information($"Trying to get app {name}");
|
||||
var comparableName = Regex.Replace(name, Misc.SpecialCharsRegex, "").ToLower();
|
||||
var app = _cache.FirstOrDefault(x => x.CompareName(comparableName));
|
||||
if (app != null) MyLogger.Log.Information("Successfully got app {App}", app);
|
||||
if (app != null) MyLogger.Log.Information($"Successfully got app {app}");
|
||||
return app;
|
||||
}
|
||||
|
||||
public SteamApp GetAppById(int appid)
|
||||
{
|
||||
MyLogger.Log.Information("Trying to get app with ID {AppId}", appid);
|
||||
MyLogger.Log.Information($"Trying to get app with ID {appid}");
|
||||
var app = _cache.FirstOrDefault(x => x.AppId.Equals(appid));
|
||||
if (app != null) MyLogger.Log.Information("Successfully got app {App}", app);
|
||||
if (app != null) MyLogger.Log.Information($"Successfully got app {app}");
|
||||
return app;
|
||||
}
|
||||
|
||||
public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb, bool ignoreUnknown)
|
||||
public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb)
|
||||
{
|
||||
MyLogger.Log.Debug("Start: GetListOfDlc");
|
||||
MyLogger.Log.Information("Get DLC");
|
||||
var dlcList = new List<SteamApp>();
|
||||
try
|
||||
{
|
||||
if (steamApp != null)
|
||||
{
|
||||
var steamAppDetails = await AppDetails.GetAsync(steamApp.AppId).ConfigureAwait(false);
|
||||
if (steamAppDetails != null)
|
||||
{
|
||||
MyLogger.Log.Debug("Type for Steam App {Name}: \"{Type}\"", steamApp.Name,
|
||||
steamAppDetails.Type);
|
||||
if (steamAppDetails.Type == "game" || steamAppDetails.Type == "demo")
|
||||
MyLogger.Log.Debug($"Type for Steam App {steamApp.Name}: \"{steamAppDetails.Type}\"");
|
||||
if (steamAppDetails.Type == "game" | steamAppDetails.Type == "demo")
|
||||
{
|
||||
steamAppDetails.DLC.ForEach(x =>
|
||||
steamAppDetails?.DLC.ForEach(x =>
|
||||
{
|
||||
var result = _cache.FirstOrDefault(y => y.AppId.Equals(x));
|
||||
if (result == null) return;
|
||||
var dlcDetails = AppDetails.GetAsync(x).Result;
|
||||
dlcList.Add(dlcDetails != null
|
||||
? new SteamApp { AppId = dlcDetails.SteamAppId, Name = dlcDetails.Name }
|
||||
: new SteamApp { AppId = x, Name = $"Unknown DLC {x}" });
|
||||
var result = _cache.FirstOrDefault(y => y.AppId.Equals(x)) ??
|
||||
new SteamApp {AppId = x, Name = $"Unknown DLC {x}"};
|
||||
dlcList.Add(result);
|
||||
});
|
||||
|
||||
dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name));
|
||||
dlcList.ForEach(x => MyLogger.Log.Debug($"{x.AppId}={x.Name}"));
|
||||
MyLogger.Log.Information("Got DLC successfully...");
|
||||
|
||||
// Return if Steam DB is deactivated
|
||||
if (!useSteamDb) return dlcList;
|
||||
// Get DLC from SteamDB
|
||||
// Get Cloudflare cookie
|
||||
// Scrape and parse HTML page
|
||||
// Add missing to DLC list
|
||||
if (useSteamDb)
|
||||
{
|
||||
var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/");
|
||||
|
||||
string steamDbUrl = $"https://steamdb.info/app/{steamApp.AppId}/dlc/";
|
||||
/* var handler = new ClearanceHandler();
|
||||
|
||||
var client = new HttpClient(handler);
|
||||
|
||||
var content = client.GetStringAsync(steamDbUri).Result;
|
||||
MyLogger.Log.Debug(content); */
|
||||
|
||||
var client = new HttpClient();
|
||||
string archiveJson = await client.GetStringAsync($"https://archive.org/wayback/available?url={steamDbUrl}");
|
||||
var archiveResult = JsonSerializer.Deserialize<AvailableArchive>(archiveJson);
|
||||
|
||||
if (archiveResult == null || archiveResult.ArchivedSnapshots.Closest?.Status != "200")
|
||||
{
|
||||
return dlcList;
|
||||
}
|
||||
|
||||
//language=regex
|
||||
const string pattern = @"^(https?:\/\/web\.archive\.org\/web\/\d+)(\/.+)$";
|
||||
const string substitution = "$1id_$2";
|
||||
const RegexOptions options = RegexOptions.Multiline;
|
||||
|
||||
Regex regex = new(pattern, options);
|
||||
string newUrl = regex.Replace(archiveResult.ArchivedSnapshots.Closest.Url, substitution);
|
||||
|
||||
//client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
|
||||
client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
|
||||
|
||||
MyLogger.Log.Information("Get SteamDB App");
|
||||
var httpCall = client.GetAsync(newUrl);
|
||||
var response = await httpCall.ConfigureAwait(false);
|
||||
MyLogger.Log.Debug("{Status}", httpCall.Status.ToString());
|
||||
MyLogger.Log.Debug("{Boolean}", response.IsSuccessStatusCode.ToString());
|
||||
|
||||
response.EnsureSuccessStatusCode();
|
||||
var httpCall = client.GetAsync(steamDbUri);
|
||||
var response = await httpCall;
|
||||
MyLogger.Log.Debug(httpCall.Status.ToString());
|
||||
MyLogger.Log.Debug(response.EnsureSuccessStatusCode().ToString());
|
||||
|
||||
var readAsStringAsync = response.Content.ReadAsStringAsync();
|
||||
var responseBody = await readAsStringAsync.ConfigureAwait(false);
|
||||
MyLogger.Log.Debug("{Status}", readAsStringAsync.Status.ToString());
|
||||
var responseBody = await readAsStringAsync;
|
||||
MyLogger.Log.Debug(readAsStringAsync.Status.ToString());
|
||||
|
||||
var parser = new HtmlParser();
|
||||
var doc = parser.ParseDocument(responseBody);
|
||||
@ -171,17 +155,10 @@ namespace auto_creamapi.Services
|
||||
foreach (var element in query2)
|
||||
{
|
||||
var dlcId = element.GetAttribute("data-appid");
|
||||
var dlcName = $"Unknown DLC {dlcId}";
|
||||
var query3 = element.QuerySelectorAll("td");
|
||||
var dlcName = query3 == null
|
||||
? $"Unknown DLC {dlcId}"
|
||||
: query3[1].Text().Replace("\n", "").Trim();
|
||||
if (query3 != null) dlcName = query3[1].Text().Replace("\n", "").Trim();
|
||||
|
||||
if (ignoreUnknown && dlcName.Contains("SteamDB Unknown App"))
|
||||
{
|
||||
MyLogger.Log.Information("Skipping SteamDB Unknown App {DlcId}", dlcId);
|
||||
}
|
||||
else
|
||||
{
|
||||
var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName};
|
||||
var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId));
|
||||
if (i > -1)
|
||||
@ -193,9 +170,8 @@ namespace auto_creamapi.Services
|
||||
dlcList.Add(dlcApp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name));
|
||||
dlcList.ForEach(x => MyLogger.Log.Debug($"{x.AppId}={x.Name}"));
|
||||
MyLogger.Log.Information("Got DLC from SteamDB successfully...");
|
||||
}
|
||||
else
|
||||
@ -203,6 +179,7 @@ namespace auto_creamapi.Services
|
||||
MyLogger.Log.Error("Could not get DLC from SteamDB!");
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
MyLogger.Log.Error("Could not get DLC: Steam App is not of type: \"Game\"");
|
||||
@ -210,7 +187,7 @@ namespace auto_creamapi.Services
|
||||
}
|
||||
else
|
||||
{
|
||||
MyLogger.Log.Error("Could not get DLC: Could not get Steam App details");
|
||||
MyLogger.Log.Error("Could not get DLC...");
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -218,14 +195,6 @@ namespace auto_creamapi.Services
|
||||
MyLogger.Log.Error("Could not get DLC: Invalid Steam App");
|
||||
}
|
||||
|
||||
//return dlcList;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
MyLogger.Log.Error("Could not get DLC!");
|
||||
MyLogger.Log.Debug(e.Demystify(), "Exception thrown!");
|
||||
}
|
||||
|
||||
return dlcList;
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ namespace auto_creamapi.Services
|
||||
bool unlockAll,
|
||||
bool extraProtection,
|
||||
bool forceOffline,
|
||||
IEnumerable<SteamApp> dlcList);
|
||||
ObservableCollection<SteamApp> dlcList);
|
||||
|
||||
public bool ConfigExists();
|
||||
}
|
||||
@ -47,7 +47,7 @@ namespace auto_creamapi.Services
|
||||
{
|
||||
private string _configFilePath;
|
||||
|
||||
public CreamConfig Config { get; private set; }
|
||||
public CreamConfig Config { get; set; }
|
||||
|
||||
public void Initialize()
|
||||
{
|
||||
@ -65,7 +65,7 @@ namespace auto_creamapi.Services
|
||||
_configFilePath = configFilePath;
|
||||
if (File.Exists(configFilePath))
|
||||
{
|
||||
MyLogger.Log.Information("Config file found @ {ConfigFilePath}, parsing...", configFilePath);
|
||||
MyLogger.Log.Information($"Config file found @ {configFilePath}, parsing...");
|
||||
var parser = new FileIniDataParser();
|
||||
var data = parser.ReadFile(_configFilePath, Encoding.UTF8);
|
||||
|
||||
@ -83,7 +83,7 @@ namespace auto_creamapi.Services
|
||||
}
|
||||
else
|
||||
{
|
||||
MyLogger.Log.Information("Config file does not exist @ {ConfigFilePath}, skipping...", configFilePath);
|
||||
MyLogger.Log.Information($"Config file does not exist @ {configFilePath}, skipping...");
|
||||
ResetConfigData();
|
||||
}
|
||||
}
|
||||
@ -144,7 +144,7 @@ namespace auto_creamapi.Services
|
||||
bool unlockAll,
|
||||
bool extraProtection,
|
||||
bool forceOffline,
|
||||
IEnumerable<SteamApp> dlcList)
|
||||
ObservableCollection<SteamApp> dlcList)
|
||||
{
|
||||
Config.AppId = appId;
|
||||
Config.Language = language;
|
||||
|
||||
@ -66,8 +66,8 @@ namespace auto_creamapi.Services
|
||||
var x64File = Path.Combine(TargetPath, "steam_api64.dll");
|
||||
_x86Exists = File.Exists(x86File);
|
||||
_x64Exists = File.Exists(x64File);
|
||||
if (_x86Exists) MyLogger.Log.Information("x86 SteamAPI DLL found: {X}", x86File);
|
||||
if (_x64Exists) MyLogger.Log.Information("x64 SteamAPI DLL found: {X}", x64File);
|
||||
if (_x86Exists) MyLogger.Log.Information($"x86 SteamAPI DLL found: {x86File}");
|
||||
if (_x64Exists) MyLogger.Log.Information($"x64 SteamAPI DLL found: {x64File}");
|
||||
}
|
||||
|
||||
public bool CreamApiApplied()
|
||||
@ -83,7 +83,7 @@ namespace auto_creamapi.Services
|
||||
var targetSteamApiDll = Path.Combine(TargetPath, _creamDlls[arch].Filename);
|
||||
var targetSteamApiOrigDll = Path.Combine(TargetPath, _creamDlls[arch].OrigFilename);
|
||||
var targetSteamApiDllBackup = Path.Combine(TargetPath, $"{_creamDlls[arch].Filename}.backup");
|
||||
MyLogger.Log.Information("Setting up CreamAPI DLL @ {TargetPath} (arch :{Arch})", TargetPath, arch);
|
||||
MyLogger.Log.Information($"Setting up CreamAPI DLL @ {TargetPath} (arch :{arch})");
|
||||
// Create backup of steam_api.dll
|
||||
File.Copy(targetSteamApiDll, targetSteamApiDllBackup, true);
|
||||
// Check if steam_api_o.dll already exists
|
||||
@ -103,13 +103,16 @@ namespace auto_creamapi.Services
|
||||
|
||||
private static string GetHash(string filename)
|
||||
{
|
||||
if (!File.Exists(filename)) return "";
|
||||
if (File.Exists(filename))
|
||||
{
|
||||
using var md5 = MD5.Create();
|
||||
using var stream = File.OpenRead(filename);
|
||||
return BitConverter
|
||||
.ToString(md5.ComputeHash(stream))
|
||||
.Replace("-", string.Empty);
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -10,20 +10,27 @@ using auto_creamapi.Messenger;
|
||||
using auto_creamapi.Utils;
|
||||
using HttpProgress;
|
||||
using MvvmCross.Plugin.Messenger;
|
||||
using SevenZip;
|
||||
using SharpCompress.Archives;
|
||||
using SharpCompress.Common;
|
||||
using SharpCompress.Readers;
|
||||
|
||||
namespace auto_creamapi.Services
|
||||
{
|
||||
public interface IDownloadCreamApiService
|
||||
{
|
||||
/*public void Initialize();
|
||||
public Task InitializeAsync();*/
|
||||
public Task<string> Download(string username, string password);
|
||||
public Task Extract(string filename);
|
||||
public void Extract(string filename);
|
||||
}
|
||||
|
||||
public class DownloadCreamApiService : IDownloadCreamApiService
|
||||
{
|
||||
private const string ArchivePassword = "cs.rin.ru";
|
||||
|
||||
//private string _filename;
|
||||
private readonly IMvxMessenger _messenger;
|
||||
//private DownloadWindow _wnd;
|
||||
|
||||
public DownloadCreamApiService(IMvxMessenger messenger)
|
||||
{
|
||||
@ -36,8 +43,6 @@ namespace auto_creamapi.Services
|
||||
var container = new CookieContainer();
|
||||
var handler = new HttpClientHandler {CookieContainer = container};
|
||||
var client = new HttpClient(handler);
|
||||
client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:86.0) " +
|
||||
"Gecko/20100101 Firefox/86.0");
|
||||
var formContent = new FormUrlEncodedContent(new[]
|
||||
{
|
||||
new KeyValuePair<string, string>("username", username),
|
||||
@ -46,26 +51,23 @@ namespace auto_creamapi.Services
|
||||
new KeyValuePair<string, string>("login", "login")
|
||||
});
|
||||
MyLogger.Log.Debug("Download: post login");
|
||||
var response1 = await client.PostAsync("https://cs.rin.ru/forum/ucp.php?mode=login", formContent)
|
||||
.ConfigureAwait(false);
|
||||
MyLogger.Log.Debug("Login Status Code: {StatusCode}",
|
||||
response1.EnsureSuccessStatusCode().StatusCode);
|
||||
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}", cookie);
|
||||
var response2 = await client.GetAsync("https://cs.rin.ru/forum/viewtopic.php?t=70576")
|
||||
.ConfigureAwait(false);
|
||||
MyLogger.Log.Debug("Download Page Status Code: {StatusCode}",
|
||||
response2.EnsureSuccessStatusCode().StatusCode);
|
||||
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.ConfigureAwait(false);
|
||||
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().ConfigureAwait(false)) != null)
|
||||
while ((line = await reader.ReadLineAsync()) != null)
|
||||
{
|
||||
var match = expression.Match(line);
|
||||
// ReSharper disable once InvertIf
|
||||
@ -73,15 +75,16 @@ namespace auto_creamapi.Services
|
||||
{
|
||||
archiveFileList.Add(match.Groups["filename"].Value,
|
||||
$"https://cs.rin.ru/forum{match.Groups["url"].Value}");
|
||||
MyLogger.Log.Debug("{X}", archiveFileList.LastOrDefault().Key);
|
||||
MyLogger.Log.Debug(archiveFileList.LastOrDefault().Key);
|
||||
}
|
||||
}
|
||||
|
||||
MyLogger.Log.Debug("Choosing first element from list...");
|
||||
var (filename, url) = archiveFileList.FirstOrDefault();
|
||||
//filename = filename;
|
||||
if (File.Exists(filename))
|
||||
{
|
||||
MyLogger.Log.Information("{Filename} already exists, skipping download...", filename);
|
||||
MyLogger.Log.Information($"{filename} already exists, skipping download...");
|
||||
return filename;
|
||||
}
|
||||
|
||||
@ -90,53 +93,33 @@ namespace auto_creamapi.Services
|
||||
x => _messenger.Publish(new ProgressMessage(this, "Downloading...", filename, x)));
|
||||
await using var fileStream = File.OpenWrite(filename);
|
||||
var task = client.GetAsync(url, fileStream, progress);
|
||||
await task.ConfigureAwait(false);
|
||||
var response = await task;
|
||||
if (task.IsCompletedSuccessfully)
|
||||
_messenger.Publish(new ProgressMessage(this, "Downloading...", filename, 1.0));
|
||||
MyLogger.Log.Information("Download done.");
|
||||
return filename;
|
||||
}
|
||||
|
||||
public async Task Extract(string filename)
|
||||
public void Extract(string filename)
|
||||
{
|
||||
MyLogger.Log.Debug("Extract");
|
||||
var cwd = Directory.GetCurrentDirectory();
|
||||
const string nonlogBuild = "nonlog_build";
|
||||
const string steamApi64Dll = "steam_api64.dll";
|
||||
const string steamApiDll = "steam_api.dll";
|
||||
MyLogger.Log.Information(@"Start extraction of ""{Filename}""...", filename);
|
||||
var nonlogBuildPath = Path.Combine(cwd, nonlogBuild);
|
||||
if (Directory.Exists(nonlogBuildPath))
|
||||
Directory.Delete(nonlogBuildPath, true);
|
||||
MyLogger.Log.Information($@"Start extraction of ""{filename}""...");
|
||||
var options = new ReaderOptions {Password = ArchivePassword};
|
||||
var archive = ArchiveFactory.Open(filename, options);
|
||||
var expression1 = new Regex(@"nonlog_build\\steam_api(?:64)?\.dll");
|
||||
_messenger.Publish(new ProgressMessage(this, "Extracting...", filename, 1.0));
|
||||
SevenZipBase.SetLibraryPath(Path.Combine(cwd, "resources/7z.dll"));
|
||||
using (var extractor =
|
||||
new SevenZipExtractor(filename, ArchivePassword, InArchiveFormat.Rar)
|
||||
{PreserveDirectoryStructure = false})
|
||||
foreach (var entry in archive.Entries)
|
||||
// ReSharper disable once InvertIf
|
||||
if (!entry.IsDirectory && expression1.IsMatch(entry.Key))
|
||||
{
|
||||
await extractor.ExtractFilesAsync(
|
||||
cwd,
|
||||
$@"{nonlogBuild}\{steamApi64Dll}",
|
||||
$@"{nonlogBuild}\{steamApiDll}"
|
||||
).ConfigureAwait(false);
|
||||
MyLogger.Log.Debug(entry.Key);
|
||||
entry.WriteToDirectory(Directory.GetCurrentDirectory(), new ExtractionOptions
|
||||
{
|
||||
ExtractFullPath = false,
|
||||
Overwrite = true
|
||||
});
|
||||
}
|
||||
|
||||
if (File.Exists(Path.Combine(nonlogBuildPath, steamApi64Dll)))
|
||||
File.Move(
|
||||
Path.Combine(cwd, nonlogBuild, steamApi64Dll),
|
||||
Path.Combine(cwd, steamApi64Dll),
|
||||
true
|
||||
);
|
||||
|
||||
if (File.Exists(Path.Combine(nonlogBuildPath, steamApiDll)))
|
||||
File.Move(
|
||||
Path.Combine(nonlogBuildPath, steamApiDll),
|
||||
Path.Combine(cwd, steamApiDll),
|
||||
true
|
||||
);
|
||||
|
||||
if (Directory.Exists(nonlogBuildPath))
|
||||
Directory.Delete(nonlogBuildPath, true);
|
||||
MyLogger.Log.Information("Extraction done!");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
using auto_creamapi.Core;
|
||||
using auto_creamapi.Utils;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using MvvmCross.Platforms.Wpf.Core;
|
||||
using Serilog;
|
||||
using Serilog.Extensions.Logging;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace auto_creamapi
|
||||
{
|
||||
public class Setup : MvxWpfSetup<MainApplication>
|
||||
{
|
||||
protected override ILoggerFactory CreateLogFactory()
|
||||
{
|
||||
Log.Logger = MyLogger.Log;
|
||||
|
||||
return new SerilogLoggerFactory();
|
||||
}
|
||||
|
||||
protected override ILoggerProvider CreateLogProvider()
|
||||
{
|
||||
return new SerilogLoggerProvider();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace auto_creamapi.Utils
|
||||
{
|
||||
|
||||
public class AvailableArchive
|
||||
{
|
||||
[JsonPropertyName("url")]
|
||||
public string Url { get; set; }
|
||||
|
||||
[JsonPropertyName("archived_snapshots")]
|
||||
public ArchivedSnapshot ArchivedSnapshots { get; set; }
|
||||
}
|
||||
|
||||
public class ArchivedSnapshot
|
||||
{
|
||||
[JsonPropertyName("closest")]
|
||||
public Closest Closest { get; set; }
|
||||
}
|
||||
|
||||
public class Closest
|
||||
{
|
||||
[JsonPropertyName("status")]
|
||||
public string Status { get; set; }
|
||||
|
||||
[JsonPropertyName("available")]
|
||||
public bool Available { get; set; }
|
||||
|
||||
[JsonPropertyName("url")]
|
||||
public string Url { get; set; }
|
||||
|
||||
[JsonPropertyName("timestamp")]
|
||||
public string Timestamp { get; set; }
|
||||
}
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
namespace auto_creamapi.Utils
|
||||
{
|
||||
public interface ISecrets
|
||||
{
|
||||
public string ForumUsername();
|
||||
public string ForumPassword();
|
||||
}
|
||||
}
|
||||
@ -3,11 +3,11 @@ using System.Collections.ObjectModel;
|
||||
|
||||
namespace auto_creamapi.Utils
|
||||
{
|
||||
public static class Misc
|
||||
public class Misc
|
||||
{
|
||||
public const string SpecialCharsRegex = "[^0-9a-zA-Z]+";
|
||||
public const string DefaultLanguageSelection = "english";
|
||||
public static readonly ObservableCollection<string> DefaultLanguages = new(new[]
|
||||
public static readonly ObservableCollection<string> DefaultLanguages = new ObservableCollection<string>(new[]
|
||||
{
|
||||
"arabic",
|
||||
"bulgarian",
|
||||
|
||||
@ -1,14 +1,12 @@
|
||||
using Serilog;
|
||||
using Serilog.Core;
|
||||
using Serilog.Exceptions;
|
||||
|
||||
namespace auto_creamapi.Utils
|
||||
{
|
||||
public static class MyLogger
|
||||
public class MyLogger
|
||||
{
|
||||
public static readonly Logger Log = new LoggerConfiguration()
|
||||
.MinimumLevel.Debug()
|
||||
.Enrich.WithExceptionDetails()
|
||||
.WriteTo.Console()
|
||||
.WriteTo.File("autocreamapi.log", rollingInterval: RollingInterval.Day)
|
||||
.CreateLogger();
|
||||
|
||||
14
auto-creamapi/Utils/Secrets.EXAMPLE.cs
Normal file
14
auto-creamapi/Utils/Secrets.EXAMPLE.cs
Normal file
@ -0,0 +1,14 @@
|
||||
namespace auto_creamapi.Utils
|
||||
{
|
||||
/// <summary>
|
||||
/// To use this:
|
||||
/// Rename file Secrets.EXAMPLE.cs to Secrets.cs
|
||||
/// Rename class Secrets_REMOVETHIS to Secrets
|
||||
/// Enter the relevant info below
|
||||
/// </summary>
|
||||
public class Secrets_REMOVETHIS
|
||||
{
|
||||
public const string Username = "Enter username here";
|
||||
public const string Password = "Enter password here";
|
||||
}
|
||||
}
|
||||
@ -1,10 +1,8 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using auto_creamapi.Messenger;
|
||||
using auto_creamapi.Services;
|
||||
using auto_creamapi.Utils;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using MvvmCross.Logging;
|
||||
using MvvmCross.Navigation;
|
||||
using MvvmCross.Plugin.Messenger;
|
||||
using MvvmCross.ViewModels;
|
||||
@ -16,22 +14,18 @@ namespace auto_creamapi.ViewModels
|
||||
private readonly IDownloadCreamApiService _download;
|
||||
private readonly IMvxNavigationService _navigationService;
|
||||
private readonly MvxSubscriptionToken _token;
|
||||
private readonly ILogger<DownloadViewModel> _logger;
|
||||
private string _filename;
|
||||
|
||||
private string _info;
|
||||
private double _progress;
|
||||
|
||||
private readonly Secrets _secrets = new();
|
||||
|
||||
public DownloadViewModel(ILoggerFactory loggerFactory, IMvxNavigationService navigationService,
|
||||
IDownloadCreamApiService download, IMvxMessenger messenger) : base(loggerFactory, navigationService)
|
||||
public DownloadViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService,
|
||||
IDownloadCreamApiService download, IMvxMessenger messenger) : base(logProvider, navigationService)
|
||||
{
|
||||
_navigationService = navigationService;
|
||||
_logger = loggerFactory.CreateLogger<DownloadViewModel>();
|
||||
_download = download;
|
||||
_token = messenger.Subscribe<ProgressMessage>(OnProgressMessage);
|
||||
_logger.LogDebug("{Count}", messenger.CountSubscriptionsFor<ProgressMessage>());
|
||||
MyLogger.Log.Debug(messenger.CountSubscriptionsFor<ProgressMessage>().ToString());
|
||||
}
|
||||
|
||||
public string InfoLabel
|
||||
@ -67,38 +61,25 @@ namespace auto_creamapi.ViewModels
|
||||
|
||||
public string ProgressPercent => _progress.ToString("P2");
|
||||
|
||||
public override void Prepare()
|
||||
public override async Task Initialize()
|
||||
{
|
||||
await base.Initialize();
|
||||
InfoLabel = "Please wait...";
|
||||
FilenameLabel = "";
|
||||
Progress = 0.0;
|
||||
}
|
||||
|
||||
public override async Task Initialize()
|
||||
{
|
||||
try
|
||||
{
|
||||
await base.Initialize().ConfigureAwait(false);
|
||||
var download = _download.Download(_secrets.ForumUsername(), _secrets.ForumPassword());
|
||||
var filename = await download.ConfigureAwait(false);
|
||||
var extract = _download.Extract(filename);
|
||||
var download = _download.Download(Secrets.ForumUsername, Secrets.ForumPassword);
|
||||
var filename = await download;
|
||||
/*var extract = _download.Extract(filename);
|
||||
await extract;*/
|
||||
var extract = Task.Run(() => _download.Extract(filename));
|
||||
await extract.ConfigureAwait(false);
|
||||
_token.Dispose();
|
||||
await _navigationService.Close(this).ConfigureAwait(false);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
MessageBox.Show("Could not download CreamAPI!\nPlease add CreamAPI DLLs manually!\nShutting down...",
|
||||
"Error", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
_token.Dispose();
|
||||
await _navigationService.Close(this).ConfigureAwait(false);
|
||||
Console.WriteLine(e);
|
||||
throw;
|
||||
}
|
||||
await _navigationService.Close(this);
|
||||
}
|
||||
|
||||
private void OnProgressMessage(ProgressMessage obj)
|
||||
{
|
||||
//MyLogger.Log.Debug($"{obj.Filename}: {obj.BytesTransferred}");
|
||||
InfoLabel = obj.Info;
|
||||
FilenameLabel = obj.Filename;
|
||||
Progress = obj.PercentComplete;
|
||||
|
||||
@ -7,7 +7,6 @@ using System.Threading.Tasks;
|
||||
using auto_creamapi.Models;
|
||||
using auto_creamapi.Services;
|
||||
using auto_creamapi.Utils;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Win32;
|
||||
using MvvmCross.Commands;
|
||||
using MvvmCross.Navigation;
|
||||
@ -20,7 +19,6 @@ namespace auto_creamapi.ViewModels
|
||||
private readonly ICacheService _cache;
|
||||
private readonly ICreamConfigService _config;
|
||||
|
||||
private readonly ILogger<MainViewModel> _logger;
|
||||
private readonly ICreamDllService _dll;
|
||||
private readonly IMvxNavigationService _navigationService;
|
||||
private int _appId;
|
||||
@ -40,31 +38,26 @@ namespace auto_creamapi.ViewModels
|
||||
private bool _unlockAll;
|
||||
|
||||
private bool _useSteamDb;
|
||||
|
||||
private bool _ignoreUnknown;
|
||||
//private const string DlcRegexPattern = @"(?<id>.*) *= *(?<name>.*)";
|
||||
|
||||
public MainViewModel(ICacheService cache, ICreamConfigService config, ICreamDllService dll,
|
||||
IMvxNavigationService navigationService, ILoggerFactory loggerFactory)
|
||||
IMvxNavigationService navigationService)
|
||||
{
|
||||
_navigationService = navigationService;
|
||||
_logger = loggerFactory.CreateLogger<MainViewModel>();
|
||||
_cache = cache;
|
||||
_config = config;
|
||||
_dll = dll;
|
||||
//_download = download;
|
||||
}
|
||||
|
||||
public override async void Prepare()
|
||||
public override async Task Initialize()
|
||||
{
|
||||
base.Prepare();
|
||||
_config.Initialize();
|
||||
var tasks = new List<Task> { _cache.Initialize() };
|
||||
var tasks = new List<Task> {base.Initialize(), _cache.Initialize()};
|
||||
if (!File.Exists("steam_api.dll") | !File.Exists("steam_api64.dll"))
|
||||
tasks.Add(_navigationService.Navigate<DownloadViewModel>());
|
||||
//tasks.Add(_navigationService.Navigate<DownloadViewModel>());
|
||||
tasks.Add(_dll.Initialize());
|
||||
await Task.WhenAll(tasks).ConfigureAwait(false);
|
||||
await Task.WhenAll(tasks);
|
||||
Languages = new ObservableCollection<string>(Misc.DefaultLanguages);
|
||||
ResetForm();
|
||||
UseSteamDb = true;
|
||||
@ -76,7 +69,7 @@ namespace auto_creamapi.ViewModels
|
||||
|
||||
public IMvxCommand OpenFileCommand => new MvxAsyncCommand(OpenFile);
|
||||
|
||||
public IMvxCommand SearchCommand => new MvxAsyncCommand(async () => await Search().ConfigureAwait(false)); //Command(Search);
|
||||
public IMvxCommand SearchCommand => new MvxAsyncCommand(async () => await Search()); //Command(Search);
|
||||
|
||||
public IMvxCommand GetListOfDlcCommand => new MvxAsyncCommand(GetListOfDlc);
|
||||
|
||||
@ -86,8 +79,6 @@ namespace auto_creamapi.ViewModels
|
||||
|
||||
public IMvxCommand GoToForumThreadCommand => new MvxCommand(GoToForumThread);
|
||||
|
||||
public IMvxCommand GoToSteamdbCommand => new MvxCommand(GoToSteamdb);
|
||||
|
||||
// // ATTRIBUTES // //
|
||||
|
||||
public bool MainWindowEnabled
|
||||
@ -117,6 +108,7 @@ namespace auto_creamapi.ViewModels
|
||||
{
|
||||
_gameName = value;
|
||||
RaisePropertyChanged(() => GameName);
|
||||
//MyLogger.Log.Debug($"GameName: {value}");
|
||||
}
|
||||
}
|
||||
|
||||
@ -138,6 +130,7 @@ namespace auto_creamapi.ViewModels
|
||||
{
|
||||
_lang = value;
|
||||
RaisePropertyChanged(() => Lang);
|
||||
//MyLogger.Log.Debug($"Lang: {value}");
|
||||
}
|
||||
}
|
||||
|
||||
@ -231,16 +224,6 @@ namespace auto_creamapi.ViewModels
|
||||
}
|
||||
}
|
||||
|
||||
public bool IgnoreUnknown
|
||||
{
|
||||
get => _ignoreUnknown;
|
||||
set
|
||||
{
|
||||
_ignoreUnknown = value;
|
||||
RaisePropertyChanged(() => IgnoreUnknown);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OpenFile()
|
||||
{
|
||||
Status = "Waiting for file...";
|
||||
@ -268,16 +251,11 @@ namespace auto_creamapi.ViewModels
|
||||
var separator = Path.DirectorySeparatorChar;
|
||||
var strings = new List<string>(dirPath.Split(separator));
|
||||
var index = strings.Contains("common") ? strings.FindIndex(x => x.Equals("common")) + 1 : -1;
|
||||
if (index == -1)
|
||||
index = strings.Contains("steamapps")
|
||||
? strings.FindIndex(x => x.Equals("steamapps")) + 2
|
||||
: -1;
|
||||
if (index == -1) index = strings.Contains("steamapps") ? strings.FindIndex(x => x.Equals("steamapps")) + 2 : -1;
|
||||
var s = index > -1 ? strings[index] : null;
|
||||
if (s != null) GameName = s;
|
||||
await Search().ConfigureAwait(false);
|
||||
// await GetListOfDlc().ConfigureAwait(false);
|
||||
await Search();
|
||||
}
|
||||
|
||||
Status = "Ready.";
|
||||
}
|
||||
}
|
||||
@ -299,10 +277,9 @@ namespace auto_creamapi.ViewModels
|
||||
}
|
||||
else
|
||||
{
|
||||
MainWindowEnabled = false;
|
||||
var navigate = _navigationService.Navigate<SearchResultViewModel, IEnumerable<SteamApp>, SteamApp>(
|
||||
_cache.GetListOfAppsByName(GameName));
|
||||
await navigate.ConfigureAwait(false);
|
||||
await navigate;
|
||||
var navigateResult = navigate.Result;
|
||||
if (navigateResult != null)
|
||||
{
|
||||
@ -310,31 +287,27 @@ namespace auto_creamapi.ViewModels
|
||||
AppId = navigateResult.AppId;
|
||||
}
|
||||
}
|
||||
|
||||
// await GetListOfDlc().ConfigureAwait(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogWarning("Empty game name, cannot initiate search!");
|
||||
MyLogger.Log.Warning("Empty game name, cannot initiate search!");
|
||||
}
|
||||
|
||||
MainWindowEnabled = true;
|
||||
}
|
||||
|
||||
private async Task GetListOfDlc()
|
||||
{
|
||||
Status = "Trying to get DLC, please wait...";
|
||||
Status = "Trying to get DLC...";
|
||||
if (AppId > 0)
|
||||
{
|
||||
var app = new SteamApp {AppId = AppId, Name = GameName};
|
||||
var task = _cache.GetListOfDlc(app, UseSteamDb, IgnoreUnknown);
|
||||
var task = _cache.GetListOfDlc(app, UseSteamDb);
|
||||
MainWindowEnabled = false;
|
||||
var listOfDlc = await task.ConfigureAwait(false);
|
||||
var listOfDlc = await task;
|
||||
if (task.IsCompletedSuccessfully)
|
||||
{
|
||||
listOfDlc.Sort((app1, app2) => app1.AppId.CompareTo(app2.AppId));
|
||||
Dlcs = new ObservableCollection<SteamApp>(listOfDlc);
|
||||
Status = $"Got DLC for AppID {AppId} (Count: {Dlcs.Count})";
|
||||
Status = $"Got DLC for AppID {AppId}";
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -346,7 +319,7 @@ namespace auto_creamapi.ViewModels
|
||||
else
|
||||
{
|
||||
Status = $"Could not get DLC for AppID {AppId}";
|
||||
_logger.LogError("GetListOfDlc: Invalid AppID {AppId}", AppId);
|
||||
MyLogger.Log.Error($"GetListOfDlc: Invalid AppID {AppId}");
|
||||
}
|
||||
}
|
||||
|
||||
@ -385,7 +358,9 @@ namespace auto_creamapi.ViewModels
|
||||
{
|
||||
var searchTerm = AppId; //$"{GameName.Replace(" ", "+")}+{appId}";
|
||||
var destinationUrl =
|
||||
$"https://cs.rin.ru/forum/search.php?keywords={searchTerm}&terms=any&fid[]=10&sf=firstpost&sr=topics&submit=Search";
|
||||
"https://cs.rin.ru/forum/search.php?keywords=" +
|
||||
searchTerm +
|
||||
"&terms=any&fid[]=10&sf=firstpost&sr=topics&submit=Search";
|
||||
var uri = new Uri(destinationUrl);
|
||||
var process = new ProcessStartInfo(uri.AbsoluteUri)
|
||||
{
|
||||
@ -395,29 +370,7 @@ namespace auto_creamapi.ViewModels
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogError("OpenURL: Invalid AppID {AppId}", AppId);
|
||||
Status = $"Could not open URL: Invalid AppID {AppId}";
|
||||
}
|
||||
}
|
||||
|
||||
private void GoToSteamdb()
|
||||
{
|
||||
Status = "Opening URL...";
|
||||
if (AppId > 0)
|
||||
{
|
||||
var searchTerm = AppId; //$"{GameName.Replace(" ", "+")}+{appId}";
|
||||
var destinationUrl =
|
||||
$"https://steamdb.info/app/{searchTerm}/dlc/";
|
||||
var uri = new Uri(destinationUrl);
|
||||
var process = new ProcessStartInfo(uri.AbsoluteUri)
|
||||
{
|
||||
UseShellExecute = true
|
||||
};
|
||||
Process.Start(process);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogError("OpenURL: Invalid AppID {AppId}", AppId);
|
||||
MyLogger.Log.Error($"OpenURL: Invalid AppID {AppId}");
|
||||
Status = $"Could not open URL: Invalid AppID {AppId}";
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,6 @@ using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using auto_creamapi.Models;
|
||||
using auto_creamapi.Utils;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using MvvmCross.Commands;
|
||||
using MvvmCross.Logging;
|
||||
using MvvmCross.Navigation;
|
||||
@ -14,18 +13,16 @@ namespace auto_creamapi.ViewModels
|
||||
IMvxViewModel<IEnumerable<SteamApp>, SteamApp>
|
||||
{
|
||||
private readonly IMvxNavigationService _navigationService;
|
||||
private readonly ILogger<SearchResultViewModel> _logger;
|
||||
private IEnumerable<SteamApp> _steamApps;
|
||||
|
||||
/*public override async Task Initialize()
|
||||
{
|
||||
await base.Initialize();
|
||||
}*/
|
||||
public SearchResultViewModel(ILoggerFactory loggerFactory, IMvxNavigationService navigationService) : base(
|
||||
loggerFactory, navigationService)
|
||||
public SearchResultViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService) : base(
|
||||
logProvider, navigationService)
|
||||
{
|
||||
_navigationService = navigationService;
|
||||
_logger = loggerFactory.CreateLogger<SearchResultViewModel>();
|
||||
}
|
||||
|
||||
public IEnumerable<SteamApp> Apps
|
||||
@ -58,11 +55,9 @@ namespace auto_creamapi.ViewModels
|
||||
|
||||
public override void ViewDestroy(bool viewFinishing = true)
|
||||
{
|
||||
if (viewFinishing && CloseCompletionSource?.Task.IsCompleted == false &&
|
||||
if (viewFinishing && CloseCompletionSource != null && !CloseCompletionSource.Task.IsCompleted &&
|
||||
!CloseCompletionSource.Task.IsFaulted)
|
||||
{
|
||||
CloseCompletionSource?.TrySetCanceled();
|
||||
}
|
||||
|
||||
base.ViewDestroy(viewFinishing);
|
||||
}
|
||||
@ -71,8 +66,8 @@ namespace auto_creamapi.ViewModels
|
||||
{
|
||||
if (Selected != null)
|
||||
{
|
||||
_logger.LogInformation("Successfully got app {Selected}", Selected);
|
||||
await _navigationService.Close(this, Selected).ConfigureAwait(false);
|
||||
MyLogger.Log.Information($"Successfully got app {Selected}");
|
||||
await _navigationService.Close(this, Selected);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -10,8 +10,7 @@
|
||||
xmlns:vm="clr-namespace:auto_creamapi.ViewModels"
|
||||
d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
|
||||
xmlns:converters="clr-namespace:auto_creamapi.Converters"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="720" d:DesignWidth="560">
|
||||
mc:Ignorable="d">
|
||||
<views:MvxWpfView.Resources>
|
||||
<converters:ListOfDLcToStringNativeConverter x:Key="DlcConv" />
|
||||
</views:MvxWpfView.Resources>
|
||||
@ -28,7 +27,7 @@
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<wcl:WatermarkTextBox Text="{Binding DllPath}" Watermark="Path to game's steam_api(64).dll..."
|
||||
Margin="10,10,55,0" TextWrapping="NoWrap" VerticalAlignment="Top" Padding="0"
|
||||
Margin="10,11,55,0" TextWrapping="NoWrap" VerticalAlignment="Top" Padding="0"
|
||||
Grid.Row="0" IsReadOnly="True" IsReadOnlyCaretVisible="True">
|
||||
<!--MouseDoubleClick="{Binding Path=OpenFileCommand}"-->
|
||||
<wcl:WatermarkTextBox.InputBindings>
|
||||
@ -56,18 +55,9 @@
|
||||
<wcl:WatermarkTextBox Text="{Binding AppId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
||||
HorizontalAlignment="Right" Margin="0,10,10,0" Watermark="AppID" TextWrapping="Wrap"
|
||||
VerticalAlignment="Top" Width="120" Padding="0" Grid.Row="1" />
|
||||
<Grid Grid.Row="2" Margin="10,10,0,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Column="0" Margin="0,0,10,0">
|
||||
<Hyperlink Command="{Binding GoToForumThreadCommand}">Search for cs.rin.ru thread...</Hyperlink>
|
||||
<TextBlock Grid.Row="2" Margin="10,10,10,0">
|
||||
<Hyperlink Command="{Binding GoToForumThreadCommand}">Search for cs.rin.ru thread</Hyperlink>
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Column="1" Margin="0,0,0,0">
|
||||
<Hyperlink Command="{Binding GoToSteamdbCommand}">Open SteamDB DLC page...</Hyperlink>
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
<ComboBox ItemsSource="{Binding Path=Languages}" SelectedItem="{Binding Path=Lang, Mode=TwoWay}"
|
||||
HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="120" Grid.Row="3" />
|
||||
<CheckBox Content="Force offline mode" IsChecked="{Binding Offline, Mode=TwoWay}"
|
||||
@ -84,7 +74,6 @@
|
||||
<GroupBox Header="DLC" Grid.Row="0" VerticalAlignment="Stretch">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
@ -96,22 +85,19 @@
|
||||
<CheckBox Content="Additionally use SteamDB for DLCs"
|
||||
IsChecked="{Binding UseSteamDb, Mode=TwoWay}" HorizontalAlignment="Left"
|
||||
Margin="10,10,0,0" VerticalAlignment="Top" Grid.Row="1" />
|
||||
<CheckBox Content="Ignore unknown DLC from SteamDB" IsEnabled="{Binding UseSteamDb}"
|
||||
IsChecked="{Binding IgnoreUnknown, Mode=TwoWay}" HorizontalAlignment="Left"
|
||||
Margin="10,10,0,0" VerticalAlignment="Top" Grid.Row="2" />
|
||||
<!-- Text="{Binding Dlcs, Converter={StaticResource DlcConv}, Mode=TwoWay}"-->
|
||||
<!-- Text="{Binding DlcsString, Mode=TwoWay}"-->
|
||||
<wcl:WatermarkTextBox
|
||||
Text="{Binding Dlcs, Converter={StaticResource DlcConv}, Mode=TwoWay}"
|
||||
Margin="10,10,10,0" Watermark="List of DLCs...
0000 = DLC Name"
|
||||
TextWrapping="Wrap" AcceptsReturn="True"
|
||||
VerticalScrollBarVisibility="Visible" Padding="5,5,5,5"
|
||||
FontFamily="../resources/#Courier Prime" Grid.Row="3" />
|
||||
VerticalScrollBarVisibility="Visible" Padding="0"
|
||||
FontFamily="../resources/#Courier Prime" Grid.Row="2" />
|
||||
<Button Content="Get DLCs for AppID" Margin="0,10,10,10" Height="19.96" HorizontalAlignment="Right"
|
||||
VerticalAlignment="Bottom" Width="108" Command="{Binding GetListOfDlcCommand}" Grid.Row="4" />
|
||||
VerticalAlignment="Bottom" Width="108" Command="{Binding GetListOfDlcCommand}" Grid.Row="3" />
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
<GroupBox Header="Status" Grid.Row="1" VerticalAlignment="Bottom" IsEnabled="False" Margin="0,10,0,0">
|
||||
<GroupBox Header="Status" Grid.Row="1" VerticalAlignment="Bottom" IsEnabled="False">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
|
||||
@ -11,6 +11,38 @@ namespace auto_creamapi.Views
|
||||
public SearchResultView()
|
||||
{
|
||||
InitializeComponent();
|
||||
//DgApps.ItemsSource = list;
|
||||
}
|
||||
|
||||
/*private void OK_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
GetSelectedApp();
|
||||
}
|
||||
|
||||
private void DgApps_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
GetSelectedApp();
|
||||
}
|
||||
|
||||
private void Cancel_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Close();
|
||||
}
|
||||
|
||||
private void GetSelectedApp()
|
||||
{
|
||||
if (Application.Current.MainWindow is MainWindow currentMainWindow)
|
||||
{
|
||||
var app = (SteamApp) DgApps.SelectedItem;
|
||||
if (app != null)
|
||||
{
|
||||
MyLogger.Log.Information($"Successfully got app {app}");
|
||||
//currentMainWindow.Game.Text = app.Name;
|
||||
//currentMainWindow.AppId.Text = app.AppId.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
Close();
|
||||
}*/
|
||||
}
|
||||
}
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net8.0-windows</TargetFramework>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<RootNamespace>auto_creamapi</RootNamespace>
|
||||
<UseWPF>true</UseWPF>
|
||||
<PackageVersion>2.2.0</PackageVersion>
|
||||
<PackageVersion>2.1.3</PackageVersion>
|
||||
<Title>auto-creamapi</Title>
|
||||
<Authors>Jeddunk</Authors>
|
||||
<Company>jeddunk.xyz</Company>
|
||||
<AssemblyVersion>2.2.0</AssemblyVersion>
|
||||
<FileVersion>2.2.0</FileVersion>
|
||||
<AssemblyVersion>2.1.3</AssemblyVersion>
|
||||
<FileVersion>2.1.3</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
@ -18,22 +18,19 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AngleSharp" Version="1.0.7" />
|
||||
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
|
||||
<PackageReference Include="AngleSharp" Version="0.14.0" />
|
||||
<PackageReference Include="bloomtom.HttpProgress" Version="2.3.2" />
|
||||
<PackageReference Include="Dirkster.WatermarkControlsLib" Version="1.1.0" />
|
||||
<PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
|
||||
<PackageReference Include="MvvmCross" Version="8.0.2" />
|
||||
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="8.0.2" />
|
||||
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="8.0.2" />
|
||||
<PackageReference Include="MvvmCross" Version="7.1.2" />
|
||||
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="7.1.2" />
|
||||
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="7.1.2" />
|
||||
<PackageReference Include="NinjaNye.SearchExtensions" Version="3.0.1" />
|
||||
<PackageReference Include="Serilog" Version="3.1.1" />
|
||||
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
|
||||
<PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.1.23" />
|
||||
<PackageReference Include="SteamStorefrontAPI" Version="2.0.1.421" />
|
||||
<PackageReference Include="Serilog" Version="2.10.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
|
||||
<PackageReference Include="SharpCompress" Version="0.26.0" />
|
||||
<PackageReference Include="SteamStorefrontAPI.NETStandard" Version="1.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@ -50,9 +47,6 @@
|
||||
<Content Include="resources\CourierPrime-Regular.ttf">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="resources\7z.dll">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user