Removed outdated references to the "merge items" setting & no longer …

…deletes bugged duplicates (only relevant for the old looting mode)
marius00 · Oct 18, 2024 · d2edd89 · d2edd89
1 parent 114d329
commit d2edd89
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 102 deletions.
diff --git a/IAGrim/Database/DAO/PlayerItemDaoImpl.cs b/IAGrim/Database/DAO/PlayerItemDaoImpl.cs
@@ -980,66 +980,6 @@ public Dictionary<long, string> FindRecordsFromIds(IEnumerable<long> ids) {
             return result;
         }
 
-        /// <summary>
-        /// Delete duplicate items (items duplicated via bugs, not simply similar items)
-        /// </summary>
-        public void DeleteDuplicates() {
-            using (var session = SessionCreator.OpenSession()) {
-                using (var transaction = session.BeginTransaction()) {
-                    // Mark all duplicates for deletion from online backups
-                    session.CreateSQLQuery(@"
-insert into deletedplayeritem_v3(id)
-select cloudid FROM playeritem WHERE Id IN (
-	SELECT Id FROM (
-		SELECT MAX(Id) as Id, (baserecord || prefixrecord || modifierrecord || suffixrecord || materiarecord || transmuterecord || seed) as UQ FROM PlayerItem WHERE (baserecord || prefixrecord || modifierrecord || suffixrecord || materiarecord || transmuterecord || seed) IN (
-			SELECT UQ FROM (
-				SELECT (baserecord || prefixrecord || modifierrecord || suffixrecord || materiarecord || transmuterecord || seed) as UQ, COUNT(*) as C FROM PlayerItem
-					WHERE baserecord NOT LIKE '%materia%'
-					AND baserecord NOT LIKE '%questitems%'
-					AND baserecord NOT LIKE '%potions%'
-					AND baserecord NOT LIKE '%crafting%'
-					AND StackCount < 2 -- Potions, components, etc
-					GROUP BY UQ
-				) X 
-			WHERE C > 1
-		)
-
-		Group BY UQ
-	) Z
-)
-
-AND cloud_hassync
-AND cloudid IS NOT NULL 
-AND cloudid NOT IN (SELECT id FROM deletedplayeritem_v3)
-AND cloudid != ''
-").ExecuteUpdate();
-                    // Delete duplicates (if there are multiple, only one will be deleted)
-                    session.CreateSQLQuery(@"
-DELETE FROM PlayerItem WHERE Id IN (
-	SELECT Id FROM (
-		SELECT MAX(Id) as Id, (baserecord || prefixrecord || modifierrecord || suffixrecord || materiarecord || transmuterecord || seed) as UQ FROM PlayerItem WHERE (baserecord || prefixrecord || modifierrecord || suffixrecord || materiarecord || transmuterecord || seed) IN (
-			SELECT UQ FROM (
-				SELECT (baserecord || prefixrecord || modifierrecord || suffixrecord || materiarecord || transmuterecord || seed) as UQ, COUNT(*) as C FROM PlayerItem
-					WHERE baserecord NOT LIKE '%materia%'
-					AND baserecord NOT LIKE '%questitems%'
-					AND baserecord NOT LIKE '%potions%'
-					AND baserecord NOT LIKE '%crafting%'
-					AND StackCount < 2 -- Potions, components, etc
-					GROUP BY UQ
-				) X 
-			WHERE C > 1
-		)
-
-		Group BY UQ
-	) Z
-)
-").ExecuteUpdate();
-
-                    transaction.Commit();
-                }
-            }
-        }
-
         public IList<PlayerItem> ListMissingReplica() {
 
 

diff --git a/IAGrim/Database/Interfaces/IPlayerItemDao.cs b/IAGrim/Database/Interfaces/IPlayerItemDao.cs
@@ -36,7 +36,6 @@ public interface IPlayerItemDao : IBaseDao<PlayerItem> {
 
         bool Exists(PlayerItem item);
 
-        void DeleteDuplicates();
 
         IList<PlayerItem> ListMissingReplica();
     }

diff --git a/IAGrim/Database/Synchronizer/PlayerItemRepo.cs b/IAGrim/Database/Synchronizer/PlayerItemRepo.cs
@@ -72,12 +72,6 @@ public bool Exists(PlayerItem item) {
             );
         }
 
-        public void DeleteDuplicates() {
-            ThreadExecuter.Execute(
-                () => _repo.DeleteDuplicates()
-            );
-        }
-
         public IList<PlayerItem> ListMissingReplica() {
             return ThreadExecuter.Execute(
                 () => _repo.ListMissingReplica()

diff --git a/IAGrim/Program.cs b/IAGrim/Program.cs
@@ -192,14 +192,6 @@ private static void Run(string[] args, ThreadExecuter threadExecuter) {
                 StartupService.PerformIconCheck(grimDawnDetector, settingsService);
 
 
-                try {
-                    var playerItemDao = serviceProvider.Get<IPlayerItemDao>();
-                    playerItemDao.DeleteDuplicates();
-                }
-                catch (Exception ex) {
-                    Logger.Warn("Something went terribly wrong trying to ensure no duplicate items are found, however we'll just ignore it instead of blocking you access to your items.. sigh..", ex);
-                }
-
                 _mw.Visible = false;
                 if (new DonateNagScreen(settingsService).CanNag)
                     Application.Run(new DonateNagScreen(settingsService));

diff --git a/IAGrim/Services/ItemReplica/ItemReplicaParser.cs b/IAGrim/Services/ItemReplica/ItemReplicaParser.cs
@@ -11,7 +11,6 @@
 using IAGrim.UI.Misc.CEF;
 using IAGrim.Utilities;
 using log4net;
-using log4net.Repository.Hierarchy;
 using Newtonsoft.Json;
 using NHibernate.Exceptions;
 

diff --git a/IAGrim/Settings/Dto/PersistentSettings.cs b/IAGrim/Settings/Dto/PersistentSettings.cs
@@ -14,7 +14,6 @@ public class PersistentSettings {
         private bool _subscribeExperimentalUpdates;
         private bool _minimizeToTray;
         private bool _usingDualComputer;
-        private bool _mergeDuplicates;
         private bool _transferAnyMod;
         private bool _darkMode;
         private bool _autoUpdateModSettings;
@@ -61,14 +60,6 @@ public bool UsingDualComputer {
             }
         }
 
-        public bool MergeDuplicates {
-            get => _mergeDuplicates;
-            set {
-                _mergeDuplicates = value;
-                OnMutate?.Invoke(null, null);
-            }
-        }
-
         public bool TransferAnyMod {
             get => _transferAnyMod;
             set {

diff --git a/IAGrim/UI/Controller/ISettingsReadController.cs b/IAGrim/UI/Controller/ISettingsReadController.cs
@@ -7,7 +7,6 @@
 namespace IAGrim.UI.Controller {
     interface ISettingsReadController {
         bool MinimizeToTray { get; }
-        bool MergeDuplicates { get; }
         bool AutoUpdateModSettings { get; }
     }
 }
diff --git a/IAGrim/UI/Controller/SettingsController.cs b/IAGrim/UI/Controller/SettingsController.cs
@@ -24,7 +24,6 @@ public SettingsController(SettingsService settings) {
 
         public void LoadDefaults() {
             MinimizeToTray = _settings.GetPersistent().MinimizeToTray;
-            MergeDuplicates = _settings.GetPersistent().MergeDuplicates;
             AutoUpdateModSettings = _settings.GetPersistent().AutoUpdateModSettings;
             HideSkills = _settings.GetPersistent().HideSkills;
         }
@@ -71,19 +70,6 @@ public bool MinimizeToTray {
         }
 
 
-        /// <summary>
-        /// Merge duplicate items into a single entry
-        /// </summary>
-        public bool MergeDuplicates {
-            get => _settings.GetPersistent().MergeDuplicates;
-            set {
-                _settings.GetPersistent().MergeDuplicates = value;
-                OnPropertyChanged();
-            }
-        }
-
-
-
         #endregion
 
         private string StripPrefix(string s) {

diff --git a/StatTranslator/EnglishLanguage.cs b/StatTranslator/EnglishLanguage.cs
@@ -459,7 +459,6 @@ public string Export() {
             {"iatag_ui_no", "No"},
             {"iatag_ui_survivalmode", "The Crucible (DLC)"},
             {"iatag_ui_dualcomputer", "Using IA on multiple PCs"},
-            {"iatag_ui_deleteduplicates", "Delete bugged duplicates"},
             {"iatag_ui_backup_service_error", "The backup service is currently experiencing technical difficulties.\nPlease try again later."},
             {"iatag_ui_backup_status", "Backup status"},
             {"iatag_ui_backup_complete", "Backup complete!"},
@@ -550,7 +549,6 @@ public string Export() {
             {"iatag_ui_autoselectmod", "Auto Select Mod"},
             {"iatag_ui_autosearch", "Auto Search"},
             {"iatag_ui_transferanymod", "Transfer to any mod"},
-            {"iatag_ui_mergeduplicates", "Merge Duplicates"},
             {"iatag_ui_minimizetotray", "Minimize to Tray"},
             {"iatag_ui_startminimized", "Start minimized"},
             {"iatag_ui_update_title", "Automatic Updates"},