From 107a98686a105468b5f200ebcbd27343c1210ce4 Mon Sep 17 00:00:00 2001
From: RogueAI42 <declanhoare@exemail.com.au>
Date: Sun, 11 Jun 2017 17:34:38 +1000
Subject: 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.
---
 ShiftOS.WinForms/Applications/IconManager.cs | 99 +++++++++++-----------------
 1 file changed, 40 insertions(+), 59 deletions(-)

(limited to 'ShiftOS.WinForms/Applications/IconManager.cs')

diff --git a/ShiftOS.WinForms/Applications/IconManager.cs b/ShiftOS.WinForms/Applications/IconManager.cs
index 0c6e119..7bbeb34 100644
--- a/ShiftOS.WinForms/Applications/IconManager.cs
+++ b/ShiftOS.WinForms/Applications/IconManager.cs
@@ -92,70 +92,51 @@ namespace ShiftOS.WinForms.Applications
         {
             flbody.Controls.Clear(); //Clear the icon list.
 
-            List<Type> types = new List<Type>();
+            Type[] types = Array.FindAll(ReflectMan.Types, x => x.GetCustomAttributes(false).FirstOrDefault(y => y is DefaultIconAttribute) != null);
 
-            foreach(var exe in System.IO.Directory.GetFiles(Environment.CurrentDirectory))
-            {
-                if(exe.ToLower().EndsWith(".exe") || exe.ToLower().EndsWith(".dll"))
-                {
-                    try
-                    {
-                        var asm = Assembly.LoadFile(exe);
+            pageCount = types.GetPageCount(pageSize);
 
-                        var typeList = asm.GetTypes().Where(x => x.GetCustomAttributes(false).FirstOrDefault(y => y is DefaultIconAttribute) != null);
-                        types.AddRange(typeList);
-
-                    }
-                    catch { }
-                }
-            }
-
-            pageCount = types.ToArray().GetPageCount(pageSize);
-
-            foreach (var type in types.ToArray().GetItemsOnPage(currentPage, pageSize))
+            foreach (var type in Array.FindAll(types.GetItemsOnPage(currentPage, pageSize), t => Shiftorium.UpgradeAttributesUnlocked(t)))
             {
-                if (Shiftorium.UpgradeAttributesUnlocked(type))
+                var pnl = new Panel();
+                pnl.Height = 30;
+                pnl.Width = flbody.Width - 15;
+                flbody.Controls.Add(pnl);
+                pnl.Show();
+                var pic = new PictureBox();
+                pic.SizeMode = PictureBoxSizeMode.StretchImage;
+                pic.Size = new Size(24, 24);
+                pic.Image = GetIcon(type.Name);
+                pnl.Controls.Add(pic);
+                pic.Left = 5;
+                pic.Top = (pnl.Height - pic.Height) / 2;
+                pic.Show();
+                var lbl = new Label();
+                lbl.Tag = "header3";
+                lbl.AutoSize = true;
+                lbl.Text = NameChangerBackend.GetNameRaw(type);
+                ControlManager.SetupControl(lbl);
+                pnl.Controls.Add(lbl);
+                lbl.CenterParent();
+                lbl.Show();
+                var btn = new Button();
+                btn.Text = "Change...";
+                btn.AutoSize = true;
+                btn.AutoSizeMode = AutoSizeMode.GrowAndShrink;
+                pnl.Controls.Add(btn);
+                btn.Left = (pnl.Width - btn.Width) - 5;
+                btn.Top = (pnl.Height - btn.Height) / 2;
+                btn.Click += (o, a) =>
                 {
-                    var pnl = new Panel();
-                    pnl.Height = 30;
-                    pnl.Width = flbody.Width - 15;
-                    flbody.Controls.Add(pnl);
-                    pnl.Show();
-                    var pic = new PictureBox();
-                    pic.SizeMode = PictureBoxSizeMode.StretchImage;
-                    pic.Size = new Size(24, 24);
-                    pic.Image = GetIcon(type.Name);
-                    pnl.Controls.Add(pic);
-                    pic.Left = 5;
-                    pic.Top = (pnl.Height - pic.Height) / 2;
-                    pic.Show();
-                    var lbl = new Label();
-                    lbl.Tag = "header3";
-                    lbl.AutoSize = true;
-                    lbl.Text = NameChangerBackend.GetNameRaw(type);
-                    ControlManager.SetupControl(lbl);
-                    pnl.Controls.Add(lbl);
-                    lbl.CenterParent();
-                    lbl.Show();
-                    var btn = new Button();
-                    btn.Text = "Change...";
-                    btn.AutoSize = true;
-                    btn.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-                    pnl.Controls.Add(btn);
-                    btn.Left = (pnl.Width - btn.Width) - 5;
-                    btn.Top = (pnl.Height - btn.Height) / 2;
-                    btn.Click += (o, a) =>
+                    var gfp = new GraphicPicker(pic.Image, lbl.Text + " icon", ImageLayout.Stretch, (raw, img, layout) =>
                     {
-                        var gfp = new GraphicPicker(pic.Image, lbl.Text + " icon", ImageLayout.Stretch, (raw, img, layout) =>
-                        {
-                            pic.Image = img;
-                            SetIcon(type.Name, raw);
-                        });
-                        AppearanceManager.SetupDialog(gfp);
-                    };
-                    btn.Show();
-                    ControlManager.SetupControls(pnl);
-                }
+                        pic.Image = img;
+                        SetIcon(type.Name, raw);
+                    });
+                    AppearanceManager.SetupDialog(gfp);
+                };
+                btn.Show();
+                ControlManager.SetupControls(pnl);
             }
 
             btnnext.Visible = (currentPage < pageCount - 1);
-- 
cgit v1.2.3