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

When searching for resource files, allow them to be not only in the dictionary

Browse source 
directory, but also in the dictionary-name.files/ subdirectory.
This commit is contained in:
Konstantin Isakov 2009-02-02 15:02:57 +00:00
parent e9799ba248
commit 1a5a4daa52
1 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/dsl.cc
View file

@ -380,7 +380,18 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
try try
{ {
File::Class f( n, "r" ); try
{
File::Class f( n, "rb" );
}
catch( File::exCantOpen & )
{
n = getDictionaryFilenames()[ 0 ] + ".files" +
FsEncoding::separator() +
FsEncoding::encode( filename );
File::Class f( n, "rb" );
}
search = false; search = false;
} }
@ -589,6 +600,19 @@ string DslDictionary::getArticle( wstring const & word,
return result; return result;
} }
void loadFromFile( string const & n, vector< char > & data )
{
File::Class f( n, "rb" );
f.seekEnd();
data.resize( f.tell() );
f.rewind();
f.read( &data.front(), data.size() );
}
void DslDictionary::getResource( string const & name, void DslDictionary::getResource( string const & name,
vector< char > & data ) vector< char > & data )
throw( Dictionary::exNoSuchResource, std::exception ) throw( Dictionary::exNoSuchResource, std::exception )
@ -602,15 +626,18 @@ void DslDictionary::getResource( string const & name,
try try
{ {
File::Class f( n, "rb" ); try
{
loadFromFile( n, data );
}
catch( File::exCantOpen & )
{
n = getDictionaryFilenames()[ 0 ] + ".files" +
FsEncoding::separator() +
FsEncoding::encode( name );
f.seekEnd(); loadFromFile( n, data );
}
data.resize( f.tell() );
f.rewind();
f.read( &data.front(), data.size() );
if ( Filetype::isNameOfTiff( name ) ) if ( Filetype::isNameOfTiff( name ) )
{ {