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

Update to MvvmCross 8; Replace SteamfrontendAPI with fork to fix DLC issues; code refactoring

Browse Source
This commit is contained in:
Jeddunk 2023-12-23 22:55:26 +01:00
parent 991f52e87e
commit 95361440f6
12 changed files with 89 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

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

1
SteamStorefrontAPI Submodule

@ -0,0 +1 @@
Subproject commit 45608312c692631476c3244e7e6560dd2935f895

10
auto-creamapi.sln
View File

@ -1,10 +1,12 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.30413.136 VisualStudioVersion = 17.8.34330.188
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
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamStorefrontAPI", "SteamStorefrontAPI\SteamStorefrontAPI\SteamStorefrontAPI.csproj", "{ECDB602D-4823-4F8E-8BAA-9554A08FA90F}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -15,6 +17,10 @@ Global
{26060B32-199E-4366-8FDE-6B1E10E0EF62}.Debug|Any CPU.Build.0 = Debug|Any CPU {26060B32-199E-4366-8FDE-6B1E10E0EF62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26060B32-199E-4366-8FDE-6B1E10E0EF62}.Release|Any CPU.ActiveCfg = Release|Any CPU {26060B32-199E-4366-8FDE-6B1E10E0EF62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26060B32-199E-4366-8FDE-6B1E10E0EF62}.Release|Any CPU.Build.0 = Release|Any CPU {26060B32-199E-4366-8FDE-6B1E10E0EF62}.Release|Any CPU.Build.0 = Release|Any CPU
{ECDB602D-4823-4F8E-8BAA-9554A08FA90F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ECDB602D-4823-4F8E-8BAA-9554A08FA90F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ECDB602D-4823-4F8E-8BAA-9554A08FA90F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ECDB602D-4823-4F8E-8BAA-9554A08FA90F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

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<MvxWpfSetup<Core.MainApplication>>(); this.RegisterSetupType<Setup>();
} }
} }
} }

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

@ -31,24 +31,26 @@ 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 : new ObservableCollection<SteamApp>(); return stringToDlcList.GetType() == targetType ? stringToDlcList : [];
} }
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;

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

@ -37,7 +37,7 @@ namespace auto_creamapi.Services
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) " + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) " +
"Chrome/87.0.4280.88 Safari/537.36"; "Chrome/87.0.4280.88 Safari/537.36";
private HashSet<SteamApp> _cache = new HashSet<SteamApp>(); private HashSet<SteamApp> _cache = [];
public async Task Initialize() public async Task Initialize()
{ {
@ -113,7 +113,7 @@ namespace auto_creamapi.Services
{ {
MyLogger.Log.Debug("Type for Steam App {Name}: \"{Type}\"", steamApp.Name, MyLogger.Log.Debug("Type for Steam App {Name}: \"{Type}\"", steamApp.Name,
steamAppDetails.Type); steamAppDetails.Type);
if (steamAppDetails.Type == "game" | steamAppDetails.Type == "demo") if (steamAppDetails.Type == "game" || steamAppDetails.Type == "demo")
{ {
steamAppDetails.DLC.ForEach(x => steamAppDetails.DLC.ForEach(x =>
{ {
@ -121,8 +121,8 @@ namespace auto_creamapi.Services
if (result == null) return; if (result == null) return;
var dlcDetails = AppDetails.GetAsync(x).Result; var dlcDetails = AppDetails.GetAsync(x).Result;
dlcList.Add(dlcDetails != null dlcList.Add(dlcDetails != null
? new SteamApp {AppId = dlcDetails.SteamAppId, Name = dlcDetails.Name} ? new SteamApp { AppId = dlcDetails.SteamAppId, Name = dlcDetails.Name }
: new SteamApp {AppId = x, Name = $"Unknown DLC {x}"}); : new SteamApp { AppId = x, Name = $"Unknown DLC {x}" });
}); });
dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name)); dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name));
@ -130,10 +130,6 @@ namespace auto_creamapi.Services
if (!useSteamDb) return dlcList; 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 steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/");
var client = new HttpClient(); var client = new HttpClient();
@ -143,7 +139,9 @@ namespace auto_creamapi.Services
var httpCall = client.GetAsync(steamDbUri); var httpCall = client.GetAsync(steamDbUri);
var response = await httpCall.ConfigureAwait(false); var response = await httpCall.ConfigureAwait(false);
MyLogger.Log.Debug("{Status}", httpCall.Status.ToString()); MyLogger.Log.Debug("{Status}", httpCall.Status.ToString());
MyLogger.Log.Debug("{Boolean}", response.EnsureSuccessStatusCode().ToString()); MyLogger.Log.Debug("{Boolean}", response.IsSuccessStatusCode.ToString());
response.EnsureSuccessStatusCode();
var readAsStringAsync = response.Content.ReadAsStringAsync(); var readAsStringAsync = response.Content.ReadAsStringAsync();
var responseBody = await readAsStringAsync.ConfigureAwait(false); var responseBody = await readAsStringAsync.ConfigureAwait(false);
@ -171,7 +169,7 @@ namespace auto_creamapi.Services
} }
else else
{ {
var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName}; var dlcApp = new SteamApp { AppId = Convert.ToInt32(dlcId), Name = dlcName };
var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId)); var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId));
if (i > -1) if (i > -1)
{ {

29
auto-creamapi/Setup.cs Normal file
View File

@ -0,0 +1,29 @@
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();
}
}
}

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 class Misc public static 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 ObservableCollection<string>(new[] public static readonly ObservableCollection<string> DefaultLanguages = new(new[]
{ {
"arabic", "arabic",
"bulgarian", "bulgarian",

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

@ -5,6 +5,7 @@ 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.Logging;
using MvvmCross.Navigation; using MvvmCross.Navigation;
using MvvmCross.Plugin.Messenger; using MvvmCross.Plugin.Messenger;
@ -12,24 +13,26 @@ 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;
public DownloadViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService, public DownloadViewModel(ILoggerFactory loggerFactory, IMvxNavigationService navigationService,
IDownloadCreamApiService download, IMvxMessenger messenger) : base(logProvider, 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);
MyLogger.Log.Debug("{Count}", messenger.CountSubscriptionsFor<ProgressMessage>()); _logger.LogDebug("{Count}", messenger.CountSubscriptionsFor<ProgressMessage>());
} }
public string InfoLabel public string InfoLabel

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

@ -7,6 +7,7 @@ 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;
@ -19,6 +20,7 @@ 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;
@ -43,9 +45,10 @@ 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) IMvxNavigationService navigationService, ILoggerFactory loggerFactory)
{ {
_navigationService = navigationService; _navigationService = navigationService;
_logger = loggerFactory.CreateLogger<MainViewModel>();
_cache = cache; _cache = cache;
_config = config; _config = config;
_dll = dll; _dll = dll;
@ -56,7 +59,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>());
@ -310,7 +313,7 @@ namespace auto_creamapi.ViewModels
} }
else else
{ {
MyLogger.Log.Warning("Empty game name, cannot initiate search!"); _logger.LogWarning("Empty game name, cannot initiate search!");
} }
MainWindowEnabled = true; MainWindowEnabled = true;
@ -321,7 +324,7 @@ namespace auto_creamapi.ViewModels
Status = "Trying to get DLC..."; 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);
@ -341,7 +344,7 @@ namespace auto_creamapi.ViewModels
else else
{ {
Status = $"Could not get DLC for AppID {AppId}"; Status = $"Could not get DLC for AppID {AppId}";
MyLogger.Log.Error("GetListOfDlc: Invalid AppID {AppId}", AppId); _logger.LogError("GetListOfDlc: Invalid AppID {AppId}", AppId);
} }
} }
@ -392,7 +395,7 @@ namespace auto_creamapi.ViewModels
} }
else else
{ {
MyLogger.Log.Error("OpenURL: Invalid AppID {AppId}", AppId); _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,6 +2,7 @@ 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;
@ -13,16 +14,18 @@ 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(IMvxLogProvider logProvider, IMvxNavigationService navigationService) : base( public SearchResultViewModel(ILoggerFactory loggerFactory, IMvxNavigationService navigationService) : base(
logProvider, navigationService) loggerFactory, navigationService)
{ {
_navigationService = navigationService; _navigationService = navigationService;
_logger = loggerFactory.CreateLogger<SearchResultViewModel>();
} }
public IEnumerable<SteamApp> Apps public IEnumerable<SteamApp> Apps
@ -55,9 +58,11 @@ namespace auto_creamapi.ViewModels
public override void ViewDestroy(bool viewFinishing = true) public override void ViewDestroy(bool viewFinishing = true)
{ {
if (viewFinishing && CloseCompletionSource != null && !CloseCompletionSource.Task.IsCompleted && if (viewFinishing && CloseCompletionSource?.Task.IsCompleted == false &&
!CloseCompletionSource.Task.IsFaulted) !CloseCompletionSource.Task.IsFaulted)
{
CloseCompletionSource?.TrySetCanceled(); CloseCompletionSource?.TrySetCanceled();
}
base.ViewDestroy(viewFinishing); base.ViewDestroy(viewFinishing);
} }
@ -66,7 +71,7 @@ namespace auto_creamapi.ViewModels
{ {
if (Selected != null) if (Selected != null)
{ {
MyLogger.Log.Information("Successfully got app {Selected}", Selected); _logger.LogInformation("Successfully got app {Selected}", Selected);
await _navigationService.Close(this, Selected).ConfigureAwait(false); await _navigationService.Close(this, Selected).ConfigureAwait(false);
} }
} }

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

@ -23,16 +23,16 @@
<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="3.1.1" /> <PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" /> <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.Console" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.1.23" /> <PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.1.23" />
<PackageReference Include="SteamStorefrontAPI.NETStandard" Version="1.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -54,4 +54,8 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SteamStorefrontAPI\SteamStorefrontAPI\SteamStorefrontAPI.csproj" />
</ItemGroup>
</Project> </Project>