[vlc-commits] qt: fix controlbar profile model unique name generation

[Fatih Uzunoglu]

vlc | branch: master | Fatih Uzunoglu <fuzun54 at outlook.com> | Mon Apr 12 00:45:32 2021 +0300| [600d76a9508020ab8ed1ff0674e3303075f12484] | committer: Pierre Lamot

qt: fix controlbar profile model unique name generation

Signed-off-by: Pierre Lamot <pierre at videolabs.io>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=600d76a9508020ab8ed1ff0674e3303075f12484
---

 .../dialogs/toolbar/controlbar_profile_model.cpp   | 59 ++++++++++++++++++----
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp b/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp
index 9490c5e5e4..00e2b25ffe 100644
--- a/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp
+++ b/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp
@@ -237,14 +237,50 @@ void ControlbarProfileModel::insertDefaults()
 
 QString ControlbarProfileModel::generateUniqueName(const QString &name)
 {
-    const auto sameNameCount = std::count_if(m_profiles.begin(),
-                                             m_profiles.end(),
-                                             [name](const ControlbarProfile* i) {
-                                                 return i->name() == name;
-                                             });
-
-    if (sameNameCount > 0)
-        return QString("%1 (%2)").arg(name).arg(sameNameCount + 1);
+    static const auto targetNameGenerator = [](const auto& name, long count) {
+        return QString("%1 (%2)").arg(name).arg(count);
+    };
+
+    // Actually, the profile model inherently does not allow two
+    // profiles to have the same name so it could be sufficent
+    // to check only for name existence but for cases when the
+    // config file is edited explicitly, using count_if might
+    // be helpful.
+    static const auto sameNameCount = [this](const auto& name) {
+        return std::count_if(m_profiles.begin(),
+                             m_profiles.end(),
+                             [name](const ControlbarProfile* i) {
+                                 return i->name() == name;
+                                 });
+        };
+
+    auto count = sameNameCount(name);
+
+    if (count > 0)
+    {
+        // suppose the existing profiles with these names:
+        // Profile, Profile (1), Profile (2)
+        // when the user adds a new profile with name 'Profile',
+        // its name will be replaced with 'Profile (3)'.
+        // However, the same will not happen if the user adds a
+        // new profile with name 'Profile (1)' or 'Profile (2)'.
+        // In that case, the new names will be 'Profile (1) (1)',
+        // and 'Profile (2) (1)', respectively. This behavior is
+        // intended because otherwise profile name assignment
+        // would be restrictive.
+
+        auto targetName = targetNameGenerator(name, count);
+
+        // if targetName also exists, increase the count by one
+        // and try again:
+        while (sameNameCount(targetName) >= 1)
+        {
+            ++count;
+            targetName = targetNameGenerator(name, count);
+        }
+
+        return targetName;
+    }
     else
         return name;
 }
@@ -649,7 +685,12 @@ void ControlbarProfileModel::cloneSelectedProfile(const QString &newProfileName)
     if (!ptrNewModel)
         return;
 
-    ptrNewModel->setName(generateUniqueName(newProfileName));
+    // if the newProfileName is empty or equal to the cloned profile's name
+    // don't bother changing its name since cloneProfile() will first
+    // set the new profile's name unique by assigning its name as
+    // 'clonedProfileName (n)'
+    if (!newProfileName.isEmpty() && newProfileName != ptrModel->name())
+        ptrNewModel->setName(generateUniqueName(newProfileName));
 }
 
 void ControlbarProfileModel::deleteSelectedProfile()