mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-24 00:14:06 +00:00
Compare commits
2 commits
8b3e94757c
...
9a41f99fab
Author | SHA1 | Date | |
---|---|---|---|
9a41f99fab | |||
808d857602 |
|
@ -486,7 +486,7 @@ void DictServerWordSearchRequest::run()
|
||||||
qDebug() << "receive match:" << reply;
|
qDebug() << "receive match:" << reply;
|
||||||
auto code = reply.left( 3 );
|
auto code = reply.left( 3 );
|
||||||
|
|
||||||
if ( reply.left( 3 ) != "152" ) {
|
if ( code != "152" ) {
|
||||||
|
|
||||||
matchNext();
|
matchNext();
|
||||||
}
|
}
|
||||||
|
@ -574,8 +574,11 @@ class DictServerArticleRequest: public Dictionary::DataRequest
|
||||||
DictServerDictionary & dict;
|
DictServerDictionary & dict;
|
||||||
string articleData;
|
string articleData;
|
||||||
|
|
||||||
|
QString articleText;
|
||||||
|
|
||||||
int currentDatabase = 0;
|
int currentDatabase = 0;
|
||||||
DictServerState state;
|
DictServerState state;
|
||||||
|
QTimer * timer;
|
||||||
bool contentInHtml = false;
|
bool contentInHtml = false;
|
||||||
|
|
||||||
|
|
||||||
|
@ -587,14 +590,21 @@ public:
|
||||||
dict( dict_ ),
|
dict( dict_ ),
|
||||||
dictImpl( new DictServerImpl( this, dict_.url, "GoldenDict-t" ) )
|
dictImpl( new DictServerImpl( this, dict_.url, "GoldenDict-t" ) )
|
||||||
{
|
{
|
||||||
|
timer = new QTimer( this );
|
||||||
|
timer->setInterval( 5000 );
|
||||||
|
timer->setSingleShot( true );
|
||||||
|
qDebug() << "receive data:" << QDateTime::currentDateTime();
|
||||||
|
connect( timer, &QTimer::timeout, this, [ this ]() {
|
||||||
|
qDebug() << "Server takes too much time to response" << QDateTime::currentDateTime();
|
||||||
|
cancel();
|
||||||
|
} );
|
||||||
|
|
||||||
connect( this, &DictServerArticleRequest::finishedArticle, this, [ this ]( QString articleText ) {
|
connect( this, &DictServerArticleRequest::finishedArticle, this, [ this ]( QString articleText ) {
|
||||||
if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
|
if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
|
||||||
cancel();
|
cancel();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << articleText;
|
|
||||||
|
|
||||||
static QRegularExpression phonetic( R"(\\([^\\]+)\\)",
|
static QRegularExpression phonetic( R"(\\([^\\]+)\\)",
|
||||||
QRegularExpression::CaseInsensitiveOption ); // phonetics: \stuff\ ...
|
QRegularExpression::CaseInsensitiveOption ); // phonetics: \stuff\ ...
|
||||||
static QRegularExpression divs_inside_phonetic( "</div([^>]*)><div([^>]*)>",
|
static QRegularExpression divs_inside_phonetic( "</div([^>]*)><div([^>]*)>",
|
||||||
|
@ -687,10 +697,7 @@ public:
|
||||||
defineNext();
|
defineNext();
|
||||||
} );
|
} );
|
||||||
|
|
||||||
QTimer::singleShot( 5000, this, [ this ]() {
|
timer->start();
|
||||||
qDebug() << "Server takes too much time to response";
|
|
||||||
cancel();
|
|
||||||
} );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void run();
|
void run();
|
||||||
|
@ -723,9 +730,9 @@ void DictServerArticleRequest::run()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
connect( &dictImpl->socket, &QTcpSocket::readyRead, this, [ this ]() {
|
connect( &dictImpl->socket, &QTcpSocket::readyRead, this, [ this ]() {
|
||||||
QMutexLocker const _( &dictImpl->mutex );
|
QMutexLocker const _( &dictImpl->mutex );
|
||||||
|
timer->start();
|
||||||
if ( state == DictServerState::DEFINE ) {
|
if ( state == DictServerState::DEFINE ) {
|
||||||
QByteArray reply = dictImpl->socket.readLine();
|
QByteArray reply = dictImpl->socket.readLine();
|
||||||
qDebug() << "receive define:" << reply;
|
qDebug() << "receive define:" << reply;
|
||||||
|
@ -748,34 +755,19 @@ void DictServerArticleRequest::run()
|
||||||
if ( reply.left( 3 ) == "150" ) {
|
if ( reply.left( 3 ) == "150" ) {
|
||||||
// Articles found
|
// Articles found
|
||||||
int countPos = reply.indexOf( ' ', 4 );
|
int countPos = reply.indexOf( ' ', 4 );
|
||||||
|
// Get articles count,
|
||||||
QString articleText;
|
// todo ,how to use this count?
|
||||||
|
|
||||||
// Get articles count
|
|
||||||
int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
|
int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
|
||||||
|
|
||||||
// Read articles
|
// Read articles
|
||||||
for ( int x = 0; x < count; x++ ) {
|
readData( reply );
|
||||||
reply = dictImpl->socket.readLine();
|
|
||||||
if ( reply.isEmpty() ) {
|
|
||||||
state = DictServerState::DEFINE_DATA;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
readData( reply );
|
|
||||||
}
|
|
||||||
state = DictServerState::DEFINE_DATA;
|
state = DictServerState::DEFINE_DATA;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( state == DictServerState::DEFINE_DATA ) {
|
else if ( state == DictServerState::DEFINE_DATA ) {
|
||||||
QByteArray reply = dictImpl->socket.readLine();
|
QByteArray reply = dictImpl->socket.readLine();
|
||||||
qDebug() << "receive define data:" << reply;
|
qDebug() << "receive define data:" << reply << QDateTime::currentDateTime();
|
||||||
while ( true ) {
|
readData( reply );
|
||||||
if ( reply.isEmpty() ) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
readData( reply );
|
|
||||||
reply = dictImpl->socket.readLine();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
@ -814,7 +806,8 @@ void DictServerArticleRequest::readData( QByteArray reply )
|
||||||
|
|
||||||
pos = endPos + 1;
|
pos = endPos + 1;
|
||||||
|
|
||||||
QString dbID, dbName;
|
QString dbID;
|
||||||
|
QString dbName;
|
||||||
|
|
||||||
// Retrieve database ID
|
// Retrieve database ID
|
||||||
endPos = reply.indexOf( ' ', pos );
|
endPos = reply.indexOf( ' ', pos );
|
||||||
|
@ -827,8 +820,7 @@ void DictServerArticleRequest::readData( QByteArray reply )
|
||||||
dbID = reply.mid( pos, endPos - pos );
|
dbID = reply.mid( pos, endPos - pos );
|
||||||
|
|
||||||
// Retrieve database ID
|
// Retrieve database ID
|
||||||
pos = endPos + 1;
|
pos = endPos + 1;
|
||||||
endPos = reply.indexOf( ' ', pos );
|
|
||||||
if ( reply[ pos ] == '\"' ) {
|
if ( reply[ pos ] == '\"' ) {
|
||||||
endPos = reply.indexOf( '\"', pos + 1 ) + 1;
|
endPos = reply.indexOf( '\"', pos + 1 ) + 1;
|
||||||
}
|
}
|
||||||
|
@ -852,47 +844,30 @@ void DictServerArticleRequest::readData( QByteArray reply )
|
||||||
articleData += string( "<div class=\"dictserver_from\">" ) + dbName.toUtf8().data() + "[" + dbID.toUtf8().data()
|
articleData += string( "<div class=\"dictserver_from\">" ) + dbName.toUtf8().data() + "[" + dbID.toUtf8().data()
|
||||||
+ "]" + "</div>";
|
+ "]" + "</div>";
|
||||||
|
|
||||||
// Retreive MIME headers if any
|
reply = dictImpl->socket.readAll();
|
||||||
|
|
||||||
static QRegularExpression contentTypeExpr( "Content-Type\\s*:\\s*text/html",
|
articleText += reply;
|
||||||
QRegularExpression::CaseInsensitiveOption );
|
qDebug() << "reply data:" << reply << QDateTime::currentDateTime();
|
||||||
|
if ( articleText.contains( "\r\n.\r\n" ) ) {
|
||||||
for ( ;; ) {
|
//discard all left message.
|
||||||
reply = dictImpl->socket.readLine();
|
emit finishedArticle( articleText );
|
||||||
if ( reply.isEmpty() ) {
|
return;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( reply == "\r\n" ) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
QRegularExpressionMatch match = contentTypeExpr.match( reply );
|
|
||||||
if ( match.hasMatch() ) {
|
|
||||||
contentInHtml = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
QString articleText;
|
|
||||||
// Retrieve article text
|
|
||||||
|
|
||||||
articleText.clear();
|
|
||||||
for ( ;; ) {
|
|
||||||
reply = dictImpl->socket.readLine();
|
|
||||||
if ( reply.isEmpty() ) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
qDebug() << "reply data:" << reply;
|
|
||||||
if ( reply == ".\r\n" ) {
|
|
||||||
//discard all left message.
|
|
||||||
while ( !dictImpl->socket.readLine().isEmpty() ) {}
|
|
||||||
emit finishedArticle( articleText );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
articleText += reply;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
articleText += reply;
|
||||||
|
reply = dictImpl->socket.readAll();
|
||||||
|
qDebug() << "reply data:" << reply << QDateTime::currentDateTime();
|
||||||
|
|
||||||
|
articleText += reply;
|
||||||
|
if ( reply.contains( "\r\n.\r\n" ) ) {
|
||||||
|
//discard all left message. maybe delete all the remaining data after `.\r\n`
|
||||||
|
emit finishedArticle( articleText );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//restart.
|
||||||
|
timer->start();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DictServerArticleRequest::cancel()
|
void DictServerArticleRequest::cancel()
|
||||||
|
|
Loading…
Reference in a new issue