logic: fix more Visual Studio plugin issues

* using .Net framework version 4.6.1 in all projects * implemented exception handling in VCFileWrapperFactory * moved logging in separate assembly * enabled logging in wrapper code
2017-06-06 15:46:14 +02:00
parent fc36cc25ca
commit b659e81515
25 changed files with 326 additions and 116 deletions
@@ -1,24 +1,88 @@
-namespace VCProjectEngineWrapper
+using CoatiSoftware.SourcetrailPlugin.Logging;
+using System;
+using System.Collections.Generic;
+
+namespace VCProjectEngineWrapper
 {
 	public static class VCFileWrapperFactory
 	{
+		private interface IFactoryModule
+		{
+			IVCFileWrapper Create(object wrapped);
+		}
+
+		private class FactoryModule2017 : IFactoryModule
+		{
+			public IVCFileWrapper Create(object wrapped)
+			{
+				return new VCFileWrapperVs2017(wrapped);
+			}
+		}
+
+		private class FactoryModule2015 : IFactoryModule
+		{
+			public IVCFileWrapper Create(object wrapped)
+			{
+				return new VCFileWrapperVs2015(wrapped);
+			}
+		}
+
+		private class FactoryModule2013 : IFactoryModule
+		{
+			public IVCFileWrapper Create(object wrapped)
+			{
+				return new VCFileWrapperVs2013(wrapped);
+			}
+		}
+
+		private class FactoryModule2012 : IFactoryModule
+		{
+			public IVCFileWrapper Create(object wrapped)
+			{
+				return new VCFileWrapperVs2012(wrapped);
+			}
+		}
+
+		private static Queue<IFactoryModule> modules = null;
+
 		public static IVCFileWrapper create(object wrapped)
 		{
+			if (modules == null)
+			{
+				modules = new Queue<IFactoryModule>();
+
+				// One of these modules will be working for each version of Visual Studio.
+				modules.Enqueue(new FactoryModule2017());
+				modules.Enqueue(new FactoryModule2015());
+				modules.Enqueue(new FactoryModule2013());
+				modules.Enqueue(new FactoryModule2012());
+			}
+
 			IVCFileWrapper wrapper = null;
+			int testedModuleCount = 0;

-			wrapper = new VCFileWrapperVs2017(wrapped);
+			while (wrapper == null && testedModuleCount < modules.Count)
+			{
+				try
+				{
+					wrapper = modules.Peek().Create(wrapped);
+				}
+				catch (Exception e)
+				{
+					wrapper = null;
+				}

-			if (wrapper == null || !wrapper.isValid())
-			{
-				wrapper = new VCFileWrapperVs2015(wrapped);
-			}
-			if (wrapper == null || !wrapper.isValid())
-			{
-				wrapper = new VCFileWrapperVs2013(wrapped);
-			}
-			if (wrapper == null || !wrapper.isValid())
-			{
-				wrapper = new VCFileWrapperVs2012(wrapped);
+				testedModuleCount++;
+
+				if (wrapper == null || !wrapper.isValid())
+				{
+					// Moving the failing module to the end of the queue.
+					// This causes the working module to finall end up in front.
+					IFactoryModule failedModule = modules.Dequeue();
+					Logging.LogInfo("Discarcing " + failedModule.GetType().Name + " while creating file wrapper.");
+					modules.Enqueue(failedModule);
+					wrapper = null;
+				}
 			}

 			return wrapper;