hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-28 03:44:07 +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-12-31 19:05:45 +08:00
parent 4b9906dc52 9acbd3aa2f
commit e0b74fea4b
2 changed files with 84 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
dictheadwords.cc
View file

@ -17,6 +17,7 @@
#include <QRegularExpression>
#include "wildcard.hh"
#include "gddebug.hh"
#include <QMessageBox>
#define AUTO_APPLY_LIMIT 150000
@ -282,52 +283,71 @@ void DictHeadwords::saveHeadersToFile()
if( fileName.size() == 0)
return;
cfg.headwordsDialog.headwordsExportPath = QDir::toNativeSeparators(
QFileInfo( fileName ).absoluteDir().absolutePath() );
QFile file( fileName );
for(;;)
{
if ( !file.open( QFile::WriteOnly | QIODevice::Text ) )
break;
int headwordsNumber = model->totalCount();
// Setup progress dialog
int n = headwordsNumber;
int step = 1;
while( n > 1000 )
{
step *= 10;
n /= 10;
QMessageBox::critical( this, "GoldenDict", tr( "Can not open exported file" ) );
return;
}
QProgressDialog progress( tr( "Export headwords..."), tr( "Cancel" ),
0, n, this );
cfg.headwordsDialog.headwordsExportPath = QDir::toNativeSeparators(
QFileInfo( fileName ).absoluteDir().absolutePath() );
QSet< QString > allHeadwords;
int headwordsNumber = model->totalCount();
//headwordsNumber*2 , read + write
QProgressDialog progress( tr( "Export headwords..." ), tr( "Cancel" ), 0, headwordsNumber*2, this );
progress.setWindowModality( Qt::WindowModal );
// Write UTF-8 BOM
QByteArray line;
line.append( 0xEF ).append( 0xBB ).append( 0xBF );
if ( file.write( line ) != line.size() )
break;
// Write headwords
int i;
for( i = 0; i < headwordsNumber&&i<model->wordCount(); ++i )
int totalCount=0;
for( int i = 0; i < headwordsNumber && i < model->wordCount(); ++i )
{
if( i % step == 0 )
progress.setValue( i / step );
if( progress.wasCanceled() )
break;
progress.setValue( totalCount++ );
QVariant value = model->getRow( i );
if( !value.canConvert< QString >() )
continue;
line = value.toString().toUtf8();
allHeadwords.insert( value.toString() );
}
// continue to write the remaining headword
int nodeIndex = model->getCurrentIndex();
auto headwords = model->getRemainRows( nodeIndex );
while( !headwords.isEmpty() )
{
if( progress.wasCanceled() )
break;
allHeadwords.unite(headwords);
totalCount += headwords.size();
progress.setValue( totalCount );
headwords = model->getRemainRows( nodeIndex );
}
qDebug()<<model->getCurrentIndex();
// Write UTF-8 BOM
QByteArray line;
line.append( 0xEF ).append( 0xBB ).append( 0xBF );
file.write( line );
QList< QString > sortedWords = allHeadwords.values();
sortedWords.sort();
// Write headwords
for( auto const & word : sortedWords )
{
if( progress.wasCanceled() )
break;
progress.setValue( totalCount++ );
line = word.toUtf8();
line.replace( '\n', ' ' );
line.replace( '\r', ' ' );
@ -338,36 +358,20 @@ void DictHeadwords::saveHeadersToFile()
break;
}
//continue to write the remaining headword
int nodeIndex = model->getCurrentIndex();
auto headwords = model->getRemainRows(nodeIndex);
while(!headwords.isEmpty())
{
file.close();
if( progress.wasCanceled() )
break;
for(auto & w:headwords){
//progress
if( ++i % step == 0 )
progress.setValue( i / step );
line = w.toUtf8();
line += "\n";
if ( file.write( line ) != line.size() )
break;
}
headwords = model->getRemainRows(nodeIndex);
}
if( i < headwordsNumber && !progress.wasCanceled() )
break;
file.close();
return;
}
{
QMessageBox::warning( this, "GoldenDict", tr( "Export process is interrupted" ) );
gdWarning( "Headers export error: %s", file.errorString().toUtf8().data() );
file.close();
}
else
{
//completed.
progress.setValue(headwordsNumber*2);
progress.hide();
QMessageBox::information( this, "GoldenDict", tr( "Export finished" ) );
}
}
void DictHeadwords::helpRequested()

2
headwordsmodel.cpp
View file

@ -41,7 +41,7 @@ void HeadwordListModel::setFilter( QRegularExpression reg )
}
filtering = true;
filterWords.clear();
auto sr = _dict->prefixMatch( gd::toWString( reg.pattern() ), 30 );
auto sr = _dict->prefixMatch( gd::toWString( reg.pattern() ), 500 );
connect( sr.get(), &Dictionary::Request::finished, this, &HeadwordListModel::requestFinished, Qt::QueuedConnection );
queuedRequests.push_back( sr );
}