RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix HTML export wrapper.

This commit is contained in:
John Preston 2019-03-24 11:02:00 +04:00
parent db121c0839
commit 6a2b1bb48d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/export/output/export_output_html.cpp
View File

@ -624,6 +624,7 @@ private:
[[nodiscard]] QByteArray pushPoll(const Data::Poll &data);
File _file;
QByteArray _composedStart;
bool _closed = false;
QByteArray _base;
Context _context;
@ -677,6 +678,8 @@ HtmlWriter::Wrap::Wrap(
const auto left = path.mid(base.size());
const auto nesting = ranges::count(left, '/');
_base = QString("../").repeated(nesting).toUtf8();
_composedStart = composeStart();
}
bool HtmlWriter::Wrap::empty() const {
@ -837,7 +840,7 @@ Result HtmlWriter::Wrap::writeBlock(const QByteArray &block) {
if (block.isEmpty()) {
return _file.writeBlock(block);
} else if (_file.empty()) {
return _file.writeBlock(composeStart() + block);
return _file.writeBlock(_composedStart + block);
}
return _file.writeBlock(block);
}();
@ -1310,7 +1313,10 @@ QByteArray HtmlWriter::Wrap::pushStickerMedia(
generic.title = "Sticker";
generic.status = data.stickerEmoji;
if (data.file.relativePath.isEmpty()) {
generic.status += ", " + FormatFileSize(data.file.size);
if (!generic.status.isEmpty()) {
generic.status += ", ";
}
generic.status += FormatFileSize(data.file.size);
} else {
generic.link = data.file.relativePath;
}