Compare commits

...

2 Commits

Author SHA1 Message Date
0005f3d74b Set version to 2.1.7 2021-02-14 15:20:19 +01:00
67d289905c Throw exception if needed when trying to get DLCs. 2021-02-14 15:19:45 +01:00
2 changed files with 85 additions and 73 deletions

View File

@ -101,105 +101,117 @@ namespace auto_creamapi.Services
public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb, bool ignoreUnknown) public async Task<List<SteamApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb, bool ignoreUnknown)
{ {
MyLogger.Log.Information("Get DLC"); MyLogger.Log.Debug("Start: GetListOfDlc");
var dlcList = new List<SteamApp>(); var dlcList = new List<SteamApp>();
if (steamApp != null) try
{ {
var steamAppDetails = await AppDetails.GetAsync(steamApp.AppId).ConfigureAwait(false); if (steamApp != null)
if (steamAppDetails != null)
{ {
MyLogger.Log.Debug("Type for Steam App {Name}: \"{Type}\"", steamApp.Name, steamAppDetails.Type); var steamAppDetails = await AppDetails.GetAsync(steamApp.AppId).ConfigureAwait(false);
if (steamAppDetails.Type == "game" | steamAppDetails.Type == "demo") 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)); steamAppDetails.DLC.ForEach(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("{AppId}={Name}", x.AppId, x.Name));
MyLogger.Log.Information("Got DLC successfully...");
if (!useSteamDb) return dlcList;
// Get DLC from SteamDB
// Get Cloudflare cookie
// Scrape and parse HTML page
// Add missing to DLC list
var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/");
var client = new HttpClient();
client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
MyLogger.Log.Information("Get SteamDB App");
var httpCall = client.GetAsync(steamDbUri);
var response = await httpCall.ConfigureAwait(false);
MyLogger.Log.Debug("{Status}", httpCall.Status.ToString());
MyLogger.Log.Debug("{Boolean}", response.EnsureSuccessStatusCode().ToString());
var readAsStringAsync = response.Content.ReadAsStringAsync();
var responseBody = await readAsStringAsync.ConfigureAwait(false);
MyLogger.Log.Debug("{Status}", readAsStringAsync.Status.ToString());
var parser = new HtmlParser();
var doc = parser.ParseDocument(responseBody);
// Console.WriteLine(doc.DocumentElement.OuterHtml);
var query1 = doc.QuerySelector("#dlc");
if (query1 != null)
{
var query2 = query1.QuerySelectorAll(".app");
foreach (var element in query2)
{ {
var dlcId = element.GetAttribute("data-appid"); var result = _cache.FirstOrDefault(y => y.AppId.Equals(x));
var query3 = element.QuerySelectorAll("td"); if (result == null) return;
var dlcName = query3 == null var dlcDetails = AppDetails.GetAsync(x).Result;
? $"Unknown DLC {dlcId}" dlcList.Add(dlcDetails != null
: query3[1].Text().Replace("\n", "").Trim(); ? new SteamApp {AppId = dlcDetails.SteamAppId, Name = dlcDetails.Name}
: new SteamApp {AppId = x, Name = $"Unknown DLC {x}"});
});
if (ignoreUnknown && dlcName.Contains("SteamDB Unknown App")) dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name));
MyLogger.Log.Information("Got DLC successfully...");
if (!useSteamDb) return dlcList;
// Get DLC from SteamDB
// Get Cloudflare cookie
// Scrape and parse HTML page
// Add missing to DLC list
var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/");
var client = new HttpClient();
client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
MyLogger.Log.Information("Get SteamDB App");
var httpCall = client.GetAsync(steamDbUri);
var response = await httpCall.ConfigureAwait(false);
MyLogger.Log.Debug("{Status}", httpCall.Status.ToString());
MyLogger.Log.Debug("{Boolean}", response.EnsureSuccessStatusCode().ToString());
var readAsStringAsync = response.Content.ReadAsStringAsync();
var responseBody = await readAsStringAsync.ConfigureAwait(false);
MyLogger.Log.Debug("{Status}", readAsStringAsync.Status.ToString());
var parser = new HtmlParser();
var doc = parser.ParseDocument(responseBody);
// Console.WriteLine(doc.DocumentElement.OuterHtml);
var query1 = doc.QuerySelector("#dlc");
if (query1 != null)
{
var query2 = query1.QuerySelectorAll(".app");
foreach (var element in query2)
{ {
MyLogger.Log.Information("Skipping SteamDB Unknown App {DlcId}", dlcId); var dlcId = element.GetAttribute("data-appid");
} var query3 = element.QuerySelectorAll("td");
else var dlcName = query3 == null
{ ? $"Unknown DLC {dlcId}"
var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName}; : query3[1].Text().Replace("\n", "").Trim();
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 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("{AppId}={Name}", x.AppId, x.Name));
MyLogger.Log.Information("Got DLC from SteamDB successfully...");
}
else
{
MyLogger.Log.Error("Could not get DLC from SteamDB!");
} }
dlcList.ForEach(x => MyLogger.Log.Debug("{AppId}={Name}", x.AppId, x.Name));
MyLogger.Log.Information("Got DLC from SteamDB successfully...");
} }
else else
{ {
MyLogger.Log.Error("Could not get DLC from SteamDB!"); MyLogger.Log.Error("Could not get DLC: Steam App is not of type: \"Game\"");
} }
} }
else 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 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!");
Console.WriteLine(e);
} }
return dlcList; return dlcList;

View File

@ -5,12 +5,12 @@
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>auto_creamapi</RootNamespace> <RootNamespace>auto_creamapi</RootNamespace>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<PackageVersion>2.1.6</PackageVersion> <PackageVersion>2.1.7</PackageVersion>
<Title>auto-creamapi</Title> <Title>auto-creamapi</Title>
<Authors>Jeddunk</Authors> <Authors>Jeddunk</Authors>
<Company>jeddunk.xyz</Company> <Company>jeddunk.xyz</Company>
<AssemblyVersion>2.1.6</AssemblyVersion> <AssemblyVersion>2.1.7</AssemblyVersion>
<FileVersion>2.1.6</FileVersion> <FileVersion>2.1.7</FileVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">