Merge branch 'dev'

cadon · May 5, 2024 · 177d3ed · 177d3ed
2 parents ec76dfe + 6ea8486
commit 177d3ed
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 55 deletions.
diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -532,6 +532,9 @@
             <setting name="OverlayInfoSize" serializeAs="String">
                 <value>400, 800</value>
             </setting>
+            <setting name="CopyNameToClipboardOnImport" serializeAs="String">
+                <value>False</value>
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ARKBreedingStats/AsbServer/Connection.cs b/ARKBreedingStats/AsbServer/Connection.cs
@@ -6,6 +6,7 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Forms.VisualStyles;
 using ARKBreedingStats.importExportGun;
 using ARKBreedingStats.Library;
@@ -300,7 +301,7 @@ public static string CreateNewToken()
             // use last character as check digit
             // checkSum % 15, add 1 (to avoid ambiguous 0), display as hex digit (range [1-9a-f])
             token[tokenLength - 1] = ((checkSum % 15) + 1).ToString("x")[0];
-            
+
             return new string(token);
         }
 
@@ -310,5 +311,17 @@ public static string CreateNewToken()
         public static string TokenStringForDisplay(string token) => Properties.Settings.Default.StreamerMode ? "****" : token;
 
         public static bool IsCurrentlyListening => _lastCancellationTokenSource?.IsCancellationRequested == false;
+
+        /// <summary>
+        /// If the token is in the clipboard, remove it from there, when the user is not expecting it to be there.
+        /// </summary>
+        public static void ClearTokenFromClipboard()
+        {
+            var clipboardText = Clipboard.GetText();
+            if (!string.IsNullOrEmpty(clipboardText) && clipboardText == Properties.Settings.Default.ExportServerToken)
+            {
+                Clipboard.SetText(string.Empty);
+            }
+        }
     }
 }
diff --git a/ARKBreedingStats/Form1.exportGun.cs b/ARKBreedingStats/Form1.exportGun.cs
@@ -122,13 +122,13 @@ private void AsbServerDataSent(ProgressReportAsbServer data)
 
                 var addCreature = Properties.Settings.Default.OnAutoImportAddToLibrary;
                 var gotoLibraryTab = addCreature && Properties.Settings.Default.AutoImportGotoLibraryAfterSuccess;
-                if (addCreature)
-                {
-                    DetermineLevelStatusAndSoundFeedback(creature, Properties.Settings.Default.PlaySoundOnAutoImport);
 
-                    SetNameOfImportedCreature(creature, null, out _,
+                DetermineLevelStatusAndSoundFeedback(creature, Properties.Settings.Default.PlaySoundOnAutoImport);
+                SetNameOfImportedCreature(creature, null, out _,
                         _creatureCollection.creatures.FirstOrDefault(c => c.guid == creature.guid));
 
+                if (addCreature)
+                {
                     data.TaskNameGenerated?.SetResult(creature.name);
 
                     _creatureCollection.MergeCreatureList(new[] { creature }, true);
@@ -137,11 +137,6 @@ private void AsbServerDataSent(ProgressReportAsbServer data)
                 else
                 {
                     SetCreatureValuesLevelsAndInfoToExtractor(creature);
-
-                    if (Properties.Settings.Default.PlaySoundOnAutoImport)
-                    {
-                        SoundFeedback.BeepSignalCurrentLevelFlags(IsCreatureAlreadyInLibrary(creature.guid, creature.ArkId, out _));
-                    }
                 }
 
                 if (resultText == null)

diff --git a/ARKBreedingStats/Form1.extractor.cs b/ARKBreedingStats/Form1.extractor.cs
@@ -980,6 +980,7 @@ private void CopyExtractionToClipboard()
         /// </summary>
         private bool GenerateCreatureNameAndCopyNameToClipboardIfSet(Creature alreadyExistingCreature)
         {
+            var nameWasApplied = false;
             if (Properties.Settings.Default.applyNamePatternOnAutoImportAlways
                 || (Properties.Settings.Default.applyNamePatternOnImportIfEmptyName
                     && string.IsNullOrEmpty(creatureInfoInputExtractor.CreatureName))
@@ -988,10 +989,9 @@ private bool GenerateCreatureNameAndCopyNameToClipboardIfSet(Creature alreadyExi
             )
             {
                 CreatureInfoInput_CreatureDataRequested(creatureInfoInputExtractor, false, false, false, 0, alreadyExistingCreature);
-                return CopyCreatureNameToClipboardOnImportIfSetting(creatureInfoInputExtractor.CreatureName);
+                nameWasApplied = true;
             }
-
-            return false;
+            return CopyCreatureNameToClipboardOnImportIfSetting(creatureInfoInputExtractor.CreatureName, nameWasApplied);
         }
 
         /// <summary>

diff --git a/ARKBreedingStats/Form1.importExported.cs b/ARKBreedingStats/Form1.importExported.cs
@@ -315,6 +315,7 @@ private Creature ImportExportedAddIfPossible(string filePath)
         private bool SetNameOfImportedCreature(Creature creature, Creature[] creaturesOfSpeciesIn, out Creature[] creaturesOfSpecies, Creature alreadyExistingCreature, int totalCreatureCount = -1)
         {
             creaturesOfSpecies = creaturesOfSpeciesIn;
+            var nameWasApplied = false;
             if (ShouldNamingPatternBeApplied(creature, alreadyExistingCreature))
             {
                 // don't overwrite existing ASB creature name with empty ingame name
@@ -338,10 +339,10 @@ private bool SetNameOfImportedCreature(Creature creature, Creature[] creaturesOf
                         alreadyExistingCreature.name = creature.name; // if alreadyExistingCreature was already updated and creature is not used anymore make sure name is not lost
                 }
 
-                return CopyCreatureNameToClipboardOnImportIfSetting(creature.name);
+                nameWasApplied = true;
             }
 
-            return false;
+            return CopyCreatureNameToClipboardOnImportIfSetting(creature.name, nameWasApplied);
         }
 
         /// <summary>
@@ -357,13 +358,19 @@ private bool ShouldNamingPatternBeApplied(Creature creature, Creature alreadyExi
         /// <summary>
         /// Copies name to clipboard if the according setting is enabled. Returns true if copied.
         /// </summary>
-        private bool CopyCreatureNameToClipboardOnImportIfSetting(string creatureName)
+        private bool CopyCreatureNameToClipboardOnImportIfSetting(string creatureName, bool nameWasJustApplied)
         {
-            if (!Properties.Settings.Default.copyNameToClipboardOnImportWhenAutoNameApplied) return false;
-            Clipboard.SetText(string.IsNullOrEmpty(creatureName)
-                ? "<no name>"
-                : creatureName);
-            return true;
+            if (Properties.Settings.Default.CopyNameToClipboardOnImport
+                || (nameWasJustApplied && Properties.Settings.Default.copyNameToClipboardOnImportWhenAutoNameApplied))
+            {
+                Clipboard.SetText(string.IsNullOrEmpty(creatureName)
+                    ? "<no name>"
+                    : creatureName);
+                return true;
+            }
+
+            AsbServer.Connection.ClearTokenFromClipboard();
+            return false;
         }
 
         /// <summary>

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.61.0.0")]
+[assembly: AssemblyFileVersion("0.61.1.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/Properties/Settings.Designer.cs b/ARKBreedingStats/Properties/Settings.Designer.cs
diff --git a/ARKBreedingStats/Properties/Settings.settings b/ARKBreedingStats/Properties/Settings.settings
@@ -599,5 +599,8 @@
     <Setting Name="OverlayInfoSize" Type="System.Drawing.Size" Scope="User">
       <Value Profile="(Default)">400, 800</Value>
     </Setting>
+    <Setting Name="CopyNameToClipboardOnImport" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/ARKBreedingStats/_manifest.json b/ARKBreedingStats/_manifest.json
@@ -4,7 +4,7 @@
     "ARK Smart Breeding": {
       "Id": "ARK Smart Breeding",
       "Category": "main",
-      "version": "0.61.0.0"
+      "version": "0.61.1.0"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",

diff --git a/ARKBreedingStats/settings/Settings.Designer.cs b/ARKBreedingStats/settings/Settings.Designer.cs
diff --git a/ARKBreedingStats/settings/Settings.cs b/ARKBreedingStats/settings/Settings.cs
@@ -399,6 +399,7 @@ private void LoadSettings(CreatureCollection cc)
             cbApplyNamePatternOnImportOnEmptyNames.Checked = Properties.Settings.Default.applyNamePatternOnImportIfEmptyName;
             cbApplyNamePatternOnImportOnNewCreatures.Checked = Properties.Settings.Default.applyNamePatternOnAutoImportForNewCreatures;
             cbCopyPatternNameToClipboard.Checked = Properties.Settings.Default.copyNameToClipboardOnImportWhenAutoNameApplied;
+            CbCopyNameToClipboardOnImport.Checked = Properties.Settings.Default.CopyNameToClipboardOnImport;
             cbAutoImportExported.Checked = Properties.Settings.Default.AutoImportExportedCreatures;
             CbAutoExtractAddToLibrary.Checked = Properties.Settings.Default.OnAutoImportAddToLibrary;
             cbPlaySoundOnAutomaticImport.Checked = Properties.Settings.Default.PlaySoundOnAutoImport;
@@ -662,6 +663,7 @@ private void SaveSettings()
             Properties.Settings.Default.applyNamePatternOnImportIfEmptyName = cbApplyNamePatternOnImportOnEmptyNames.Checked;
             Properties.Settings.Default.applyNamePatternOnAutoImportForNewCreatures = cbApplyNamePatternOnImportOnNewCreatures.Checked;
             Properties.Settings.Default.copyNameToClipboardOnImportWhenAutoNameApplied = cbCopyPatternNameToClipboard.Checked;
+            Properties.Settings.Default.CopyNameToClipboardOnImport = CbCopyNameToClipboardOnImport.Checked;
             Properties.Settings.Default.AutoImportExportedCreatures = cbAutoImportExported.Checked;
             Properties.Settings.Default.OnAutoImportAddToLibrary = CbAutoExtractAddToLibrary.Checked;
             Properties.Settings.Default.PlaySoundOnAutoImport = cbPlaySoundOnAutomaticImport.Checked;

diff --git a/ARKBreedingStats/settings/Settings.resx b/ARKBreedingStats/settings/Settings.resx
@@ -136,30 +136,6 @@ If you set the according files below, you can start the process automatically fr
   <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>
-  <metadata name="ImportWithQuickImport.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="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="dgvExportMakeDefault.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>
   <metadata name="dgvExportFolderChange.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -189,9 +165,6 @@ The window-mode "Fullscreen-Windowed" should be set ingame.</value>
   <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>526, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>647, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>73</value>
   </metadata>