Added a new argument 'single thread': Generate all the reports one by…

… one without use parallel tasks. Best used with single core CPUs or for debuging. Fixed application always crash on autoruns collection when tab icons are null Removed unused namespaces
sn4k3 · Apr 10, 2015 · 4ddd1b2 · 4ddd1b2
1 parent e5b64d1
commit 4ddd1b2
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+# 1.2.20.2
+## 10/04/2015
+
+* Added a new argument 'single thread': Generate all the reports one by one without use parallel tasks. Best used with single core CPUs or for debuging.
+* Fixed application always crash on autoruns collection when tab icons are null
+* Removed unused namespaces
+
+
 # 1.2.20.0
 ## 10/04/2015
 

diff --git a/README.md b/README.md
@@ -43,11 +43,16 @@ Report will be generated and the html file will show on explorer after completio
 * **Description:** Run program without showing the GUI. After the report is generated that will be shown on explorer after completion.
 * **Example:** "SystemInfoSnapshot.exe -s"
 
-##Open report on completion
+## Open report on completion
 * **Arguments:** '-o', '/o' or '--open-report'
 * **Description:** After the report is generated that will be opened automatically in the default browser.
 * **Example:** "SystemInfoSnapshot.exe -o"
 
+## Use single thread instead (No parallelism)
+* **Arguments:** '-st', '/st' or '--single-thread'
+* **Description:** Generate all the reports one by one without use parallel tasks. Best used with single core CPUs or for debuging.
+* **Example:** "SystemInfoSnapshot.exe -st"
+
 ## Examples
 1. "SystemInfoSnapshot.exe --null -o" - Generate and open the report in the default browser without showing the GUI.
 2. "SystemInfoSnapshot.exe -s -o" - Generate, show and open the report in the explorer and the default browser without showing the GUI.

diff --git a/SystemInfoSnapshot/ApplicationArguments.cs b/SystemInfoSnapshot/ApplicationArguments.cs
@@ -31,14 +31,20 @@ public sealed class ApplicationArguments
         /// </summary>
         public bool OpenReport { get; private set; }
 
+        /// <summary>
+        /// Gets if the reports will be generated under a single thread.
+        /// </summary>
+        public bool UseSingleThread { get; private set; }
+
         /// <summary>
         /// Variable - Arguments list
         /// </summary>
         public readonly Dictionary<string, string[]>  Arguments = new Dictionary<string, string[]>
         {
-            {"Null",        new []{"-n", "/n", "--null"}},
-            {"Silent",      new []{"-s", "/s", "--silent"}},
-            {"OpenReport",  new []{"-o", "/o", "--open-report"}}
+            {"Null",            new []{"-n", "/n", "--null"}},
+            {"Silent",          new []{"-s", "/s", "--silent"}},
+            {"OpenReport",      new []{"-o", "/o", "--open-report"}},
+            {"UseSingleThread", new []{"-st", "/st", "--single-thread"}}
         };
 
         /// <summary>

diff --git a/SystemInfoSnapshot/Autoruns.cs b/SystemInfoSnapshot/Autoruns.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Diagnostics;
 using System.IO;
+using SystemInfoSnapshot.Properties;
 
 namespace SystemInfoSnapshot
 {
@@ -88,12 +88,12 @@ public void BuildEntries()
                 if (string.IsNullOrEmpty(ExecutableFile))
                 {
                     ExecutableFile = Path.Combine(Path.GetTempPath(), "autorunsc.exe");
-                    File.WriteAllBytes(ExecutableFile, Properties.Resources.autorunsc);
+                    File.WriteAllBytes(ExecutableFile, Resources.autorunsc);
                 }
                 using (var proc = new Process())
                 {
                     proc.StartInfo.FileName = ExecutableFile;
-                    proc.StartInfo.Arguments = "-a * -m -c";
+                    proc.StartInfo.Arguments = "-a * -m -c -accepteula";
                     proc.StartInfo.CreateNoWindow = true;
                     proc.StartInfo.UseShellExecute = false;
                     proc.StartInfo.RedirectStandardOutput = true;

diff --git a/SystemInfoSnapshot/Program.cs b/SystemInfoSnapshot/Program.cs
@@ -45,7 +45,7 @@ static void Main()
         /// </summary>
         public static void WriteTemplate()
         {
-            HtmlTemplate = Report.GenerateReports(Reports);
+            HtmlTemplate = Report.GenerateReports(Reports, true, ApplicationArguments.UseSingleThread);
 
             if (ApplicationArguments.Silent)
             {

diff --git a/SystemInfoSnapshot/Properties/AssemblyInfo.cs b/SystemInfoSnapshot/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.20.0")]
-[assembly: AssemblyFileVersion("1.2.20.0")]
+[assembly: AssemblyVersion("1.2.20.2")]
+[assembly: AssemblyFileVersion("1.2.20.2")]
diff --git a/SystemInfoSnapshot/Reports/Report.cs b/SystemInfoSnapshot/Reports/Report.cs
@@ -137,33 +137,44 @@ public static Report[] GetReports()
         /// <param name="reports">List of reports to generate.</param>
         /// <param name="saveReport">True for save reports in the html file.</param>
         /// <returns><see cref="HtmlTemplate"/> with the reports already written in the template.</returns>
-        public static HtmlTemplate GenerateReports(Report[] reports, bool saveReport = true)
+        public static HtmlTemplate GenerateReports(Report[] reports, bool saveReport = true, bool useSingleThread = false)
         {
             var htmlTemplate = new HtmlTemplate();
-            /*List<Report> asyncReports = new List<Report>();
-            foreach (var report in reports)
-            {
-                if (report.CanAsync)
-                {
-                    Debug.WriteLine(report.CanAsync);
-                    asyncReports.Add(report);
-                    continue;
-                }
-                report.Generate();
-                //if (ReferenceEquals(htmlTemplate, null)) continue;
-                htmlTemplate.WriteFromVar(report.GetTemplateVar(), report.Html);
-            }*/
+            //List<Report> asyncReports = new List<Report>();
 
-            Parallel.ForEach(reports, report =>
+            if (useSingleThread)
             {
-                //Debug.WriteLine(report.GetTemplateVar());
-                report.Generate();
-
-                lock (htmlTemplate.TemplateHTML)
+                foreach (var report in reports)
                 {
+                    //if (report.CanAsync)
+                    //{
+                    //    asyncReports.Add(report);
+                    //    continue;
+                    //}
+                    report.Generate();
                     htmlTemplate.WriteFromVar(report.GetTemplateVar(), report.Html);
                 }
-            });
+            }
+            else
+            {
+#if DEBUG
+                var options = new ParallelOptions { MaxDegreeOfParallelism = 1 };
+#else
+                var options = new ParallelOptions { MaxDegreeOfParallelism = -1 };
+#endif
+                Parallel.ForEach(reports, options, report =>
+                {
+                    //Debug.WriteLine(report.GetTemplateVar());
+                    report.Generate();
+
+                    lock (htmlTemplate.TemplateHTML)
+                    {
+                        htmlTemplate.WriteFromVar(report.GetTemplateVar(), report.Html);
+                    }
+                });
+            }
+
+
 
 
             if (/*!ReferenceEquals(htmlTemplate, null) && */saveReport)

diff --git a/SystemInfoSnapshot/Reports/Startup.cs b/SystemInfoSnapshot/Reports/Startup.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 
 namespace SystemInfoSnapshot.Reports
 {
@@ -64,6 +63,7 @@ protected override void Build()
                 {"LSA Providers", "fa fa-shield"},
                 {"Network Providers", "fa fa-wifi"},
                 {"WDM", ""},
+                {"WMI", ""},
                 {"Sidebar Gadgets", ""},
             };
             var autoruns = new Autoruns();
@@ -73,13 +73,15 @@ protected override void Build()
             var result = "<ul class=\"nav nav-tabs\" role=\"tablist\">";
             foreach (var autorunDict in autorunsDict)
             {
-                result += string.Format("<li role=\"presentation\" class=\"{0}\"><a href=\"#autorun_{2}\" aria-controls=\"{2}\" role=\"tab\" data-toggle=\"tab\"><i class=\"{4}\"></i> {1} ({3})</a></li>", (autorunDict.Key.Equals("Logon") ? "active" : string.Empty), autorunDict.Key, autorunDict.Key.Replace(" ", ""), autorunDict.Value.Count, icons[autorunDict.Key]);
+                result += string.Format("<li role=\"presentation\" class=\"{0}\"><a href=\"#autorun_{2}\" aria-controls=\"{2}\" role=\"tab\" data-toggle=\"tab\"><i class=\"{4}\"></i> {1} ({3})</a></li>", 
+                    autorunDict.Key.Equals("Logon") ? "active" : string.Empty, 
+                    autorunDict.Key, autorunDict.Key.Replace(" ", ""), 
+                    autorunDict.Value.Count, 
+                    icons.ContainsKey(autorunDict.Key) ? icons[autorunDict.Key] : string.Empty);
             }
             result += "</ul>";
 
 
-
-            var i = 0;
             result += "<div class=\"tab-content\">";
             foreach (var autorunDict in autorunsDict)
             {
@@ -101,7 +103,7 @@ protected override void Build()
                                 "</tr>" +
                             "</thead>" +
                          "<tbody>";
-                i = 0;
+                var i = 0;
                 foreach (var autorunEntry in autorunDict.Value)
                 {
                     i++;

diff --git a/SystemInfoSnapshot/Reports/SystemInfo.cs b/SystemInfoSnapshot/Reports/SystemInfo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using OpenHardwareMonitor.Hardware;
 
 namespace SystemInfoSnapshot.Reports
 {