opt: dictionarygroup refactor in articleview (#1625)

* opt: refactor dictionary logic to seperate class


---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

goldendict.pro

@@ -362,6 +362,7 @@ HEADERS += \
     src/iframeschemehandler.hh \
     src/indexedzip.hh \
     src/initializing.hh \
+    src/dictionary_group.hh \
     src/instances.hh \
     src/keyboardstate.hh \
     src/langcoder.hh \
@@ -484,6 +485,7 @@ SOURCES += \
     src/iframeschemehandler.cc \
     src/indexedzip.cc \
     src/initializing.cc \
+    src/dictionary_group.cc \
     src/instances.cc \
     src/keyboardstate.cc \
     src/langcoder.cc \

src/dictionary_group.cc

@@ -0,0 +1,50 @@
+/* Licensed under GPLv3 or later, see the LICENSE file */
+
+
+#include "dictionary_group.hh"
+
+
+sptr< Dictionary::Class > DictionaryGroup::getDictionaryByName( QString const & dictName )
+{
+  // Link to other dictionary
+  for ( const auto & allDictionarie : allDictionaries ) {
+    if ( dictName.compare( QString::fromUtf8( allDictionarie->getName().c_str() ) ) == 0 ) {
+      return allDictionarie;
+    }
+  }
+  return nullptr;
+}
+
+const std::vector< sptr< Dictionary::Class > > * DictionaryGroup::getActiveDictionaries( unsigned currentGroup )
+{
+  std::vector< sptr< Dictionary::Class > > const * activeDicts = nullptr;
+
+  if ( !groups.empty() ) {
+    for ( const auto & group : groups )
+      if ( group.id == currentGroup ) {
+        activeDicts = &( group.dictionaries );
+        break;
+      }
+  }
+  else
+    activeDicts = &allDictionaries;
+
+  return activeDicts;
+}
+
+
+sptr< Dictionary::Class > DictionaryGroup::getDictionaryById( const std::string & dictId )
+{
+
+  for ( unsigned x = allDictionaries.size(); x--; ) {
+    if ( allDictionaries[ x ]->getId() == dictId ) {
+      return allDictionaries[ x ];
+    }
+  }
+  return nullptr;
+}
+
+Instances::Group const * DictionaryGroup::getGroupById( unsigned groupId )
+{
+  return groups.findGroup( groupId );
+}

src/dictionary_group.hh

@@ -0,0 +1,34 @@
+/* Licensed under GPLv3 or later, see the LICENSE file */
+
+#ifndef DICTIONARYGROUP_HH_INCLUDED
+#define DICTIONARYGROUP_HH_INCLUDED
+
+#include "sptr.hh"
+#include "dict/dictionary.hh"
+#include "instances.hh"
+
+class DictionaryGroup
+{
+public:
+  DictionaryGroup( std::vector< sptr< Dictionary::Class > > const & allDictionaries_,
+                   Instances::Groups const & groups_ ):
+    allDictionaries( allDictionaries_ ),
+    groups( groups_ )
+  {
+  }
+
+  sptr< Dictionary::Class > getDictionaryByName( QString const & dictionaryName );
+
+  const std::vector< sptr< Dictionary::Class > > * getActiveDictionaries( unsigned groupId );
+
+  sptr< Dictionary::Class > getDictionaryById( const std::string & dictId );
+
+  Instances::Group const * getGroupById( unsigned groupId );
+
+
+private:
+  std::vector< sptr< Dictionary::Class > > const & allDictionaries;
+  Instances::Groups const & groups;
+};
+
+#endif // DICTIONARYGROUP_HH_INCLUDED

src/ui/articleview.cc

@@ -99,8 +99,7 @@ ArticleView::ArticleView( QWidget * parent,
   QWidget( parent ),
   articleNetMgr( nm ),
   audioPlayer( audioPlayer_ ),
-  allDictionaries( allDictionaries_ ),
-  groups( groups_ ),
+  dictionaryGroup( std::make_unique< DictionaryGroup >( allDictionaries_, groups_ ) ),
   popupView( popupView_ ),
   cfg( cfg_ ),
   pasteAction( this ),
@@ -750,7 +749,7 @@ QString ArticleView::getMutedForGroup( unsigned group )
 {
   if ( dictionaryBarToggled && dictionaryBarToggled->isChecked() ) {
     // Dictionary bar is active -- mute the muted dictionaries
-    Instances::Group const * groupInstance = groups.findGroup( group );
+    Instances::Group const * groupInstance = dictionaryGroup->getGroupById( group );
 
     // Find muted dictionaries for current group
     Config::Group const * grp = cfg.getGroup( group );
@@ -784,7 +783,7 @@ QStringList ArticleView::getMutedDictionaries( unsigned group )
 {
   if ( dictionaryBarToggled && dictionaryBarToggled->isChecked() ) {
     // Dictionary bar is active -- mute the muted dictionaries
-    Instances::Group const * groupInstance = groups.findGroup( group );
+    Instances::Group const * groupInstance = dictionaryGroup->getGroupById( group );
 
     // Find muted dictionaries for current group
     Config::Group const * grp = cfg.getGroup( group );
@@ -981,11 +980,9 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
       if ( Utils::Url::hasQueryItem( url, "dict" ) ) {
         // Link to other dictionary
         QString dictName( Utils::Url::queryItemValue( url, "dict" ) );
-        for ( const auto & allDictionarie : allDictionaries ) {
-          if ( dictName.compare( QString::fromUtf8( allDictionarie->getName().c_str() ) ) == 0 ) {
-            newScrollTo = scrollToFromDictionaryId( QString::fromUtf8( allDictionarie->getId().c_str() ) );
-            break;
-          }
+        auto dict = dictionaryGroup->getDictionaryByName( dictName );
+        if ( dict ) {
+          newScrollTo = scrollToFromDictionaryId( QString::fromUtf8( dict->getId().c_str() ) );
         }
       }
 
@@ -1019,17 +1016,8 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
 
       unsigned currentGroup = getGroup( ref );
 
-      std::vector< sptr< Dictionary::Class > > const * activeDicts = nullptr;
-
-      if ( !groups.empty() ) {
-        for ( const auto & group : groups )
-          if ( group.id == currentGroup ) {
-            activeDicts = &( group.dictionaries );
-            break;
-          }
-      }
-      else
-        activeDicts = &allDictionaries;
+      std::vector< sptr< Dictionary::Class > > const * activeDicts =
+        dictionaryGroup->getActiveDictionaries( currentGroup );
 
       if ( activeDicts ) {
         unsigned preferred = UINT_MAX;
@@ -1200,17 +1188,8 @@ ResourceToSaveHandler * ArticleView::saveResource( const QUrl & url, const QUrl
 
       unsigned currentGroup = getGroup( ref );
 
-      std::vector< sptr< Dictionary::Class > > const * activeDicts = nullptr;
-
-      if ( groups.size() ) {
-        for ( const auto & group : groups )
-          if ( group.id == currentGroup ) {
-            activeDicts = &( group.dictionaries );
-            break;
-          }
-      }
-      else
-        activeDicts = &allDictionaries;
+      std::vector< sptr< Dictionary::Class > > const * activeDicts =
+        dictionaryGroup->getActiveDictionaries( currentGroup );
 
       if ( activeDicts ) {
         unsigned preferred = UINT_MAX;
@@ -1570,7 +1549,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
     menu.addAction( addWordToHistoryAction );
 
     Instances::Group const * altGroup =
-      ( currentGroupId != getGroup( webview->url() ) ) ? groups.findGroup( currentGroupId ) : nullptr;
+      ( currentGroupId != getGroup( webview->url() ) ) ? dictionaryGroup->getGroupById( currentGroupId ) : nullptr;
 
     if ( altGroup ) {
       QIcon icon = altGroup->icon.size() ? QIcon( ":/flags/" + altGroup->icon ) : QIcon();
@@ -1607,7 +1586,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
     if ( txt.size() > 60 )
       txt = txt.left( 60 ) + "...";
 
-    addHeaderToHistoryAction = new QAction( tr( "&Add \"%1\" to history" ).arg( txt ), &menu );
+    addHeaderToHistoryAction = new QAction( tr( R"(&Add "%1" to history)" ).arg( txt ), &menu );
     menu.addAction( addHeaderToHistoryAction );
   }
 
@@ -1625,7 +1604,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
   // Add table of contents
   QStringList ids = getArticlesList();
 
-  if ( !menu.isEmpty() && ids.size() )
+  if ( !menu.isEmpty() && !ids.empty() )
     menu.addSeparator();
 
   unsigned refsAdded            = 0;
@@ -1634,8 +1613,8 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
   for ( QStringList::const_iterator i = ids.constBegin(); i != ids.constEnd(); ++i, ++refsAdded ) {
     // Find this dictionary
 
-    for ( unsigned x = allDictionaries.size(); x--; ) {
-      if ( allDictionaries[ x ]->getId() == i->toUtf8().data() ) {
+    auto dictionary = dictionaryGroup->getDictionaryById( i->toUtf8().data() );
+    if ( dictionary ) {
       QAction * action = nullptr;
       if ( refsAdded == cfg.preferences.maxDictionaryRefsInContextMenu ) {
         // Enough! Or the menu would become too large.
@@ -1644,9 +1623,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
         maxDictionaryRefsReached = true;
       }
       else {
-          action = new QAction( allDictionaries[ x ]->getIcon(),
-                                QString::fromUtf8( allDictionaries[ x ]->getName().c_str() ),
-                                &menu );
+        action = new QAction( dictionary->getIcon(), QString::fromUtf8( dictionary->getName().c_str() ), &menu );
         // Force icons in menu on all platforms,
         // since without them it will be much harder
         // to find things.
@@ -1655,10 +1632,8 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
       menu.addAction( action );
 
       tableOfContents[ action ] = *i;
+    }
 
-        break;
-      }
-    }
     if ( maxDictionaryRefsReached )
       break;
   }

src/ui/articleview.hh

@@ -23,6 +23,7 @@
 #include "articlewebview.hh"
 #include "ui/searchpanel.hh"
 #include "ui/ftssearchpanel.hh"
+#include "dictionary_group.hh"
 
 class ResourceToSaveHandler;
 class ArticleViewAgent;
@@ -35,8 +36,7 @@ class ArticleView: public QWidget
 
   ArticleNetworkAccessManager & articleNetMgr;
   AudioPlayerPtr const & audioPlayer;
-  std::vector< sptr< Dictionary::Class > > const & allDictionaries;
-  Instances::Groups const & groups;
+  std::unique_ptr< DictionaryGroup > dictionaryGroup;
   bool popupView;
   Config::Class const & cfg;
   QWebChannel * channel;