jeddunk/auto-creamapi-2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Compare commits

base: jeddunk:master
Branches Tags
jeddunk:master
jeddunk:2.1.7
jeddunk:2.1.6
jeddunk:2.1.5
jeddunk:2.1.4
jeddunk:2.1.3
jeddunk:2.1.2
jeddunk:2.1.1
jeddunk:2.1.0
jeddunk:2.0.1
jeddunk:2.0.0
..
compare: jeddunk:2.1.6
Branches Tags
jeddunk:master
jeddunk:2.1.7
jeddunk:2.1.6
jeddunk:2.1.5
jeddunk:2.1.4
jeddunk:2.1.3
jeddunk:2.1.2
jeddunk:2.1.1
jeddunk:2.1.0
jeddunk:2.0.1
jeddunk:2.0.0

No commits in common. "master" and "2.1.6" have entirely different histories.
master ... 2.1.6

20 changed files with 203 additions and 349 deletions
Show Stats Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "SteamStorefrontAPI"]
path = SteamStorefrontAPI
url = https://git.jeddunk.xyz/jeddunk/SteamStorefrontAPI.git

4
auto-creamapi.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 16
VisualStudioVersion = 17.8.34330.188 VisualStudioVersion = 16.0.30413.136
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "auto-creamapi", "auto-creamapi\auto-creamapi.csproj", "{26060B32-199E-4366-8FDE-6B1E10E0EF62}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "auto-creamapi", "auto-creamapi\auto-creamapi.csproj", "{26060B32-199E-4366-8FDE-6B1E10E0EF62}"
EndProject EndProject

2
auto-creamapi/App.xaml.cs
View File

@ -10,7 +10,7 @@ namespace auto_creamapi
{ {
protected override void RegisterSetup() protected override void RegisterSetup()
{ {
this.RegisterSetupType<Setup>(); this.RegisterSetupType<MvxWpfSetup<Core.App>>();
} }
} }
} }

6
auto-creamapi/Converters/ListOfDLcToStringConverter.cs
View File

@ -31,26 +31,24 @@ namespace auto_creamapi.Converters
{ {
MyLogger.Log.Debug("ListOfDLcToStringConverter: ConvertBack"); MyLogger.Log.Debug("ListOfDLcToStringConverter: ConvertBack");
var stringToDlcList = StringToDlcList(value); var stringToDlcList = StringToDlcList(value);
return stringToDlcList.GetType() == targetType ? stringToDlcList : []; return stringToDlcList.GetType() == targetType ? stringToDlcList : new ObservableCollection<SteamApp>();
} }
private static ObservableCollection<SteamApp> StringToDlcList(string value) private static ObservableCollection<SteamApp> StringToDlcList(string value)
{ {
var result = new ObservableCollection<SteamApp>(); var result = new ObservableCollection<SteamApp>();
var expression = new Regex("(?<id>.*) *= *(?<name>.*)"); var expression = new Regex(@"(?<id>.*) *= *(?<name>.*)");
using var reader = new StringReader(value); using var reader = new StringReader(value);
string line; string line;
while ((line = reader.ReadLine()) != null) while ((line = reader.ReadLine()) != null)
{ {
var match = expression.Match(line); var match = expression.Match(line);
if (match.Success) if (match.Success)
{
result.Add(new SteamApp result.Add(new SteamApp
{ {
AppId = int.Parse(match.Groups["id"].Value), AppId = int.Parse(match.Groups["id"].Value),
Name = match.Groups["name"].Value Name = match.Groups["name"].Value
}); });
}
} }
return result; return result;

2
auto-creamapi/Core/MainApplication.cs → auto-creamapi/Core/App.cs
View File

@ -4,7 +4,7 @@ using MvvmCross.ViewModels;
namespace auto_creamapi.Core namespace auto_creamapi.Core
{ {
public class MainApplication : MvxApplication public class App : MvxApplication
{ {
public override void Initialize() public override void Initialize()
{ {

182
auto-creamapi/Services/CacheService.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
@ -33,7 +32,11 @@ namespace auto_creamapi.Services
private const string CachePath = "steamapps.json"; private const string CachePath = "steamapps.json";
private const string SteamUri = "https://api.steampowered.com/ISteamApps/GetAppList/v2/"; 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() public async Task Initialize()
{ {
@ -81,149 +84,122 @@ namespace auto_creamapi.Services
public SteamApp GetAppByName(string name) 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 comparableName = Regex.Replace(name, Misc.SpecialCharsRegex, "").ToLower();
var app = _cache.FirstOrDefault(x => x.CompareName(comparableName)); 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; return app;
} }
public SteamApp GetAppById(int appid) 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)); 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; return app;
} }
public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb, bool ignoreUnknown) public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb, bool ignoreUnknown)
{ {
MyLogger.Log.Debug("Start: GetListOfDlc"); MyLogger.Log.Information("Get DLC");
var dlcList = new List<SteamApp>(); var dlcList = new List<SteamApp>();
try if (steamApp != null)
{ {
if (steamApp != null) var steamAppDetails = await AppDetails.GetAsync(steamApp.AppId).ConfigureAwait(false);
if (steamAppDetails != null)
{ {
var steamAppDetails = await AppDetails.GetAsync(steamApp.AppId).ConfigureAwait(false); MyLogger.Log.Debug($"Type for Steam App {steamApp.Name}: \"{steamAppDetails.Type}\"");
if (steamAppDetails != null) if (steamAppDetails.Type == "game" | steamAppDetails.Type == "demo")
{ {
MyLogger.Log.Debug("Type for Steam App {Name}: \"{Type}\"", steamApp.Name, steamAppDetails.DLC.ForEach(x =>
steamAppDetails.Type);
if (steamAppDetails.Type == "game" || steamAppDetails.Type == "demo")
{ {
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}" });
});
dlcList.ForEach(x => MyLogger.Log.Debug($"{x.AppId}={x.Name}"));
MyLogger.Log.Information("Got DLC successfully...");
if (!useSteamDb) return dlcList;
// Get DLC from SteamDB
// Get Cloudflare cookie
// Scrape and parse HTML page
// Add missing to DLC list
var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/");
var client = new HttpClient();
client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
MyLogger.Log.Information("Get SteamDB App");
var httpCall = client.GetAsync(steamDbUri);
var response = await httpCall.ConfigureAwait(false);
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(readAsStringAsync.Status.ToString());
var parser = new HtmlParser();
var doc = parser.ParseDocument(responseBody);
// Console.WriteLine(doc.DocumentElement.OuterHtml);
var query1 = doc.QuerySelector("#dlc");
if (query1 != null)
{
var query2 = query1.QuerySelectorAll(".app");
foreach (var element in query2)
{ {
var result = _cache.FirstOrDefault(y => y.AppId.Equals(x)); var dlcId = element.GetAttribute("data-appid");
if (result == null) return; var query3 = element.QuerySelectorAll("td");
var dlcDetails = AppDetails.GetAsync(x).Result; var dlcName = query3 == null
dlcList.Add(dlcDetails != null ? $"Unknown DLC {dlcId}"
? new SteamApp { AppId = dlcDetails.SteamAppId, Name = dlcDetails.Name } : query3[1].Text().Replace("\n", "").Trim();
: new SteamApp { AppId = x, Name = $"Unknown DLC {x}" });
});
dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name)); if (ignoreUnknown && dlcName.Contains("SteamDB Unknown App"))
MyLogger.Log.Information("Got DLC successfully...");
// Return if Steam DB is deactivated
if (!useSteamDb) return dlcList;
string steamDbUrl = $"https://steamdb.info/app/{steamApp.AppId}/dlc/";
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);
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 readAsStringAsync = response.Content.ReadAsStringAsync();
var responseBody = await readAsStringAsync.ConfigureAwait(false);
MyLogger.Log.Debug("{Status}", readAsStringAsync.Status.ToString());
var parser = new HtmlParser();
var doc = parser.ParseDocument(responseBody);
// Console.WriteLine(doc.DocumentElement.OuterHtml);
var query1 = doc.QuerySelector("#dlc");
if (query1 != null)
{
var query2 = query1.QuerySelectorAll(".app");
foreach (var element in query2)
{ {
var dlcId = element.GetAttribute("data-appid"); MyLogger.Log.Information($"Skipping SteamDB Unknown App {dlcId}");
var query3 = element.QuerySelectorAll("td"); }
var dlcName = query3 == null else
? $"Unknown DLC {dlcId}" {
: query3[1].Text().Replace("\n", "").Trim(); var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName};
var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId));
if (ignoreUnknown && dlcName.Contains("SteamDB Unknown App")) if (i > -1)
{ {
MyLogger.Log.Information("Skipping SteamDB Unknown App {DlcId}", dlcId); if (dlcList[i].Name.Contains("Unknown DLC")) dlcList[i] = dlcApp;
} }
else else
{ {
var dlcApp = new SteamApp { AppId = Convert.ToInt32(dlcId), Name = dlcName }; dlcList.Add(dlcApp);
var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId));
if (i > -1)
{
if (dlcList[i].Name.Contains("Unknown DLC")) dlcList[i] = dlcApp;
}
else
{
dlcList.Add(dlcApp);
}
} }
} }
dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name));
MyLogger.Log.Information("Got DLC from SteamDB successfully...");
}
else
{
MyLogger.Log.Error("Could not get DLC from SteamDB!");
} }
dlcList.ForEach(x => MyLogger.Log.Debug($"{x.AppId}={x.Name}"));
MyLogger.Log.Information("Got DLC from SteamDB successfully...");
} }
else else
{ {
MyLogger.Log.Error("Could not get DLC: Steam App is not of type: \"Game\""); MyLogger.Log.Error("Could not get DLC from SteamDB!");
} }
} }
else else
{ {
MyLogger.Log.Error("Could not get DLC: Could not get Steam App details"); MyLogger.Log.Error("Could not get DLC: Steam App is not of type: \"Game\"");
} }
} }
else else
{ {
MyLogger.Log.Error("Could not get DLC: Invalid Steam App"); MyLogger.Log.Error("Could not get DLC...");
} }
//return dlcList;
} }
catch (Exception e) else
{ {
MyLogger.Log.Error("Could not get DLC!"); MyLogger.Log.Error("Could not get DLC: Invalid Steam App");
MyLogger.Log.Debug(e.Demystify(), "Exception thrown!");
} }
return dlcList; return dlcList;

4
auto-creamapi/Services/CreamConfigService.cs
View File

@ -65,7 +65,7 @@ namespace auto_creamapi.Services
_configFilePath = configFilePath; _configFilePath = configFilePath;
if (File.Exists(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 parser = new FileIniDataParser();
var data = parser.ReadFile(_configFilePath, Encoding.UTF8); var data = parser.ReadFile(_configFilePath, Encoding.UTF8);
@ -83,7 +83,7 @@ namespace auto_creamapi.Services
} }
else else
{ {
MyLogger.Log.Information("Config file does not exist @ {ConfigFilePath}, skipping...", configFilePath); MyLogger.Log.Information($"Config file does not exist @ {configFilePath}, skipping...");
ResetConfigData(); ResetConfigData();
} }
} }

6
auto-creamapi/Services/CreamDllService.cs
View File

@ -66,8 +66,8 @@ namespace auto_creamapi.Services
var x64File = Path.Combine(TargetPath, "steam_api64.dll"); var x64File = Path.Combine(TargetPath, "steam_api64.dll");
_x86Exists = File.Exists(x86File); _x86Exists = File.Exists(x86File);
_x64Exists = File.Exists(x64File); _x64Exists = File.Exists(x64File);
if (_x86Exists) MyLogger.Log.Information("x86 SteamAPI DLL found: {X}", x86File); if (_x86Exists) MyLogger.Log.Information($"x86 SteamAPI DLL found: {x86File}");
if (_x64Exists) MyLogger.Log.Information("x64 SteamAPI DLL found: {X}", x64File); if (_x64Exists) MyLogger.Log.Information($"x64 SteamAPI DLL found: {x64File}");
} }
public bool CreamApiApplied() public bool CreamApiApplied()
@ -83,7 +83,7 @@ namespace auto_creamapi.Services
var targetSteamApiDll = Path.Combine(TargetPath, _creamDlls[arch].Filename); var targetSteamApiDll = Path.Combine(TargetPath, _creamDlls[arch].Filename);
var targetSteamApiOrigDll = Path.Combine(TargetPath, _creamDlls[arch].OrigFilename); var targetSteamApiOrigDll = Path.Combine(TargetPath, _creamDlls[arch].OrigFilename);
var targetSteamApiDllBackup = Path.Combine(TargetPath, $"{_creamDlls[arch].Filename}.backup"); 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 // Create backup of steam_api.dll
File.Copy(targetSteamApiDll, targetSteamApiDllBackup, true); File.Copy(targetSteamApiDll, targetSteamApiDllBackup, true);
// Check if steam_api_o.dll already exists // Check if steam_api_o.dll already exists

18
auto-creamapi/Services/DownloadCreamApiService.cs
View File

@ -4,6 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using auto_creamapi.Messenger; using auto_creamapi.Messenger;
@ -36,8 +37,6 @@ namespace auto_creamapi.Services
var container = new CookieContainer(); var container = new CookieContainer();
var handler = new HttpClientHandler {CookieContainer = container}; var handler = new HttpClientHandler {CookieContainer = container};
var client = new HttpClient(handler); 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[] var formContent = new FormUrlEncodedContent(new[]
{ {
new KeyValuePair<string, string>("username", username), new KeyValuePair<string, string>("username", username),
@ -48,15 +47,14 @@ namespace auto_creamapi.Services
MyLogger.Log.Debug("Download: post login"); MyLogger.Log.Debug("Download: post login");
var response1 = await client.PostAsync("https://cs.rin.ru/forum/ucp.php?mode=login", formContent) var response1 = await client.PostAsync("https://cs.rin.ru/forum/ucp.php?mode=login", formContent)
.ConfigureAwait(false); .ConfigureAwait(false);
MyLogger.Log.Debug("Login Status Code: {StatusCode}", MyLogger.Log.Debug($"Login Status Code: {response1.EnsureSuccessStatusCode().StatusCode.ToString()}");
response1.EnsureSuccessStatusCode().StatusCode);
var cookie = container.GetCookies(new Uri("https://cs.rin.ru/forum/ucp.php?mode=login")) var cookie = container.GetCookies(new Uri("https://cs.rin.ru/forum/ucp.php?mode=login"))
.FirstOrDefault(c => c.Name.Contains("_sid")); .FirstOrDefault(c => c.Name.Contains("_sid"));
MyLogger.Log.Debug("Login Cookie: {Cookie}", cookie); MyLogger.Log.Debug($"Login Cookie: {cookie}");
var response2 = await client.GetAsync("https://cs.rin.ru/forum/viewtopic.php?t=70576") var response2 = await client.GetAsync("https://cs.rin.ru/forum/viewtopic.php?t=70576")
.ConfigureAwait(false); .ConfigureAwait(false);
MyLogger.Log.Debug("Download Page Status Code: {StatusCode}", MyLogger.Log.Debug(
response2.EnsureSuccessStatusCode().StatusCode); $"Download Page Status Code: {response2.EnsureSuccessStatusCode().StatusCode.ToString()}");
var content = response2.Content.ReadAsStringAsync(); var content = response2.Content.ReadAsStringAsync();
var contentResult = await content.ConfigureAwait(false); var contentResult = await content.ConfigureAwait(false);
@ -73,7 +71,7 @@ namespace auto_creamapi.Services
{ {
archiveFileList.Add(match.Groups["filename"].Value, archiveFileList.Add(match.Groups["filename"].Value,
$"https://cs.rin.ru/forum{match.Groups["url"].Value}"); $"https://cs.rin.ru/forum{match.Groups["url"].Value}");
MyLogger.Log.Debug("{X}", archiveFileList.LastOrDefault().Key); MyLogger.Log.Debug(archiveFileList.LastOrDefault().Key);
} }
} }
@ -81,7 +79,7 @@ namespace auto_creamapi.Services
var (filename, url) = archiveFileList.FirstOrDefault(); var (filename, url) = archiveFileList.FirstOrDefault();
if (File.Exists(filename)) if (File.Exists(filename))
{ {
MyLogger.Log.Information("{Filename} already exists, skipping download...", filename); MyLogger.Log.Information($"{filename} already exists, skipping download...");
return filename; return filename;
} }
@ -104,7 +102,7 @@ namespace auto_creamapi.Services
const string nonlogBuild = "nonlog_build"; const string nonlogBuild = "nonlog_build";
const string steamApi64Dll = "steam_api64.dll"; const string steamApi64Dll = "steam_api64.dll";
const string steamApiDll = "steam_api.dll"; const string steamApiDll = "steam_api.dll";
MyLogger.Log.Information(@"Start extraction of ""{Filename}""...", filename); MyLogger.Log.Information($@"Start extraction of ""{filename}""...");
var nonlogBuildPath = Path.Combine(cwd, nonlogBuild); var nonlogBuildPath = Path.Combine(cwd, nonlogBuild);
if (Directory.Exists(nonlogBuildPath)) if (Directory.Exists(nonlogBuildPath))
Directory.Delete(nonlogBuildPath, true); Directory.Delete(nonlogBuildPath, true);

29
auto-creamapi/Setup.cs
View File

@ -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();
}
}
}

35
auto-creamapi/Utils/AvailabeArchive.cs
View File

@ -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; }
}
}

8
auto-creamapi/Utils/ISecrets.cs
View File

@ -1,8 +0,0 @@
namespace auto_creamapi.Utils
{
public interface ISecrets
{
public string ForumUsername();
public string ForumPassword();
}
}

4
auto-creamapi/Utils/Misc.cs
View File

@ -3,11 +3,11 @@ using System.Collections.ObjectModel;
namespace auto_creamapi.Utils namespace auto_creamapi.Utils
{ {
public static class Misc public class Misc
{ {
public const string SpecialCharsRegex = "[^0-9a-zA-Z]+"; public const string SpecialCharsRegex = "[^0-9a-zA-Z]+";
public const string DefaultLanguageSelection = "english"; public const string DefaultLanguageSelection = "english";
public static readonly ObservableCollection<string> DefaultLanguages = new(new[] public static readonly ObservableCollection<string> DefaultLanguages = new ObservableCollection<string>(new[]
{ {
"arabic", "arabic",
"bulgarian", "bulgarian",

4
auto-creamapi/Utils/MyLogger.cs
View File

@ -1,14 +1,12 @@
using Serilog; using Serilog;
using Serilog.Core; using Serilog.Core;
using Serilog.Exceptions;
namespace auto_creamapi.Utils namespace auto_creamapi.Utils
{ {
public static class MyLogger public class MyLogger
{ {
public static readonly Logger Log = new LoggerConfiguration() public static readonly Logger Log = new LoggerConfiguration()
.MinimumLevel.Debug() .MinimumLevel.Debug()
.Enrich.WithExceptionDetails()
.WriteTo.Console() .WriteTo.Console()
.WriteTo.File("autocreamapi.log", rollingInterval: RollingInterval.Day) .WriteTo.File("autocreamapi.log", rollingInterval: RollingInterval.Day)
.CreateLogger(); .CreateLogger();

14
auto-creamapi/Utils/Secrets.EXAMPLE.cs Normal file
View 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";
}
}

50
auto-creamapi/ViewModels/DownloadViewModel.cs
View File

@ -1,37 +1,32 @@
using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows;
using auto_creamapi.Messenger; using auto_creamapi.Messenger;
using auto_creamapi.Services; using auto_creamapi.Services;
using auto_creamapi.Utils; using auto_creamapi.Utils;
using Microsoft.Extensions.Logging; using MvvmCross.Logging;
using MvvmCross.Navigation; using MvvmCross.Navigation;
using MvvmCross.Plugin.Messenger; using MvvmCross.Plugin.Messenger;
using MvvmCross.ViewModels; using MvvmCross.ViewModels;
namespace auto_creamapi.ViewModels namespace auto_creamapi.ViewModels
{ {
public class DownloadViewModel : MvxNavigationViewModel public class DownloadViewModel : MvxNavigationViewModel
{ {
private readonly IDownloadCreamApiService _download; private readonly IDownloadCreamApiService _download;
private readonly IMvxNavigationService _navigationService; private readonly IMvxNavigationService _navigationService;
private readonly MvxSubscriptionToken _token; private readonly MvxSubscriptionToken _token;
private readonly ILogger<DownloadViewModel> _logger;
private string _filename; private string _filename;
private string _info; private string _info;
private double _progress; private double _progress;
private readonly Secrets _secrets = new(); public DownloadViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService,
IDownloadCreamApiService download, IMvxMessenger messenger) : base(logProvider, navigationService)
public DownloadViewModel(ILoggerFactory loggerFactory, IMvxNavigationService navigationService,
IDownloadCreamApiService download, IMvxMessenger messenger) : base(loggerFactory, navigationService)
{ {
_navigationService = navigationService; _navigationService = navigationService;
_logger = loggerFactory.CreateLogger<DownloadViewModel>();
_download = download; _download = download;
_token = messenger.Subscribe<ProgressMessage>(OnProgressMessage); _token = messenger.Subscribe<ProgressMessage>(OnProgressMessage);
_logger.LogDebug("{Count}", messenger.CountSubscriptionsFor<ProgressMessage>()); MyLogger.Log.Debug(messenger.CountSubscriptionsFor<ProgressMessage>().ToString());
} }
public string InfoLabel public string InfoLabel
@ -67,38 +62,25 @@ namespace auto_creamapi.ViewModels
public string ProgressPercent => _progress.ToString("P2"); public string ProgressPercent => _progress.ToString("P2");
public override void Prepare() public override async Task Initialize()
{ {
await base.Initialize().ConfigureAwait(false);
InfoLabel = "Please wait..."; InfoLabel = "Please wait...";
FilenameLabel = ""; FilenameLabel = "";
Progress = 0.0; Progress = 0.0;
} var download = _download.Download(Secrets.ForumUsername, Secrets.ForumPassword);
var filename = await download.ConfigureAwait(false);
public override async Task Initialize() /*var extract = _download.Extract(filename);
{ await extract;*/
try var extract = _download.Extract(filename);
{ await extract.ConfigureAwait(false);
await base.Initialize().ConfigureAwait(false); _token.Dispose();
var download = _download.Download(_secrets.ForumUsername(), _secrets.ForumPassword()); await _navigationService.Close(this).ConfigureAwait(false);
var filename = await download.ConfigureAwait(false);
var extract = _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;
}
} }
private void OnProgressMessage(ProgressMessage obj) private void OnProgressMessage(ProgressMessage obj)
{ {
//MyLogger.Log.Debug($"{obj.Filename}: {obj.BytesTransferred}");
InfoLabel = obj.Info; InfoLabel = obj.Info;
FilenameLabel = obj.Filename; FilenameLabel = obj.Filename;
Progress = obj.PercentComplete; Progress = obj.PercentComplete;

54
auto-creamapi/ViewModels/MainViewModel.cs
View File

@ -7,7 +7,6 @@ using System.Threading.Tasks;
using auto_creamapi.Models; using auto_creamapi.Models;
using auto_creamapi.Services; using auto_creamapi.Services;
using auto_creamapi.Utils; using auto_creamapi.Utils;
using Microsoft.Extensions.Logging;
using Microsoft.Win32; using Microsoft.Win32;
using MvvmCross.Commands; using MvvmCross.Commands;
using MvvmCross.Navigation; using MvvmCross.Navigation;
@ -20,7 +19,6 @@ namespace auto_creamapi.ViewModels
private readonly ICacheService _cache; private readonly ICacheService _cache;
private readonly ICreamConfigService _config; private readonly ICreamConfigService _config;
private readonly ILogger<MainViewModel> _logger;
private readonly ICreamDllService _dll; private readonly ICreamDllService _dll;
private readonly IMvxNavigationService _navigationService; private readonly IMvxNavigationService _navigationService;
private int _appId; private int _appId;
@ -45,10 +43,9 @@ namespace auto_creamapi.ViewModels
//private const string DlcRegexPattern = @"(?<id>.*) *= *(?<name>.*)"; //private const string DlcRegexPattern = @"(?<id>.*) *= *(?<name>.*)";
public MainViewModel(ICacheService cache, ICreamConfigService config, ICreamDllService dll, public MainViewModel(ICacheService cache, ICreamConfigService config, ICreamDllService dll,
IMvxNavigationService navigationService, ILoggerFactory loggerFactory) IMvxNavigationService navigationService)
{ {
_navigationService = navigationService; _navigationService = navigationService;
_logger = loggerFactory.CreateLogger<MainViewModel>();
_cache = cache; _cache = cache;
_config = config; _config = config;
_dll = dll; _dll = dll;
@ -59,7 +56,7 @@ namespace auto_creamapi.ViewModels
{ {
base.Prepare(); base.Prepare();
_config.Initialize(); _config.Initialize();
var tasks = new List<Task> { _cache.Initialize() }; var tasks = new List<Task> {_cache.Initialize()};
if (!File.Exists("steam_api.dll") | !File.Exists("steam_api64.dll")) if (!File.Exists("steam_api.dll") | !File.Exists("steam_api64.dll"))
tasks.Add(_navigationService.Navigate<DownloadViewModel>()); tasks.Add(_navigationService.Navigate<DownloadViewModel>());
//tasks.Add(_navigationService.Navigate<DownloadViewModel>()); //tasks.Add(_navigationService.Navigate<DownloadViewModel>());
@ -72,6 +69,11 @@ namespace auto_creamapi.ViewModels
Status = "Ready."; Status = "Ready.";
} }
public override Task Initialize()
{
return base.Initialize();
}
// // COMMANDS // // // // COMMANDS // //
public IMvxCommand OpenFileCommand => new MvxAsyncCommand(OpenFile); public IMvxCommand OpenFileCommand => new MvxAsyncCommand(OpenFile);
@ -86,8 +88,6 @@ namespace auto_creamapi.ViewModels
public IMvxCommand GoToForumThreadCommand => new MvxCommand(GoToForumThread); public IMvxCommand GoToForumThreadCommand => new MvxCommand(GoToForumThread);
public IMvxCommand GoToSteamdbCommand => new MvxCommand(GoToSteamdb);
// // ATTRIBUTES // // // // ATTRIBUTES // //
public bool MainWindowEnabled public bool MainWindowEnabled
@ -275,7 +275,7 @@ namespace auto_creamapi.ViewModels
var s = index > -1 ? strings[index] : null; var s = index > -1 ? strings[index] : null;
if (s != null) GameName = s; if (s != null) GameName = s;
await Search().ConfigureAwait(false); await Search().ConfigureAwait(false);
// await GetListOfDlc().ConfigureAwait(false); await GetListOfDlc().ConfigureAwait(false);
} }
Status = "Ready."; Status = "Ready.";
@ -311,11 +311,11 @@ namespace auto_creamapi.ViewModels
} }
} }
// await GetListOfDlc().ConfigureAwait(false); await GetListOfDlc().ConfigureAwait(false);
} }
else else
{ {
_logger.LogWarning("Empty game name, cannot initiate search!"); MyLogger.Log.Warning("Empty game name, cannot initiate search!");
} }
MainWindowEnabled = true; MainWindowEnabled = true;
@ -323,10 +323,10 @@ namespace auto_creamapi.ViewModels
private async Task GetListOfDlc() private async Task GetListOfDlc()
{ {
Status = "Trying to get DLC, please wait..."; Status = "Trying to get DLC...";
if (AppId > 0) if (AppId > 0)
{ {
var app = new SteamApp { AppId = AppId, Name = GameName }; var app = new SteamApp {AppId = AppId, Name = GameName};
var task = _cache.GetListOfDlc(app, UseSteamDb, IgnoreUnknown); var task = _cache.GetListOfDlc(app, UseSteamDb, IgnoreUnknown);
MainWindowEnabled = false; MainWindowEnabled = false;
var listOfDlc = await task.ConfigureAwait(false); var listOfDlc = await task.ConfigureAwait(false);
@ -346,7 +346,7 @@ namespace auto_creamapi.ViewModels
else else
{ {
Status = $"Could not get DLC for AppID {AppId}"; Status = $"Could not get DLC for AppID {AppId}";
_logger.LogError("GetListOfDlc: Invalid AppID {AppId}", AppId); MyLogger.Log.Error($"GetListOfDlc: Invalid AppID {AppId}");
} }
} }
@ -385,7 +385,9 @@ namespace auto_creamapi.ViewModels
{ {
var searchTerm = AppId; //$"{GameName.Replace(" ", "+")}+{appId}"; var searchTerm = AppId; //$"{GameName.Replace(" ", "+")}+{appId}";
var destinationUrl = 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 uri = new Uri(destinationUrl);
var process = new ProcessStartInfo(uri.AbsoluteUri) var process = new ProcessStartInfo(uri.AbsoluteUri)
{ {
@ -395,29 +397,7 @@ namespace auto_creamapi.ViewModels
} }
else else
{ {
_logger.LogError("OpenURL: Invalid AppID {AppId}", AppId); MyLogger.Log.Error($"OpenURL: Invalid 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);
Status = $"Could not open URL: Invalid AppID {AppId}"; Status = $"Could not open URL: Invalid AppID {AppId}";
} }
} }

13
auto-creamapi/ViewModels/SearchResultViewModel.cs
View File

@ -2,7 +2,6 @@ using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using auto_creamapi.Models; using auto_creamapi.Models;
using auto_creamapi.Utils; using auto_creamapi.Utils;
using Microsoft.Extensions.Logging;
using MvvmCross.Commands; using MvvmCross.Commands;
using MvvmCross.Logging; using MvvmCross.Logging;
using MvvmCross.Navigation; using MvvmCross.Navigation;
@ -14,18 +13,16 @@ namespace auto_creamapi.ViewModels
IMvxViewModel<IEnumerable<SteamApp>, SteamApp> IMvxViewModel<IEnumerable<SteamApp>, SteamApp>
{ {
private readonly IMvxNavigationService _navigationService; private readonly IMvxNavigationService _navigationService;
private readonly ILogger<SearchResultViewModel> _logger;
private IEnumerable<SteamApp> _steamApps; private IEnumerable<SteamApp> _steamApps;
/*public override async Task Initialize() /*public override async Task Initialize()
{ {
await base.Initialize(); await base.Initialize();
}*/ }*/
public SearchResultViewModel(ILoggerFactory loggerFactory, IMvxNavigationService navigationService) : base( public SearchResultViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService) : base(
loggerFactory, navigationService) logProvider, navigationService)
{ {
_navigationService = navigationService; _navigationService = navigationService;
_logger = loggerFactory.CreateLogger<SearchResultViewModel>();
} }
public IEnumerable<SteamApp> Apps public IEnumerable<SteamApp> Apps
@ -58,11 +55,9 @@ namespace auto_creamapi.ViewModels
public override void ViewDestroy(bool viewFinishing = true) public override void ViewDestroy(bool viewFinishing = true)
{ {
if (viewFinishing && CloseCompletionSource?.Task.IsCompleted == false && if (viewFinishing && CloseCompletionSource != null && !CloseCompletionSource.Task.IsCompleted &&
!CloseCompletionSource.Task.IsFaulted) !CloseCompletionSource.Task.IsFaulted)
{
CloseCompletionSource?.TrySetCanceled(); CloseCompletionSource?.TrySetCanceled();
}
base.ViewDestroy(viewFinishing); base.ViewDestroy(viewFinishing);
} }
@ -71,7 +66,7 @@ namespace auto_creamapi.ViewModels
{ {
if (Selected != null) if (Selected != null)
{ {
_logger.LogInformation("Successfully got app {Selected}", Selected); MyLogger.Log.Information($"Successfully got app {Selected}");
await _navigationService.Close(this, Selected).ConfigureAwait(false); await _navigationService.Close(this, Selected).ConfigureAwait(false);
} }
} }

15
auto-creamapi/Views/MainView.xaml
View File

@ -56,18 +56,9 @@
<wcl:WatermarkTextBox Text="{Binding AppId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" <wcl:WatermarkTextBox Text="{Binding AppId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Right" Margin="0,10,10,0" Watermark="AppID" TextWrapping="Wrap" HorizontalAlignment="Right" Margin="0,10,10,0" Watermark="AppID" TextWrapping="Wrap"
VerticalAlignment="Top" Width="120" Padding="0" Grid.Row="1" /> VerticalAlignment="Top" Width="120" Padding="0" Grid.Row="1" />
<Grid Grid.Row="2" Margin="10,10,0,0"> <TextBlock Grid.Row="2" Margin="10,10,10,0">
<Grid.ColumnDefinitions> <Hyperlink Command="{Binding GoToForumThreadCommand}">Search for cs.rin.ru thread</Hyperlink>
<ColumnDefinition Width="Auto"/> </TextBlock>
<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>
<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}" <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" /> HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="120" Grid.Row="3" />
<CheckBox Content="Force offline mode" IsChecked="{Binding Offline, Mode=TwoWay}" <CheckBox Content="Force offline mode" IsChecked="{Binding Offline, Mode=TwoWay}"

99
auto-creamapi/auto-creamapi.csproj
View File

@ -1,58 +1,55 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>auto_creamapi</RootNamespace> <RootNamespace>auto_creamapi</RootNamespace>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<PackageVersion>2.2.0</PackageVersion> <PackageVersion>2.1.6</PackageVersion>
<Title>auto-creamapi</Title> <Title>auto-creamapi</Title>
<Authors>Jeddunk</Authors> <Authors>Jeddunk</Authors>
<Company>jeddunk.xyz</Company> <Company>jeddunk.xyz</Company>
<AssemblyVersion>2.2.0</AssemblyVersion> <AssemblyVersion>2.1.6</AssemblyVersion>
<FileVersion>2.2.0</FileVersion> <FileVersion>2.1.6</FileVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>none</DebugType> <DebugType>none</DebugType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AngleSharp" Version="1.0.7" /> <PackageReference Include="AngleSharp" Version="0.14.0" />
<PackageReference Include="Ben.Demystifier" Version="0.4.1" /> <PackageReference Include="bloomtom.HttpProgress" Version="2.3.2" />
<PackageReference Include="bloomtom.HttpProgress" Version="2.3.2" /> <PackageReference Include="Dirkster.WatermarkControlsLib" Version="1.1.0" />
<PackageReference Include="Dirkster.WatermarkControlsLib" Version="1.1.0" /> <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
<PackageReference Include="ini-parser-netstandard" Version="2.5.2" /> <PackageReference Include="MvvmCross" Version="7.1.2" />
<PackageReference Include="MvvmCross" Version="8.0.2" /> <PackageReference Include="MvvmCross.Platforms.Wpf" Version="7.1.2" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="8.0.2" /> <PackageReference Include="MvvmCross.Plugin.Messenger" Version="7.1.2" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="8.0.2" /> <PackageReference Include="NinjaNye.SearchExtensions" Version="3.0.1" />
<PackageReference Include="NinjaNye.SearchExtensions" Version="3.0.1" /> <PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog" Version="3.1.1" /> <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" /> <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" /> <PackageReference Include="Squid-Box.SevenZipSharp" Version="1.3.283" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" /> <PackageReference Include="SteamStorefrontAPI.NETStandard" Version="1.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> </ItemGroup>
<PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.1.23" />
<PackageReference Include="SteamStorefrontAPI" Version="2.0.1.421" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="App.xaml" /> <Page Include="App.xaml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="README.md"> <Content Include="README.md">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="COPYING"> <Content Include="COPYING">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="resources\CourierPrime-Regular.ttf"> <Content Include="resources\CourierPrime-Regular.ttf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="resources\7z.dll"> <Content Include="resources\7z.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
</Project> </Project>