Removed SentryModule in place of an IDictionary<string, string> as per …

…@xpicio's suggestion in #55.
getsentry · Nov 12, 2014 · 944b912 · 944b912
1 parent 58a380a
commit 944b912
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 66 deletions.
diff --git a/src/app/SharpRaven/Data/JsonPacket.cs b/src/app/SharpRaven/Data/JsonPacket.cs
@@ -106,9 +106,7 @@ public JsonPacket(string project)
         private JsonPacket()
         {
             // Get assemblies.
-            Modules = SystemUtil
-                .GetModules()
-                .ToDictionary(k => k.Name, v => v.Version);
+            Modules = SystemUtil.GetModules();
 
             // The current hostname
             ServerName = Environment.MachineName;

diff --git a/src/app/SharpRaven/Data/SentryModule.cs b/src/app/SharpRaven/Data/SentryModule.cs
diff --git a/src/app/SharpRaven/SharpRaven.csproj b/src/app/SharpRaven/SharpRaven.csproj
@@ -79,7 +79,6 @@
     <Compile Include="Data\ExceptionFrame.cs" />
     <Compile Include="Data\IJsonPacketFactory.cs" />
     <Compile Include="Data\SentryMessage.cs" />
-    <Compile Include="Data\SentryModule.cs" />
     <Compile Include="Data\SentryException.cs" />
     <Compile Include="Data\SentryRequest.cs" />
     <Compile Include="Data\SentryStacktrace.cs" />

diff --git a/src/app/SharpRaven/Utilities/SystemUtil.cs b/src/app/SharpRaven/Utilities/SystemUtil.cs
@@ -32,8 +32,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using SharpRaven.Data;
-
 namespace SharpRaven.Utilities
 {
     /// <summary>
@@ -47,15 +45,24 @@ public static class SystemUtil
         /// <returns>
         /// All loaded modules.
         /// </returns>
-        public static IEnumerable<SentryModule> GetModules()
+        public static IDictionary<string, string> GetModules()
         {
-            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            var assemblies = AppDomain.CurrentDomain
+                                      .GetAssemblies()
+                                      .Select(a => a.GetName())
+                                      .OrderBy(a => a.Name);
+
+            var dictionary = new Dictionary<string, string>();
 
-            return assemblies.Select(a => a.GetName()).OrderBy(a => a.Name).Select(a => new SentryModule
+            foreach (var assembly in assemblies)
             {
-                Name = a.Name,
-                Version = a.Version.ToString()
-            });
+                if (dictionary.ContainsKey(assembly.Name))
+                    continue;
+
+                dictionary.Add(assembly.Name, assembly.Version.ToString());
+            }
+
+            return dictionary;
         }
     }
 }