mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Preserve the filename header when reading attachments

Browse source
This commit is contained in:
Thomas Goyne 2013-12-09 13:45:28 -08:00
parent 23a21b33b1
commit 29eb7b5e9e
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/src/ass_attachment.cpp
View file

@ -25,8 +25,9 @@
#include <boost/range/iterator_range.hpp> #include <boost/range/iterator_range.hpp>
#include <fstream> #include <fstream>
AssAttachment::AssAttachment(std::string const& name, AssEntryGroup group) AssAttachment::AssAttachment(std::string const& header, AssEntryGroup group)
: filename(name) : entry_data(header + "\r\n")
, filename(header.substr(10))
, group(group) , group(group)
{ {
} }
@ -35,7 +36,7 @@ AssAttachment::AssAttachment(agi::fs::path const& name, AssEntryGroup group)
: filename(name.filename().string()) : filename(name.filename().string())
, group(group) , group(group)
{ {
// SSA stuffs some information about the font in the embeded filename, but // SSA stuffs some information about the font in the embedded filename, but
// nothing else uses it so just do the absolute minimum (0 is the encoding) // nothing else uses it so just do the absolute minimum (0 is the encoding)
if (boost::iends_with(filename.get(), ".ttf")) if (boost::iends_with(filename.get(), ".ttf"))
filename = filename.get().substr(0, filename.get().size() - 4) + "_0" + filename.get().substr(filename.get().size() - 4); filename = filename.get().substr(0, filename.get().size() - 4) + "_0" + filename.get().substr(filename.get().size() - 4);

2
aegisub/src/ass_attachment.h
View file

@ -50,6 +50,6 @@ public:
AssEntryGroup Group() const override { return group; } AssEntryGroup Group() const override { return group; }
AssEntry *Clone() const override; AssEntry *Clone() const override;
AssAttachment(std::string const& name, AssEntryGroup group); AssAttachment(std::string const& header, AssEntryGroup group);
AssAttachment(agi::fs::path const& name, AssEntryGroup group); AssAttachment(agi::fs::path const& name, AssEntryGroup group);
}; };

4
aegisub/src/ass_parser.cpp
View file

@ -107,12 +107,12 @@ void AssParser::ParseStyleLine(std::string const& data) {
void AssParser::ParseFontLine(std::string const& data) { void AssParser::ParseFontLine(std::string const& data) {
if (boost::starts_with(data, "fontname: ")) if (boost::starts_with(data, "fontname: "))
attach.reset(new AssAttachment(data.substr(10), AssEntryGroup::FONT)); attach.reset(new AssAttachment(data, AssEntryGroup::FONT));
} }
void AssParser::ParseGraphicsLine(std::string const& data) { void AssParser::ParseGraphicsLine(std::string const& data) {
if (boost::starts_with(data, "filename: ")) if (boost::starts_with(data, "filename: "))
attach.reset(new AssAttachment(data.substr(10), AssEntryGroup::GRAPHIC)); attach.reset(new AssAttachment(data, AssEntryGroup::GRAPHIC));
} }
void AssParser::AddLine(std::string const& data) { void AssParser::AddLine(std::string const& data) {