#8095 Support for environment variables in squiggle settings

hasankhan · hasankhan · commit cec71e76fed2 · 2013-10-06T23:01:56.000-07:00
diff --git a/Shared/AssemblyInfo.Version.cs b/Shared/AssemblyInfo.Version.cs
@@ -2,5 +2,5 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("3.2.4.0")]
-[assembly: AssemblyFileVersion("3.2.4.0")]
+[assembly: AssemblyVersion("3.3.0.0")]
+[assembly: AssemblyFileVersion("3.3.0.0")]
diff --git a/Squiggle.Client/Chat.cs b/Squiggle.Client/Chat.cs
@@ -24,10 +24,9 @@ class Chat: IChat
         IChatSession session;
         ChatBuddies buddies;
         IBuddy self;
+        HistoryManager history;
 
-        public Chat(IChatSession session, IBuddy self, IBuddy buddy, BuddyResolver buddyResolver) : this(session, self, Enumerable.Repeat(buddy, 1), buddyResolver) { }
-
-        public Chat(IChatSession session, IBuddy self, IEnumerable<IBuddy> buddies, BuddyResolver buddyResolver)
+        public Chat(IChatSession session, IBuddy self, IEnumerable<IBuddy> buddies, BuddyResolver buddyResolver, HistoryManager history)
         {
             this.self = self;
             
@@ -42,6 +41,8 @@ public Chat(IChatSession session, IBuddy self, IEnumerable<IBuddy> buddies, Budd
             session.UserTyping += session_UserTyping;
             session.BuzzReceived += session_BuzzReceived;
             session.ActivityInviteReceived += session_ActivityInviteReceived;
+
+            this.history = history;
         }             
 
         #region IChat Members
@@ -273,7 +274,7 @@ void LogSessionStart()
         void DoHistoryAction(Action<HistoryManager> action)
         {
             if (EnableLogging)
-                ExceptionMonster.EatTheException(() => action(new HistoryManager()), "logging history.");
+                ExceptionMonster.EatTheException(() => action(history), "logging history.");
         }      
     }
 }
diff --git a/Squiggle.Client/ChatClient.cs b/Squiggle.Client/ChatClient.cs
@@ -16,6 +16,7 @@ public class ChatClient: IChatClient
         IPresenceService presenceService;
         SquiggleEndPoint chatEndPoint;
         BuddyList buddies;
+        HistoryManager history;
 
         public event EventHandler<ChatStartedEventArgs> ChatStarted = delegate { };
         public event EventHandler<BuddyOnlineEventArgs> BuddyOnline = delegate { };
@@ -47,8 +48,9 @@ public bool IsLoggedIn
 
         public bool EnableLogging { get; set; }
 
-        public ChatClient(string clientId)
+        public ChatClient(string clientId, HistoryManager history)
         {
+            this.history = history;
             buddies = new BuddyList();
             CurrentUser = new SelfBuddy(this, clientId, String.Empty, UserStatus.Offline, new BuddyProperties());
         }        
@@ -59,7 +61,7 @@ public IChat StartChat(IBuddy buddy)
                 throw new InvalidOperationException("Not logged in.");
 
             IChatSession session = chatService.CreateSession(new SquiggleEndPoint(buddy.Id, ((Buddy)buddy).ChatEndPoint));
-            var chat = new Chat(session, CurrentUser, buddy, id=>buddies[id]);
+            var chat = new Chat(session, CurrentUser, new[]{ buddy }, id=>buddies[id], history);
             return chat;
         }        
 
@@ -121,7 +123,7 @@ void chatService_ChatStarted(object sender, Squiggle.Core.Chat.ChatStartedEventA
             
             if (buddyList.Any())
             {
-                var chat = new Chat(e.Session, CurrentUser, buddyList, id=>buddies[id]);
+                var chat = new Chat(e.Session, CurrentUser, buddyList, id=>buddies[id], history);
                 ChatStarted(this, new ChatStartedEventArgs() { Chat = chat, Buddies = buddyList });
             }
         }
@@ -196,8 +198,7 @@ void LogStatus(IBuddy buddy)
             if (EnableLogging)
                 ExceptionMonster.EatTheException(() =>
                 {
-                    var manager = new HistoryManager();
-                    manager.AddStatusUpdate(new Guid(buddy.Id), buddy.DisplayName, (int)buddy.Status);
+                    history.AddStatusUpdate(new Guid(buddy.Id), buddy.DisplayName, (int)buddy.Status);
                 }, "logging history.");
         }
 
diff --git a/Squiggle.History/DAL/Entities/HistoryContext.cs b/Squiggle.History/DAL/Entities/HistoryContext.cs
@@ -12,5 +12,9 @@ class HistoryContext : DbContext
         public DbSet<Session> Sessions { get; set; }
         public DbSet<Event> Events { get; set; }
         public DbSet<StatusUpdate> StatusUpdates { get; set; }
+
+        public HistoryContext(string nameOrConnectionString): base(nameOrConnectionString)
+        {
+        }
     }
 }
diff --git a/Squiggle.History/DAL/HistoryRepository.cs b/Squiggle.History/DAL/HistoryRepository.cs
@@ -11,7 +11,12 @@ namespace Squiggle.History.DAL
 {
     class HistoryRepository : IDisposable
     {
-        HistoryContext context = new HistoryContext();
+        HistoryContext context;
+
+        public HistoryRepository(string nameOrConnectionString)
+        {
+            this.context = new HistoryContext(nameOrConnectionString);
+        }
 
         public void AddSessionEvent(Guid sessionId, DateTime stamp, EventType type, Guid sender, string senderName, IEnumerable<Guid> recipients, string data)
         {
diff --git a/Squiggle.History/HistoryManager.cs b/Squiggle.History/HistoryManager.cs
@@ -9,9 +9,16 @@ namespace Squiggle.History
 {
     public class HistoryManager
     {
+        string connectionString;
+
+        public HistoryManager(string connectionString)
+        {
+            this.connectionString = connectionString;
+        }
+
         public void AddSessionEvent(Guid sessionId, EventType type, Guid senderId, string senderName, IEnumerable<Guid> recipients, string data)
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
             {
                 repository.AddSessionEvent(sessionId, DateTime.UtcNow, type, senderId, senderName, recipients, data);
                 if (type == EventType.Joined)
@@ -29,50 +36,50 @@ public void AddSessionEvent(Guid sessionId, EventType type, Guid senderId, strin
 
         public void AddStatusUpdate(Guid contactId, string contactName, int status)
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
                 repository.AddStatusUpdate(DateTime.UtcNow, contactId, contactName, status);
         }
 
         public IEnumerable<Session> GetSessions(SessionCriteria criteria)
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
                 return repository.GetSessions(criteria);
         }
 
         public Session GetSession(Guid sessionId)
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
                 return repository.GetSession(sessionId);
         }
 
 
         public IEnumerable<StatusUpdate> GetStatusUpdates(StatusCriteria criteria)
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
                 return repository.GetStatusUpdates(criteria);
         }
 
         public void ClearChatHistory()
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
                 repository.ClearChatHistory();
         }
 
         public void ClearStatusHistory()
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
                 repository.ClearStatusHistory();
         }
 
         public void AddSession(Session newSession, IEnumerable<Participant> participants)
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
                 repository.AddSession(newSession, participants);
         }
 
         public void DeleteSessions(IEnumerable<Guid> sessionIds)
         {
-            using (var repository = new HistoryRepository())
+            using (var repository = new HistoryRepository(connectionString))
                 repository.DeleteSessions(sessionIds);
         }
     }
diff --git a/Squiggle.UI/Controls/ChatHistoryViewer.xaml.cs b/Squiggle.UI/Controls/ChatHistoryViewer.xaml.cs
@@ -8,6 +8,7 @@
 using Squiggle.History.DAL;
 using Squiggle.History.DAL.Entities;
 using Squiggle.Plugins;
+using Squiggle.UI.Factories;
 using Squiggle.UI.Helpers;
 using Squiggle.UI.Resources;
 using Squiggle.UI.Windows;
@@ -61,7 +62,7 @@ private void results_MouseDoubleClick(object sender, MouseButtonEventArgs e)
 
         void SearchSessions(DateTime? from, DateTime? to, string message)
         {
-            var historyManager = new HistoryManager();
+            var historyManager = new HistoryManagerFactory().CreateInstance();
             var sessions = historyManager.GetSessions(new SessionCriteria()
                                         {
                                             From = from.HasValue ? from.Value.ToUniversalTime() : from,
@@ -85,7 +86,7 @@ private void Delete_Click(object sender, RoutedEventArgs e)
                 IEnumerable<Guid> sessionIds = results.SelectedItems.Cast<Result>().Select(r => r.Id).ToList();
                 AsyncInvoke(() =>
                 {
-                    var historyManager = new HistoryManager();
+                    var historyManager = new HistoryManagerFactory().CreateInstance();
                     historyManager.DeleteSessions(sessionIds);
                 },
                 lastSearch);
@@ -98,7 +99,7 @@ private void Clear_Click(object sender, RoutedEventArgs e)
             {
                 AsyncInvoke(() =>
                 {
-                    var historyManager = new HistoryManager();
+                    var historyManager = new HistoryManagerFactory().CreateInstance();
                     historyManager.ClearChatHistory();
                 }, () => results.ItemsSource = null);
             }
diff --git a/Squiggle.UI/Controls/StatusHistoryViewer.xaml.cs b/Squiggle.UI/Controls/StatusHistoryViewer.xaml.cs
@@ -16,6 +16,7 @@
 using Squiggle.History;
 using Squiggle.History.DAL;
 using Squiggle.History.DAL.Entities;
+using Squiggle.UI.Factories;
 using Squiggle.UI.Resources;
 using Squiggle.Utilities;
 using Squiggle.Utilities.Threading;
@@ -44,7 +45,7 @@ void Search_Click(object sender, RoutedEventArgs e)
 
         void SearchUpdates(DateTime? from, DateTime? to)
         {
-            var historyManager = new HistoryManager();
+            var historyManager = new HistoryManagerFactory().CreateInstance();
             var updates = historyManager.GetStatusUpdates(new StatusCriteria()
                                         {
                                             From = from.HasValue ? from.Value.ToUniversalTime() : from,
@@ -65,7 +66,7 @@ private void Clear_Click(object sender, RoutedEventArgs e)
             {
                 AsyncInvoke(() =>
                 {
-                    var historyManager = new HistoryManager();
+                    var historyManager = new HistoryManagerFactory().CreateInstance();
                     historyManager.ClearStatusHistory();
                 }, () => results.ItemsSource = null);
             }
diff --git a/Squiggle.UI/Factories/HistoryManagerFactory.cs b/Squiggle.UI/Factories/HistoryManagerFactory.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using Squiggle.History;
+
+namespace Squiggle.UI.Factories
+{
+    class HistoryManagerFactory: IInstanceFactory<HistoryManager>
+    {
+        public HistoryManager CreateInstance()
+        {
+            ConnectionStringSettings setting = ConfigurationManager.ConnectionStrings["HistoryContext"];
+            if (setting == null)
+                return null;
+
+            string connectionString = Environment.ExpandEnvironmentVariables(setting.ConnectionString);
+            return new HistoryManager(connectionString);
+        }
+    }
+}
diff --git a/Squiggle.UI/Factories/LoginOptionsFactory.cs b/Squiggle.UI/Factories/LoginOptionsFactory.cs
@@ -48,6 +48,9 @@ public LoginOptions CreateInstance()
 
             string clientID = settings.ConnectionSettings.ClientID;
 
+            string displayName = Environment.ExpandEnvironmentVariables(userInfo.DisplayName.NullIfEmpty() ?? 
+                                                                        signInOptions.DisplayName.NullIfEmpty() ?? 
+                                                                        settings.PersonalSettings.DisplayName);
             var options = new LoginOptions()
             {
                 ChatEndPoint = chatEndPoint,
@@ -56,19 +59,27 @@ public LoginOptions CreateInstance()
                 PresenceServiceEndPoint = presenceServiceEndPoint,
                 KeepAliveTime = keepAliveTimeout,
                 UserProperties = CreateProperties(),
-                DisplayName = userInfo.DisplayName.NullIfEmpty() ?? signInOptions.DisplayName.NullIfEmpty() ?? settings.PersonalSettings.DisplayName
+                DisplayName = displayName
             };
 
             return options;
         }
 
         IBuddyProperties CreateProperties()
         {
+            string groupName = Environment.ExpandEnvironmentVariables(userInfo.GroupName.NullIfEmpty() ?? 
+                                                                       signInOptions.GroupName.NullIfEmpty() ?? 
+                                                                       settings.PersonalSettings.GroupName);
+
+            string email = Environment.ExpandEnvironmentVariables(userInfo.Email.NullIfEmpty() ?? settings.PersonalSettings.EmailAddress);
+
+            string displayMessage = Environment.ExpandEnvironmentVariables(settings.PersonalSettings.DisplayMessage);
+
             var properties = new BuddyProperties();
-            properties.GroupName = userInfo.GroupName.NullIfEmpty() ?? signInOptions.GroupName.NullIfEmpty() ?? settings.PersonalSettings.GroupName;
-            properties.EmailAddress = userInfo.Email.NullIfEmpty() ?? settings.PersonalSettings.EmailAddress;
+            properties.GroupName = groupName;
+            properties.EmailAddress = email;
             properties.DisplayImage = userInfo.Image ?? settings.PersonalSettings.DisplayImage;
-            properties.DisplayMessage = settings.PersonalSettings.DisplayMessage;
+            properties.DisplayMessage = displayMessage;
             properties.MachineName = Environment.MachineName;
 
             return properties;
diff --git a/Squiggle.UI/Factories/SquiggleContextFactory.cs b/Squiggle.UI/Factories/SquiggleContextFactory.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using Squiggle.Client;
+using Squiggle.History;
 using Squiggle.UI.Components;
 using Squiggle.UI.Windows;
 
@@ -11,12 +12,17 @@ namespace Squiggle.UI.Factories
     class SquiggleContextFactory: IInstanceFactory<SquiggleContext>
     {
         IInstanceFactory<PluginLoader> pluginLoaderFactory;
+        HistoryManager history;
         MainWindow window;
         string clientId;
 
-        public SquiggleContextFactory(IInstanceFactory<PluginLoader> pluginLoaderFactory, MainWindow window, string clientId)
+        public SquiggleContextFactory(IInstanceFactory<PluginLoader> pluginLoaderFactory, 
+                                      HistoryManager history,
+                                      MainWindow window, 
+                                      string clientId)
         {
             this.pluginLoaderFactory = pluginLoaderFactory;
+            this.history = history;
             this.window = window;
             this.clientId = clientId;
         }
@@ -29,7 +35,7 @@ public SquiggleContext CreateInstance()
                 SquiggleContext context = new SquiggleContext();
                 context.MainWindow = window;
                 context.PluginLoader = pluginLoader;
-                context.ChatClient = new ChatClient(clientId);
+                context.ChatClient = new ChatClient(clientId, history);
                 SquiggleContext.Current = context;
             }
             return SquiggleContext.Current;
diff --git a/Squiggle.UI/Helpers/SquiggleUtility.cs b/Squiggle.UI/Helpers/SquiggleUtility.cs
@@ -1,20 +1,18 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Windows;
 using Squiggle.Client;
 using Squiggle.Core.Presence;
+using Squiggle.UI.Components;
 using Squiggle.UI.Controls;
 using Squiggle.UI.Settings;
 using Squiggle.UI.ViewModel;
+using Squiggle.UI.Windows;
 using Squiggle.Utilities;
 using Squiggle.Utilities.Application;
-using Squiggle.UI.Windows;
-using Squiggle.UI.Components;
 
 namespace Squiggle.UI.Helpers
 {
@@ -34,9 +32,16 @@ public static IEnumerable<UserStatus> GetChangableStatuses()
             return statuses;
         }
 
-        public static void OpenDownloadsFolder()
+        public static string GetDownloadsFolderPath()
         {
             string downloadsFolder = SettingsProvider.Current.Settings.GeneralSettings.DownloadsFolder;
+            downloadsFolder = Environment.ExpandEnvironmentVariables(downloadsFolder);
+            return downloadsFolder;
+        }
+
+        public static void OpenDownloadsFolder()
+        {
+            string downloadsFolder = GetDownloadsFolderPath();
             if (Shell.CreateDirectoryIfNotExists(downloadsFolder))
                 ExceptionMonster.EatTheException(() => Process.Start(downloadsFolder), "opening downloads folder");
         }
diff --git a/Squiggle.UI/Settings/GeneralSettings.cs b/Squiggle.UI/Settings/GeneralSettings.cs
diff --git a/Squiggle.UI/Squiggle.UI.csproj b/Squiggle.UI/Squiggle.UI.csproj
diff --git a/Squiggle.UI/Windows/ChatWindow.xaml.cs b/Squiggle.UI/Windows/ChatWindow.xaml.cs
diff --git a/Squiggle.UI/Windows/ConversationViewer.xaml.cs b/Squiggle.UI/Windows/ConversationViewer.xaml.cs
diff --git a/Squiggle.UI/Windows/MainWindow.xaml.cs b/Squiggle.UI/Windows/MainWindow.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,9 @@ class Chat: IChat`
`24`	`24`	`IChatSession session;`
`25`	`25`	`ChatBuddies buddies;`
`26`	`26`	`IBuddy self;`
	`27`	`+ HistoryManager history;`
`27`	`28`
`28`		`- public Chat(IChatSession session, IBuddy self, IBuddy buddy, BuddyResolver buddyResolver) : this(session, self, Enumerable.Repeat(buddy, 1), buddyResolver) { }`
`29`		`-`
`30`		`- public Chat(IChatSession session, IBuddy self, IEnumerable<IBuddy> buddies, BuddyResolver buddyResolver)`
	`29`	`+ public Chat(IChatSession session, IBuddy self, IEnumerable<IBuddy> buddies, BuddyResolver buddyResolver, HistoryManager history)`
`31`	`30`	`{`
`32`	`31`	`this.self = self;`
`33`	`32`
`@@ -42,6 +41,8 @@ public Chat(IChatSession session, IBuddy self, IEnumerable<IBuddy> buddies, Budd`
`42`	`41`	`session.UserTyping += session_UserTyping;`
`43`	`42`	`session.BuzzReceived += session_BuzzReceived;`
`44`	`43`	`session.ActivityInviteReceived += session_ActivityInviteReceived;`
	`44`	`+`
	`45`	`+ this.history = history;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`#region IChat Members`
`@@ -273,7 +274,7 @@ void LogSessionStart()`
`273`	`274`	`void DoHistoryAction(Action<HistoryManager> action)`
`274`	`275`	`{`
`275`	`276`	`if (EnableLogging)`
`276`		`- ExceptionMonster.EatTheException(() => action(new HistoryManager()), "logging history.");`
	`277`	`+ ExceptionMonster.EatTheException(() => action(history), "logging history.");`
`277`	`278`	`}`
`278`	`279`	`}`
`279`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public class ChatClient: IChatClient`
`16`	`16`	`IPresenceService presenceService;`
`17`	`17`	`SquiggleEndPoint chatEndPoint;`
`18`	`18`	`BuddyList buddies;`
	`19`	`+ HistoryManager history;`
`19`	`20`
`20`	`21`	`public event EventHandler<ChatStartedEventArgs> ChatStarted = delegate { };`
`21`	`22`	`public event EventHandler<BuddyOnlineEventArgs> BuddyOnline = delegate { };`
`@@ -47,8 +48,9 @@ public bool IsLoggedIn`
`47`	`48`
`48`	`49`	`public bool EnableLogging { get; set; }`
`49`	`50`
`50`		`- public ChatClient(string clientId)`
	`51`	`+ public ChatClient(string clientId, HistoryManager history)`
`51`	`52`	`{`
	`53`	`+ this.history = history;`
`52`	`54`	`buddies = new BuddyList();`
`53`	`55`	`CurrentUser = new SelfBuddy(this, clientId, String.Empty, UserStatus.Offline, new BuddyProperties());`
`54`	`56`	`}`
`@@ -59,7 +61,7 @@ public IChat StartChat(IBuddy buddy)`
`59`	`61`	`throw new InvalidOperationException("Not logged in.");`
`60`	`62`
`61`	`63`	`IChatSession session = chatService.CreateSession(new SquiggleEndPoint(buddy.Id, ((Buddy)buddy).ChatEndPoint));`
`62`		`- var chat = new Chat(session, CurrentUser, buddy, id=>buddies[id]);`
	`64`	`+ var chat = new Chat(session, CurrentUser, new[]{ buddy }, id=>buddies[id], history);`
`63`	`65`	`return chat;`
`64`	`66`	`}`
`65`	`67`
`@@ -121,7 +123,7 @@ void chatService_ChatStarted(object sender, Squiggle.Core.Chat.ChatStartedEventA`
`121`	`123`
`122`	`124`	`if (buddyList.Any())`
`123`	`125`	`{`
`124`		`- var chat = new Chat(e.Session, CurrentUser, buddyList, id=>buddies[id]);`
	`126`	`+ var chat = new Chat(e.Session, CurrentUser, buddyList, id=>buddies[id], history);`
`125`	`127`	`ChatStarted(this, new ChatStartedEventArgs() { Chat = chat, Buddies = buddyList });`
`126`	`128`	`}`
`127`	`129`	`}`
`@@ -196,8 +198,7 @@ void LogStatus(IBuddy buddy)`
`196`	`198`	`if (EnableLogging)`
`197`	`199`	`ExceptionMonster.EatTheException(() =>`
`198`	`200`	`{`
`199`		`- var manager = new HistoryManager();`
`200`		`- manager.AddStatusUpdate(new Guid(buddy.Id), buddy.DisplayName, (int)buddy.Status);`
	`201`	`+ history.AddStatusUpdate(new Guid(buddy.Id), buddy.DisplayName, (int)buddy.Status);`
`201`	`202`	`}, "logging history.");`
`202`	`203`	`}`
`203`	`204`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,9 @@ class HistoryContext : DbContext`
`12`	`12`	`public DbSet<Session> Sessions { get; set; }`
`13`	`13`	`public DbSet<Event> Events { get; set; }`
`14`	`14`	`public DbSet<StatusUpdate> StatusUpdates { get; set; }`
	`15`	`+`
	`16`	`+ public HistoryContext(string nameOrConnectionString): base(nameOrConnectionString)`
	`17`	`+ {`
	`18`	`+ }`
`15`	`19`	`}`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,12 @@ namespace Squiggle.History.DAL`
`11`	`11`	`{`
`12`	`12`	`class HistoryRepository : IDisposable`
`13`	`13`	`{`
`14`		`- HistoryContext context = new HistoryContext();`
	`14`	`+ HistoryContext context;`
	`15`	`+`
	`16`	`+ public HistoryRepository(string nameOrConnectionString)`
	`17`	`+ {`
	`18`	`+ this.context = new HistoryContext(nameOrConnectionString);`
	`19`	`+ }`
`15`	`20`
`16`	`21`	`public void AddSessionEvent(Guid sessionId, DateTime stamp, EventType type, Guid sender, string senderName, IEnumerable<Guid> recipients, string data)`
`17`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,16 @@ namespace Squiggle.History`
`9`	`9`	`{`
`10`	`10`	`public class HistoryManager`
`11`	`11`	`{`
	`12`	`+ string connectionString;`
	`13`	`+`
	`14`	`+ public HistoryManager(string connectionString)`
	`15`	`+ {`
	`16`	`+ this.connectionString = connectionString;`
	`17`	`+ }`
	`18`	`+`
`12`	`19`	`public void AddSessionEvent(Guid sessionId, EventType type, Guid senderId, string senderName, IEnumerable<Guid> recipients, string data)`
`13`	`20`	`{`
`14`		`- using (var repository = new HistoryRepository())`
	`21`	`+ using (var repository = new HistoryRepository(connectionString))`
`15`	`22`	`{`
`16`	`23`	`repository.AddSessionEvent(sessionId, DateTime.UtcNow, type, senderId, senderName, recipients, data);`
`17`	`24`	`if (type == EventType.Joined)`
`@@ -29,50 +36,50 @@ public void AddSessionEvent(Guid sessionId, EventType type, Guid senderId, strin`
`29`	`36`
`30`	`37`	`public void AddStatusUpdate(Guid contactId, string contactName, int status)`
`31`	`38`	`{`
`32`		`- using (var repository = new HistoryRepository())`
	`39`	`+ using (var repository = new HistoryRepository(connectionString))`
`33`	`40`	`repository.AddStatusUpdate(DateTime.UtcNow, contactId, contactName, status);`
`34`	`41`	`}`
`35`	`42`
`36`	`43`	`public IEnumerable<Session> GetSessions(SessionCriteria criteria)`
`37`	`44`	`{`
`38`		`- using (var repository = new HistoryRepository())`
	`45`	`+ using (var repository = new HistoryRepository(connectionString))`
`39`	`46`	`return repository.GetSessions(criteria);`
`40`	`47`	`}`
`41`	`48`
`42`	`49`	`public Session GetSession(Guid sessionId)`
`43`	`50`	`{`
`44`		`- using (var repository = new HistoryRepository())`
	`51`	`+ using (var repository = new HistoryRepository(connectionString))`
`45`	`52`	`return repository.GetSession(sessionId);`
`46`	`53`	`}`
`47`	`54`
`48`	`55`
`49`	`56`	`public IEnumerable<StatusUpdate> GetStatusUpdates(StatusCriteria criteria)`
`50`	`57`	`{`
`51`		`- using (var repository = new HistoryRepository())`
	`58`	`+ using (var repository = new HistoryRepository(connectionString))`
`52`	`59`	`return repository.GetStatusUpdates(criteria);`
`53`	`60`	`}`
`54`	`61`
`55`	`62`	`public void ClearChatHistory()`
`56`	`63`	`{`
`57`		`- using (var repository = new HistoryRepository())`
	`64`	`+ using (var repository = new HistoryRepository(connectionString))`
`58`	`65`	`repository.ClearChatHistory();`
`59`	`66`	`}`
`60`	`67`
`61`	`68`	`public void ClearStatusHistory()`
`62`	`69`	`{`
`63`		`- using (var repository = new HistoryRepository())`
	`70`	`+ using (var repository = new HistoryRepository(connectionString))`
`64`	`71`	`repository.ClearStatusHistory();`
`65`	`72`	`}`
`66`	`73`
`67`	`74`	`public void AddSession(Session newSession, IEnumerable<Participant> participants)`
`68`	`75`	`{`
`69`		`- using (var repository = new HistoryRepository())`
	`76`	`+ using (var repository = new HistoryRepository(connectionString))`
`70`	`77`	`repository.AddSession(newSession, participants);`
`71`	`78`	`}`
`72`	`79`
`73`	`80`	`public void DeleteSessions(IEnumerable<Guid> sessionIds)`
`74`	`81`	`{`
`75`		`- using (var repository = new HistoryRepository())`
	`82`	`+ using (var repository = new HistoryRepository(connectionString))`
`76`	`83`	`repository.DeleteSessions(sessionIds);`
`77`	`84`	`}`
`78`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using Squiggle.History.DAL;`
`9`	`9`	`using Squiggle.History.DAL.Entities;`
`10`	`10`	`using Squiggle.Plugins;`
	`11`	`+using Squiggle.UI.Factories;`
`11`	`12`	`using Squiggle.UI.Helpers;`
`12`	`13`	`using Squiggle.UI.Resources;`
`13`	`14`	`using Squiggle.UI.Windows;`
`@@ -61,7 +62,7 @@ private void results_MouseDoubleClick(object sender, MouseButtonEventArgs e)`
`61`	`62`
`62`	`63`	`void SearchSessions(DateTime? from, DateTime? to, string message)`
`63`	`64`	`{`
`64`		`- var historyManager = new HistoryManager();`
	`65`	`+ var historyManager = new HistoryManagerFactory().CreateInstance();`
`65`	`66`	`var sessions = historyManager.GetSessions(new SessionCriteria()`
`66`	`67`	`{`
`67`	`68`	`From = from.HasValue ? from.Value.ToUniversalTime() : from,`
`@@ -85,7 +86,7 @@ private void Delete_Click(object sender, RoutedEventArgs e)`
`85`	`86`	`IEnumerable<Guid> sessionIds = results.SelectedItems.Cast<Result>().Select(r => r.Id).ToList();`
`86`	`87`	`AsyncInvoke(() =>`
`87`	`88`	`{`
`88`		`- var historyManager = new HistoryManager();`
	`89`	`+ var historyManager = new HistoryManagerFactory().CreateInstance();`
`89`	`90`	`historyManager.DeleteSessions(sessionIds);`
`90`	`91`	`},`
`91`	`92`	`lastSearch);`
`@@ -98,7 +99,7 @@ private void Clear_Click(object sender, RoutedEventArgs e)`
`98`	`99`	`{`
`99`	`100`	`AsyncInvoke(() =>`
`100`	`101`	`{`
`101`		`- var historyManager = new HistoryManager();`
	`102`	`+ var historyManager = new HistoryManagerFactory().CreateInstance();`
`102`	`103`	`historyManager.ClearChatHistory();`
`103`	`104`	`}, () => results.ItemsSource = null);`
`104`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using Squiggle.History;`
`17`	`17`	`using Squiggle.History.DAL;`
`18`	`18`	`using Squiggle.History.DAL.Entities;`
	`19`	`+using Squiggle.UI.Factories;`
`19`	`20`	`using Squiggle.UI.Resources;`
`20`	`21`	`using Squiggle.Utilities;`
`21`	`22`	`using Squiggle.Utilities.Threading;`
`@@ -44,7 +45,7 @@ void Search_Click(object sender, RoutedEventArgs e)`
`44`	`45`
`45`	`46`	`void SearchUpdates(DateTime? from, DateTime? to)`
`46`	`47`	`{`
`47`		`- var historyManager = new HistoryManager();`
	`48`	`+ var historyManager = new HistoryManagerFactory().CreateInstance();`
`48`	`49`	`var updates = historyManager.GetStatusUpdates(new StatusCriteria()`
`49`	`50`	`{`
`50`	`51`	`From = from.HasValue ? from.Value.ToUniversalTime() : from,`
`@@ -65,7 +66,7 @@ private void Clear_Click(object sender, RoutedEventArgs e)`
`65`	`66`	`{`
`66`	`67`	`AsyncInvoke(() =>`
`67`	`68`	`{`
`68`		`- var historyManager = new HistoryManager();`
	`69`	`+ var historyManager = new HistoryManagerFactory().CreateInstance();`
`69`	`70`	`historyManager.ClearStatusHistory();`
`70`	`71`	`}, () => results.ItemsSource = null);`
`71`	`72`	`}`