jonny_bro/CreamInstaller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

output changes, VValue error fix

Browse source
This commit is contained in:
pointfeev 2021-11-06 20:18:22 -04:00
parent 62cd170a17
commit 8a0bdbfb7e
No known key found for this signature in database
GPG key ID: AA14DC36C4D7D13C
6 changed files with 50 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CreamInstaller/CreamInstaller.csproj
View file

@ -9,7 +9,7 @@
<Version>2.0.0.0</Version> <Version>2.0.0.0</Version>
<PackageIcon>ini.ico</PackageIcon> <PackageIcon>ini.ico</PackageIcon>
<PackageIconUrl /> <PackageIconUrl />
<Description>Automatically generates and installs CreamAPI files for programs/games.</Description> <Description>Automatically installs and generates CreamAPI files for programs/games on the user's computer.</Description>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>2021, pointfeev (https://github.com/pointfeev)</Copyright> <Copyright>2021, pointfeev (https://github.com/pointfeev)</Copyright>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@ -20,7 +20,7 @@
<PackageTags>steam, dlc</PackageTags> <PackageTags>steam, dlc</PackageTags>
<AssemblyName>CreamInstaller</AssemblyName> <AssemblyName>CreamInstaller</AssemblyName>
<Company>CreamInstaller</Company> <Company>CreamInstaller</Company>
<Product>CreamAPI Generator &amp; Installer</Product> <Product>CreamAPI Installer &amp; Generator</Product>
<Authors>pointfeev</Authors> <Authors>pointfeev</Authors>
<PackageId>pointfeev.creaminstaller</PackageId> <PackageId>pointfeev.creaminstaller</PackageId>
<StartupObject>CreamInstaller.Program</StartupObject> <StartupObject>CreamInstaller.Program</StartupObject>

7
CreamInstaller/InstallForm.cs
View file

@ -78,10 +78,11 @@ namespace CreamInstaller
Resources.WriteResourceToFile("steam_api64.dll", api64); Resources.WriteResourceToFile("steam_api64.dll", api64);
UpdateUser($"Wrote resource to file: {api64}", LogColor.Resource); UpdateUser($"Wrote resource to file: {api64}", LogColor.Resource);
} }
UpdateUser("Generating CreamAPI for " + selection.Name + $" in directory \"{directory}\" . . . ", LogColor.Operation);
string cApi = directory + @"\cream_api.ini"; string cApi = directory + @"\cream_api.ini";
File.Create(cApi).Close(); File.Create(cApi).Close();
StreamWriter writer = File.AppendText(cApi); StreamWriter writer = File.AppendText(cApi);
writer.WriteLine("; CreamInstaller"); writer.WriteLine("; " + Application.CompanyName + " v" + Application.ProductVersion);
if (selection.SteamAppId > 0) if (selection.SteamAppId > 0)
{ {
writer.WriteLine(); writer.WriteLine();
@ -165,11 +166,11 @@ namespace CreamInstaller
try try
{ {
await Operate(); await Operate();
UpdateUser("CreamAPI successfully installed for " + ProgramCount + " program(s).", LogColor.Success); UpdateUser("CreamAPI successfully installed and generated for " + ProgramCount + " program(s).", LogColor.Success);
} }
catch (Exception exception) catch (Exception exception)
{ {
UpdateUser("CreamAPI installation failed: " + exception.ToString(), LogColor.Error); UpdateUser("CreamAPI installation and/or generation failed: " + exception.ToString(), LogColor.Error);
retryButton.Enabled = true; retryButton.Enabled = true;
} }
userProgressBar.Value = userProgressBar.Maximum; userProgressBar.Value = userProgressBar.Maximum;

15
CreamInstaller/ProgramSelection.cs
View file

@ -63,5 +63,20 @@ namespace CreamInstaller
public static List<ProgramSelection> AllSafeEnabled => AllSafe.FindAll(s => s.Enabled); public static List<ProgramSelection> AllSafeEnabled => AllSafe.FindAll(s => s.Enabled);
public static ProgramSelection FromName(string displayName) => AllSafe.Find(s => s.Name == displayName); public static ProgramSelection FromName(string displayName) => AllSafe.Find(s => s.Name == displayName);
public static Tuple<int, string> GetDlc(string displayName)
{
foreach (ProgramSelection selection in AllSafe)
{
foreach (Tuple<int, string> app in selection.AllSteamDlc)
{
if (app.Item2 == displayName)
{
return app;
}
}
}
return null;
}
} }
} }

3
CreamInstaller/SelectForm.Designer.cs generated
View file

@ -111,6 +111,9 @@ namespace CreamInstaller
this.treeView1.BackColor = System.Drawing.SystemColors.Control; this.treeView1.BackColor = System.Drawing.SystemColors.Control;
this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.treeView1.CheckBoxes = true; this.treeView1.CheckBoxes = true;
this.treeView1.Enabled = false;
this.treeView1.FullRowSelect = true;
this.treeView1.HotTracking = true;
this.treeView1.Location = new System.Drawing.Point(6, 22); this.treeView1.Location = new System.Drawing.Point(6, 22);
this.treeView1.Name = "treeView1"; this.treeView1.Name = "treeView1";
this.treeView1.Size = new System.Drawing.Size(448, 208); this.treeView1.Size = new System.Drawing.Size(448, 208);

32
CreamInstaller/SelectForm.cs
View file

@ -3,6 +3,7 @@ using Gameloop.Vdf.Linq;
using Microsoft.Win32; using Microsoft.Win32;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -162,10 +163,7 @@ namespace CreamInstaller
if (Program.Canceled) return; if (Program.Canceled) return;
string dlcName = null; string dlcName = null;
VProperty dlcAppInfo = null; VProperty dlcAppInfo = null;
if (SteamCMD.GetAppInfo(id, 0, out dlcAppInfo) if (SteamCMD.GetAppInfo(id, 0, out dlcAppInfo)) dlcName = dlcAppInfo?.Value?["common"]?["name"]?.ToString();
&& !(dlcAppInfo?.Value is VValue)
&& !(dlcAppInfo?.Value?["common"] is VValue))
dlcName = dlcAppInfo?.Value?["common"]?["name"]?.ToString();
if (Program.Canceled) return; if (Program.Canceled) return;
if (string.IsNullOrWhiteSpace(dlcName)) dlcName = $"Unnamed DLC ({id})"; if (string.IsNullOrWhiteSpace(dlcName)) dlcName = $"Unnamed DLC ({id})";
dlc[id] = dlcName; dlc[id] = dlcName;
@ -201,6 +199,7 @@ namespace CreamInstaller
if (Program.Canceled) return; if (Program.Canceled) return;
TreeNode programNode = treeNodes.Find(s => s.Text == name) ?? new(); TreeNode programNode = treeNodes.Find(s => s.Text == name) ?? new();
programNode.Text = name; programNode.Text = name;
programNode.Checked = true;
programNode.Remove(); programNode.Remove();
treeView1.Nodes.Add(programNode); treeView1.Nodes.Add(programNode);
treeNodes.Remove(programNode); treeNodes.Remove(programNode);
@ -210,6 +209,7 @@ namespace CreamInstaller
if (Program.Canceled || programNode is null) return; if (Program.Canceled || programNode is null) return;
TreeNode dlcNode = treeNodes.Find(s => s.Text == dlcApp.Value) ?? new(); TreeNode dlcNode = treeNodes.Find(s => s.Text == dlcApp.Value) ?? new();
dlcNode.Text = dlcApp.Value; dlcNode.Text = dlcApp.Value;
dlcNode.Checked = true;
dlcNode.Remove(); dlcNode.Remove();
programNode.Nodes.Add(dlcNode); programNode.Nodes.Add(dlcNode);
treeNodes.Remove(dlcNode); treeNodes.Remove(dlcNode);
@ -242,7 +242,7 @@ namespace CreamInstaller
noneFoundLabel.Visible = false; noneFoundLabel.Visible = false;
allCheckBox.Enabled = false; allCheckBox.Enabled = false;
acceptButton.Enabled = false; acceptButton.Enabled = false;
treeView1.CheckBoxes = false; treeView1.Enabled = false;
label2.Visible = true; label2.Visible = true;
progressBar1.Visible = true; progressBar1.Visible = true;
@ -259,8 +259,8 @@ namespace CreamInstaller
if (_progress < 0) maxProgress = -_progress; if (_progress < 0) maxProgress = -_progress;
else curProgress = _progress; else curProgress = _progress;
int p = Math.Max(Math.Min((int)((float)(curProgress / (float)maxProgress) * 100), 100), 0); int p = Math.Max(Math.Min((int)((float)(curProgress / (float)maxProgress) * 100), 100), 0);
if (setup) label2.Text = "Setting up SteamCMD . . . " + p + "%"; if (setup) label2.Text = $"Setting up SteamCMD . . . {p}% ({curProgress}/{maxProgress})";
else label2.Text = "Gathering your CreamAPI-applicable games and their DLCs . . . " + p + "%"; else label2.Text = $"Gathering and caching your applicable games and their DLCs . . . {p}% ({curProgress}/{maxProgress})";
progressBar1.Value = p; progressBar1.Value = p;
}; };
@ -278,7 +278,7 @@ namespace CreamInstaller
watcher.Dispose(); watcher.Dispose();
setup = false; setup = false;
label2.Text = "Gathering your CreamAPI-applicable games and their DLCs . . . "; label2.Text = "Gathering and caching your applicable games and their DLCs . . . ";
await Task.Run(() => GetCreamApiApplicablePrograms(iProgress)); await Task.Run(() => GetCreamApiApplicablePrograms(iProgress));
ProgramSelection.All.ForEach(selection => selection.SteamApiDllDirectories.RemoveAll(directory => !Directory.Exists(directory))); ProgramSelection.All.ForEach(selection => selection.SteamApiDllDirectories.RemoveAll(directory => !Directory.Exists(directory)));
@ -295,7 +295,7 @@ namespace CreamInstaller
if (ProgramSelection.All.Any()) if (ProgramSelection.All.Any())
{ {
allCheckBox.Enabled = true; allCheckBox.Enabled = true;
treeView1.CheckBoxes = true; treeView1.Enabled = true;
treeNodes.ForEach(node => node.Checked = true); treeNodes.ForEach(node => node.Checked = true);
if (ProgramSelection.AllSafeEnabled.Any()) if (ProgramSelection.AllSafeEnabled.Any())
{ {
@ -338,6 +338,20 @@ namespace CreamInstaller
private void OnLoad(object sender, EventArgs e) private void OnLoad(object sender, EventArgs e)
{ {
treeView1.AfterCheck += OnTreeViewNodeCheckedChanged; treeView1.AfterCheck += OnTreeViewNodeCheckedChanged;
treeView1.NodeMouseClick += (sender, e) =>
{
if (e.Button == MouseButtons.Right)
{
ProgramSelection selection = ProgramSelection.FromName(e.Node.Text);
Tuple<int, string> dlc = ProgramSelection.GetDlc(e.Node.Text);
int appId = selection?.SteamAppId ?? dlc?.Item1 ?? 0;
if (appId > 0) Process.Start(new ProcessStartInfo
{
FileName = "https://steamdb.info/app/" + appId,
UseShellExecute = true
});
}
};
OnLoad(); OnLoad();
} }

8
CreamInstaller/SteamCMD.cs
View file

@ -77,13 +77,11 @@ namespace CreamInstaller
} }
if (Program.Canceled || output is null) return false; if (Program.Canceled || output is null) return false;
appInfo = VdfConvert.Deserialize(output); appInfo = VdfConvert.Deserialize(output);
if (appInfo?.Value?.Children()?.ToList()?.Count == 0) return true; if (!(appInfo.Value is VValue) && appInfo.Value.Children().ToList().Count == 0) return true;
VToken type = null; VToken type = appInfo.Value is VValue ? null : appInfo.Value?["common"]?["type"];
try { type = appInfo?.Value?["common"]?["type"]; } catch { }
if (type is null || type.ToString() == "Game") if (type is null || type.ToString() == "Game")
{ {
string buildid = null; string buildid = appInfo.Value is VValue ? null : appInfo.Value["depots"]?["public"]?["buildid"]?.ToString();
try { buildid = appInfo.Value["depots"]["public"]["buildid"].ToString(); } catch { }
if (buildid is null && !(type is null)) return true; if (buildid is null && !(type is null)) return true;
if (type is null || int.Parse(buildid) < buildId) if (type is null || int.Parse(buildid) < buildId)
{ {