Merge branch 'staged' into dev

articleview.cc

@@ -548,7 +548,6 @@ void ArticleView::loadFinished( bool result )
     return;
   }
 
-
   if( cfg.preferences.autoScrollToTargetArticle )
   {
     QString const scrollTo = Utils::Url::queryItemValue( url, "scrollto" );

ftshelpers.cc

@@ -220,6 +220,8 @@ bool parseSearchString( QString const & str, QStringList & indexWords,
 
   return true;
 }
+//definition;
+Mutex lockMutex;
 
 void parseArticleForFts( uint32_t articleAddress, QString & articleText,
                          QMap< QString, QVector< uint32_t > > & words,
@@ -232,7 +234,7 @@ void parseArticleForFts( uint32_t articleAddress, QString & articleText,
       .split( handleRoundBrackets ? RX::Ftx::handleRoundBracket : RX::Ftx::noRoundBracket,
                                                 Qt::SkipEmptyParts );
 
-  QSet< QString > setOfWords;
+  QVector< QString > setOfWords;
   setOfWords.reserve( articleWords.size() );
 
   for( int x = 0; x < articleWords.size(); x++ )
@@ -253,10 +255,11 @@ void parseArticleForFts( uint32_t articleAddress, QString & articleText,
             &&  QChar( word[ y + 1 ] ).isLowSurrogate() )
           hieroglyph.append( word[ ++y ] );
 
-        if( !setOfWords.contains( hieroglyph ) )
+        //if( !setOfWords.contains( hieroglyph ) )
         {
-          setOfWords.insert( hieroglyph );
+          setOfWords.push_back( hieroglyph );
-          words[ hieroglyph ].push_back( articleAddress );
+          /*Mutex::Lock _( _mapLock );
+          words[ hieroglyph ].push_back( articleAddress );*/
         }
 
         hieroglyph.clear();
@@ -302,20 +305,33 @@ void parseArticleForFts( uint32_t articleAddress, QString & articleText,
 
         for( QStringList::iterator it = list.begin(); it != list.end(); ++it )
         {
-          if( !setOfWords.contains( *it ) )
+          //if( !setOfWords.contains( *it ) )
           {
-            setOfWords.insert( *it );
+            setOfWords.push_back( *it );
-            words[ *it ].push_back( articleAddress );
+            /*Mutex::Lock _( _mapLock );
+            words[ *it ].push_back( articleAddress );*/
           }
         }
       }
       else
-      if( !setOfWords.contains( word ) )
+      //if( !setOfWords.contains( word ) )
       {
-        setOfWords.insert( word );
+        setOfWords.push_back( word );
-        words[ word ].push_back( articleAddress );
+        /*Mutex::Lock _( _mapLock );
+        words[ word ].push_back( articleAddress );*/
       }
     }
+
+
+  }
+
+  {
+    Mutex::Lock _( lockMutex );
+
+    for( const QString & word : setOfWords )
+    {
+      words[ word ].push_back( articleAddress );
+    }
   }
 }
 
@@ -375,22 +391,43 @@ void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancell
     needHandleBrackets = name.endsWith( ".dsl" ) || name.endsWith( "dsl.dz" );
   }
 
-  // index articles for full-text search
+  QSemaphore sem( QThread::idealThreadCount() );
-  for( int i = 0; i < offsets.size(); i++ )
+  //QFutureSynchronizer< void > synchronizer;
+
+  for( auto & address : offsets )
   {
     if( Utils::AtomicInt::loadAcquire( isCancelled ) )
-      throw exUserAbort();
+    {
+        //wait the future to be finished.
+      sem.acquire( QThread::idealThreadCount() );
+      return;
+    }
+
+    sem.acquire();
+    QFuture< void > f = QtConcurrent::run(
+      [ & ]()
+      {
+        QSemaphoreReleaser releaser( sem );
+        if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+        {
+          return;
+        }
 
         QString headword, articleStr;
 
-    dict->getArticleText( offsets.at( i ), headword, articleStr );
+        dict->getArticleText( address, headword, articleStr );
 
-    parseArticleForFts( offsets.at( i ), articleStr, ftsWords, needHandleBrackets );
+        parseArticleForFts( address, articleStr, ftsWords, needHandleBrackets );
+      } );
+    //synchronizer.addFuture( f );
   }
-
+  sem.acquire( QThread::idealThreadCount() );
   // Free memory
   offsets.clear();
 
+  if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+    throw exUserAbort();
+
   QMap< QString, QVector< uint32_t > >::iterator it = ftsWords.begin();
   while( it != ftsWords.end() )
   {
@@ -822,8 +859,8 @@ void FTSResultsRequest::combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsInde
           linksPtr = chunks->getBlock( links[ x ].articleOffset, chunk );
         }
 
-        memcpy( &size, linksPtr, sizeof(uint32_t) );
+        memcpy( &size, linksPtr, sizeof( uint32_t ) );
-        linksPtr += sizeof(uint32_t);
+        linksPtr += sizeof( uint32_t );
         // across chunks, need further investigation
         uint32_t max = ( chunk.size() - ( linksPtr - &chunk.front() )) / 4;
 
@@ -832,7 +869,7 @@ void FTSResultsRequest::combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsInde
         for( uint32_t y = 0; y < q_max; y++ )
         {
           tmp.insert( *( reinterpret_cast< uint32_t * >( linksPtr ) ) );
-          linksPtr += sizeof(uint32_t);
+          linksPtr += sizeof( uint32_t );
         }
       }
 

mainwindow.cc

@@ -1853,8 +1853,11 @@ void MainWindow::titleChanged( ArticleView * view, QString const & title )
     escaped.append( (ushort)0x202C ); // PDF, POP DIRECTIONAL FORMATTING
   }
 
-  ui.tabWidget->setTabText( ui.tabWidget->indexOf( view ), escaped );
+  int index = ui.tabWidget->indexOf( view );
+  ui.tabWidget->setTabText( index, escaped );
 
+  if( index == ui.tabWidget->currentIndex() )
+  {
     // Set icon for "Add to Favorites" action
     if( isWordPresentedInFavorites( title, cfg.lastMainGroupId ) )
     {
@@ -1868,6 +1871,7 @@ void MainWindow::titleChanged( ArticleView * view, QString const & title )
     }
 
     updateWindowTitle();
+  }
 }
 
 void MainWindow::iconChanged( ArticleView * view, QIcon const & icon )