jeddunk/GoldbergGUI
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 5 Wiki Activity

Fixed DLC crash

Browse Source
This commit is contained in:
Jeddunk 2021-08-29 22:42:33 +02:00
parent 0be8f4ad8c
commit 0239ffbb27
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
GoldbergGUI.Core/Models/GoldbergModel.cs
View File

@ -69,6 +69,18 @@ namespace GoldbergGUI.Core.Models
public class DlcApp : SteamApp public class DlcApp : SteamApp
{ {
public DlcApp() { }
public DlcApp(SteamApp steamApp)
{
this.AppId = steamApp.AppId;
this.Name = steamApp.Name;
this.ComparableName = steamApp.ComparableName;
this.AppType = steamApp.AppType;
this.LastModified = steamApp.LastModified;
this.PriceChangeNumber = steamApp.PriceChangeNumber;
}
/// <summary> /// <summary>
/// Path to DLC (relative to Steam API DLL) (optional) /// Path to DLC (relative to Steam API DLL) (optional)
/// </summary> /// </summary>

2
GoldbergGUI.Core/Models/SteamAppModel.cs
View File

@ -32,7 +32,7 @@ namespace GoldbergGUI.Core.Models
/// App type (Game, DLC, ...) /// App type (Game, DLC, ...)
/// </summary> /// </summary>
[Column("type")] [Column("type")]
public string type { get; set; } public string AppType { get; set; }
public override string ToString() public override string ToString()
{ {

14
GoldbergGUI.Core/Services/SteamService.cs
View File

@ -128,7 +128,7 @@ namespace GoldbergGUI.Core.Services
var cache = new HashSet<SteamApp>(); var cache = new HashSet<SteamApp>();
foreach (var steamApp in cacheRaw) foreach (var steamApp in cacheRaw)
{ {
steamApp.type = steamCache.SteamAppType; steamApp.AppType = steamCache.SteamAppType;
steamApp.ComparableName = PrepareStringToCompare(steamApp.Name); steamApp.ComparableName = PrepareStringToCompare(steamApp.Name);
cache.Add(steamApp); cache.Add(steamApp);
} }
@ -141,7 +141,7 @@ namespace GoldbergGUI.Core.Services
public async Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name) public async Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name)
{ {
var query = await _db.Table<SteamApp>() var query = await _db.Table<SteamApp>()
.Where(x => x.type == AppTypeGame).ToListAsync().ConfigureAwait(false); .Where(x => x.AppType == AppTypeGame).ToListAsync().ConfigureAwait(false);
var listOfAppsByName = query.Search(x => x.Name) var listOfAppsByName = query.Search(x => x.Name)
.SetCulture(StringComparison.OrdinalIgnoreCase) .SetCulture(StringComparison.OrdinalIgnoreCase)
.ContainingAll(name.Split(' ')); .ContainingAll(name.Split(' '));
@ -153,7 +153,7 @@ namespace GoldbergGUI.Core.Services
_log.Info($"Trying to get app {name}"); _log.Info($"Trying to get app {name}");
var comparableName = PrepareStringToCompare(name); var comparableName = PrepareStringToCompare(name);
var app = await _db.Table<SteamApp>() var app = await _db.Table<SteamApp>()
.FirstOrDefaultAsync(x => x.type == AppTypeGame && x.ComparableName.Equals(comparableName)) .FirstOrDefaultAsync(x => x.AppType == AppTypeGame && x.ComparableName.Equals(comparableName))
.ConfigureAwait(false); .ConfigureAwait(false);
if (app != null) _log.Info($"Successfully got app {app}"); if (app != null) _log.Info($"Successfully got app {app}");
return app; return app;
@ -162,7 +162,7 @@ namespace GoldbergGUI.Core.Services
public async Task<SteamApp> GetAppById(int appid) public async Task<SteamApp> GetAppById(int appid)
{ {
_log.Info($"Trying to get app with ID {appid}"); _log.Info($"Trying to get app with ID {appid}");
var app = await _db.Table<SteamApp>().Where(x => x.type == AppTypeGame) var app = await _db.Table<SteamApp>().Where(x => x.AppType == AppTypeGame)
.FirstOrDefaultAsync(x => x.AppId.Equals(appid)).ConfigureAwait(false); .FirstOrDefaultAsync(x => x.AppId.Equals(appid)).ConfigureAwait(false);
if (app != null) _log.Info($"Successfully got app {app}"); if (app != null) _log.Info($"Successfully got app {app}");
return app; return app;
@ -180,10 +180,10 @@ namespace GoldbergGUI.Core.Services
{ {
steamAppDetails.DLC.ForEach(async x => steamAppDetails.DLC.ForEach(async x =>
{ {
var result = await _db.Table<DlcApp>().Where(z => z.type == AppTypeDlc) var result = await _db.Table<SteamApp>().Where(z => z.AppType == AppTypeDlc)
.FirstOrDefaultAsync(y => y.AppId.Equals(x)).ConfigureAwait(true) .FirstOrDefaultAsync(y => y.AppId.Equals(x)).ConfigureAwait(true)
?? new DlcApp() {AppId = x, Name = $"Unknown DLC {x}"}; ?? new SteamApp() { AppId = x, Name = $"Unknown DLC {x}", ComparableName = $"unknownDlc{x}", AppType = AppTypeDlc };
dlcList.Add(result); dlcList.Add(new DlcApp(result));
_log.Debug($"{result.AppId}={result.Name}"); _log.Debug($"{result.AppId}={result.Name}");
}); });