mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 23:34:06 +00:00
MDict: handle malformed resource link without quotes
This commit is contained in:
parent
0101f52abd
commit
6f0a47fe53
21
mdx.cc
21
mdx.cc
|
@ -812,6 +812,7 @@ void MdxDictionary::loadArticle( uint32_t offset, string & articleText )
|
||||||
|
|
||||||
string MdxDictionary::filterResource( const char * articleId, const char * article )
|
string MdxDictionary::filterResource( const char * articleId, const char * article )
|
||||||
{
|
{
|
||||||
|
QString id = QString::fromStdString( getId() );
|
||||||
QString uniquePrefix = QString::fromStdString( getId() + "_" + articleId + "_" );
|
QString uniquePrefix = QString::fromStdString( getId() + "_" + articleId + "_" );
|
||||||
|
|
||||||
return string( QString::fromUtf8( article )
|
return string( QString::fromUtf8( article )
|
||||||
|
@ -826,15 +827,21 @@ string MdxDictionary::filterResource( const char * articleId, const char * artic
|
||||||
// sounds, and audio link script
|
// sounds, and audio link script
|
||||||
.replace( QRegExp( "(<\\s*a\\s+[^>]*href\\s*=\\s*\")sound://([^\"']*)", Qt::CaseInsensitive ),
|
.replace( QRegExp( "(<\\s*a\\s+[^>]*href\\s*=\\s*\")sound://([^\"']*)", Qt::CaseInsensitive ),
|
||||||
QString::fromStdString( addAudioLink( "\"gdau://" + getId() + "/\\2\"", getId() ) ) +
|
QString::fromStdString( addAudioLink( "\"gdau://" + getId() + "/\\2\"", getId() ) ) +
|
||||||
"\\1gdau://" + QString::fromStdString( getId() ) + "/\\2" )
|
"\\1gdau://" + id + "/\\2" )
|
||||||
// stylesheets
|
// stylesheets
|
||||||
.replace( QRegExp( "(<\\s*link\\s+[^>]*href\\s*=\\s*[\"']+)(file://)?[\\x00-\\x30\\x7f]*([^\"']*)",
|
.replace( QRegExp( "(<\\s*link\\s+[^>]*href\\s*=\\s*[\"']+)(?:file://)?[\\x00-\\x30\\x7f]*([^\"']*)",
|
||||||
Qt::CaseInsensitive, QRegExp::RegExp2 ),
|
Qt::CaseInsensitive, QRegExp::RegExp2 ),
|
||||||
"\\1bres://" + QString::fromStdString( getId() ) + "/\\3" )
|
"\\1bres://" + id + "/\\2" )
|
||||||
|
.replace( QRegExp( "(<\\s*link\\s+[^>]*href\\s*=\\s*)(?!['\"]+)(?!bres:|data:)(?:file://)?([^\\s>]+)",
|
||||||
|
Qt::CaseInsensitive, QRegExp::RegExp2 ),
|
||||||
|
"\\1\"bres://" + id + "/\\\"" )
|
||||||
// images
|
// images
|
||||||
.replace( QRegExp( "(<\\s*img\\s+[^>]*src\\s*=\\s*[\"']+)(file://)?[\\x00-\\x30\\x7f]*([^\"']*)",
|
.replace( QRegExp( "(<\\s*img\\s+[^>]*src\\s*=\\s*[\"']+)(?:file://)?[\\x00-\\x30\\x7f]*([^\"']*)",
|
||||||
Qt::CaseInsensitive, QRegExp::RegExp2 ),
|
Qt::CaseInsensitive, QRegExp::RegExp2 ),
|
||||||
"\\1bres://" + QString::fromStdString( getId() ) + "/\\3" )
|
"\\1bres://" + id + "/\\2" )
|
||||||
|
.replace( QRegExp( "(<\\s*img\\s+[^>]*src\\s*=\\s*)(?!['\"]+)(?!bres:|data:)(?:file://)?([^\\s>]+)",
|
||||||
|
Qt::CaseInsensitive, QRegExp::RegExp2 ),
|
||||||
|
"\\1\"bres://" + id + "/\\2\"" )
|
||||||
.toUtf8().constData() );
|
.toUtf8().constData() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue