From 1064880450a648696dfabdf698fdbeec095604e1 Mon Sep 17 00:00:00 2001 From: Abs62 Date: Fri, 29 Jul 2022 18:48:04 +0300 Subject: [PATCH 1/2] Fix favorities indication when new tabs open in background --- mainwindow.cc | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/mainwindow.cc b/mainwindow.cc index b0ca85c3..67dfe308 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -1821,21 +1821,25 @@ 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 ); - // Set icon for "Add to Favorites" action - if( isWordPresentedInFavorites( title, cfg.lastMainGroupId ) ) + if( index == ui.tabWidget->currentIndex() ) { - addToFavorites->setIcon( blueStarIcon ); - addToFavorites->setToolTip( tr( "Remove current tab from Favorites" ) ); - } - else - { - addToFavorites->setIcon( starIcon ); - addToFavorites->setToolTip( tr( "Add current tab to Favorites" ) ); - } + // Set icon for "Add to Favorites" action + if( isWordPresentedInFavorites( title, cfg.lastMainGroupId ) ) + { + addToFavorites->setIcon( blueStarIcon ); + addToFavorites->setToolTip( tr( "Remove current tab from Favorites" ) ); + } + else + { + addToFavorites->setIcon( starIcon ); + addToFavorites->setToolTip( tr( "Add current tab to Favorites" ) ); + } - updateWindowTitle(); + updateWindowTitle(); + } } void MainWindow::iconChanged( ArticleView * view, QIcon const & icon ) From 6caf4fa58c2623717067a2dd3d0accb6e53bc0c1 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 18 Jun 2022 14:48:24 +0800 Subject: [PATCH 2/2] feat: fulltext qtconcurrent worker return directly when canceled concurrent index with segmentation lock --- articleview.cc | 1 - ftshelpers.cc | 77 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/articleview.cc b/articleview.cc index 6dee2b84..4135d83b 100644 --- a/articleview.cc +++ b/articleview.cc @@ -548,7 +548,6 @@ void ArticleView::loadFinished( bool result ) return; } - if( cfg.preferences.autoScrollToTargetArticle ) { QString const scrollTo = Utils::Url::queryItemValue( url, "scrollto" ); diff --git a/ftshelpers.cc b/ftshelpers.cc index 680ace67..db6e6b13 100644 --- a/ftshelpers.cc +++ b/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 ); - words[ hieroglyph ].push_back( articleAddress ); + setOfWords.push_back( hieroglyph ); + /*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 ); - words[ *it ].push_back( articleAddress ); + setOfWords.push_back( *it ); + /*Mutex::Lock _( _mapLock ); + words[ *it ].push_back( articleAddress );*/ } } } else - if( !setOfWords.contains( word ) ) + //if( !setOfWords.contains( word ) ) { - setOfWords.insert( word ); - words[ word ].push_back( articleAddress ); + setOfWords.push_back( word ); + /*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 - for( int i = 0; i < offsets.size(); i++ ) + QSemaphore sem( QThread::idealThreadCount() ); + //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; + } - QString headword, articleStr; + sem.acquire(); + QFuture< void > f = QtConcurrent::run( + [ & ]() + { + QSemaphoreReleaser releaser( sem ); + if( Utils::AtomicInt::loadAcquire( isCancelled ) ) + { + return; + } - dict->getArticleText( offsets.at( i ), headword, articleStr ); + QString headword, articleStr; - parseArticleForFts( offsets.at( i ), articleStr, ftsWords, needHandleBrackets ); + dict->getArticleText( address, headword, articleStr ); + + 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) ); - linksPtr += sizeof(uint32_t); + memcpy( &size, 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 ); } }