code cleanup; build x86 per default

Improve log verbosity.

GoldbergGUI.Core/GoldbergGUI.Core.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <FileVersion>0.1.0</FileVersion>
+    <FileVersion>0.2.0</FileVersion>
-    <AssemblyVersion>0.1.0</AssemblyVersion>
     <Company>Jeddunk</Company>
+    <Platforms>AnyCPU;x86;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +12,7 @@
     <PackageReference Include="MvvmCross" Version="7.1.2" />
     <PackageReference Include="NinjaNye.SearchExtensions" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
+    <PackageReference Include="sqlite-net-pcl" Version="1.7.335" />
     <PackageReference Include="SteamStorefrontAPI.NETStandard" Version="1.0.0" />
   </ItemGroup>
 

GoldbergGUI.Core/Models/GoldbergModel.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedMember.Global
 
 namespace GoldbergGUI.Core.Models
 {
@@ -32,13 +34,13 @@ namespace GoldbergGUI.Core.Models
         /// <summary>
         /// List of DLC
         /// </summary>
-        public List<SteamApp> DlcList { get; set; }
+        public List<DlcApp> DlcList { get; set; }
 
-        public List<Depot> Depots { get; set; }
+        public List<int> Depots { get; set; }
 
         public List<Group> SubscribedGroups { get; set; }
 
-        public List<AppPath> AppPaths { get; set; }
+        //public List<AppPath> AppPaths { get; set; }
 
         public List<Achievement> Achievements { get; set; }
 
@@ -65,20 +67,24 @@ namespace GoldbergGUI.Core.Models
         public GoldbergGlobalConfiguration OverwrittenGlobalConfiguration { get; set; }
     }
 
-    public class Depot
+    public class DlcApp : SteamApp
     {
+        public DlcApp() { }
+
+        public DlcApp(SteamApp steamApp)
+        {
+            AppId = steamApp.AppId;
+            Name = steamApp.Name;
+            ComparableName = steamApp.ComparableName;
+            AppType = steamApp.AppType;
+            LastModified = steamApp.LastModified;
+            PriceChangeNumber = steamApp.PriceChangeNumber;
+        }
+
         /// <summary>
-        /// ID of Depot.
+        /// Path to DLC (relative to Steam API DLL) (optional)
         /// </summary>
-        public int DepotId { get; set; }
+        public string AppPath { get; set; }
-        /// <summary>
-        /// Name of Depot.
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// Associated DLC App ID, can be null (e.g. if Depot is for base game).
-        /// </summary>
-        public int DlcAppId { get; set; }
     }
 
     public class Group
@@ -97,12 +103,6 @@ namespace GoldbergGUI.Core.Models
         public int AppId { get; set; }
     }
 
-    public class AppPath
-    {
-        public int AppId { get; set; }
-        public string Path { get; set; }
-    }
-
     public class Achievement
     {
         /// <summary>
@@ -112,7 +112,7 @@ namespace GoldbergGUI.Core.Models
         public string Description { get; set; }
 
         /// <summary>
-        /// Human readable name, as shown on webpage, game libary, overlay, etc.
+        /// Human readable name, as shown on webpage, game library, overlay, etc.
         /// </summary>
         [JsonPropertyName("displayName")]
         public string DisplayName { get; set; }
@@ -132,6 +132,7 @@ namespace GoldbergGUI.Core.Models
         /// <summary>
         /// Path to icon when locked (grayed out).
         /// </summary>
+        // ReSharper disable once StringLiteralTypo
         [JsonPropertyName("icongray")]
         public string IconGray { get; set; }
 
@@ -200,9 +201,10 @@ namespace GoldbergGUI.Core.Models
         // [JsonConverter(typeof(FluffyParseStringConverter))]
         public long DropMaxPerWindow { get; set; }
 
+        // ReSharper disable once StringLiteralTypo
         [JsonPropertyName("workshopid")]
         // [JsonConverter(typeof(FluffyParseStringConverter))]
-        public long Workshopid { get; set; }
+        public long WorkshopId { get; set; }
 
         [JsonPropertyName("tw_unique_to_own")]
         // [JsonConverter(typeof(PurpleParseStringConverter))]

GoldbergGUI.Core/Models/SteamAppModel.cs

@@ -1,7 +1,6 @@
+using SQLite;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using System.Text.RegularExpressions;
-using GoldbergGUI.Core.Utils;
 
 // ReSharper disable UnusedMember.Global
 // ReSharper disable ClassNeverInstantiated.Global
@@ -11,44 +10,41 @@ using GoldbergGUI.Core.Utils;
 // ReSharper disable InconsistentNaming
 namespace GoldbergGUI.Core.Models
 {
+    [Table("steamapp")]
     public class SteamApp
     {
-        private string _name;
+        [JsonPropertyName("appid")]
-        private string _comparableName;
+        [Column("appid")]
-        [JsonPropertyName("appid")] public int AppId { get; set; }
+        [PrimaryKey]
+        public int AppId { get; set; }
 
         /// <summary>
         /// Name of Steam app
         /// </summary>
         [JsonPropertyName("name")]
-        public string Name
+        [Column("name")]
-        {
+        public string Name { get; set; }
-            get => _name;
-            set
-            {
-                _name = value;
-                _comparableName = Regex.Replace(value, Misc.AlphaNumOnlyRegex, "").ToLower();
-            }
-        }
 
-        /// <summary>
+        [Column("comparable_name")]
-        /// Trimmed and cleaned name of Steam app, used for comparisons.
+        public string ComparableName { get; set; }
-        /// </summary>
-        public bool CompareName(string value) => _comparableName.Equals(value);
 
         /// <summary>
         /// App type (Game, DLC, ...)
         /// </summary>
-        public AppType type { get; set; }
+        [Column("type")]
+        public string AppType { get; set; }
 
         public override string ToString()
         {
             return $"{AppId}={Name}";
         }
 
-        [JsonPropertyName("last_modified")] public long LastModified { get; set; }
+        [JsonPropertyName("last_modified")]
+        [Ignore]
+        public long LastModified { get; set; }
 
         [JsonPropertyName("price_change_number")]
+        [Ignore]
         public long PriceChangeNumber { get; set; }
     }
 
@@ -76,19 +72,4 @@ namespace GoldbergGUI.Core.Models
     {
         [JsonPropertyName("response")] public override AppList AppList { get; set; }
     }
-
-    public class AppType
-    {
-        private AppType(string value) => Value = value;
-
-        public string Value { get; }
-
-        public static AppType Game { get; } = new AppType("game");
-        public static AppType DLC { get; } = new AppType("dlc");
-        public static AppType Music { get; } = new AppType("music");
-        public static AppType Demo { get; } = new AppType("demo");
-        public static AppType Ad { get; } = new AppType("advertising");
-        public static AppType Mod { get; } = new AppType("mod");
-        public static AppType Video { get; } = new AppType("video");
-    }
 }

GoldbergGUI.Core/Services/GoldbergService.cs

@@ -1,3 +1,6 @@
+using GoldbergGUI.Core.Models;
+using GoldbergGUI.Core.Utils;
+using MvvmCross.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -7,9 +10,6 @@ using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
-using GoldbergGUI.Core.Models;
-using GoldbergGUI.Core.Utils;
-using MvvmCross.Logging;
 
 namespace GoldbergGUI.Core.Services
 {
@@ -23,16 +23,13 @@ namespace GoldbergGUI.Core.Services
         public Task Save(string path, GoldbergConfiguration configuration);
         public Task<GoldbergGlobalConfiguration> GetGlobalSettings();
         public Task SetGlobalSettings(GoldbergGlobalConfiguration configuration);
-
         public bool GoldbergApplied(string path);
-
-        // public Task<bool> Download();
-        // public Task Extract(string archivePath);
         public Task GenerateInterfacesFile(string filePath);
         public List<string> Languages();
     }
 
     // ReSharper disable once UnusedType.Global
+    // ReSharper disable once ClassNeverInstantiated.Global
     public class GoldbergService : IGoldbergService
     {
         private IMvxLog _log;
@@ -211,7 +208,7 @@ namespace GoldbergGUI.Core.Services
         {
             _log.Info("Reading configuration...");
             var appId = -1;
-            var dlcList = new List<SteamApp>();
+            var dlcList = new List<DlcApp>();
             var steamAppidTxt = Path.Combine(path, "steam_appid.txt");
             if (File.Exists(steamAppidTxt))
             {
@@ -225,6 +222,7 @@ namespace GoldbergGUI.Core.Services
             }
 
             var dlcTxt = Path.Combine(path, "steam_settings", "DLC.txt");
+            var appPathTxt = Path.Combine(path, "steam_settings", "app_paths.txt");
             if (File.Exists(dlcTxt))
             {
                 _log.Info("Getting DLCs...");
@@ -235,12 +233,27 @@ namespace GoldbergGUI.Core.Services
                 {
                     var match = expression.Match(line);
                     if (match.Success)
-                        dlcList.Add(new SteamApp
+                        dlcList.Add(new DlcApp()
                         {
                             AppId = Convert.ToInt32(match.Groups["id"].Value),
                             Name = match.Groups["name"].Value
                         });
                 }
+
+                // ReSharper disable once InvertIf
+                if (File.Exists(appPathTxt))
+                {
+                    var appPathAllLinesAsync = await File.ReadAllLinesAsync(appPathTxt).ConfigureAwait(false);
+                    var appPathExpression = new Regex(@"(?<id>.*) *= *(?<appPath>.*)");
+                    foreach (var line in appPathAllLinesAsync)
+                    {
+                        var match = appPathExpression.Match(line);
+                        if (!match.Success) continue;
+                        var i = dlcList.FindIndex(x =>
+                            x.AppId.Equals(Convert.ToInt32(match.Groups["id"].Value)));
+                        dlcList[i].AppPath = match.Groups["appPath"].Value;
+                    }
+                }
             }
             else
             {
@@ -277,6 +290,7 @@ namespace GoldbergGUI.Core.Services
             {
                 CopyDllFiles(path, x64Name);
             }
+            _log.Info("DLL setup finished!");
 
             // Create steam_settings folder if missing
             _log.Info("Saving settings...");
@@ -289,50 +303,88 @@ namespace GoldbergGUI.Core.Services
             await File.WriteAllTextAsync(Path.Combine(path, "steam_appid.txt"), c.AppId.ToString())
                 .ConfigureAwait(false);
 
-            // DLC
+            // DLC + App path
             if (c.DlcList.Count > 0)
             {
-                var dlcString = "";
+                _log.Info("Saving DLC settings...");
-                c.DlcList.ForEach(x => dlcString += $"{x}\n");
+                var dlcContent = "";
-                await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "DLC.txt"), dlcString)
+                //var depotContent = "";
+                var appPathContent = "";
+                c.DlcList.ForEach(x =>
+                {
+                    dlcContent += $"{x}\n";
+                    //depotContent += $"{x.DepotId}\n";
+                    if (!string.IsNullOrEmpty(x.AppPath))
+                        appPathContent += $"{x.AppId}={x.AppPath}\n";
+                });
+                await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "DLC.txt"), dlcContent)
+                    .ConfigureAwait(false);
+
+                /*if (!string.IsNullOrEmpty(depotContent))
+                {
+                    await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "depots.txt"), depotContent)
+                        .ConfigureAwait(false);
+                }*/
+
+
+                if (!string.IsNullOrEmpty(appPathContent))
+                {
+                    await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "app_paths.txt"), appPathContent)
                         .ConfigureAwait(false);
                 }
                 else
                 {
+                    if (File.Exists(Path.Combine(path, "steam_settings", "app_paths.txt")))
+                        File.Delete(Path.Combine(path, "steam_settings", "app_paths.txt"));
+                }
+                _log.Info("Saved DLC settings.");
+            }
+            else
+            {
+                _log.Info("No DLC set! Removing DLC configuration files...");
                 if (File.Exists(Path.Combine(path, "steam_settings", "DLC.txt")))
                     File.Delete(Path.Combine(path, "steam_settings", "DLC.txt"));
+                if (File.Exists(Path.Combine(path, "steam_settings", "app_paths.txt")))
+                    File.Delete(Path.Combine(path, "steam_settings", "app_paths.txt"));
+                _log.Info("Removed DLC configuration files.");
             }
 
             // Offline
             if (c.Offline)
             {
+                _log.Info("Create offline.txt");
                 await File.Create(Path.Combine(path, "steam_settings", "offline.txt")).DisposeAsync()
                     .ConfigureAwait(false);
             }
             else
             {
+                _log.Info("Delete offline.txt if it exists");
                 File.Delete(Path.Combine(path, "steam_settings", "offline.txt"));
             }
 
             // Disable Networking
             if (c.DisableNetworking)
             {
+                _log.Info("Create disable_networking.txt");
                 await File.Create(Path.Combine(path, "steam_settings", "disable_networking.txt")).DisposeAsync()
                     .ConfigureAwait(false);
             }
             else
             {
+                _log.Info("Delete disable_networking.txt if it exists");
                 File.Delete(Path.Combine(path, "steam_settings", "disable_networking.txt"));
             }
 
             // Disable Overlay
             if (c.DisableOverlay)
             {
+                _log.Info("Create disable_overlay.txt");
                 await File.Create(Path.Combine(path, "steam_settings", "disable_overlay.txt")).DisposeAsync()
                     .ConfigureAwait(false);
             }
             else
             {
+                _log.Info("Delete disable_overlay.txt if it exists");
                 File.Delete(Path.Combine(path, "steam_settings", "disable_overlay.txt"));
             }
         }
@@ -341,17 +393,21 @@ namespace GoldbergGUI.Core.Services
         {
             var steamApiDll = Path.Combine(path, $"{name}.dll");
             var originalDll = Path.Combine(path, $"{name}_o.dll");
-            var guiBackup = Path.Combine(path, $"{name}.dll.GOLDBERGGUIBACKUP");
+            var guiBackup = Path.Combine(path, $".{name}.dll.GOLDBERGGUIBACKUP");
             var goldbergDll = Path.Combine(_goldbergPath, $"{name}.dll");
 
             if (!File.Exists(originalDll))
+            {
+                _log.Info("Back up original Steam API DLL...");
                 File.Move(steamApiDll, originalDll);
+            }
             else
             {
                 File.Move(steamApiDll, guiBackup, true);
                 File.SetAttributes(guiBackup, FileAttributes.Hidden);
             }
 
+            _log.Info("Copy Goldberg DLL to target path...");
             File.Copy(goldbergDll, steamApiDll);
         }
 
@@ -415,6 +471,7 @@ namespace GoldbergGUI.Core.Services
                 var contentLength = headResponse.Content.Headers.ContentLength;
                 await client.GetFileAsync(downloadUrl, fileStream).ContinueWith(async t =>
                 {
+                    // ReSharper disable once AccessToDisposedClosure
                     await fileStream.DisposeAsync().ConfigureAwait(false);
                     var fileLength = new FileInfo(_goldbergZipPath).Length;
                     // Environment.Exit(128);

GoldbergGUI.Core/Services/SteamService.cs

@@ -1,19 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
 using GoldbergGUI.Core.Models;
 using GoldbergGUI.Core.Utils;
 using MvvmCross.Logging;
 using NinjaNye.SearchExtensions;
+using SQLite;
 using SteamStorefrontAPI;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace GoldbergGUI.Core.Services
 {
@@ -21,23 +20,20 @@ namespace GoldbergGUI.Core.Services
     public interface ISteamService
     {
         public Task Initialize(IMvxLog log);
-        public IEnumerable<SteamApp> GetListOfAppsByName(string name);
+        public Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name);
-        public SteamApp GetAppByName(string name);
+        public Task<SteamApp> GetAppByName(string name);
-        public SteamApp GetAppById(int appid);
+        public Task<SteamApp> GetAppById(int appid);
-        public Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb);
+        public Task<List<DlcApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb);
     }
 
     class SteamCache
     {
-        public string Filename { get; }
         public string SteamUri { get; }
         public Type ApiVersion { get; }
-        public AppType SteamAppType { get; }
+        public string SteamAppType { get; }
-        public HashSet<SteamApp> Cache { get; set; } = new HashSet<SteamApp>();
 
-        public SteamCache(string filename, string uri, Type apiVersion, AppType steamAppType)
+        public SteamCache(string uri, Type apiVersion, string steamAppType)
         {
-            Filename = filename;
             SteamUri = uri;
             ApiVersion = apiVersion;
             SteamAppType = steamAppType;
@@ -49,32 +45,30 @@ namespace GoldbergGUI.Core.Services
     public class SteamService : ISteamService
     {
         // ReSharper disable StringLiteralTypo
-        private readonly Dictionary<AppType, SteamCache> _caches =
+        private readonly Dictionary<string, SteamCache> _caches =
-            new Dictionary<AppType, SteamCache>
+            new Dictionary<string, SteamCache>
             {
                 {
-                    AppType.Game,
+                    AppTypeGame,
                     new SteamCache(
-                        "steamapps_games.json",
                         "https://api.steampowered.com/IStoreService/GetAppList/v1/" +
                         "?max_results=50000" +
                         "&include_games=1" +
                         "&key=" + Secrets.SteamWebApiKey(),
                         typeof(SteamAppsV1),
-                        AppType.Game
+                        AppTypeGame
                     )
                 },
                 {
-                    AppType.DLC,
+                    AppTypeDlc,
                     new SteamCache(
-                        "steamapps_dlc.json",
                         "https://api.steampowered.com/IStoreService/GetAppList/v1/" +
                         "?max_results=50000" +
                         "&include_games=0" +
                         "&include_dlc=1" +
                         "&key=" + Secrets.SteamWebApiKey(),
                         typeof(SteamAppsV1),
-                        AppType.DLC
+                        AppTypeDlc
                     )
                 }
             };
@@ -84,135 +78,119 @@ namespace GoldbergGUI.Core.Services
         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 const string AppTypeGame = "game";
+        private const string AppTypeDlc = "dlc";
+        private const string Database = "steamapps.cache";
 
         private IMvxLog _log;
 
+        private SQLiteAsyncConnection _db;
+
         public async Task Initialize(IMvxLog log)
         {
-            //var (path, uri, jsonType, appType) = _caches[0];
             static SteamApps DeserializeSteamApps(Type type, string cacheString)
             {
-                if (type == typeof(SteamAppsV1))
+                return type == typeof(SteamAppsV2)
-                    return JsonSerializer.Deserialize<SteamAppsV1>(cacheString);
+                    ? (SteamApps)JsonSerializer.Deserialize<SteamAppsV2>(cacheString)
-                else if (type == typeof(SteamAppsV2))
+                    : JsonSerializer.Deserialize<SteamAppsV1>(cacheString);
-                    return JsonSerializer.Deserialize<SteamAppsV2>(cacheString);
-                return null;
             }
 
-            foreach (var (k, c) in _caches)
-            {
             _log = log;
-                _log.Info($"Updating cache ({k.Value})...");
+            _db = new SQLiteAsyncConnection(Database);
-                var updateNeeded =
+            //_db.CreateTable<SteamApp>();
-                    DateTime.Now.Subtract(File.GetLastWriteTimeUtc(c.Filename)).TotalDays >= 1;
+            await _db.CreateTableAsync<SteamApp>()
-                SteamApps steamApps;
+                //.ContinueWith(x => _log.Debug("Table success!"))
-                try
-                {
-                    var temp = await GetCache(updateNeeded, c.SteamUri, c.Filename)
                 .ConfigureAwait(false);
-                    steamApps = DeserializeSteamApps(c.ApiVersion, temp);
-                }
-                catch (JsonException)
-                {
-                    _log.Error("Local cache broken, forcing update...");
-                    var temp = await GetCache(true, c.SteamUri, c.Filename).ConfigureAwait(false);
-                    steamApps = DeserializeSteamApps(c.ApiVersion, temp);
-                }
 
-                try
+            var countAsync = await _db.Table<SteamApp>().CountAsync().ConfigureAwait(false);
+            if (DateTime.Now.Subtract(File.GetLastWriteTimeUtc(Database)).TotalDays >= 1 || countAsync == 0)
             {
-                    var cacheRaw = new HashSet<SteamApp>(steamApps.AppList.Apps);
+                foreach (var (appType, steamCache) in _caches)
+                {
+                    _log.Info($"Updating cache ({appType})...");
+                    bool haveMoreResults;
+                    long lastAppId = 0;
+                    var client = new HttpClient();
+                    var cacheRaw = new HashSet<SteamApp>();
+                    do
+                    {
+                        var response = lastAppId > 0
+                            ? await client.GetAsync($"{steamCache.SteamUri}&last_appid={lastAppId}")
+                                .ConfigureAwait(false)
+                            : await client.GetAsync(steamCache.SteamUri).ConfigureAwait(false);
+                        var responseBody = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                        var steamApps = DeserializeSteamApps(steamCache.ApiVersion, responseBody);
+                        foreach (var appListApp in steamApps.AppList.Apps) cacheRaw.Add(appListApp);
+                        haveMoreResults = steamApps.AppList.HaveMoreResults;
+                        lastAppId = steamApps.AppList.LastAppid;
+                    } while (haveMoreResults);
+
                     var cache = new HashSet<SteamApp>();
                     foreach (var steamApp in cacheRaw)
                     {
-                        steamApp.type = c.SteamAppType;
+                        steamApp.AppType = steamCache.SteamAppType;
+                        steamApp.ComparableName = PrepareStringToCompare(steamApp.Name);
                         cache.Add(steamApp);
                     }
 
-                    c.Cache = cache;
+                    await _db.InsertAllAsync(cache, "OR IGNORE").ConfigureAwait(false);
-
-                    _log.Info("Loaded cache into memory!");
                 }
-                catch (NullReferenceException e)
+            }
+        }
+
+        public async Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name)
         {
-                    Console.WriteLine(e);
+            var query = await _db.Table<SteamApp>()
-                    throw;
+                .Where(x => x.AppType == AppTypeGame).ToListAsync().ConfigureAwait(false);
-                }
+            var listOfAppsByName = query.Search(x => x.Name)
-            }
-        }
-
-        private async Task<string> GetCache(bool updateNeeded, string steamUri, string cachePath)
-        {
-            string cacheString;
-            if (updateNeeded)
-            {
-                _log.Info("Getting content from API...");
-                var client = new HttpClient();
-                var response = await client.GetAsync(steamUri).ConfigureAwait(false);
-                var responseBody = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-
-                _log.Info("Got content from API successfully. Writing to file...");
-                await File.WriteAllTextAsync(cachePath, responseBody, Encoding.UTF8).ConfigureAwait(false);
-
-                _log.Info("Cache written to file successfully.");
-                cacheString = responseBody;
-            }
-            else
-            {
-                _log.Info("Cache already up to date!");
-                cacheString = await File.ReadAllTextAsync(cachePath).ConfigureAwait(false);
-            }
-
-            return cacheString;
-        }
-
-        public IEnumerable<SteamApp> GetListOfAppsByName(string name)
-        {
-            var listOfAppsByName = _caches[AppType.Game].Cache.Search(x => x.Name)
                 .SetCulture(StringComparison.OrdinalIgnoreCase)
                 .ContainingAll(name.Split(' '));
             return listOfAppsByName;
         }
 
-        public SteamApp GetAppByName(string name)
+        public async Task<SteamApp> GetAppByName(string name)
         {
             _log.Info($"Trying to get app {name}");
-            var comparableName = Regex.Replace(name, Misc.AlphaNumOnlyRegex, "").ToLower();
+            var comparableName = PrepareStringToCompare(name);
-            var app = _caches[AppType.Game].Cache.FirstOrDefault(x => x.CompareName(comparableName));
+            var app = await _db.Table<SteamApp>()
+                .FirstOrDefaultAsync(x => x.AppType == AppTypeGame && x.ComparableName.Equals(comparableName))
+                .ConfigureAwait(false);
             if (app != null) _log.Info($"Successfully got app {app}");
             return app;
         }
 
-        public SteamApp GetAppById(int appid)
+        public async Task<SteamApp> GetAppById(int appid)
         {
             _log.Info($"Trying to get app with ID {appid}");
-            var app = _caches[AppType.Game].Cache.FirstOrDefault(x => x.AppId.Equals(appid));
+            var app = await _db.Table<SteamApp>().Where(x => x.AppType == AppTypeGame)
+                .FirstOrDefaultAsync(x => x.AppId.Equals(appid)).ConfigureAwait(false);
             if (app != null) _log.Info($"Successfully got app {app}");
             return app;
         }
 
-        public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb)
+        public async Task<List<DlcApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb)
         {
-            var dlcList = new List<SteamApp>();
+            var dlcList = new List<DlcApp>();
             if (steamApp != null)
             {
                 _log.Info($"Get DLC for App {steamApp}");
                 var task = AppDetails.GetAsync(steamApp.AppId);
                 var steamAppDetails = await task.ConfigureAwait(true);
-                if (steamAppDetails.Type == AppType.Game.Value)
+                if (steamAppDetails.Type == AppTypeGame)
                 {
-                    steamAppDetails.DLC.ForEach(x =>
+                    steamAppDetails.DLC.ForEach(async x =>
                     {
-                        var result = _caches[AppType.DLC].Cache.FirstOrDefault(y => y.AppId.Equals(x))
+                        var result = await _db.Table<SteamApp>().Where(z => z.AppType == AppTypeDlc)
-                                     ?? new SteamApp {AppId = x, Name = $"Unknown DLC {x}"};
+                                         .FirstOrDefaultAsync(y => y.AppId.Equals(x)).ConfigureAwait(true)
-                        dlcList.Add(result);
+                                     ?? new SteamApp() { AppId = x, Name = $"Unknown DLC {x}", ComparableName = $"unknownDlc{x}", AppType = AppTypeDlc };
+                        dlcList.Add(new DlcApp(result));
+                        _log.Debug($"{result.AppId}={result.Name}");
                     });
 
-                    dlcList.ForEach(x => _log.Debug($"{x.AppId}={x.Name}"));
                     _log.Info("Got DLC successfully...");
 
                     // Get DLC from SteamDB
-                    // Get Cloudflare cookie
+                    // Get Cloudflare cookie (not implemented)
                     // Scrape and parse HTML page
                     // Add missing to DLC list
 
@@ -251,7 +229,7 @@ namespace GoldbergGUI.Core.Services
                                 var dlcName = query3 != null
                                     ? query3[1].Text().Replace("\n", "").Trim()
                                     : $"Unknown DLC {dlcId}";
-                                var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName};
+                                var dlcApp = new DlcApp { AppId = Convert.ToInt32(dlcId), Name = dlcName };
                                 var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId));
                                 if (i > -1)
                                 {
@@ -289,5 +267,10 @@ namespace GoldbergGUI.Core.Services
 
             return dlcList;
         }
+
+        private static string PrepareStringToCompare(string name)
+        {
+            return Regex.Replace(name, Misc.AlphaNumOnlyRegex, "").ToLower();
+        }
     }
 }

GoldbergGUI.Core/Utils/CustomMvxAppStart.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Threading.Tasks;
 using MvvmCross.Exceptions;
 using MvvmCross.Navigation;
 using MvvmCross.ViewModels;
+using System.Threading.Tasks;
 
 namespace GoldbergGUI.Core.Utils
 {

GoldbergGUI.Core/ViewModels/MainViewModel.cs

@@ -1,4 +1,12 @@
-using System;
+using GoldbergGUI.Core.Models;
+using GoldbergGUI.Core.Services;
+using GoldbergGUI.Core.Utils;
+using Microsoft.Win32;
+using MvvmCross.Commands;
+using MvvmCross.Logging;
+using MvvmCross.Navigation;
+using MvvmCross.ViewModels;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@@ -9,14 +17,6 @@ using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
-using GoldbergGUI.Core.Models;
-using GoldbergGUI.Core.Services;
-using GoldbergGUI.Core.Utils;
-using Microsoft.Win32;
-using MvvmCross.Commands;
-using MvvmCross.Logging;
-using MvvmCross.Navigation;
-using MvvmCross.ViewModels;
 
 namespace GoldbergGUI.Core.ViewModels
 {
@@ -30,7 +30,7 @@ namespace GoldbergGUI.Core.ViewModels
         private int _appId;
 
         //private SteamApp _currentGame;
-        private ObservableCollection<SteamApp> _dlcs;
+        private ObservableCollection<DlcApp> _dlcs;
         private string _accountName;
         private long _steamId;
         private bool _offline;
@@ -130,7 +130,7 @@ namespace GoldbergGUI.Core.ViewModels
         }
 
         // ReSharper disable once InconsistentNaming
-        public ObservableCollection<SteamApp> DLCs
+        public ObservableCollection<DlcApp> DLCs
         {
             get => _dlcs;
             set
@@ -321,7 +321,7 @@ namespace GoldbergGUI.Core.ViewModels
 
             MainWindowEnabled = false;
             StatusText = "Trying to find AppID...";
-            var appByName = _steam.GetAppByName(_gameName);
+            var appByName = await _steam.GetAppByName(_gameName).ConfigureAwait(false);
             if (appByName != null)
             {
                 GameName = appByName.Name;
@@ -329,7 +329,7 @@ namespace GoldbergGUI.Core.ViewModels
             }
             else
             {
-                var list = _steam.GetListOfAppsByName(GameName);
+                var list = await _steam.GetListOfAppsByName(GameName).ConfigureAwait(false);
                 var steamApps = list as SteamApp[] ?? list.ToArray();
                 if (steamApps.Length == 1)
                 {
@@ -364,7 +364,7 @@ namespace GoldbergGUI.Core.ViewModels
                 return;
             }
 
-            var steamApp = await Task.Run(() => _steam.GetAppById(AppId)).ConfigureAwait(false);
+            var steamApp = await _steam.GetAppById(AppId).ConfigureAwait(false);
             if (steamApp != null) GameName = steamApp.Name;
         }
 
@@ -380,9 +380,9 @@ namespace GoldbergGUI.Core.ViewModels
 
             MainWindowEnabled = false;
             StatusText = "Trying to get list of DLCs...";
-            var listOfDlc = await _steam.GetListOfDlc(new SteamApp {AppId = AppId, Name = GameName}, true)
+            var listOfDlc = await _steam.GetListOfDlc(new SteamApp { AppId = AppId, Name = GameName }, true)
                 .ConfigureAwait(false);
-            DLCs = new MvxObservableCollection<SteamApp>(listOfDlc);
+            DLCs = new MvxObservableCollection<DlcApp>(listOfDlc);
             MainWindowEnabled = true;
             if (DLCs.Count > 0)
             {
@@ -478,9 +478,11 @@ namespace GoldbergGUI.Core.ViewModels
             {
                 var result = Clipboard.GetText();
                 var expression = new Regex(@"(?<id>.*) *= *(?<name>.*)");
-                var pastedDlc = (from line in result.Split(new[] {"\n", "\r\n"},
+                var pastedDlc = (from line in result.Split(new[] { "\n", "\r\n" },
-                    StringSplitOptions.RemoveEmptyEntries) select expression.Match(line) into match
+                    StringSplitOptions.RemoveEmptyEntries)
-                    where match.Success select new SteamApp
+                                 select expression.Match(line) into match
+                                 where match.Success
+                                 select new DlcApp
                                  {
                                      AppId = Convert.ToInt32(match.Groups["id"].Value),
                                      Name = match.Groups["name"].Value
@@ -488,7 +490,7 @@ namespace GoldbergGUI.Core.ViewModels
                 if (pastedDlc.Count > 0)
                 {
                     DLCs.Clear();
-                    DLCs = new ObservableCollection<SteamApp>(pastedDlc);
+                    DLCs = new ObservableCollection<DlcApp>(pastedDlc);
                     //var empty = DLCs.Count == 1 ? "" : "s";
                     //StatusText = $"Successfully got {DLCs.Count} DLC{empty} from clipboard! Ready.";
                     var statusTextCount = DLCs.Count == 1 ? "one DLC" : $"{DLCs.Count} DLCs";
@@ -524,7 +526,7 @@ namespace GoldbergGUI.Core.ViewModels
             DllPath = "Path to game's steam_api(64).dll...";
             GameName = "Game name...";
             AppId = -1;
-            DLCs = new ObservableCollection<SteamApp>();
+            DLCs = new ObservableCollection<DlcApp>();
             AccountName = "Account name...";
             SteamId = -1;
             Offline = false;
@@ -544,7 +546,7 @@ namespace GoldbergGUI.Core.ViewModels
         private void SetFormFromConfig(GoldbergConfiguration config)
         {
             AppId = config.AppId;
-            DLCs = new ObservableCollection<SteamApp>(config.DlcList);
+            DLCs = new ObservableCollection<DlcApp>(config.DlcList);
             Offline = config.Offline;
             DisableNetworking = config.DisableNetworking;
             DisableOverlay = config.DisableOverlay;

GoldbergGUI.Core/ViewModels/SearchResultViewModel.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using GoldbergGUI.Core.Models;
 using MvvmCross.Commands;
 using MvvmCross.Logging;
 using MvvmCross.Navigation;
 using MvvmCross.ViewModels;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace GoldbergGUI.Core.ViewModels
 {

GoldbergGUI.WPF/App.xaml.cs

@@ -1,5 +1,4 @@
 using MvvmCross.Core;
-using MvvmCross.Platforms.Wpf.Core;
 using MvvmCross.Platforms.Wpf.Views;
 
 namespace GoldbergGUI.WPF

GoldbergGUI.WPF/GoldbergGUI.WPF.csproj

@@ -4,9 +4,9 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
-    <FileVersion>0.1.0</FileVersion>
+    <FileVersion>0.2.0</FileVersion>
-    <AssemblyVersion>0.1.0</AssemblyVersion>
     <Company>Jeddunk</Company>
+    <Platforms>AnyCPU;x86;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

GoldbergGUI.WPF/Setup.cs

@@ -1,10 +1,7 @@
-using System;
-using System.IO;
-using System.Windows.Controls;
-using System.Windows.Threading;
 using MvvmCross.Logging;
 using MvvmCross.Platforms.Wpf.Core;
 using Serilog;
+using System.IO;
 
 namespace GoldbergGUI.WPF
 {
@@ -14,7 +11,7 @@ namespace GoldbergGUI.WPF
 
         protected override IMvxLogProvider CreateLogProvider()
         {
-            var logPath = Path.Combine(Directory.GetCurrentDirectory(),"goldberg_.log");
+            var logPath = Path.Combine(Directory.GetCurrentDirectory(), "goldberg_.log");
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .WriteTo.Console()

GoldbergGUI.WPF/Views/MainView.xaml

@@ -7,6 +7,9 @@
                   xmlns:viewmodel="clr-namespace:GoldbergGUI.Core.ViewModels;assembly=GoldbergGUI.Core"
                   mc:Ignorable="d"
                   d:DesignHeight="500" d:DesignWidth="400" d:DataContext="{d:DesignInstance Type=viewmodel:MainViewModel }">
+    <views:MvxWpfView.Resources>
+        <BooleanToVisibilityConverter x:Key="B2V" />
+    </views:MvxWpfView.Resources>
     <Grid Margin="0,0,0,0">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
@@ -53,10 +56,13 @@
                                     <DataGrid.Columns>
                                         <DataGridTextColumn Header="App ID" Binding="{Binding AppId}" Width="80" />
                                         <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="*" />
+                                        <!--<DataGridTextColumn Header="Depot ID" Binding="{Binding DepotId}" Width="80" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}"/>
+                                        <DataGridTextColumn Header="Depot Name" Binding="{Binding DepotName}" Width="*" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}" />-->
+                                        <DataGridTextColumn Header="App Path" Binding="{Binding AppPath}" Width="*" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}" />
                                     </DataGrid.Columns>
                                 </DataGrid>
-                                <Button Content="Get _DLCs for AppID" Command="{Binding GetListOfDlcCommand}" Grid.Row="1" Width="120" HorizontalAlignment="Right" Margin="0,5,125,0" Height="20"/>
+                                <CheckBox Grid.Row="1" x:Name="ShowOptionalDlcSettings" Margin="0,5,0,0" Content="Show optional settings"/>
-                                <Button Content="_Advanced Settings..." Grid.Row="1" Width="120" HorizontalAlignment="Right" Margin="0,5,0,0" Height="20" IsEnabled="False" ToolTip="Work in progress..."/>
+                                <Button Content="Get _DLCs for AppID" Command="{Binding GetListOfDlcCommand}" Grid.Row="1" Width="120" HorizontalAlignment="Right" Margin="0,5,0,0" Height="20"/>
                             </Grid>
                         </GroupBox>
                     </Grid>

GoldbergGUI.sln

@@ -3,24 +3,44 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoldbergGUI.Core", "GoldbergGUI.Core\GoldbergGUI.Core.csproj", "{FB205F05-83DE-4D87-8CE2-F7DA320944FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.Core", "GoldbergGUI.Core\GoldbergGUI.Core.csproj", "{FB205F05-83DE-4D87-8CE2-F7DA320944FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoldbergGUI.WPF", "GoldbergGUI.WPF\GoldbergGUI.WPF.csproj", "{84ED15D3-725C-43B1-B8C7-51759CAABBAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.WPF", "GoldbergGUI.WPF\GoldbergGUI.WPF.csproj", "{84ED15D3-725C-43B1-B8C7-51759CAABBAA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|x64.ActiveCfg = Debug|x64
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|x64.Build.0 = Debug|x64
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|x86.ActiveCfg = Debug|x86
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|x86.Build.0 = Debug|x86
 		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|x64.ActiveCfg = Release|x64
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|x64.Build.0 = Release|x64
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|x86.ActiveCfg = Release|x86
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|x86.Build.0 = Release|x86
 		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|x64.Build.0 = Debug|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|x86.ActiveCfg = Debug|x86
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|x86.Build.0 = Debug|x86
 		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x64.ActiveCfg = Release|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x64.Build.0 = Release|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x86.ActiveCfg = Release|x86
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE