mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 15:05:56 +00:00
Code Issues Releases Wiki Activity

Name files by index, not by media date.

Browse Source
This commit is contained in:
John Preston
2018-06-20 21:32:52 +01:00
parent 0a5eac50be
commit a253d34c00
3 changed files with 84 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/export/export_api_wrap.cpp
View File

@@ -128,6 +128,7 @@ struct ApiWrap::UserpicsProcess {
Fn<bool(Data::UserpicsSlice&&)> handleSlice;
FnMut<void()> finish;
int processed = 0;
base::optional<Data::UserpicsSlice> slice;
uint64 maxId = 0;
bool lastSlice = false;
@@ -191,6 +192,7 @@ struct ApiWrap::ChatProcess {
int32 offsetId = 1;
Data::ParseMediaContext context;
base::optional<Data::MessagesSlice> slice;
bool lastSlice = false;
int fileIndex = -1;
@@ -513,7 +515,9 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
_userpicsProcess->lastSlice = true;
}
loadUserpicsFiles(Data::ParseUserpicsSlice(data.vphotos));
loadUserpicsFiles(Data::ParseUserpicsSlice(
data.vphotos,
_userpicsProcess->processed));
});
}
@@ -556,6 +560,7 @@ void ApiWrap::finishUserpicsSlice() {
auto slice = *base::take(_userpicsProcess->slice);
if (!slice.list.empty()) {
_userpicsProcess->processed += slice.list.size();
_userpicsProcess->maxId = slice.list.back().id;
if (!_userpicsProcess->handleSlice(std::move(slice))) {
return;
@@ -702,7 +707,6 @@ void ApiWrap::requestMessages(
void ApiWrap::requestDialogsSlice() {
Expects(_dialogsProcess != nullptr);
LOG(("REQUEST %1 %2").arg(_dialogsProcess->offsetDate).arg(_dialogsProcess->offsetId));
mainRequest(MTPmessages_GetDialogs(
MTP_flags(0),
MTP_int(_dialogsProcess->offsetDate),
@@ -726,10 +730,6 @@ void ApiWrap::requestDialogsSlice() {
_dialogsProcess->offsetDate = last.topMessageDate;
_dialogsProcess->offsetPeer = last.input;
for (const auto &item : info.list) {
LOG(("RESULT: %1 %2").arg(item.topMessageDate).arg(item.topMessageId));
}
appendDialogsSlice(std::move(info));
const auto count = _dialogsProcess->info.list.size();
@@ -856,6 +856,7 @@ void ApiWrap::requestMessagesSlice(FnMut<bool(int count)> start) {
_chatProcess->lastSlice = true;
}
loadMessagesFiles(Data::ParseMessagesSlice(
_chatProcess->context,
data.vmessages,
data.vusers,
data.vchats,