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

zim img src link replace regex changes

Browse source
This commit is contained in:
Xiao YiFang 2022-11-19 16:23:43 +08:00
parent f730a4aabc
commit 9f6ed1eec2
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zim.cc
View file

@ -838,7 +838,7 @@ string ZimDictionary::convert( const string & in )
QString( "<body \\1" ) ); QString( "<body \\1" ) );
// pattern of img and script // pattern of img and script
text.replace( QRegularExpression( "<\\s*(img|script)\\s+([^>]*)src=(\"|)(\\.\\.|)/" ), text.replace( QRegularExpression( "<\\s*(img|script)\\s+([^>]*)src=(\"|)(\\.\\./)*" ),
QString( "<\\1 \\2src=\\3bres://%1/").arg( getId().c_str() ) ); QString( "<\\1 \\2src=\\3bres://%1/").arg( getId().c_str() ) );
// Fix links without '"' // Fix links without '"'
@ -1488,9 +1488,9 @@ void ZimResourceRequest::run()
} }
sptr< Dictionary::DataRequest > ZimDictionary::getResource( string const & name ) sptr< Dictionary::DataRequest > ZimDictionary::getResource( string const & name )
{ {
return new ZimResourceRequest( *this, name ); auto formatedName = QString::fromStdString(name).replace(QRegularExpression("[\\.\\/]"),"");
return new ZimResourceRequest( *this, formatedName.toStdString() );
} }
//} // anonymous namespace //} // anonymous namespace
@ -1662,8 +1662,6 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
} }
else else
{ {
// url.insert( url.begin(), '/' );
// url.insert( url.begin(), nameSpace );
auto formatedUrl = QString::fromStdString(url).replace(QRegularExpression("[\\.\\/]"),""); auto formatedUrl = QString::fromStdString(url).replace(QRegularExpression("[\\.\\/]"),"");
indexedResources.addSingleWord( Utf8::decode( formatedUrl.toStdString() ), n ); indexedResources.addSingleWord( Utf8::decode( formatedUrl.toStdString() ), n );
} }