From f73d89f4b4ca25c808fc9957070ea45787fa6d2e Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Mon, 21 May 2018 22:15:48 +0200
Subject: [PATCH] Dispose

---
 .../AideDeJeu/ViewModels/MonstersViewModel.cs | 37 +++++--------------
 .../AideDeJeu/ViewModels/SpellsViewModel.cs   | 37 +++++--------------
 2 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
index 7dafc6f3..99ae4846 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
@@ -233,46 +233,29 @@ namespace AideDeJeu.ViewModels
 
 
 
-        private string MonstersJson
+        private IEnumerable<Monster> _AllMonsters = null;
+        private IEnumerable<Monster> AllMonsters
         {
             get
             {
-                var assembly = typeof(AboutViewModel).GetTypeInfo().Assembly;
-                //var names = assembly.GetManifestResourceNames();
-                using (var stream = assembly.GetManifestResourceStream("AideDeJeu.monsters.json"))
+                if (_AllMonsters == null)
                 {
-                    using (var reader = new System.IO.StreamReader(stream))
+                    var serializer = new DataContractJsonSerializer(typeof(IEnumerable<Monster>));
+                    var assembly = typeof(AboutViewModel).GetTypeInfo().Assembly;
+                    //var names = assembly.GetManifestResourceNames();
+                    using (var stream = assembly.GetManifestResourceStream("AideDeJeu.monsters.json"))
                     {
-                        return reader.ReadToEnd();
+                        _AllMonsters = serializer.ReadObject(stream) as IEnumerable<Monster>;
                     }
                 }
-            }
-        }
-
-        private IEnumerable<Monster> _Monsters = null;
-        private IEnumerable<Monster> Monsters
-        {
-            get
-            {
-                if (_Monsters == null)
-                {
-                    DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(IEnumerable<Monster>));
-                    MemoryStream stream = new MemoryStream();
-                    var writer = new StreamWriter(stream);
-                    writer.Write(MonstersJson);
-                    writer.Flush();
-                    stream.Seek(0, SeekOrigin.Begin);
-
-                    _Monsters = serializer.ReadObject(stream) as IEnumerable<Monster>;
-                }
-                return _Monsters;
+                return _AllMonsters;
             }
         }
 
         public IEnumerable<Monster> GetMonsters(string category, string type, string minPower, string maxPower, string size, string legendary, string source)
         {
             var powerComparer = new PowerComparer();
-            return Monsters.Where(monster =>
+            return AllMonsters.Where(monster =>
                             monster.Type.Contains(type) &&
                             (string.IsNullOrEmpty(size) || monster.Size.Equals(size)) &&
                             monster.Source.Contains(source) &&
diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs
index 7e001a12..bb34479d 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs
@@ -179,45 +179,28 @@ namespace AideDeJeu.ViewModels
         {
         }
 
-        private string SpellsJson
+        private IEnumerable<Spell> _AllSpells = null;
+        private IEnumerable<Spell> AllSpells
         {
             get
             {
-                var assembly = typeof(AboutViewModel).GetTypeInfo().Assembly;
-                //var names = assembly.GetManifestResourceNames();
-                using (var stream = assembly.GetManifestResourceStream("AideDeJeu.spells.json"))
+                if(_AllSpells == null)
                 {
-                    using (var reader = new System.IO.StreamReader(stream))
+                    var serializer = new DataContractJsonSerializer(typeof(IEnumerable<Spell>));
+                    var assembly = typeof(AboutViewModel).GetTypeInfo().Assembly;
+                    //var names = assembly.GetManifestResourceNames();
+                    using (var stream = assembly.GetManifestResourceStream("AideDeJeu.spells.json"))
                     {
-                        return reader.ReadToEnd();
+                        _AllSpells = serializer.ReadObject(stream) as IEnumerable<Spell>;
                     }
                 }
-            }
-        }
-
-        private IEnumerable<Spell> _Spells = null;
-        private IEnumerable<Spell> Spells
-        {
-            get
-            {
-                if(_Spells == null)
-                {
-                    DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(IEnumerable<Spell>));
-                    MemoryStream stream = new MemoryStream();
-                    var writer = new StreamWriter(stream);
-                    writer.Write(SpellsJson);
-                    writer.Flush();
-                    stream.Seek(0, SeekOrigin.Begin);
-
-                    _Spells = serializer.ReadObject(stream) as IEnumerable<Spell>;
-                }
-                return _Spells;
+                return _AllSpells;
             }
         }
 
         public IEnumerable<Spell> GetSpells(string classe, string niveauMin, string niveauMax, string ecole, string rituel, string source)
         {
-            return Spells.Where(spell =>
+            return AllSpells.Where(spell =>
                             (int.Parse(spell.Level) >= int.Parse(niveauMin)) &&
                             (int.Parse(spell.Level) <= int.Parse(niveauMax)) &&
                             spell.Type.Contains(ecole) &&