Merge pull request #142 from aaron-williamson/improve-file-sync

Improve File Sync, Load and Add, and Clean Up
cadon · Jan 14, 2017 · b4505ca · b4505ca
2 parents 002ea76 + 873ab43
commit b4505ca
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 6 deletions.
diff --git a/ARKBreedingStats/Creature.cs b/ARKBreedingStats/Creature.cs
@@ -5,7 +5,7 @@
 namespace ARKBreedingStats
 {
     [Serializable()]
-    public class Creature
+    public class Creature : IEquatable<Creature>
     {
         public string species;
         public string name;
@@ -71,6 +71,31 @@ public Creature(string species, string name, string owner, Sex sex, int[] levels
             calculateLevelFound();
         }
 
+        public bool Equals(Creature other)
+        {
+            if (other.guid == guid)
+                return true;
+            else
+                return false;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+                return false;
+
+            Creature creatureObj = obj as Creature;
+            if (creatureObj == null)
+                return false;
+            else
+                return Equals(creatureObj);
+        }
+
+        public override int GetHashCode()
+        {
+            return guid.GetHashCode();
+        }
+
         public void calculateLevelFound()
         {
             levelFound = 0;

diff --git a/ARKBreedingStats/CreatureCollection.cs b/ARKBreedingStats/CreatureCollection.cs
@@ -35,5 +35,14 @@ namespace ARKBreedingStats
         public List<Player> players = new List<Player>();
         [XmlArray]
         public List<Tribe> tribes = new List<Tribe>();
+
+        public void mergeCreatureList(List<Creature> creaturesToMerge)
+        {
+            foreach (Creature creature in creaturesToMerge)
+            {
+                if (!creatures.Contains(creature))
+                    creatures.Add(creature);
+            }
+        }
     }
 }
diff --git a/ARKBreedingStats/FileSync.cs b/ARKBreedingStats/FileSync.cs
@@ -50,11 +50,11 @@ private void onChanged(object source, FileSystemEventArgs e)
                             break;
                     }
                 }
-                catch (FileNotFoundException ex)
+                catch (FileNotFoundException)
                 { }
-                catch (IOException ex)
+                catch (IOException)
                 { }
-                catch (UnauthorizedAccessException ex)
+                catch (UnauthorizedAccessException)
                 { }
                 Thread.Sleep(500);
             }

diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -245,7 +245,7 @@ public void collectionChanged()
             }
             else
             {
-                loadCollectionFile(currentFileName);
+                loadCollectionFile(currentFileName, true);
             }
         }
 
@@ -1089,7 +1089,7 @@ private void loadCollectionFile(string fileName, bool keepCurrentCreatures = fal
             assignCollectionClasses();
 
             if (keepCurrentCreatures)
-                creatureCollection.creatures.AddRange(oldCreatures);
+                creatureCollection.mergeCreatureList(oldCreatures);
             else
             {
                 currentFileName = fileName;