XML handling to PersistenceService

Jocke-G · Apr 26, 2017 · 56751ef · 56751ef
1 parent 23d9355
commit 56751ef
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 44 deletions.
diff --git a/src/SportidentLapCounter/Controls/MainForm/MainFormPresenter.cs b/src/SportidentLapCounter/Controls/MainForm/MainFormPresenter.cs
@@ -1,7 +1,21 @@
-namespace SportidentLapCounter.Controls.MainForm
+using SportidentLapCounter.Services;
+
+namespace SportidentLapCounter.Controls.MainForm
 {
     public class MainFormPresenter
     {
         public MainFormModel Model;
+        private PersistenceService _persistenceService;
+        private PersistenceService PersistenceService => _persistenceService ?? (_persistenceService = new PersistenceService());
+
+        public MainFormPresenter()
+        {
+            Model = PersistenceService.Load();
+        }
+
+        public void PersistModel()
+        {
+            PersistenceService.Save(Model);
+        }
     }
 }
diff --git a/src/SportidentLapCounter/Controls/MainForm/MainFormView.cs b/src/SportidentLapCounter/Controls/MainForm/MainFormView.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using System.Xml.Serialization;
 using SportidentLapCounter.DataTypes;
 using SPORTident;
 using SPORTident.Common;
@@ -17,7 +16,6 @@ public partial class MainFormView : Form
 
         private MainFormPresenter Presenter => _presenter ?? (_presenter = new MainFormPresenter());
 
-        private const string XmlPath = "database.xml";
 
         private Reader _reader;
 
@@ -28,7 +26,6 @@ public MainFormView()
 
             dataGridView.AutoGenerateColumns = false;
 
-            Presenter.Model = LoadXmlFile();
             dataGridView.DataSource = Presenter.Model.Teams;
             SetFontSize(Presenter.Model.FontSize);
         }
@@ -46,31 +43,6 @@ private void InitializeSportidentReader()
             GetSiDevices();
         }
 
-        private MainFormModel LoadXmlFile()
-        {
-            if (!File.Exists(XmlPath))
-                return new MainFormModel();
-
-            try
-            {
-                using (var file = new StreamReader(XmlPath))
-                {
-                    var serializer = new XmlSerializer(typeof(MainFormModel));
-                    var obj = serializer.Deserialize(file);
-                    var model = obj as MainFormModel;
-                    if (model == null)
-                        return new MainFormModel();
-
-                    file.Close();
-                    return model;
-                }
-            }
-            catch (Exception e)
-            {
-                MessageBox.Show(e.Message);
-                return new MainFormModel();
-            }
-        }
 
         private void GetSiDevices()
         {
@@ -113,7 +85,7 @@ private void ReaderOnOnlineStampRead(object sender, SportidentDataEventArgs e)
                 dataGridView.DataSource = Presenter.Model.Teams;
                 dataGridView.ClearSelection();
 
-                SaveFile();
+                Presenter.PersistModel();
             });
         }
 
@@ -150,27 +122,18 @@ private void button_sportidentDisconnect_Click(object sender, EventArgs e)
             button_sportidentDisconnect.Enabled = false;
         }
 
-        private void SaveFile()
-        {
-            using (var streamWriter = new StreamWriter(XmlPath))
-            {
-                var xmlSerializer = new XmlSerializer(typeof(MainFormModel));
-                xmlSerializer.Serialize(streamWriter, Presenter.Model);
-                streamWriter.Close();
-            }
-        }
 
         private void SaveFile(object sender, DataGridViewCellEventArgs e)
         {
             if (Presenter.Model == null)
                 return;
 
-            SaveFile();
+            Presenter.PersistModel();
         }
 
         private void SaveFile(object sender, DataGridViewRowEventArgs e)
         {
-            SaveFile();
+            Presenter.PersistModel();
         }
 
         private void buttonBigger_Click(object sender, EventArgs e)
@@ -182,7 +145,7 @@ private void Bigger()
         {
             var fontSize = dataGridView.DefaultCellStyle.Font.Size + 1;
             SetFontSize(fontSize);
-            SaveFile();
+            Presenter.PersistModel();
         }
 
         private void buttonSmaller_Click(object sender, EventArgs e)
@@ -194,7 +157,7 @@ private void Smaller()
         {
             var fontSize = dataGridView.DefaultCellStyle.Font.Size - 1;
             SetFontSize(fontSize);
-            SaveFile();
+            Presenter.PersistModel();
         }
 
         private void SetFontSize(float fontSize)
@@ -265,6 +228,5 @@ private void ToggleFullscreen()
                 dataGridView.ClearSelection();
             }
         }
-
     }
 }
diff --git a/src/SportidentLapCounter/Services/PersistenceService.cs b/src/SportidentLapCounter/Services/PersistenceService.cs
@@ -0,0 +1,49 @@
+using System;
+using System.IO;
+using System.Windows.Forms;
+using System.Xml.Serialization;
+using SportidentLapCounter.Controls.MainForm;
+
+namespace SportidentLapCounter.Services
+{
+    public class PersistenceService
+    {
+        private const string XmlPath = "database.xml";
+
+        public MainFormModel Load()
+        {
+            if (!File.Exists(XmlPath))
+                return new MainFormModel();
+
+            try
+            {
+                using (var file = new StreamReader(XmlPath))
+                {
+                    var serializer = new XmlSerializer(typeof(MainFormModel));
+                    var obj = serializer.Deserialize(file);
+                    var model = obj as MainFormModel;
+                    if (model == null)
+                        return new MainFormModel();
+
+                    file.Close();
+                    return model;
+                }
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show(e.Message);
+                return new MainFormModel();
+            }
+        }
+
+        public void Save(MainFormModel model)
+        {
+            using (var streamWriter = new StreamWriter(XmlPath))
+            {
+                var xmlSerializer = new XmlSerializer(typeof(MainFormModel));
+                xmlSerializer.Serialize(streamWriter, model);
+                streamWriter.Close();
+            }
+        }
+    }
+}
diff --git a/src/SportidentLapCounter/SportidentLapCounter.csproj b/src/SportidentLapCounter/SportidentLapCounter.csproj
@@ -93,6 +93,7 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DataTypes\Team.cs" />
+    <Compile Include="Services\PersistenceService.cs" />
     <EmbeddedResource Include="Controls\MainForm\MainFormView.resx">
       <DependentUpon>MainFormView.cs</DependentUpon>
     </EmbeddedResource>