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

fix: zim dictionary has improper link caused the application not function well.

Browse source 
https://github.com/goldendict/goldendict/issues/1472#issuecomment-1086776611
This commit is contained in:
xiaoyifang 2022-04-03 19:39:58 +08:00
parent 498efdf9b7
commit 92e2708fae
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
zim.cc
View file

@ -750,7 +750,8 @@ string ZimDictionary::convert( const string & in )
// pattern <a href="..." ...>, excluding any known protocols such as http://, mailto:, #(comment) // pattern <a href="..." ...>, excluding any known protocols such as http://, mailto:, #(comment)
// these links will be translated into local definitions // these links will be translated into local definitions
QRegularExpression rxLink( "<\\s*a\\s+([^>]*)href=\"(?!(?:\\w+://|#|mailto:|tel:))(/|)([^\"]*)\"\\s*(title=\"[^\"]*\")?[^>]*>" ); // <meta http-equiv="Refresh" content="0;url=../dsalsrv02.uchicago.edu/cgi-bin/0994.html">
QRegularExpression rxLink( "<\\s*(?:a|meta)\\s+([^>]*)(?:href|url)=\"?(?!(?:\\w+://|#|mailto:|tel:))(/|)([^\"]*)\"\\s*(title=\"[^\"]*\")?[^>]*>" );
QRegularExpressionMatchIterator it = rxLink.globalMatch( text ); QRegularExpressionMatchIterator it = rxLink.globalMatch( text );
int pos = 0; int pos = 0;
QString newText; QString newText;
@ -763,7 +764,7 @@ string ZimDictionary::convert( const string & in )
QStringList list = match.capturedTexts(); QStringList list = match.capturedTexts();
// Add empty strings for compatibility with QRegExp behaviour // Add empty strings for compatibility with QRegExp behaviour
for( int i = match.lastCapturedIndex() + 1; i < 5; i++ ) for( int i = list.size(); i < 5; i++ )
list.append( QString() ); list.append( QString() );
QString tag = list[3]; // a url, ex: Precambrian_Chaotian.html QString tag = list[3]; // a url, ex: Precambrian_Chaotian.html
@ -832,7 +833,7 @@ string ZimDictionary::convert( const string & in )
QRegularExpressionMatchIterator it2 = rxLink.globalMatch( text ); QRegularExpressionMatchIterator it2 = rxLink.globalMatch( text );
while( it2.hasNext() ) while( it2.hasNext() )
{ {
QRegularExpressionMatch match = it.next(); QRegularExpressionMatch match = it2.next();
newText += text.mid( pos, match.capturedStart() - pos ); newText += text.mid( pos, match.capturedStart() - pos );
pos = match.capturedEnd(); pos = match.capturedEnd();