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

opt: refactor the compare logic

Browse source
This commit is contained in:
YiFang Xiao 2023-09-02 12:23:13 +08:00
parent 8313d93469
commit 4226abf593
11 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dict/aard.cc
View file

@ -750,7 +750,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
// Skip files with the extensions different to .aar to speed up the
// scanning
if ( fileName.size() < 4 || strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".aar" ) != 0 )
if ( !Utils::endsWithIgnoreCase(fileName, ".aar" ) )
continue;
// Got the file -- check if we need to rebuid the index

2
src/dict/bgl.cc
View file

@ -1017,7 +1017,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
// Skip files with the extensions different to .bgl to speed up the
// scanning
if ( fileName.size() < 4 || strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".bgl" ) != 0 )
if ( !Utils::endsWithIgnoreCase( fileName, ".bgl" ) )
continue;
// Got the file -- check if we need to rebuid the index

2
src/dict/dictdfiles.cc
View file

@ -550,7 +550,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
// Only allow .index suffixes
if ( fileName.size() < 6 || strcasecmp( fileName.c_str() + ( fileName.size() - 6 ), ".index" ) != 0 )
if ( !Utils::endsWithIgnoreCase( fileName, ".index" ) )
continue;
try {

6
src/dict/dsl.cc
View file

@ -1713,10 +1713,8 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
// Try .dsl and .dsl.dz suffixes
bool uncompressedDsl =
( fileName.size() >= 4 && strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".dsl" ) == 0 );
if ( !uncompressedDsl
&& ( fileName.size() < 7 || strcasecmp( fileName.c_str() + ( fileName.size() - 7 ), ".dsl.dz" ) != 0 ) )
bool uncompressedDsl = Utils::endsWithIgnoreCase( fileName, ".dsl" );
if ( !uncompressedDsl && !Utils::endsWithIgnoreCase( fileName, ".dsl.dz" ) )
continue;
// Make sure it's not an abbreviation file

3
src/dict/gls.cc
View file

@ -1195,8 +1195,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
// Try .gls and .gls.dz suffixes
if ( !( fileName.size() >= 4 && strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".gls" ) == 0 )
&& !( fileName.size() >= 7 && strcasecmp( fileName.c_str() + ( fileName.size() - 7 ), ".gls.dz" ) == 0 ) )
if ( !Utils::endsWithIgnoreCase( fileName, ".gls" ) && !Utils::endsWithIgnoreCase( fileName, ".gls.dz" ) )
continue;
unsigned atLine = 0; // Indicates current line in .gls, for debug purposes

7
src/dict/lsa.cc
View file

@ -75,7 +75,7 @@ bool indexIsOldOrBad( string const & indexFile )
string stripExtension( string const & str )
{
if ( str.size() > 3 && ( strcasecmp( str.c_str() + ( str.size() - 4 ), ".wav" ) == 0 ) )
if ( Utils::endsWithIgnoreCase(str, ".wav" ) )
return string( str, 0, str.size() - 4 );
else
return str;
@ -494,15 +494,12 @@ void LsaDictionary::loadIcon() noexcept
vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
string const & indicesDir,
Dictionary::Initializing & initializing )
{
vector< sptr< Dictionary::Class > > dictionaries;
for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
/// Only allow .dat and .lsa extensions to save scanning time
if ( i->size() < 4
|| ( strcasecmp( i->c_str() + ( i->size() - 4 ), ".dat" ) != 0
&& strcasecmp( i->c_str() + ( i->size() - 4 ), ".lsa" ) != 0 ) )
if ( !Utils::endsWithIgnoreCase(i->c_str(),".dat") &&!Utils::endsWithIgnoreCase(i->c_str(),".lsa") )
continue;
try {

2
src/dict/mdx.cc
View file

@ -1272,7 +1272,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
// Skip files with the extensions different to .mdx to speed up the
// scanning
if ( fileName.size() < 4 || strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".mdx" ) != 0 )
if ( !Utils::endsWithIgnoreCase(fileName,".mdx"))
continue;
vector< string > dictFiles( 1, fileName );

2
src/dict/sdict.cc
View file

@ -661,7 +661,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
// Skip files with the extensions different to .dct to speed up the
// scanning
if ( fileName.size() < 4 || strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".dct" ) != 0 )
if ( !Utils::endsWithIgnoreCase( fileName, ".dct" ) )
continue;
// Got the file -- check if we need to rebuid the index

2
src/dict/stardict.cc
View file

@ -1775,7 +1775,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
vector< sptr< Dictionary::Class > > dictionaries;
for ( const auto & fileName : fileNames ) {
if ( fileName.size() < 4 || strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".ifo" ) != 0 )
if ( !Utils::endsWithIgnoreCase( fileName, ".ifo" ) )
continue;
try {

3
src/dict/xdxf.cc
View file

@ -1010,8 +1010,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
// Only allow .xdxf and .xdxf.dz suffixes
if ( ( fileName.size() < 5 || strcasecmp( fileName.c_str() + ( fileName.size() - 5 ), ".xdxf" ) != 0 )
&& ( fileName.size() < 8 || strcasecmp( fileName.c_str() + ( fileName.size() - 8 ), ".xdxf.dz" ) != 0 ) )
if ( !Utils::endsWithIgnoreCase( fileName, ".xdxf" ) && !Utils::endsWithIgnoreCase( fileName, ".xdxf.dz" ) )
continue;
try {

2
src/dict/zipsounds.cc
View file

@ -383,7 +383,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
for ( const auto & fileName : fileNames ) {
/// Only allow .zips extension
if ( fileName.size() < 5 || strcasecmp( fileName.c_str() + ( fileName.size() - 5 ), ".zips" ) != 0 )
if ( !Utils::endsWithIgnoreCase( fileName, ".zips" ) )
continue;
try {