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

v3.2.2.3

Browse source 
- Fixed steam store query caching
- Improved the context menu display for app infos
- Fixed selection form exception handling
This commit is contained in:
pointfeev 2022-03-08 22:41:41 -05:00
parent 509033c8c9
commit 47c99e5e89
4 changed files with 253 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CreamInstaller/CreamInstaller.csproj
View file

@ -5,7 +5,7 @@
<UseWindowsForms>True</UseWindowsForms> <UseWindowsForms>True</UseWindowsForms>
<ApplicationIcon>Resources\ini.ico</ApplicationIcon> <ApplicationIcon>Resources\ini.ico</ApplicationIcon>
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract> <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
<Version>3.2.2.2</Version> <Version>3.2.2.3</Version>
<PackageIcon>Resources\ini.ico</PackageIcon> <PackageIcon>Resources\ini.ico</PackageIcon>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>2021, pointfeev (https://github.com/pointfeev)</Copyright> <Copyright>2021, pointfeev (https://github.com/pointfeev)</Copyright>

11
CreamInstaller/Epic/EpicStore.cs
View file

@ -32,13 +32,20 @@ internal static class EpicStore
{ {
response = JsonConvert.DeserializeObject<Response>(File.ReadAllText(cacheFile)); response = JsonConvert.DeserializeObject<Response>(File.ReadAllText(cacheFile));
} }
catch { } catch
{
File.Delete(cacheFile);
}
if (response is null) return dlcIds; if (response is null) return dlcIds;
try try
{ {
File.WriteAllText(cacheFile, JsonConvert.SerializeObject(response, Formatting.Indented)); File.WriteAllText(cacheFile, JsonConvert.SerializeObject(response, Formatting.Indented));
} }
catch { } catch //(Exception e)
{
//using DialogForm dialogForm = new(null);
//dialogForm.Show(SystemIcons.Error, "Unsuccessful serialization of query for category namespace " + categoryNamespace + ":\n\n" + e.ToString(), "FUCK");
}
List<Element> searchStore = new(response.Data.Catalog.SearchStore.Elements); List<Element> searchStore = new(response.Data.Catalog.SearchStore.Elements);
foreach (Element element in searchStore) foreach (Element element in searchStore)
{ {

446
CreamInstaller/SelectForm.cs
View file

@ -387,66 +387,57 @@ internal partial class SelectForm : CustomForm
private async void OnLoad() private async void OnLoad()
{ {
retry: Program.Canceled = false;
try blockedGamesCheckBox.Enabled = false;
blockProtectedHelpButton.Enabled = false;
cancelButton.Enabled = true;
scanButton.Enabled = false;
noneFoundLabel.Visible = false;
allCheckBox.Enabled = false;
installButton.Enabled = false;
uninstallButton.Enabled = installButton.Enabled;
selectionTreeView.Enabled = false;
ShowProgressBar();
bool setup = true;
int maxProgress = 0;
int curProgress = 0;
Progress<int> progress = new();
IProgress<int> iProgress = progress;
progress.ProgressChanged += (sender, _progress) =>
{ {
Program.Canceled = false; if (Program.Canceled) return;
blockedGamesCheckBox.Enabled = false; if (_progress < 0 || _progress > maxProgress) maxProgress = -_progress;
blockProtectedHelpButton.Enabled = false; else curProgress = _progress;
cancelButton.Enabled = true; int p = Math.Max(Math.Min((int)((float)(curProgress / (float)maxProgress) * 100), 100), 0);
scanButton.Enabled = false; progressLabel.Text = setup ? $"Setting up SteamCMD . . . {p}%"
noneFoundLabel.Visible = false; : $"Gathering and caching your applicable games and their DLCs . . . {p}%";
allCheckBox.Enabled = false; progressBar.Value = p;
installButton.Enabled = false; };
uninstallButton.Enabled = installButton.Enabled;
selectionTreeView.Enabled = false;
ShowProgressBar();
bool setup = true; await ProgramData.Setup();
int maxProgress = 0; if (Directory.Exists(SteamLibrary.InstallPath))
int curProgress = 0;
Progress<int> progress = new();
IProgress<int> iProgress = progress;
progress.ProgressChanged += (sender, _progress) =>
{
if (Program.Canceled) return;
if (_progress < 0 || _progress > maxProgress) maxProgress = -_progress;
else curProgress = _progress;
int p = Math.Max(Math.Min((int)((float)(curProgress / (float)maxProgress) * 100), 100), 0);
progressLabel.Text = setup ? $"Setting up SteamCMD . . . {p}%"
: $"Gathering and caching your applicable games and their DLCs . . . {p}%";
progressBar.Value = p;
};
await ProgramData.Setup();
if (Directory.Exists(SteamLibrary.InstallPath))
{
progressLabel.Text = $"Setting up SteamCMD . . . ";
await SteamCMD.Setup(iProgress);
}
setup = false;
progressLabel.Text = "Gathering and caching your applicable games and their DLCs . . . ";
ProgramSelection.ValidateAll();
TreeNodes.ForEach(node => node.Remove());
await GetApplicablePrograms(iProgress);
await SteamCMD.Cleanup();
HideProgressBar();
selectionTreeView.Enabled = ProgramSelection.All.Any();
allCheckBox.Enabled = selectionTreeView.Enabled;
noneFoundLabel.Visible = !selectionTreeView.Enabled;
installButton.Enabled = ProgramSelection.AllUsableEnabled.Any();
uninstallButton.Enabled = installButton.Enabled;
cancelButton.Enabled = false;
scanButton.Enabled = true;
blockedGamesCheckBox.Enabled = true;
blockProtectedHelpButton.Enabled = true;
}
catch (Exception e)
{ {
if (ExceptionHandler.OutputException(e)) goto retry; progressLabel.Text = $"Setting up SteamCMD . . . ";
Close(); await SteamCMD.Setup(iProgress);
} }
setup = false;
progressLabel.Text = "Gathering and caching your applicable games and their DLCs . . . ";
ProgramSelection.ValidateAll();
TreeNodes.ForEach(node => node.Remove());
await GetApplicablePrograms(iProgress);
await SteamCMD.Cleanup();
HideProgressBar();
selectionTreeView.Enabled = ProgramSelection.All.Any();
allCheckBox.Enabled = selectionTreeView.Enabled;
noneFoundLabel.Visible = !selectionTreeView.Enabled;
installButton.Enabled = ProgramSelection.AllUsableEnabled.Any();
uninstallButton.Enabled = installButton.Enabled;
cancelButton.Enabled = false;
scanButton.Enabled = true;
blockedGamesCheckBox.Enabled = true;
blockProtectedHelpButton.Enabled = true;
} }
private void OnTreeViewNodeCheckedChanged(object sender, TreeViewEventArgs e) private void OnTreeViewNodeCheckedChanged(object sender, TreeViewEventArgs e)
@ -549,185 +540,198 @@ internal partial class SelectForm : CustomForm
private void OnLoad(object sender, EventArgs _) private void OnLoad(object sender, EventArgs _)
{ {
HideProgressBar(); retry:
selectionTreeView.TreeViewNodeSorter = new TreeNodeSorter(); try
selectionTreeView.AfterCheck += OnTreeViewNodeCheckedChanged;
selectionTreeView.NodeMouseClick += (sender, e) =>
{ {
TreeNode node = e.Node; HideProgressBar();
if (node is null || !node.Bounds.Contains(e.Location) || e.Button != MouseButtons.Right || e.Clicks != 1) selectionTreeView.TreeViewNodeSorter = new TreeNodeSorter();
return; selectionTreeView.AfterCheck += OnTreeViewNodeCheckedChanged;
ContextMenuStrip contextMenuStrip = new(); selectionTreeView.NodeMouseClick += (sender, e) =>
selectionTreeView.SelectedNode = node;
string id = node.Name;
ProgramSelection selection = ProgramSelection.FromId(id);
(string gameAppId, (DlcType type, string name, string icon) app)? dlc = null;
if (selection is null) dlc = ProgramSelection.GetDlcFromId(id);
ProgramSelection dlcParentSelection = null;
if (dlc is not null) dlcParentSelection = ProgramSelection.FromId(dlc.Value.gameAppId);
if (selection is null && dlcParentSelection is null)
return;
ContextMenuItem header = null;
if (id == "ParadoxLauncher")
header = new(node.Text, "Paradox Launcher");
else if (selection is not null)
header = new(node.Text, (id, selection.IconUrl, false));
else if (dlc is not null)
header = new(node.Text, (id, dlc.Value.app.icon, false), (id, dlcParentSelection.IconUrl, false));
contextMenuStrip.Items.Add(header ?? new ContextMenuItem(node.Text));
string appInfoVDF = $@"{SteamCMD.AppInfoPath}\{id}.vdf";
string appInfoJSON = $@"{SteamCMD.AppInfoPath}\{id}.json";
if (Directory.Exists(Directory.GetDirectoryRoot(appInfoVDF)) && (File.Exists(appInfoVDF) || File.Exists(appInfoJSON)))
{
contextMenuStrip.Items.Add(new ToolStripSeparator());
contextMenuStrip.Items.Add(new ContextMenuItem("Open AppInfo", "Notepad",
new EventHandler((sender, e) =>
{
if (File.Exists(appInfoJSON))
Diagnostics.OpenFileInNotepad(appInfoJSON);
else if (File.Exists(appInfoVDF))
Diagnostics.OpenFileInNotepad(appInfoVDF);
})));
contextMenuStrip.Items.Add(new ContextMenuItem("Refresh AppInfo", "Command Prompt",
new EventHandler((sender, e) =>
{
try
{
File.Delete(appInfoVDF);
}
catch { }
try
{
File.Delete(appInfoJSON);
}
catch { }
OnLoad();
})));
}
if (selection is not null)
{ {
TreeNode node = e.Node;
if (node is null || !node.Bounds.Contains(e.Location) || e.Button != MouseButtons.Right || e.Clicks != 1)
return;
ContextMenuStrip contextMenuStrip = new();
selectionTreeView.SelectedNode = node;
string id = node.Name;
ProgramSelection selection = ProgramSelection.FromId(id);
(string gameAppId, (DlcType type, string name, string icon) app)? dlc = null;
if (selection is null) dlc = ProgramSelection.GetDlcFromId(id);
ProgramSelection dlcParentSelection = null;
if (dlc is not null) dlcParentSelection = ProgramSelection.FromId(dlc.Value.gameAppId);
if (selection is null && dlcParentSelection is null)
return;
ContextMenuItem header = null;
if (id == "ParadoxLauncher") if (id == "ParadoxLauncher")
header = new(node.Text, "Paradox Launcher");
else if (selection is not null)
header = new(node.Text, (id, selection.IconUrl, false));
else if (dlc is not null)
header = new(node.Text, (id, dlc.Value.app.icon, false), (id, dlcParentSelection.IconUrl, false));
contextMenuStrip.Items.Add(header ?? new ContextMenuItem(node.Text));
string appInfoVDF = $@"{SteamCMD.AppInfoPath}\{id}.vdf";
string appInfoJSON = $@"{SteamCMD.AppInfoPath}\{id}.json";
if (Directory.Exists(Directory.GetDirectoryRoot(appInfoVDF)) && (File.Exists(appInfoVDF) || File.Exists(appInfoJSON)))
{ {
contextMenuStrip.Items.Add(new ToolStripSeparator()); List<ContextMenuItem> queries = new();
contextMenuStrip.Items.Add(new ContextMenuItem("Repair", "Command Prompt", if (File.Exists(appInfoJSON))
new EventHandler(async (sender, e) => queries.Add(new ContextMenuItem((selection is null || selection.IsSteam) ? "Open Steam Store Query" : "Open Epic GraphQL Query", "Notepad",
{ new EventHandler((sender, e) => Diagnostics.OpenFileInNotepad(appInfoJSON))));
if (!Program.IsProgramRunningDialog(this, selection)) return; if (File.Exists(appInfoVDF))
byte[] creamConfig = null; queries.Add(new ContextMenuItem("Open SteamCMD Query", "Notepad",
byte[] steamOriginalSdk32 = null; new EventHandler((sender, e) => Diagnostics.OpenFileInNotepad(appInfoVDF))));
byte[] steamOriginalSdk64 = null; if (queries.Any())
byte[] screamConfig = null; {
byte[] epicOriginalSdk32 = null; contextMenuStrip.Items.Add(new ToolStripSeparator());
byte[] epicOriginalSdk64 = null; foreach (ContextMenuItem query in queries)
foreach (string directory in selection.DllDirectories) contextMenuStrip.Items.Add(query);
contextMenuStrip.Items.Add(new ContextMenuItem("Refresh Queries", "Command Prompt",
new EventHandler((sender, e) =>
{ {
directory.GetCreamApiComponents(out string sdk32, out string _, out string sdk64, out string _, out string config); try
if (creamConfig is null && File.Exists(config))
creamConfig = File.ReadAllBytes(config);
await InstallForm.UninstallCreamAPI(directory);
if (steamOriginalSdk32 is null && File.Exists(sdk32) && !Properties.Resources.Steamworks32.EqualsFile(sdk32))
steamOriginalSdk32 = File.ReadAllBytes(sdk32);
if (steamOriginalSdk64 is null && File.Exists(sdk64) && !Properties.Resources.Steamworks64.EqualsFile(sdk64))
steamOriginalSdk64 = File.ReadAllBytes(sdk64);
directory.GetScreamApiComponents(out sdk32, out string _, out sdk64, out string _, out config);
if (screamConfig is null && File.Exists(config))
screamConfig = File.ReadAllBytes(config);
await InstallForm.UninstallScreamAPI(directory);
if (epicOriginalSdk32 is null && File.Exists(sdk32) && !Properties.Resources.EpicOnlineServices32.EqualsFile(sdk32))
epicOriginalSdk32 = File.ReadAllBytes(sdk32);
if (epicOriginalSdk64 is null && File.Exists(sdk64) && !Properties.Resources.EpicOnlineServices64.EqualsFile(sdk64))
epicOriginalSdk64 = File.ReadAllBytes(sdk64);
}
if (steamOriginalSdk32 is not null || steamOriginalSdk64 is not null || epicOriginalSdk32 is not null || epicOriginalSdk64 is not null)
{
bool neededRepair = false;
foreach (string directory in selection.DllDirectories)
{ {
directory.GetCreamApiComponents(out string sdk32, out string _, out string sdk64, out string _, out string config); File.Delete(appInfoVDF);
if (steamOriginalSdk32 is not null && Properties.Resources.Steamworks32.EqualsFile(sdk32))
{
steamOriginalSdk32.Write(sdk32);
neededRepair = true;
}
if (steamOriginalSdk64 is not null && Properties.Resources.Steamworks64.EqualsFile(sdk64))
{
steamOriginalSdk64.Write(sdk64);
neededRepair = true;
}
if (creamConfig is not null)
{
await InstallForm.InstallCreamAPI(directory, selection);
creamConfig.Write(config);
}
directory.GetScreamApiComponents(out sdk32, out string _, out sdk64, out string _, out config);
if (epicOriginalSdk32 is not null && Properties.Resources.EpicOnlineServices32.EqualsFile(sdk32))
{
epicOriginalSdk32.Write(sdk32);
neededRepair = true;
}
if (epicOriginalSdk64 is not null && Properties.Resources.EpicOnlineServices64.EqualsFile(sdk64))
{
epicOriginalSdk64.Write(sdk64);
neededRepair = true;
}
if (screamConfig is not null)
{
await InstallForm.InstallScreamAPI(directory, selection);
screamConfig.Write(config);
}
} }
if (neededRepair) catch { }
new DialogForm(this).Show(Icon, "Paradox Launcher successfully repaired!", "OK"); try
else {
new DialogForm(this).Show(SystemIcons.Information, "Paradox Launcher does not need to be repaired.", "OK"); File.Delete(appInfoJSON);
} }
else catch { }
new DialogForm(this).Show(SystemIcons.Error, "Paradox Launcher repair failed!" OnLoad();
+ "\n\nAn original Steamworks/Epic Online Services SDK file could not be found." })));
+ "\nYou must reinstall Paradox Launcher to fix this issue.", "OK"); }
})));
}
contextMenuStrip.Items.Add(new ToolStripSeparator());
contextMenuStrip.Items.Add(new ContextMenuItem("Open Root Directory", "File Explorer",
new EventHandler((sender, e) => Diagnostics.OpenDirectoryInFileExplorer(selection.RootDirectory))));
for (int i = 0; i < selection.DllDirectories.Count; i++)
{
string directory = selection.DllDirectories[i];
contextMenuStrip.Items.Add(new ContextMenuItem($"Open {(selection.IsSteam ? "Steamworks" : "Epic Online Services")} SDK Directory ({i + 1})", "File Explorer",
new EventHandler((sender, e) => Diagnostics.OpenDirectoryInFileExplorer(directory))));
}
}
if (id != "ParadoxLauncher")
{
if (selection is not null && selection.IsSteam || dlcParentSelection is not null && dlcParentSelection.IsSteam)
{
contextMenuStrip.Items.Add(new ToolStripSeparator());
contextMenuStrip.Items.Add(new ContextMenuItem("Open SteamDB", "SteamDB",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser("https://steamdb.info/app/" + id))));
} }
if (selection is not null) if (selection is not null)
{ {
if (selection.IsSteam) if (id == "ParadoxLauncher")
{
contextMenuStrip.Items.Add(new ContextMenuItem("Open Steam Store", "Steam Store",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser(selection.ProductUrl))));
contextMenuStrip.Items.Add(new ContextMenuItem("Open Steam Community", (id, selection.SubIconUrl, true), "Steam Community",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser("https://steamcommunity.com/app/" + id))));
}
else
{ {
contextMenuStrip.Items.Add(new ToolStripSeparator()); contextMenuStrip.Items.Add(new ToolStripSeparator());
contextMenuStrip.Items.Add(new ContextMenuItem("Open ScreamDB", "ScreamDB", contextMenuStrip.Items.Add(new ContextMenuItem("Repair", "Command Prompt",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser("https://scream-db.web.app/offers/" + id)))); new EventHandler(async (sender, e) =>
contextMenuStrip.Items.Add(new ContextMenuItem("Open Epic Games Store", "Epic Games", {
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser(selection.ProductUrl)))); if (!Program.IsProgramRunningDialog(this, selection)) return;
byte[] creamConfig = null;
byte[] steamOriginalSdk32 = null;
byte[] steamOriginalSdk64 = null;
byte[] screamConfig = null;
byte[] epicOriginalSdk32 = null;
byte[] epicOriginalSdk64 = null;
foreach (string directory in selection.DllDirectories)
{
directory.GetCreamApiComponents(out string sdk32, out string _, out string sdk64, out string _, out string config);
if (creamConfig is null && File.Exists(config))
creamConfig = File.ReadAllBytes(config);
await InstallForm.UninstallCreamAPI(directory);
if (steamOriginalSdk32 is null && File.Exists(sdk32) && !Properties.Resources.Steamworks32.EqualsFile(sdk32))
steamOriginalSdk32 = File.ReadAllBytes(sdk32);
if (steamOriginalSdk64 is null && File.Exists(sdk64) && !Properties.Resources.Steamworks64.EqualsFile(sdk64))
steamOriginalSdk64 = File.ReadAllBytes(sdk64);
directory.GetScreamApiComponents(out sdk32, out string _, out sdk64, out string _, out config);
if (screamConfig is null && File.Exists(config))
screamConfig = File.ReadAllBytes(config);
await InstallForm.UninstallScreamAPI(directory);
if (epicOriginalSdk32 is null && File.Exists(sdk32) && !Properties.Resources.EpicOnlineServices32.EqualsFile(sdk32))
epicOriginalSdk32 = File.ReadAllBytes(sdk32);
if (epicOriginalSdk64 is null && File.Exists(sdk64) && !Properties.Resources.EpicOnlineServices64.EqualsFile(sdk64))
epicOriginalSdk64 = File.ReadAllBytes(sdk64);
}
if (steamOriginalSdk32 is not null || steamOriginalSdk64 is not null || epicOriginalSdk32 is not null || epicOriginalSdk64 is not null)
{
bool neededRepair = false;
foreach (string directory in selection.DllDirectories)
{
directory.GetCreamApiComponents(out string sdk32, out string _, out string sdk64, out string _, out string config);
if (steamOriginalSdk32 is not null && Properties.Resources.Steamworks32.EqualsFile(sdk32))
{
steamOriginalSdk32.Write(sdk32);
neededRepair = true;
}
if (steamOriginalSdk64 is not null && Properties.Resources.Steamworks64.EqualsFile(sdk64))
{
steamOriginalSdk64.Write(sdk64);
neededRepair = true;
}
if (creamConfig is not null)
{
await InstallForm.InstallCreamAPI(directory, selection);
creamConfig.Write(config);
}
directory.GetScreamApiComponents(out sdk32, out string _, out sdk64, out string _, out config);
if (epicOriginalSdk32 is not null && Properties.Resources.EpicOnlineServices32.EqualsFile(sdk32))
{
epicOriginalSdk32.Write(sdk32);
neededRepair = true;
}
if (epicOriginalSdk64 is not null && Properties.Resources.EpicOnlineServices64.EqualsFile(sdk64))
{
epicOriginalSdk64.Write(sdk64);
neededRepair = true;
}
if (screamConfig is not null)
{
await InstallForm.InstallScreamAPI(directory, selection);
screamConfig.Write(config);
}
}
if (neededRepair)
new DialogForm(this).Show(Icon, "Paradox Launcher successfully repaired!", "OK");
else
new DialogForm(this).Show(SystemIcons.Information, "Paradox Launcher does not need to be repaired.", "OK");
}
else
new DialogForm(this).Show(SystemIcons.Error, "Paradox Launcher repair failed!"
+ "\n\nAn original Steamworks/Epic Online Services SDK file could not be found."
+ "\nYou must reinstall Paradox Launcher to fix this issue.", "OK");
})));
}
contextMenuStrip.Items.Add(new ToolStripSeparator());
contextMenuStrip.Items.Add(new ContextMenuItem("Open Root Directory", "File Explorer",
new EventHandler((sender, e) => Diagnostics.OpenDirectoryInFileExplorer(selection.RootDirectory))));
for (int i = 0; i < selection.DllDirectories.Count; i++)
{
string directory = selection.DllDirectories[i];
contextMenuStrip.Items.Add(new ContextMenuItem($"Open {(selection.IsSteam ? "Steamworks" : "Epic Online Services")} SDK Directory ({i + 1})", "File Explorer",
new EventHandler((sender, e) => Diagnostics.OpenDirectoryInFileExplorer(directory))));
} }
} }
} if (id != "ParadoxLauncher")
contextMenuStrip.Show(selectionTreeView, e.Location); {
}; if (selection is not null && selection.IsSteam || dlcParentSelection is not null && dlcParentSelection.IsSteam)
OnLoad(); {
contextMenuStrip.Items.Add(new ToolStripSeparator());
contextMenuStrip.Items.Add(new ContextMenuItem("Open SteamDB", "SteamDB",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser("https://steamdb.info/app/" + id))));
}
if (selection is not null)
{
if (selection.IsSteam)
{
contextMenuStrip.Items.Add(new ContextMenuItem("Open Steam Store", "Steam Store",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser(selection.ProductUrl))));
contextMenuStrip.Items.Add(new ContextMenuItem("Open Steam Community", (id, selection.SubIconUrl, true), "Steam Community",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser("https://steamcommunity.com/app/" + id))));
}
else
{
contextMenuStrip.Items.Add(new ToolStripSeparator());
contextMenuStrip.Items.Add(new ContextMenuItem("Open ScreamDB", "ScreamDB",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser("https://scream-db.web.app/offers/" + id))));
contextMenuStrip.Items.Add(new ContextMenuItem("Open Epic Games Store", "Epic Games",
new EventHandler((sender, e) => Diagnostics.OpenUrlInInternetBrowser(selection.ProductUrl))));
}
}
}
contextMenuStrip.Show(selectionTreeView, e.Location);
};
OnLoad();
}
catch (Exception e)
{
if (ExceptionHandler.OutputException(e)) goto retry;
Close();
}
} }
private void OnAccept(bool uninstall = false) private void OnAccept(bool uninstall = false)

27
CreamInstaller/Steam/SteamStore.cs
View file

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -44,17 +43,24 @@ internal static class SteamStore
try try
{ {
AppData data = JsonConvert.DeserializeObject<AppDetails>(app.Value.ToString()).data; AppData data = JsonConvert.DeserializeObject<AppDetails>(app.Value.ToString()).data;
try if (data is not null)
{ {
File.WriteAllText(cacheFile, JsonConvert.SerializeObject(data, Formatting.Indented)); try
{
File.WriteAllText(cacheFile, JsonConvert.SerializeObject(data, Formatting.Indented));
}
catch //(Exception e)
{
//using DialogForm dialogForm = new(null);
//dialogForm.Show(SystemIcons.Error, "Unsuccessful serialization of query for appid " + appId + ":\n\n" + e.ToString(), "FUCK");
}
return data;
} }
catch { }
return data;
} }
catch (Exception e) catch //(Exception e)
{ {
using DialogForm dialogForm = new(null); //using DialogForm dialogForm = new(null);
dialogForm.Show(SystemIcons.Error, "Unsuccessful deserialization of query for appid " + appId + ":\n\n" + e.ToString(), "FUCK"); //dialogForm.Show(SystemIcons.Error, "Unsuccessful deserialization of query for appid " + appId + ":\n\n" + e.ToString(), "FUCK");
} }
} }
} }
@ -65,7 +71,10 @@ internal static class SteamStore
{ {
return JsonConvert.DeserializeObject<AppData>(File.ReadAllText(cacheFile)); return JsonConvert.DeserializeObject<AppData>(File.ReadAllText(cacheFile));
} }
catch { } catch
{
File.Delete(cacheFile);
}
} }
return null; return null;
} }