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

opt: add codecs detection in the website dictionary

Browse source
This commit is contained in:
Xiao YiFang 2022-12-18 21:30:35 +08:00
parent c53cd32fe7
commit 021645ffc6
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
iframeschemehandler.cpp
View file

@ -26,13 +26,29 @@ void IframeSchemeHandler::requestStarted(QWebEngineUrlRequestJob *requestJob)
QByteArray replyData = reply->readAll(); QByteArray replyData = reply->readAll();
QString articleString; QString articleString;
QTextCodec * codec = QTextCodec::codecForHtml( replyData, QTextCodec::codecForName( "UTF-8" ) ); QString codecName;
articleString = codec->toUnicode( replyData ); auto contentTypeV = reply->header(QNetworkRequest::ContentTypeHeader);
if(contentTypeV.isValid())
{
auto _ct = contentTypeV.toString();
auto index = _ct.indexOf("charset=");
if(index>-1){
codecName=_ct.mid(index+QString("charset=").size());
qDebug()<<codecName;
}
}
QTextCodec * codec = QTextCodec::codecForUtfText( replyData, QTextCodec::codecForName( codecName.toUtf8() ) );
if(codec)
articleString = codec->toUnicode( replyData );
else
articleString = QString::fromUtf8(replyData);
// Handle reply data // Handle reply data
// 404 response may have response body. // 404 response may have response body.
if( reply->error() != QNetworkReply::NoError && articleString.isEmpty()) if( reply->error() != QNetworkReply::NoError && articleString.isEmpty())
{ {
if(reply->error()==QNetworkReply::ContentNotFoundError){ if(reply->error()==QNetworkReply::ContentNotFoundError){
buffer->deleteLater();
//work around to fix QTBUG-106573 //work around to fix QTBUG-106573
requestJob->redirect(url); requestJob->redirect(url);
return; return;
@ -77,7 +93,10 @@ void IframeSchemeHandler::requestStarted(QWebEngineUrlRequestJob *requestJob)
articleString.insert( 0, depressionFocus ); articleString.insert( 0, depressionFocus );
} }
buffer->setData(codec->fromUnicode(articleString)); if(codec)
buffer->setData(codec->fromUnicode(articleString));
else
buffer->setData(articleString.toUtf8());
requestJob->reply(contentType , buffer ); requestJob->reply(contentType , buffer );
}; };