aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/Program.cs
diff options
context:
space:
mode:
authorRogueAI42 <[email protected]>2017-06-11 17:34:38 +1000
committerRogueAI42 <[email protected]>2017-06-11 17:38:53 +1000
commit107a98686a105468b5f200ebcbd27343c1210ce4 (patch)
treef6b8403368ddf0b4be2569c0ac8c237635e7b764 /ShiftOS.WinForms/Program.cs
parentc3deaa23fffb7011efb2b5b0f7fc3e754d21f600 (diff)
downloadshiftos_thereturn-107a98686a105468b5f200ebcbd27343c1210ce4.tar.gz
shiftos_thereturn-107a98686a105468b5f200ebcbd27343c1210ce4.tar.bz2
shiftos_thereturn-107a98686a105468b5f200ebcbd27343c1210ce4.zip
ReflectMan Saves The Day..............
Refactored every part in the code that used that damn foreach loop. All assemblies are now loaded on startup into an array, and the results of GetType() on each are concatenated into another array. The parts of the code that were loading the assemblies and scanning them themselves now look to ReflectMan.Types, and all disk I/O is limited to the first time ReflectMan is accessed. While I was there I also replaced some other foreach loops with array comprehensions and such to speed things up - there is a noticeable improvement. It doesn't seem to have broken anything, but I'd appreciate if someone could do more stress testing for me.
Diffstat (limited to 'ShiftOS.WinForms/Program.cs')
-rw-r--r--ShiftOS.WinForms/Program.cs70
1 files changed, 28 insertions, 42 deletions
diff --git a/ShiftOS.WinForms/Program.cs b/ShiftOS.WinForms/Program.cs
index b5fb731..d3530a0 100644
--- a/ShiftOS.WinForms/Program.cs
+++ b/ShiftOS.WinForms/Program.cs
@@ -114,53 +114,39 @@ namespace ShiftOS.WinForms
{
var defaultList = JsonConvert.DeserializeObject<List<ShiftoriumUpgrade>>(Properties.Resources.Shiftorium);
- foreach(var exe in Directory.GetFiles(Environment.CurrentDirectory))
+ foreach (var type in ReflectMan.Types)
{
- if (exe.EndsWith(".exe") || exe.EndsWith(".dll"))
+ var attribs = type.GetCustomAttributes(false);
+ var attrib = attribs.FirstOrDefault(x => x is AppscapeEntryAttribute) as AppscapeEntryAttribute;
+ if (attrib != null)
{
- try
+ var upgrade = new ShiftoriumUpgrade
{
- var asm = Assembly.LoadFile(exe);
- foreach (var type in asm.GetTypes())
- {
- var attrib = type.GetCustomAttributes(false).FirstOrDefault(x => x is AppscapeEntryAttribute) as AppscapeEntryAttribute;
- if (attrib != null)
- {
- var upgrade = new ShiftoriumUpgrade
- {
- Id = attrib.Name.ToLower().Replace(" ", "_"),
- Name = attrib.Name,
- Description = attrib.Description,
- Cost = attrib.Cost,
- Category = attrib.Category,
- Dependencies = (string.IsNullOrWhiteSpace(attrib.DependencyString)) ? "appscape_handled_nodisplay" : "appscape_handled_nodisplay;" + attrib.DependencyString
- };
- defaultList.Add(upgrade);
- }
-
- var sattrib = type.GetCustomAttributes(false).FirstOrDefault(x => x is StpContents) as StpContents;
- if (sattrib != null)
- {
- var upgrade = new ShiftoriumUpgrade
- {
- Id = sattrib.Upgrade,
- Name = sattrib.Name,
- Description = "This is a hidden dummy upgrade for the .stp file installation attribute \"" + sattrib.Name + "\".",
- Cost = 0,
- Category = "If this is shown, there's a bug in the Shiftorium Provider or the user is a supreme Shifter.",
- Dependencies = "dummy_nodisplay"
- };
- defaultList.Add(upgrade);
- }
-
- }
-
-
-
+ Id = attrib.Name.ToLower().Replace(" ", "_"),
+ Name = attrib.Name,
+ Description = attrib.Description,
+ Cost = attrib.Cost,
+ Category = attrib.Category,
+ Dependencies = (string.IsNullOrWhiteSpace(attrib.DependencyString)) ? "appscape_handled_nodisplay" : "appscape_handled_nodisplay;" + attrib.DependencyString
+ };
+ defaultList.Add(upgrade);
+ }
- }
- catch { }
+ var sattrib = attribs.FirstOrDefault(x => x is StpContents) as StpContents;
+ if (sattrib != null)
+ {
+ var upgrade = new ShiftoriumUpgrade
+ {
+ Id = sattrib.Upgrade,
+ Name = sattrib.Name,
+ Description = "This is a hidden dummy upgrade for the .stp file installation attribute \"" + sattrib.Name + "\".",
+ Cost = 0,
+ Category = "If this is shown, there's a bug in the Shiftorium Provider or the user is a supreme Shifter.",
+ Dependencies = "dummy_nodisplay"
+ };
+ defaultList.Add(upgrade);
}
+
}
return defaultList;
}