tweaked fileWatcher. fixed colorUpdating. Tweaked settings info.

cadon · Dec 24, 2019 · 876964e · 876964e
1 parent 17147f8
commit 876964e
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 22 deletions.
diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -1203,6 +1203,11 @@ private void Form1_FormClosed(object sender, FormClosedEventArgs e)
             timerGlobal.Dispose();
         }
 
+        /// <summary>
+        /// Sets the text at the top to display infos.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="icon"></param>
         private void SetMessageLabelText(string text = "", MessageBoxIcon icon = MessageBoxIcon.None)
         {
             lbLibrarySelectionInfo.Text = text;

diff --git a/ARKBreedingStats/Form1.importExported.cs b/ARKBreedingStats/Form1.importExported.cs
@@ -110,15 +110,18 @@ private void ExportedCreatureList_CopyValuesToExtractor(importExported.ExportedC
             }
         }
 
-        private void ImportExportedAddIfPossible_WatcherThread(string filePath)
+        private void ImportExportedAddIfPossible_WatcherThread(string filePath, importExported.FileWatcherExports fwe)
         {
+            fwe.Watching = false;
             // wait a moment until the file is readable. why is this necessary? blocked by fileWatcher?
             System.Threading.Thread.Sleep(200);
 
             // moving to the archived folder can trigger another fileWatcherEvent, first check if the file is still there
             if (File.Exists(filePath))
                 // filewatcher is on another thread, invoke ui-thread to work with ui
                 Invoke(new Action(delegate () { ImportExportedAddIfPossible(filePath); }));
+
+            fwe.Watching = true;
         }
 
         /// <summary>
@@ -134,6 +137,7 @@ private void ImportExportedAddIfPossible(string filePath)
                 || (alreadyExists && extractor.validResults))
             {
                 AddCreatureToCollection(true, goToLibraryTab: false);
+                SetMessageLabelText($"Successful {(alreadyExists ? "updated" : "added")} creature of the exported file\n" + filePath);
                 added = true;
             }
 

diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.34.7.2")]
+[assembly: AssemblyFileVersion("0.35.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/importExported/FileWatcherExports.cs b/ARKBreedingStats/importExported/FileWatcherExports.cs
@@ -10,15 +10,15 @@ namespace ARKBreedingStats.importExported
     class FileWatcherExports
     {
         private FileSystemWatcher fileWatcherExport;
-        public FileWatcherExports(string folderToWatch, Action<string> callbackNewFile, bool watching)
+        public FileWatcherExports(string folderToWatch, Action<string, FileWatcherExports> callbackNewFile, bool watching)
         {
             fileWatcherExport = new FileSystemWatcher()
             {
                 Filter = "*.ini",
                 NotifyFilter = NotifyFilters.LastWrite
             };
-            fileWatcherExport.Created += (sender, e) => callbackNewFile(e.FullPath);
-            fileWatcherExport.Changed += (sender, e) => callbackNewFile(e.FullPath);
+            fileWatcherExport.Created += (sender, e) => callbackNewFile(e.FullPath, this);
+            fileWatcherExport.Changed += (sender, e) => callbackNewFile(e.FullPath, this);
             SetWatchFolder(folderToWatch, watching);
         }
 

diff --git a/ARKBreedingStats/library/CreatureCollection.cs b/ARKBreedingStats/library/CreatureCollection.cs
@@ -277,6 +277,7 @@ public bool MergeCreatureList(List<Creature> creaturesToMerge, bool update = fal
                             old.fatherGuid = creature.fatherGuid;
                             old.fatherName = creature.fatherName;
                         }
+                        old.colors = creature.colors;
                     }
 
                     if (recalculate)

diff --git a/ARKBreedingStats/settings/Settings.Designer.cs b/ARKBreedingStats/settings/Settings.Designer.cs
diff --git a/ARKBreedingStats/settings/Settings.resx b/ARKBreedingStats/settings/Settings.resx
@@ -122,6 +122,23 @@
 It does only work with the resolutions 1920×1080 and 1680×1050, and sometimes does make mistakes.
 It works with the window-mode "Fullscreen-Windowed" and sometimes does not work when multiple screens are used.</value>
   </data>
+  <data name="label25.Text" xml:space="preserve">
+    <value>In ARK you can export a creature (hold use while looking at a creature, then choose "Options" - "Export" from the wheel).
+
+The exported creatures are saved as a file. Select the folder to import these files. Usually the folder is
+...\Steam\steamapps\common\ARK\ShooterGame\Saved\DinoExports\&lt;ID&gt;
+
+The first entry is the default export folder and is used for 'Import last exported' and the Auto Import.</value>
+  </data>
+  <metadata name="dgvFileLocation_Change.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dgvFileLocation_Delete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="aTImportFileLocationBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="dgvFileLocation_Change.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -144,12 +161,13 @@ If you set the according files below, you can start the process automatically fr
   <metadata name="aTExportFolderLocationsBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>262, 17</value>
   </metadata>
-  <data name="label25.Text" xml:space="preserve">
-    <value>In ARK you can export a creature (hold use while looking at a creature, then choose "Options" - "Export" from the wheel).
-
-The exported creatures are saved as a file. Select the folder to import these files. Usually the folder is
-...\Steam\steamapps\common\ARK\ShooterGame\Saved\DinoExports\&lt;ID&gt;
-
-The first entry is the default export folder and is used for 'Import last exported' and the Auto Import.</value>
-  </data>
+  <metadata name="dgvExportFolderChange.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dgvExportFolderDelete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="aTExportFolderLocationsBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>262, 17</value>
+  </metadata>
 </root>