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

DICT servers: Some fixes for OPTION MIME handling

Browse source
This commit is contained in:
Abs62 2018-10-21 13:17:22 +03:00
parent 7e4a42a95e
commit 0ecb217e9b
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dictserver.cc
View file

@ -763,7 +763,13 @@ void DictServerArticleRequest::run()
// Retreive MIME headers if any
QString contentType = QString( "text/plain" );
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
static QRegularExpression contentTypeExpr( "Content-Type\\s*:\\s*text/html",
QRegularExpression::CaseInsensitiveOption );
#else
QRegExp contentTypeExpr( "Content-Type\\s*:\\s*text/html", Qt::CaseInsensitive );
#endif
bool contentInHtml = false;
for( ; ; )
{
if( !readLine( *socket, reply, errorString, isCancelled ) )
@ -773,14 +779,13 @@ void DictServerArticleRequest::run()
break;
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
static QRegularExpression contentTypeExpr( "Content-Type\\s*:\\s*text/html(.*)",
QRegularExpression::CaseInsensitiveOption );
#else
QRegExp contentTypeExpr( "Content-Type\\s*:\\s*text/html(.*)", Qt::CaseInsensitive );
#endif
QRegularExpressionMatch match = contentTypeExpr.match( reply );
if( match.hasMatch() )
contentType = QString( "text/html" );
contentInHtml = true;
#else
if( contentTypeExpr.indexIn( reply ) >= 0 )
contentInHtml = true;
#endif
}
// Retrieve article text
@ -819,10 +824,10 @@ void DictServerArticleRequest::run()
QRegExp tags( "<[^>]*>", Qt::CaseInsensitive );
#endif
string articleStr;
if( contentType != "text/html" )
articleStr = Html::preformat( articleText.toUtf8().data() );
else
if( contentInHtml )
articleStr = articleText.toUtf8().data();
else
articleStr = Html::preformat( articleText.toUtf8().data() );
articleText = QString::fromUtf8( articleStr.c_str(), articleStr.size() )
.replace(refs, "<a href=\"gdlookup://localhost/\\1\">\\1</a>" );