hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 04:24:09 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-07-30 11:57:13 +08:00
parent 89a8ad38f4 66e5deaf62
commit 740d400d18
3 changed files with 73 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
articleview.cc
View file

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

77
ftshelpers.cc
View file

@ -220,6 +220,8 @@ bool parseSearchString( QString const & str, QStringList & indexWords,
return true; return true;
} }
//definition;
Mutex lockMutex;
void parseArticleForFts( uint32_t articleAddress, QString & articleText, void parseArticleForFts( uint32_t articleAddress, QString & articleText,
QMap< QString, QVector< uint32_t > > & words, 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, .split( handleRoundBrackets ? RX::Ftx::handleRoundBracket : RX::Ftx::noRoundBracket,
Qt::SkipEmptyParts ); Qt::SkipEmptyParts );
QSet< QString > setOfWords; QVector< QString > setOfWords;
setOfWords.reserve( articleWords.size() ); setOfWords.reserve( articleWords.size() );
for( int x = 0; x < articleWords.size(); x++ ) for( int x = 0; x < articleWords.size(); x++ )
@ -253,10 +255,11 @@ void parseArticleForFts( uint32_t articleAddress, QString & articleText,
&& QChar( word[ y + 1 ] ).isLowSurrogate() ) && QChar( word[ y + 1 ] ).isLowSurrogate() )
hieroglyph.append( word[ ++y ] ); 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(); hieroglyph.clear();
@ -302,20 +305,33 @@ void parseArticleForFts( uint32_t articleAddress, QString & articleText,
for( QStringList::iterator it = list.begin(); it != list.end(); ++it ) 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 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" ); 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 ) ) 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 // Free memory
offsets.clear(); offsets.clear();
if( Utils::AtomicInt::loadAcquire( isCancelled ) )
throw exUserAbort();
QMap< QString, QVector< uint32_t > >::iterator it = ftsWords.begin(); QMap< QString, QVector< uint32_t > >::iterator it = ftsWords.begin();
while( it != ftsWords.end() ) while( it != ftsWords.end() )
{ {
@ -822,8 +859,8 @@ void FTSResultsRequest::combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsInde
linksPtr = chunks->getBlock( links[ x ].articleOffset, chunk ); 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 // across chunks, need further investigation
uint32_t max = ( chunk.size() - ( linksPtr - &chunk.front() )) / 4; 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++ ) for( uint32_t y = 0; y < q_max; y++ )
{ {
tmp.insert( *( reinterpret_cast< uint32_t * >( linksPtr ) ) ); tmp.insert( *( reinterpret_cast< uint32_t * >( linksPtr ) ) );
linksPtr += sizeof(uint32_t); linksPtr += sizeof( uint32_t );
} }
} }

28
mainwindow.cc
View file

@ -1853,21 +1853,25 @@ void MainWindow::titleChanged( ArticleView * view, QString const & title )
escaped.append( (ushort)0x202C ); // PDF, POP DIRECTIONAL FORMATTING 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( index == ui.tabWidget->currentIndex() )
if( isWordPresentedInFavorites( title, cfg.lastMainGroupId ) )
{ {
addToFavorites->setIcon( blueStarIcon ); // Set icon for "Add to Favorites" action
addToFavorites->setToolTip( tr( "Remove current tab from Favorites" ) ); if( isWordPresentedInFavorites( title, cfg.lastMainGroupId ) )
} {
else addToFavorites->setIcon( blueStarIcon );
{ addToFavorites->setToolTip( tr( "Remove current tab from Favorites" ) );
addToFavorites->setIcon( starIcon ); }
addToFavorites->setToolTip( tr( "Add current tab to Favorites" ) ); else
} {
addToFavorites->setIcon( starIcon );
addToFavorites->setToolTip( tr( "Add current tab to Favorites" ) );
}
updateWindowTitle(); updateWindowTitle();
}
} }
void MainWindow::iconChanged( ArticleView * view, QIcon const & icon ) void MainWindow::iconChanged( ArticleView * view, QIcon const & icon )