Remove old SteamStorefrontAPI fork

Fixed incorrect logging syntax.

.gitmodules

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

auto-creamapi.sln

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

auto-creamapi/App.xaml.cs

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

auto-creamapi/Converters/ListOfDLcToStringConverter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
@@ -19,6 +20,7 @@ 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 : "";
@@ -29,30 +31,32 @@ namespace auto_creamapi.Converters
         {
             MyLogger.Log.Debug("ListOfDLcToStringConverter: ConvertBack");
             var stringToDlcList = StringToDlcList(value);
-            return stringToDlcList.GetType() == targetType ? stringToDlcList : new ObservableCollection<SteamApp>();
+            return stringToDlcList.GetType() == targetType ? stringToDlcList : [];
         }
 
         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(ObservableCollection<SteamApp> value)
+        private static string DlcListToString(IEnumerable<SteamApp> value)
         {
             var result = "";
             //value.ForEach(x => result += $"{x}\n");

auto-creamapi/Core/MainApplication.cs

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

auto-creamapi/MainWindow.xaml

@@ -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="600" Width="420" Height="600">
+    Title="Auto-CreamAPI 2" MinWidth="420" MinHeight="640" Width="560" Height="720">
     <Grid />
 </views:MvxWindow>

auto-creamapi/Services/CacheService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -24,7 +25,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);
+        public Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb, bool ignoreUnknown);
     }
 
     public class CacheService : ICacheService
@@ -32,11 +33,7 @@ namespace auto_creamapi.Services
         private const string CachePath = "steamapps.json";
         private const string SteamUri = "https://api.steampowered.com/ISteamApps/GetAppList/v2/";
 
-        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>();
+        private HashSet<SteamApp> _cache = [];
 
         public async Task Initialize()
         {
@@ -65,10 +62,10 @@ namespace auto_creamapi.Services
             var httpCall = client.GetAsync(SteamUri);
             var response = await httpCall.ConfigureAwait(false);
             var readAsStringAsync = response.Content.ReadAsStringAsync();
-            var responseBody = await 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);
+            await File.WriteAllTextAsync(CachePath, responseBody, Encoding.UTF8).ConfigureAwait(false);
             var cacheString = responseBody;
             MyLogger.Log.Information("Cache written to file successfully.");
             return cacheString;
@@ -84,70 +81,84 @@ namespace auto_creamapi.Services
 
         public SteamApp GetAppByName(string name)
         {
-            MyLogger.Log.Information($"Trying to get app {name}");
+            MyLogger.Log.Information("Trying to get app {Name}", 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}");
+            if (app != null) MyLogger.Log.Information("Successfully got app {App}", app);
             return app;
         }
 
         public SteamApp GetAppById(int appid)
         {
-            MyLogger.Log.Information($"Trying to get app with ID {appid}");
+            MyLogger.Log.Information("Trying to get app with ID {AppId}", appid);
             var app = _cache.FirstOrDefault(x => x.AppId.Equals(appid));
-            if (app != null) MyLogger.Log.Information($"Successfully got app {app}");
+            if (app != null) MyLogger.Log.Information("Successfully got app {App}", app);
             return app;
         }
 
-        public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb)
+        public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb, bool ignoreUnknown)
         {
-            MyLogger.Log.Information("Get DLC");
+            MyLogger.Log.Debug("Start: GetListOfDlc");
             var dlcList = new List<SteamApp>();
-            if (steamApp != null)
+            try
             {
-                var steamAppDetails = await AppDetails.GetAsync(steamApp.AppId).ConfigureAwait(false);
-                if (steamAppDetails != null)
+                if (steamApp != null)
                 {
-                    MyLogger.Log.Debug($"Type for Steam App {steamApp.Name}: \"{steamAppDetails.Type}\"");
-                    if (steamAppDetails.Type == "game" | steamAppDetails.Type == "demo")
+                    var steamAppDetails = await AppDetails.GetAsync(steamApp.AppId).ConfigureAwait(false);
+                    if (steamAppDetails != null)
                     {
-                        steamAppDetails?.DLC.ForEach(x =>
+                        MyLogger.Log.Debug("Type for Steam App {Name}: \"{Type}\"", steamApp.Name,
+                            steamAppDetails.Type);
+                        if (steamAppDetails.Type == "game" || steamAppDetails.Type == "demo")
                         {
-                            var result = _cache.FirstOrDefault(y => y.AppId.Equals(x)) ??
-                                         new SteamApp {AppId = x, Name = $"Unknown DLC {x}"};
-                            dlcList.Add(result);
-                        });
+                            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...");
+                            dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name));
+                            MyLogger.Log.Information("Got DLC successfully...");
 
-                        // 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/");
+                            // Return if Steam DB is deactivated
+                            if (!useSteamDb) return dlcList;
 
-                            /* var handler = new ClearanceHandler();
-                
-                    var client = new HttpClient(handler);
-    
-                    var content = client.GetStringAsync(steamDbUri).Result;
-                    MyLogger.Log.Debug(content); */
+                            string steamDbUrl = $"https://steamdb.info/app/{steamApp.AppId}/dlc/";
 
                             var client = new HttpClient();
-                            client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
+                            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(steamDbUri);
-                            var response = await httpCall;
-                            MyLogger.Log.Debug(httpCall.Status.ToString());
-                            MyLogger.Log.Debug(response.EnsureSuccessStatusCode().ToString());
+                            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;
-                            MyLogger.Log.Debug(readAsStringAsync.Status.ToString());
+                            var responseBody = await readAsStringAsync.ConfigureAwait(false);
+                            MyLogger.Log.Debug("{Status}", readAsStringAsync.Status.ToString());
 
                             var parser = new HtmlParser();
                             var doc = parser.ParseDocument(responseBody);
@@ -160,23 +171,31 @@ 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");
-                                    if (query3 != null) dlcName = query3[1].Text().Replace("\n", "").Trim();
+                                    var dlcName = query3 == null
+                                        ? $"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 (i > -1)
+                                    if (ignoreUnknown && dlcName.Contains("SteamDB Unknown App"))
                                     {
-                                        if (dlcList[i].Name.Contains("Unknown DLC")) dlcList[i] = dlcApp;
+                                        MyLogger.Log.Information("Skipping SteamDB Unknown App {DlcId}", dlcId);
                                     }
                                     else
                                     {
-                                        dlcList.Add(dlcApp);
+                                        var dlcApp = new SteamApp { AppId = Convert.ToInt32(dlcId), Name = dlcName };
+                                        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($"{x.AppId}={x.Name}"));
+                                dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name));
                                 MyLogger.Log.Information("Got DLC from SteamDB successfully...");
                             }
                             else
@@ -184,20 +203,27 @@ 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\"");
+                        }
                     }
                     else
                     {
-                        MyLogger.Log.Error("Could not get DLC: Steam App is not of type: \"Game\"");
+                        MyLogger.Log.Error("Could not get DLC: Could not get Steam App details");
                     }
                 }
                 else
                 {
-                    MyLogger.Log.Error("Could not get DLC...");
+                    MyLogger.Log.Error("Could not get DLC: Invalid Steam App");
                 }
+
+                //return dlcList;
             }
-            else
+            catch (Exception e)
             {
-                MyLogger.Log.Error("Could not get DLC: Invalid Steam App");
+                MyLogger.Log.Error("Could not get DLC!");
+                MyLogger.Log.Debug(e.Demystify(), "Exception thrown!");
             }
 
             return dlcList;

auto-creamapi/Services/CreamConfigService.cs

@@ -38,7 +38,7 @@ namespace auto_creamapi.Services
             bool unlockAll,
             bool extraProtection,
             bool forceOffline,
-            ObservableCollection<SteamApp> dlcList);
+            IEnumerable<SteamApp> dlcList);
 
         public bool ConfigExists();
     }
@@ -47,7 +47,7 @@ namespace auto_creamapi.Services
     {
         private string _configFilePath;
 
-        public CreamConfig Config { get; set; }
+        public CreamConfig Config { get; private 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...");
+                MyLogger.Log.Information("Config file found @ {ConfigFilePath}, parsing...", configFilePath);
                 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...");
+                MyLogger.Log.Information("Config file does not exist @ {ConfigFilePath}, skipping...", configFilePath);
                 ResetConfigData();
             }
         }
@@ -144,7 +144,7 @@ namespace auto_creamapi.Services
             bool unlockAll,
             bool extraProtection,
             bool forceOffline,
-            ObservableCollection<SteamApp> dlcList)
+            IEnumerable<SteamApp> dlcList)
         {
             Config.AppId = appId;
             Config.Language = language;

auto-creamapi/Services/CreamDllService.cs

@@ -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: {x86File}");
-            if (_x64Exists) MyLogger.Log.Information($"x64 SteamAPI DLL found: {x64File}");
+            if (_x86Exists) MyLogger.Log.Information("x86 SteamAPI DLL found: {X}", x86File);
+            if (_x64Exists) MyLogger.Log.Information("x64 SteamAPI DLL found: {X}", 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})");
+            MyLogger.Log.Information("Setting up CreamAPI DLL @ {TargetPath} (arch :{Arch})", TargetPath, arch);
             // Create backup of steam_api.dll
             File.Copy(targetSteamApiDll, targetSteamApiDllBackup, true);
             // Check if steam_api_o.dll already exists
@@ -103,16 +103,13 @@ namespace auto_creamapi.Services
 
         private static string GetHash(string filename)
         {
-            if (File.Exists(filename))
-            {
-                using var md5 = MD5.Create();
-                using var stream = File.OpenRead(filename);
-                return BitConverter
-                    .ToString(md5.ComputeHash(stream))
-                    .Replace("-", string.Empty);
-            }
+            if (!File.Exists(filename)) return "";
+            using var md5 = MD5.Create();
+            using var stream = File.OpenRead(filename);
+            return BitConverter
+                .ToString(md5.ComputeHash(stream))
+                .Replace("-", string.Empty);
 
-            return "";
         }
     }
 }

auto-creamapi/Services/DownloadCreamApiService.cs

@@ -4,7 +4,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using auto_creamapi.Messenger;
@@ -17,8 +16,6 @@ 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);
     }
@@ -26,10 +23,7 @@ namespace auto_creamapi.Services
     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)
         {
@@ -42,6 +36,8 @@ 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),
@@ -50,23 +46,26 @@ 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);
-            MyLogger.Log.Debug($"Login Status Code: {response1.EnsureSuccessStatusCode().StatusCode.ToString()}");
+            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 cookie = container.GetCookies(new Uri("https://cs.rin.ru/forum/ucp.php?mode=login"))
                 .FirstOrDefault(c => c.Name.Contains("_sid"));
-            MyLogger.Log.Debug($"Login Cookie: {cookie}");
-            var response2 = await client.GetAsync("https://cs.rin.ru/forum/viewtopic.php?t=70576");
-            MyLogger.Log.Debug(
-                $"Download Page Status Code: {response2.EnsureSuccessStatusCode().StatusCode.ToString()}");
+            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);
             var content = response2.Content.ReadAsStringAsync();
-            var contentResult = await content;
+            var contentResult = await content.ConfigureAwait(false);
 
             var expression =
                 new Regex(".*<a href=\"\\.(?<url>\\/download\\/file\\.php\\?id=.*)\">(?<filename>.*)<\\/a>.*");
             using var reader = new StringReader(contentResult);
             string line;
             var archiveFileList = new Dictionary<string, string>();
-            while ((line = await reader.ReadLineAsync()) != null)
+            while ((line = await reader.ReadLineAsync().ConfigureAwait(false)) != null)
             {
                 var match = expression.Match(line);
                 // ReSharper disable once InvertIf
@@ -74,16 +73,15 @@ namespace auto_creamapi.Services
                 {
                     archiveFileList.Add(match.Groups["filename"].Value,
                         $"https://cs.rin.ru/forum{match.Groups["url"].Value}");
-                    MyLogger.Log.Debug(archiveFileList.LastOrDefault().Key);
+                    MyLogger.Log.Debug("{X}", 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...");
+                MyLogger.Log.Information("{Filename} already exists, skipping download...", filename);
                 return filename;
             }
 
@@ -92,7 +90,7 @@ 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);
-            var response = await task;
+            await task.ConfigureAwait(false);
             if (task.IsCompletedSuccessfully)
                 _messenger.Publish(new ProgressMessage(this, "Downloading...", filename, 1.0));
             MyLogger.Log.Information("Download done.");
@@ -106,23 +104,39 @@ namespace auto_creamapi.Services
             const string nonlogBuild = "nonlog_build";
             const string steamApi64Dll = "steam_api64.dll";
             const string steamApiDll = "steam_api.dll";
-            MyLogger.Log.Information($@"Start extraction of ""{filename}""...");
-            var expression1 = new Regex(@"nonlog_build\\steam_api(?:64)?\.dll");
+            MyLogger.Log.Information(@"Start extraction of ""{Filename}""...", filename);
+            var nonlogBuildPath = Path.Combine(cwd, nonlogBuild);
+            if (Directory.Exists(nonlogBuildPath))
+                Directory.Delete(nonlogBuildPath, true);
             _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})
             {
-                await extractor.ExtractFilesAsync(cwd,
-                    $"{nonlogBuild}\\{steamApi64Dll}",
-                    $"{nonlogBuild}\\{steamApiDll}");
+                await extractor.ExtractFilesAsync(
+                    cwd,
+                    $@"{nonlogBuild}\{steamApi64Dll}",
+                    $@"{nonlogBuild}\{steamApiDll}"
+                ).ConfigureAwait(false);
             }
-            if (File.Exists(Path.Combine(cwd, nonlogBuild, steamApi64Dll)))
-              File.Move(Path.Combine(cwd, nonlogBuild, steamApi64Dll), Path.Combine(cwd, steamApi64Dll));
-            if (File.Exists(Path.Combine(cwd, nonlogBuild, steamApiDll)))
-                File.Move(Path.Combine(cwd, nonlogBuild, steamApiDll), Path.Combine(cwd, steamApiDll));
-            Directory.Delete(Path.Combine(cwd, nonlogBuild));
+
+            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!");
         }
     }

auto-creamapi/Setup.cs

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

auto-creamapi/Utils/AvailabeArchive.cs

@@ -0,0 +1,35 @@
+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; }
+    }
+}

auto-creamapi/Utils/ISecrets.cs

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

auto-creamapi/Utils/Misc.cs

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

auto-creamapi/Utils/MyLogger.cs

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

auto-creamapi/Utils/Secrets.EXAMPLE.cs

@@ -1,14 +0,0 @@
-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";
-    }
-}

auto-creamapi/ViewModels/DownloadViewModel.cs

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

auto-creamapi/ViewModels/MainViewModel.cs

@@ -7,6 +7,7 @@ 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;
@@ -19,6 +20,7 @@ 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;
@@ -38,26 +40,31 @@ 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)
+            IMvxNavigationService navigationService, ILoggerFactory loggerFactory)
         {
             _navigationService = navigationService;
+            _logger = loggerFactory.CreateLogger<MainViewModel>();
             _cache = cache;
             _config = config;
             _dll = dll;
             //_download = download;
         }
 
-        public override async Task Initialize()
+        public override async void Prepare()
         {
+            base.Prepare();
             _config.Initialize();
-            var tasks = new List<Task> {base.Initialize(), _cache.Initialize()};
+            var tasks = new List<Task> { _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);
+            await Task.WhenAll(tasks).ConfigureAwait(false);
             Languages = new ObservableCollection<string>(Misc.DefaultLanguages);
             ResetForm();
             UseSteamDb = true;
@@ -69,7 +76,7 @@ namespace auto_creamapi.ViewModels
 
         public IMvxCommand OpenFileCommand => new MvxAsyncCommand(OpenFile);
 
-        public IMvxCommand SearchCommand => new MvxAsyncCommand(async () => await Search()); //Command(Search);
+        public IMvxCommand SearchCommand => new MvxAsyncCommand(async () => await Search().ConfigureAwait(false)); //Command(Search);
 
         public IMvxCommand GetListOfDlcCommand => new MvxAsyncCommand(GetListOfDlc);
 
@@ -79,6 +86,8 @@ namespace auto_creamapi.ViewModels
 
         public IMvxCommand GoToForumThreadCommand => new MvxCommand(GoToForumThread);
 
+        public IMvxCommand GoToSteamdbCommand => new MvxCommand(GoToSteamdb);
+
         // // ATTRIBUTES // //
 
         public bool MainWindowEnabled
@@ -108,7 +117,6 @@ namespace auto_creamapi.ViewModels
             {
                 _gameName = value;
                 RaisePropertyChanged(() => GameName);
-                //MyLogger.Log.Debug($"GameName: {value}");
             }
         }
 
@@ -130,7 +138,6 @@ namespace auto_creamapi.ViewModels
             {
                 _lang = value;
                 RaisePropertyChanged(() => Lang);
-                //MyLogger.Log.Debug($"Lang: {value}");
             }
         }
 
@@ -224,6 +231,16 @@ namespace auto_creamapi.ViewModels
             }
         }
 
+        public bool IgnoreUnknown
+        {
+            get => _ignoreUnknown;
+            set
+            {
+                _ignoreUnknown = value;
+                RaisePropertyChanged(() => IgnoreUnknown);
+            }
+        }
+
         private async Task OpenFile()
         {
             Status = "Waiting for file...";
@@ -251,12 +268,16 @@ 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();
-                        await GetListOfDlc();
+                        await Search().ConfigureAwait(false);
+                        // await GetListOfDlc().ConfigureAwait(false);
                     }
+
                     Status = "Ready.";
                 }
             }
@@ -281,7 +302,7 @@ namespace auto_creamapi.ViewModels
                     MainWindowEnabled = false;
                     var navigate = _navigationService.Navigate<SearchResultViewModel, IEnumerable<SteamApp>, SteamApp>(
                         _cache.GetListOfAppsByName(GameName));
-                    await navigate;
+                    await navigate.ConfigureAwait(false);
                     var navigateResult = navigate.Result;
                     if (navigateResult != null)
                     {
@@ -289,29 +310,31 @@ namespace auto_creamapi.ViewModels
                         AppId = navigateResult.AppId;
                     }
                 }
-                await GetListOfDlc();
+
+                // await GetListOfDlc().ConfigureAwait(false);
             }
             else
             {
-                MyLogger.Log.Warning("Empty game name, cannot initiate search!");
+                _logger.LogWarning("Empty game name, cannot initiate search!");
             }
+
             MainWindowEnabled = true;
         }
 
         private async Task GetListOfDlc()
         {
-            Status = "Trying to get DLC...";
+            Status = "Trying to get DLC, please wait...";
             if (AppId > 0)
             {
-                var app = new SteamApp {AppId = AppId, Name = GameName};
-                var task = _cache.GetListOfDlc(app, UseSteamDb);
+                var app = new SteamApp { AppId = AppId, Name = GameName };
+                var task = _cache.GetListOfDlc(app, UseSteamDb, IgnoreUnknown);
                 MainWindowEnabled = false;
-                var listOfDlc = await task;
+                var listOfDlc = await task.ConfigureAwait(false);
                 if (task.IsCompletedSuccessfully)
                 {
                     listOfDlc.Sort((app1, app2) => app1.AppId.CompareTo(app2.AppId));
                     Dlcs = new ObservableCollection<SteamApp>(listOfDlc);
-                    Status = $"Got DLC for AppID {AppId}";
+                    Status = $"Got DLC for AppID {AppId} (Count: {Dlcs.Count})";
                 }
                 else
                 {
@@ -323,7 +346,7 @@ namespace auto_creamapi.ViewModels
             else
             {
                 Status = $"Could not get DLC for AppID {AppId}";
-                MyLogger.Log.Error($"GetListOfDlc: Invalid AppID {AppId}");
+                _logger.LogError("GetListOfDlc: Invalid AppID {AppId}", AppId);
             }
         }
 
@@ -362,9 +385,7 @@ 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)
                 {
@@ -374,7 +395,29 @@ namespace auto_creamapi.ViewModels
             }
             else
             {
-                MyLogger.Log.Error($"OpenURL: Invalid AppID {AppId}");
+                _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);
                 Status = $"Could not open URL: Invalid AppID {AppId}";
             }
         }

auto-creamapi/ViewModels/SearchResultViewModel.cs

@@ -2,6 +2,7 @@ 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;
@@ -13,16 +14,18 @@ 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(IMvxLogProvider logProvider, IMvxNavigationService navigationService) : base(
-            logProvider, navigationService)
+        public SearchResultViewModel(ILoggerFactory loggerFactory, IMvxNavigationService navigationService) : base(
+            loggerFactory, navigationService)
         {
             _navigationService = navigationService;
+            _logger = loggerFactory.CreateLogger<SearchResultViewModel>();
         }
 
         public IEnumerable<SteamApp> Apps
@@ -55,9 +58,11 @@ namespace auto_creamapi.ViewModels
 
         public override void ViewDestroy(bool viewFinishing = true)
         {
-            if (viewFinishing && CloseCompletionSource != null && !CloseCompletionSource.Task.IsCompleted &&
+            if (viewFinishing && CloseCompletionSource?.Task.IsCompleted == false &&
                 !CloseCompletionSource.Task.IsFaulted)
+            {
                 CloseCompletionSource?.TrySetCanceled();
+            }
 
             base.ViewDestroy(viewFinishing);
         }
@@ -66,8 +71,8 @@ namespace auto_creamapi.ViewModels
         {
             if (Selected != null)
             {
-                MyLogger.Log.Information($"Successfully got app {Selected}");
-                await _navigationService.Close(this, Selected);
+                _logger.LogInformation("Successfully got app {Selected}", Selected);
+                await _navigationService.Close(this, Selected).ConfigureAwait(false);
             }
         }
 

auto-creamapi/Views/MainView.xaml

@@ -10,7 +10,8 @@
     xmlns:vm="clr-namespace:auto_creamapi.ViewModels"
     d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
     xmlns:converters="clr-namespace:auto_creamapi.Converters"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    d:DesignHeight="720" d:DesignWidth="560">
     <views:MvxWpfView.Resources>
         <converters:ListOfDLcToStringNativeConverter x:Key="DlcConv" />
     </views:MvxWpfView.Resources>
@@ -27,7 +28,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <wcl:WatermarkTextBox Text="{Binding DllPath}" Watermark="Path to game's steam_api(64).dll..."
-                              Margin="10,11,55,0" TextWrapping="NoWrap" VerticalAlignment="Top" Padding="0"
+                              Margin="10,10,55,0" TextWrapping="NoWrap" VerticalAlignment="Top" Padding="0"
                               Grid.Row="0" IsReadOnly="True" IsReadOnlyCaretVisible="True">
             <!--MouseDoubleClick="{Binding Path=OpenFileCommand}"-->
             <wcl:WatermarkTextBox.InputBindings>
@@ -55,9 +56,18 @@
         <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" />
-        <TextBlock Grid.Row="2" Margin="10,10,10,0">
-            <Hyperlink Command="{Binding GoToForumThreadCommand}">Search for cs.rin.ru thread</Hyperlink>
-        </TextBlock>
+        <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>
+            <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}"
@@ -74,6 +84,7 @@
             <GroupBox Header="DLC" Grid.Row="0" VerticalAlignment="Stretch">
                 <Grid>
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
@@ -85,19 +96,22 @@
                     <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...&#xA;0000 = DLC Name"
                         TextWrapping="Wrap" AcceptsReturn="True"
-                        VerticalScrollBarVisibility="Visible" Padding="0"
-                        FontFamily="../resources/#Courier Prime" Grid.Row="2" />
+                        VerticalScrollBarVisibility="Visible" Padding="5,5,5,5"
+                        FontFamily="../resources/#Courier Prime" Grid.Row="3" />
                     <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="3" />
+                            VerticalAlignment="Bottom" Width="108" Command="{Binding GetListOfDlcCommand}" Grid.Row="4" />
                 </Grid>
             </GroupBox>
-            <GroupBox Header="Status" Grid.Row="1" VerticalAlignment="Bottom" IsEnabled="False">
+            <GroupBox Header="Status" Grid.Row="1" VerticalAlignment="Bottom" IsEnabled="False" Margin="0,10,0,0">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />

auto-creamapi/Views/SearchResultView.xaml.cs

@@ -11,38 +11,6 @@ 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();
-        }*/
     }
 }

auto-creamapi/auto-creamapi.csproj

@@ -1,55 +1,58 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>auto_creamapi</RootNamespace>
-    <UseWPF>true</UseWPF>
-    <PackageVersion>2.1.4</PackageVersion>
-    <Title>auto-creamapi</Title>
-    <Authors>Jeddunk</Authors>
-    <Company>jeddunk.xyz</Company>
-    <AssemblyVersion>2.1.4</AssemblyVersion>
-    <FileVersion>2.1.4</FileVersion>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net8.0-windows</TargetFramework>
+		<RootNamespace>auto_creamapi</RootNamespace>
+		<UseWPF>true</UseWPF>
+		<PackageVersion>2.2.0</PackageVersion>
+		<Title>auto-creamapi</Title>
+		<Authors>Jeddunk</Authors>
+		<Company>jeddunk.xyz</Company>
+		<AssemblyVersion>2.2.0</AssemblyVersion>
+		<FileVersion>2.2.0</FileVersion>
+	</PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<DebugType>none</DebugType>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <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="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="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="Squid-Box.SevenZipSharp" Version="1.3.283" />
-    <PackageReference Include="SteamStorefrontAPI.NETStandard" Version="1.0.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="AngleSharp" Version="1.0.7" />
+		<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
+		<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="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" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Page Include="App.xaml" />
-  </ItemGroup>
+	<ItemGroup>
+		<Page Include="App.xaml" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Include="README.md">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="COPYING">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="resources\CourierPrime-Regular.ttf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="resources\7z.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="README.md">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="COPYING">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="resources\CourierPrime-Regular.ttf">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="resources\7z.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 
 </Project>