From bf7897991ef0a2f5a8e8c300e58c817e049a0dee Mon Sep 17 00:00:00 2001
From: Anton Filimonov <anton.filimonov@gmail.com>
Date: Mon, 18 Nov 2024 16:18:51 +0100
Subject: [PATCH] fix: skip sets by name during import (#539)

---
 src/ui/include/highlighterset.h   |  1 +
 src/ui/src/highlightersdialog.cpp | 10 ++++++++--
 src/ui/src/highlighterset.cpp     |  6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/ui/include/highlighterset.h b/src/ui/include/highlighterset.h
index e7f6d56e..b25ce3db 100644
--- a/src/ui/include/highlighterset.h
+++ b/src/ui/include/highlighterset.h
@@ -184,6 +184,7 @@ class HighlighterSetCollection final : public Persistable<HighlighterSetCollecti
     HighlighterSet currentActiveSet() const;
 
     bool hasSet( const QString& setId ) const;
+    bool hasSetByName( const QString& name ) const;
 
     QStringList activeSetIds() const;
     void activateSet( const QString& setId );
diff --git a/src/ui/src/highlightersdialog.cpp b/src/ui/src/highlightersdialog.cpp
index 17f58f45..acb45e7c 100644
--- a/src/ui/src/highlightersdialog.cpp
+++ b/src/ui/src/highlightersdialog.cpp
@@ -211,15 +211,21 @@ void HighlightersDialog::importHighlighters()
         this, tr( "Select one or more files to open" ), "", tr( "Highlighters (*.conf)" ) );
 
     for ( const auto& file : files ) {
-        LOG_DEBUG << "Loading highlighters from " << file;
+        LOG_INFO << "Loading highlighters from " << file;
         QSettings settings{ file, QSettings::IniFormat };
         HighlighterSetCollection collection;
         collection.retrieveFromStorage( settings );
         for ( const auto& set : klogg::as_const( collection.highlighters_ ) ) {
-            if ( highlighterSetCollection_.hasSet( set.id() ) ) {
+            if ( highlighterSetCollection_.hasSet( set.id() )
+                 || highlighterSetCollection_.hasSetByName( set.name() ) ) {
+
+                LOG_INFO << "Skipping set " << set.name() << " (" << set.id() << ")";
+
                 continue;
             }
 
+            LOG_INFO << "Adding set " << set.name() << " (" << set.id() << ")";
+
             highlighterSetCollection_.highlighters_.append( set );
             highlighterListWidget->addItem( set.name() );
         }
diff --git a/src/ui/src/highlighterset.cpp b/src/ui/src/highlighterset.cpp
index f05b253f..18e4a89f 100644
--- a/src/ui/src/highlighterset.cpp
+++ b/src/ui/src/highlighterset.cpp
@@ -480,6 +480,12 @@ bool HighlighterSetCollection::hasSet( const QString& setId ) const
                         [ setId ]( const auto& s ) { return s.id() == setId; } );
 }
 
+bool HighlighterSetCollection::hasSetByName( const QString& setName ) const
+{
+    return std::any_of( highlighters_.begin(), highlighters_.end(),
+                        [ setName ]( const auto& s ) { return s.name() == setName; } );
+}
+
 QList<QuickHighlighter> HighlighterSetCollection::quickHighlighters() const
 {
     return quickHighlighters_;