From 0b14cc4753f2a5c359b842f2573124bdabb6d0b3 Mon Sep 17 00:00:00 2001
From: Chris Bessent <lost.dragonist@gmail.com>
Date: Sun, 23 Jan 2022 11:09:56 -0700
Subject: Enforce the priority rules on every refresh

---
 src/pluginlist.cpp | 77 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 14 deletions(-)

(limited to 'src/pluginlist.cpp')

diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index 657ada17..52434e89 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -273,6 +273,7 @@ void PluginList::refresh(const QString &profileName
   }
 
   fixPrimaryPlugins();
+  fixPluginRelationships();
 
   testMasters();
 
@@ -318,6 +319,51 @@ void PluginList::fixPrimaryPlugins()
   }
 }
 
+void PluginList::fixPluginRelationships()
+{
+  TimeThis timer("PluginList::fixPluginRelationships");
+
+  // Count the types of plugins
+  int masterCount = 0;
+  for (auto plugin : m_ESPs) {
+    if (plugin.isLight || plugin.isMaster) {
+      masterCount++;
+    }
+  }
+
+  // Ensure masters are up top and normal plugins are down below
+  for (int i = 0; i < m_ESPs.size(); i++) {
+    ESPInfo& plugin = m_ESPs[i];
+    if (plugin.isLight || plugin.isMaster) {
+      if (plugin.priority > masterCount) {
+        int newPriority = masterCount + 1;
+        setPluginPriority(i, newPriority);
+      }
+    }
+    else {
+      if (plugin.priority < masterCount) {
+        int newPriority = masterCount + 1;
+        setPluginPriority(i, newPriority);
+      }
+    }
+  }
+
+  // Ensure master/child relationships are observed
+  for (int i = 0; i < m_ESPs.size(); i++) {
+    ESPInfo& plugin = m_ESPs[i];
+    int newPriority = plugin.priority;
+    for (auto master : plugin.masters) {
+      auto iter = m_ESPsByName.find(master);
+      if (iter != m_ESPsByName.end()) {
+        newPriority = std::max(newPriority, m_ESPs[iter->second].priority);
+      }
+    }
+    if (newPriority != plugin.priority) {
+      setPluginPriority(i, newPriority);
+    }
+  }
+}
+
 void PluginList::fixPriorities()
 {
   std::vector<std::pair<int, int>> espPrios;
@@ -1514,23 +1560,26 @@ void PluginList::setPluginPriority(int row, int &newPriority, bool isForced)
   }
 
   try {
-    if (newPriorityTemp > oldPriority) {
-      // priority is higher than the old, so the gap we left is in lower priorities
-      for (int i = oldPriority + 1; i <= newPriorityTemp; ++i) {
-        --m_ESPs.at(m_ESPsByPriority.at(i)).priority;
+    if (newPriorityTemp != oldPriority) {
+      if (newPriorityTemp > oldPriority) {
+        // priority is higher than the old, so the gap we left is in lower priorities
+        for (int i = oldPriority + 1; i <= newPriorityTemp; ++i) {
+          --m_ESPs.at(m_ESPsByPriority.at(i)).priority;
+        }
+        emit dataChanged(index(oldPriority + 1, 0), index(newPriorityTemp, columnCount()));
       }
-      emit dataChanged(index(oldPriority + 1, 0), index(newPriorityTemp, columnCount()));
-    } else {
-      for (int i = newPriorityTemp; i < oldPriority; ++i) {
-        ++m_ESPs.at(m_ESPsByPriority.at(i)).priority;
+      else {
+        for (int i = newPriorityTemp; i < oldPriority; ++i) {
+          ++m_ESPs.at(m_ESPsByPriority.at(i)).priority;
+        }
+        emit dataChanged(index(newPriorityTemp, 0), index(oldPriority - 1, columnCount()));
+        ++newPriority;
       }
-      emit dataChanged(index(newPriorityTemp, 0), index(oldPriority - 1, columnCount()));
-      ++newPriority;
-    }
 
-    m_ESPs.at(row).priority = newPriorityTemp;
-    emit dataChanged(index(row, 0), index(row, columnCount()));
-    m_PluginMoved(m_ESPs[row].name, oldPriority, newPriorityTemp);
+      m_ESPs.at(row).priority = newPriorityTemp;
+      emit dataChanged(index(row, 0), index(row, columnCount()));
+      m_PluginMoved(m_ESPs[row].name, oldPriority, newPriorityTemp);
+    }
   } catch (const std::out_of_range&) {
     reportError(tr("failed to restore load order for %1").arg(m_ESPs[row].name));
   }
-- 
cgit v1.3.1