MERGE

2 files changed, 47 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.Synchronization/Local/LocalDBSynchronizer.cs b/Software/Visual_Studio/Tango.Synchronization/Local/LocalDBSynchronizer.cs
new file mode 100644
index 000000000..ca58686f3
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Synchronization/Local/LocalDBSynchronizer.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Synchronization.Local
+{
+    public class LocalDBSynchronizer
+    {
+        public static void Synchronize(String masterSQLiteFile, String slaveSQLiteFile)
+        {
+            using (LocalDBComparer comparer = new LocalDBComparer(new SQLiteDataBase(masterSQLiteFile), new SQLiteDataBase(slaveSQLiteFile)))
+            {
+                var diffs = comparer.Compare();
+                foreach (var diff in diffs)
+                {
+                    diff.Commit();
+                }
+            }
+        }
+
+        public static Task SynchronizeAsync(String masterSQLiteFile, String slaveSQLiteFile)
+        {
+            return Task.Factory.StartNew(() => Synchronize(masterSQLiteFile, slaveSQLiteFile));
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Synchronization/Local/SqliteDataBase.cs b/Software/Visual_Studio/Tango.Synchronization/Local/SqliteDataBase.cs
index 83a14b493..b3d259e8c 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Local/SqliteDataBase.cs
+++ b/Software/Visual_Studio/Tango.Synchronization/Local/SqliteDataBase.cs
@@ -8,6 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Threading;
 
 namespace Tango.Synchronization.Local
 {
@@ -487,6 +488,24 @@ namespace Tango.Synchronization.Local
         public void Dispose()
         {
             _connection.Close();
+            _connection.Dispose();
+            GC.Collect();
+
+            while (true)
+            {
+                try
+                {
+                    using (FileStream stream = File.Open(Source, FileMode.Open, FileAccess.Read))
+                    {
+                        return;
+                    }
+                }
+                catch (IOException)
+                {
+                    GC.Collect();
+                    Thread.Sleep(200);
+                }
+            }
         }
     }
 }