yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

better RTF encoding detection; don't fail on RTF files with .doc extension; fixed XML serialisation

Browse source
This commit is contained in:
Nikolay Pultsin 2015-02-14 12:20:05 +00:00
parent a6c8ead2bf
commit 7e9d47bba9
5 changed files with 84 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

27
jni/NativeFormats/fbreader/src/formats/rtf/RtfPlugin.cpp
View file

@ -34,23 +34,16 @@ bool RtfPlugin::providesMetainfo() const {
}
const std::string RtfPlugin::supportedFileType() const {
return "rtf";
return "RTF";
}
bool RtfPlugin::readMetainfo(Book &book) const {
readLanguageAndEncoding(book);
if (!RtfDescriptionReader(book).readDocument(book.file())) {
return false;
}
if (book.encoding().empty()) {
book.setEncoding(ZLEncodingConverter::UTF8);
} else if (book.language().empty()) {
shared_ptr<ZLInputStream> stream = new RtfReaderStream(book.file(), 50000);
if (!stream.isNull()) {
detectLanguage(book, *stream, book.encoding());
}
}
return true;
}
@ -64,5 +57,19 @@ bool RtfPlugin::readModel(BookModel &model) const {
}
bool RtfPlugin::readLanguageAndEncoding(Book &book) const {
if (book.encoding().empty()) {
shared_ptr<ZLInputStream> stream = new RtfReaderStream(book.file(), 50000);
if (!stream.isNull()) {
detectEncodingAndLanguage(book, *stream);
}
if (book.encoding().empty()) {
book.setEncoding(ZLEncodingConverter::UTF8);
}
} else if (book.language().empty()) {
shared_ptr<ZLInputStream> stream = new RtfReaderStream(book.file(), 50000);
if (!stream.isNull()) {
detectLanguage(book, *stream, book.encoding());
}
}
return true;
}