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

Use file names in UTF-8. Fix issue #30.

Browse source
This commit is contained in:
Abs62 2011-09-09 16:05:28 +04:00
parent 8b5512123f
commit 2763b74635
17 changed files with 169 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bgl_babylon.cc
View file

@ -29,6 +29,7 @@
#include<iconv.h>
#include <QTextDocument>
#include "dprintf.hh"
#include "ufile.hh"
#ifdef _WIN32
#include <io.h>
@ -58,7 +59,7 @@ bool Babylon::open()
unsigned char buf[6];
int i;
f = fopen( m_filename.c_str(), "rb" );
f = gd_fopen( m_filename.c_str(), "rb" );
if( f == NULL )
return false;
@ -325,7 +326,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
block.data + pos,
block.length - pos );
#if 0
FILE *ifile = fopen(filename.c_str(), "w");
FILE *ifile = gd_fopen(filename.c_str(), "w");
fwrite(block.data + pos, 1, block.length -pos, ifile);
fclose(ifile);
#endif

9
dictionary.cc
View file

@ -17,6 +17,7 @@
#include <QFileInfo>
#include <QCryptographicHash>
#include <QDateTime>
#include "fsencoding.hh"
namespace Dictionary {
@ -163,10 +164,10 @@ string makeDictionaryId( vector< string > const & dictionaryFiles ) throw()
{
string const & full( dictionaryFiles[ x ] );
QFileInfo fileInfo( QString::fromLocal8Bit( full.c_str() ) );
QFileInfo fileInfo( FsEncoding::decode( full.c_str() ) );
if ( fileInfo.isAbsolute() )
sortedList.push_back( dictionariesDir.relativeFilePath( fileInfo.filePath() ).toLocal8Bit().data() );
sortedList.push_back( FsEncoding::encode( dictionariesDir.relativeFilePath( fileInfo.filePath() ) ) );
else
{
// Well, it's relative. We don't technically support those, but
@ -201,7 +202,7 @@ bool needToRebuildIndex( vector< string > const & dictionaryFiles,
for( std::vector< string >::const_iterator i = dictionaryFiles.begin();
i != dictionaryFiles.end(); ++i )
{
QFileInfo fileInfo( QString::fromLocal8Bit( i->c_str() ) );
QFileInfo fileInfo( FsEncoding::decode( i->c_str() ) );
if ( !fileInfo.exists() )
return true;
@ -212,7 +213,7 @@ bool needToRebuildIndex( vector< string > const & dictionaryFiles,
lastModified = ts;
}
QFileInfo fileInfo( QString::fromLocal8Bit( indexFile.c_str() ) );
QFileInfo fileInfo( FsEncoding::decode( indexFile.c_str() ) );
if ( !fileInfo.exists() )
return true;

6
dictzip.c
View file

@ -31,6 +31,8 @@
#include <stdlib.h>
#include <string.h>
#include "ufile.hh"
#define BUFFERSIZE 10240
#define OUT_BUFFER_SIZE 0xffffL
@ -270,7 +272,7 @@ static int dict_read_header( const char *filename,
int count;
unsigned long offset;
if (!(str = fopen( filename, "rb" )))
if (!(str = gd_fopen( filename, "rb" )))
err_fatal_errno( __func__,
"Cannot open data file \"%s\" for read\n", filename );
@ -444,7 +446,7 @@ dictData *dict_data_open( const char *filename, int computeCRC )
"\"%s\" not in text or dzip format\n", filename );*/
}
h->fd = fopen( filename, "rb" );
h->fd = gd_fopen( filename, "rb" );
if ( !h->fd )
{

6
dsl.cc
View file

@ -375,7 +375,7 @@ void DslDictionary::doDeferredInit()
idx, idxMutex );
QString zipName = QDir::fromNativeSeparators(
QFile::decodeName( getDictionaryFilenames().back().c_str() ) );
FsEncoding::decode( getDictionaryFilenames().back().c_str() ) );
if ( zipName.endsWith( ".zip", Qt::CaseInsensitive ) ) // Sanity check
resourceZip.openZipFile( zipName );
@ -416,7 +416,7 @@ void DslDictionary::loadIcon()
return;
QString fileName =
QDir::fromNativeSeparators( QString::fromLocal8Bit( getDictionaryFilenames()[ 0 ].c_str() ) );
QDir::fromNativeSeparators( FsEncoding::decode( getDictionaryFilenames()[ 0 ].c_str() ) );
// Remove the extension
@ -1650,7 +1650,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
idxHeader.hasZipFile = 1;
QFile zipFile( QDir::fromNativeSeparators(
QFile::decodeName( zipFileName.c_str() ) ) );
FsEncoding::decode( zipFileName.c_str() ) ) );
if ( !zipFile.open( QFile::ReadOnly ) )
throw exCantReadFile( zipFileName );

14
dsl_details.cc
View file

@ -7,6 +7,7 @@
#include <wctype.h>
#include <stdio.h>
#include "dprintf.hh"
#include "ufile.hh"
namespace Dsl {
namespace Details {
@ -499,10 +500,21 @@ DslScanner::DslScanner( string const & fileName ) throw( Ex, Iconv::Ex ):
{
// Since .dz is backwards-compatible with .gz, we use gz- functions to
// read it -- they are much nicer than the dict_data- ones.
#ifdef __WIN32
int id = gd_open( fileName.c_str() );
if( id == -1 )
throw exCantOpen( fileName );
f = gzdopen( id, "rb");
if ( !f )
{
_close( id );
throw exCantOpen( fileName );
}
#else
f = gzopen( fileName.c_str(), "rb");
if ( !f )
throw exCantOpen( fileName );
#endif
// Now try guessing the encoding by reading the first two bytes

12
file.cc
View file

@ -10,6 +10,12 @@
#include <sys/stat.h>
#include <unistd.h>
#ifdef __WIN32
#include <windows.h>
#endif
#include "ufile.hh"
namespace File {
enum
@ -23,7 +29,9 @@ bool exists( char const * filename ) throw()
{
#ifdef __WIN32
struct _stat buf;
return _stat( filename, &buf ) == 0;
wchar_t wname[16384];
MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 );
return _wstat( wname, &buf ) == 0;
#else
struct stat buf;
@ -34,7 +42,7 @@ bool exists( char const * filename ) throw()
void Class::open( char const * filename, char const * mode ) throw( exCantOpen )
{
f = fopen( filename, mode );
f = gd_fopen( filename, mode );
if ( !f )
throw exCantOpen( std::string( filename ) + ": " + strerror( errno ) );

30
fsencoding.cc
View file

@ -11,17 +11,47 @@ namespace FsEncoding {
string encode( wstring const & str )
{
#ifdef __WIN32
return string( gd::toQString( str ).toUtf8().data() );
#else
return string( gd::toQString( str ).toLocal8Bit().data() );
#endif
}
string encode( string const & str )
{
#ifdef __WIN32
return string( str );
#else
return string( QString::fromUtf8( str.c_str() ).toLocal8Bit().data() );
#endif
}
string encode( QString const & str )
{
#ifdef __WIN32
return string( str.toUtf8().data() );
#else
return string( str.toLocal8Bit().data() );
#endif
}
wstring decode( string const & str )
{
#ifdef __WIN32
return gd::toWString( QString::fromUtf8( str.c_str() ) );
#else
return gd::toWString( QString::fromLocal8Bit( str.c_str() ) );
#endif
}
QString decode( const char *str )
{
#ifdef __WIN32
return QString::fromUtf8( str );
#else
return QString::fromLocal8Bit( str );
#endif
}
char separator()

11
fsencoding.hh
View file

@ -5,6 +5,7 @@
#define __FSENCODING_HH_INCLUDED__
#include "wstring.hh"
#include <QString>
/// Utilities to convert a wide string or an utf8 string to the local 8bit
/// encoding of the file system, and to do other manipulations on the file
@ -14,15 +15,21 @@ namespace FsEncoding {
using std::string;
using gd::wstring;
/// Encodes the given wide string to the system 8bit encoding.
/// Encodes the given wide string to the utf8 encoding.
string encode( wstring const & );
/// Encodes the given string in utf8 to the system 8bit encoding.
string encode( string const & );
/// Decodes the given 8bit-encoded string to a wide string.
/// Encodes the QString to the utf8/local 8-bit encoding.
string encode( QString const & );
/// Decodes the given utf8-encoded string to a wide string.
wstring decode( string const & str );
/// Decodes the given utf8/local 8-bit string to a QString.
QString decode( const char *str );
/// Returns the filesystem separator (/ on Unix and clones, \ on Windows).
char separator();

10
goldendict.pro
View file

@ -188,7 +188,8 @@ HEADERS += folding.hh \
maintabwidget.hh \
dprintf.hh \
mainstatusbar.hh \
gdappstyle.hh
gdappstyle.hh \
ufile.hh
FORMS += groups.ui \
dictgroupwidget.ui \
mainwindow.ui \
@ -275,7 +276,8 @@ SOURCES += folding.cc \
parsecmdline.cc \
maintabwidget.cc \
mainstatusbar.cc \
gdappstyle.cc
gdappstyle.cc \
ufile.cc
win32 {
SOURCES += mouseover_win32/ThTypes.c \
wordbyauto.cc \
@ -330,3 +332,7 @@ TS_OUT ~= s/.ts/.qm/g
PRE_TARGETDEPS += $$TS_OUT
include( qtsingleapplication/src/qtsingleapplication.pri )

3
groups_widgets.cc
View file

@ -7,6 +7,7 @@
#include "config.hh"
#include "langcoder.hh"
#include "language.hh"
#include "fsencoding.hh"
//#include "initializing.hh"
@ -191,7 +192,7 @@ QVariant DictListModel::data( QModelIndex const & index, int role ) const
if ( dirs.size() )
{
tt += "<hr>";
tt += QString::fromLocal8Bit( dirs.at( 0 ).c_str() );
tt += FsEncoding::decode( dirs.at( 0 ).c_str() );
}
tt.replace( " ", "&nbsp;" );

5
hunspell.cc
View file

@ -18,6 +18,7 @@
#include <set>
#include <hunspell/hunspell.hxx>
#include "dprintf.hh"
#include "fsencoding.hh"
namespace HunspellMorpho {
@ -673,9 +674,9 @@ vector< sptr< Dictionary::Class > > makeDictionaries( Config::Hunspell const & c
vector< string > dictFiles;
dictFiles.push_back(
QDir::toNativeSeparators( dataFiles[ d ].affFileName ).toLocal8Bit().data() );
FsEncoding::encode( QDir::toNativeSeparators( dataFiles[ d ].affFileName ) ) );
dictFiles.push_back(
QDir::toNativeSeparators( dataFiles[ d ].dicFileName ).toLocal8Bit().data() );
FsEncoding::encode( QDir::toNativeSeparators( dataFiles[ d ].dicFileName ) ) );
result.push_back(
new HunspellDictionary( Dictionary::makeDictionaryId( dictFiles ),

17
loaddictionaries.cc
View file

@ -19,6 +19,7 @@
#include "forvo.hh"
#include "programs.hh"
#include "dprintf.hh"
#include "fsencoding.hh"
#include <QMessageBox>
#include <QDir>
@ -51,7 +52,7 @@ void LoadDictionaries::run()
// Make soundDirs
{
vector< sptr< Dictionary::Class > > soundDirDictionaries =
SoundDir::makeDictionaries( soundDirs, Config::getIndexDir().toLocal8Bit().data(), *this );
SoundDir::makeDictionaries( soundDirs, FsEncoding::encode( Config::getIndexDir() ), *this );
dictionaries.insert( dictionaries.end(), soundDirDictionaries.begin(),
soundDirDictionaries.end() );
@ -95,12 +96,12 @@ void LoadDictionaries::handlePath( Config::Path const & path )
handlePath( Config::Path( fullName, true ) );
}
allFiles.push_back( QDir::toNativeSeparators( fullName ).toLocal8Bit().data() );
allFiles.push_back( FsEncoding::encode( QDir::toNativeSeparators( fullName ) ) );
}
{
vector< sptr< Dictionary::Class > > bglDictionaries =
Bgl::makeDictionaries( allFiles, Config::getIndexDir().toLocal8Bit().data(), *this );
Bgl::makeDictionaries( allFiles, FsEncoding::encode( Config::getIndexDir() ), *this );
dictionaries.insert( dictionaries.end(), bglDictionaries.begin(),
bglDictionaries.end() );
@ -108,7 +109,7 @@ void LoadDictionaries::handlePath( Config::Path const & path )
{
vector< sptr< Dictionary::Class > > stardictDictionaries =
Stardict::makeDictionaries( allFiles, Config::getIndexDir().toLocal8Bit().data(), *this );
Stardict::makeDictionaries( allFiles, FsEncoding::encode( Config::getIndexDir() ), *this );
dictionaries.insert( dictionaries.end(), stardictDictionaries.begin(),
stardictDictionaries.end() );
@ -116,7 +117,7 @@ void LoadDictionaries::handlePath( Config::Path const & path )
{
vector< sptr< Dictionary::Class > > lsaDictionaries =
Lsa::makeDictionaries( allFiles, Config::getIndexDir().toLocal8Bit().data(), *this );
Lsa::makeDictionaries( allFiles, FsEncoding::encode( Config::getIndexDir() ), *this );
dictionaries.insert( dictionaries.end(), lsaDictionaries.begin(),
lsaDictionaries.end() );
@ -124,7 +125,7 @@ void LoadDictionaries::handlePath( Config::Path const & path )
{
vector< sptr< Dictionary::Class > > dslDictionaries =
Dsl::makeDictionaries( allFiles, Config::getIndexDir().toLocal8Bit().data(), *this );
Dsl::makeDictionaries( allFiles, FsEncoding::encode( Config::getIndexDir() ), *this );
dictionaries.insert( dictionaries.end(), dslDictionaries.begin(),
dslDictionaries.end() );
@ -132,7 +133,7 @@ void LoadDictionaries::handlePath( Config::Path const & path )
{
vector< sptr< Dictionary::Class > > dictdDictionaries =
DictdFiles::makeDictionaries( allFiles, Config::getIndexDir().toLocal8Bit().data(), *this );
DictdFiles::makeDictionaries( allFiles, FsEncoding::encode( Config::getIndexDir() ), *this );
dictionaries.insert( dictionaries.end(), dictdDictionaries.begin(),
dictdDictionaries.end() );
@ -256,7 +257,7 @@ void loadDictionaries( QWidget * parent, bool showInitially,
for( QStringList::const_iterator i = allIdxFiles.constBegin();
i != allIdxFiles.constEnd(); ++i )
{
if ( ids.find( i->toLocal8Bit().data() ) == ids.end() &&
if ( ids.find( FsEncoding::encode( *i ) ) == ids.end() &&
i->size() == 32 )
indexDir.remove( *i );
}

3
orderandprops.cc
View file

@ -5,6 +5,7 @@
#include "instances.hh"
#include "langcoder.hh"
#include "language.hh"
#include "fsencoding.hh"
OrderAndProps::OrderAndProps( QWidget * parent,
Config::Group const & dictionaryOrder,
@ -110,7 +111,7 @@ void OrderAndProps::describeDictionary( DictListWidget * lst, QModelIndex const
for( unsigned x = 0; x < filenames.size(); x++ )
{
filenamesText += QString::fromLocal8Bit( filenames[ x ].c_str() );
filenamesText += FsEncoding::decode( filenames[ x ].c_str() );
filenamesText += '\n';
}

5
sounddir.cc
View file

@ -11,6 +11,7 @@
#include "htmlescape.hh"
#include "audiolink.hh"
#include "wstring_qt.hh"
#include "fsencoding.hh"
#include <set>
#include <QDir>
#include <QUrl>
@ -252,7 +253,7 @@ sptr< Dictionary::DataRequest > SoundDirDictionary::getResource( string const &
chunk.back() = 0; // It must end with 0 anyway, but just in case
QDir dir( QDir::fromNativeSeparators( QString::fromLocal8Bit( getDictionaryFilenames()[ 0 ].c_str() ) ) );
QDir dir( QDir::fromNativeSeparators( FsEncoding::decode( getDictionaryFilenames()[ 0 ].c_str() ) ) );
QString fileName = QDir::toNativeSeparators( dir.filePath( QString::fromUtf8( articleData ) ) );
@ -260,7 +261,7 @@ sptr< Dictionary::DataRequest > SoundDirDictionary::getResource( string const &
try
{
File::Class f( fileName.toLocal8Bit().data(), "rb" );
File::Class f( FsEncoding::encode( fileName ), "rb" );
sptr< Dictionary::DataRequestInstant > dr = new
Dictionary::DataRequestInstant( true );

15
stardict.cc
View file

@ -32,6 +32,7 @@
#include <QThreadPool>
#include <QAtomicInt>
#include "ufile.hh"
namespace Stardict {
@ -886,10 +887,21 @@ static void handleIdxSynFile( string const & fileName,
vector< uint32_t > * articleOffsets,
bool isSynFile )
{
#ifdef __WIN32
int id = gd_open( fileName.c_str() );
if( id == -1 )
throw exCantReadFile( fileName );
gzFile stardictIdx = gzdopen( id, "rb");
if ( !stardictIdx )
{
_close( id );
throw exCantReadFile( fileName );
}
#else
gzFile stardictIdx = gzopen( fileName.c_str(), "rb" );
if ( !stardictIdx )
throw exCantReadFile( fileName );
#endif
vector< char > image;
@ -913,6 +925,7 @@ static void handleIdxSynFile( string const & fileName,
break;
}
}
gzclose( stardictIdx );
// We append one zero byte to catch runaway string at the end, if any

29
ufile.cc Normal file
View file

@ -0,0 +1,29 @@
#ifdef __WIN32
#include <stdio.h>
#include <fcntl.h>
#include <windows.h>
#include "ufile.hh"
FILE *gd_fopen( const char *filename, const char *mode)
{
wchar_t wname[16384], wmode[32];
if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
return NULL;
if( MultiByteToWideChar( CP_UTF8, 0, mode, -1, wmode, 32 ) == 0 )
return NULL;
return _wfopen( wname, wmode );
}
int gd_open( const char *filename)
{
wchar_t wname[16384];
if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
return -1;
return _wopen( wname, _O_RDONLY | _O_BINARY );
}
#endif

22
ufile.hh Normal file
View file

@ -0,0 +1,22 @@
#ifndef UFILE_HH_INCLUDED
#define UFILE_HH_INCLUDED
#ifdef __WIN32
#ifdef __cplusplus
extern "C"
{
#endif
FILE *gd_fopen( const char *filename, const char *mode );
int gd_open( const char *filename);
#ifdef __cplusplus
} /* end extern "C" */
#endif
#else
#define gd_fopen fopen
#endif
#endif // UFILE_HH