FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-25 15:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve export HTML layout.

Browse Source
This commit is contained in:
John Preston
2018-07-12 00:06:35 +03:00
parent 78558e513c
commit 0b7bb806b7
18 changed files with 331 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/export/export_controller.cpp
+15 -128
View File
@@ -54,7 +54,6 @@ private:
void exportNext();
void initialize();
void initialized(const ApiWrap::StartInfo &info);
void collectLeftChannels();
void collectDialogsList();
void exportPersonalInfo();
void exportUserpics();
@@ -63,31 +62,24 @@ private:
void exportOtherData();
void exportDialogs();
void exportNextDialog();
void exportLeftChannels();
void exportNextLeftChannel();
template <typename Callback = const decltype(kNullStateCallback) &>
ProcessingState prepareState(
Step step,
Callback &&callback = kNullStateCallback) const;
ProcessingState stateInitializing() const;
ProcessingState stateLeftChannelsList(int processed) const;
ProcessingState stateDialogsList(int processed) const;
ProcessingState statePersonalInfo() const;
ProcessingState stateUserpics(const DownloadProgress &progress) const;
ProcessingState stateContacts() const;
ProcessingState stateSessions() const;
ProcessingState stateOtherData() const;
ProcessingState stateLeftChannels(
const DownloadProgress &progress) const;
ProcessingState stateDialogs(const DownloadProgress &progress) const;
void fillMessagesState(
ProcessingState &result,
const Data::DialogsInfo &info,
int index,
const DownloadProgress &progress,
int addIndex,
int addCount) const;
const DownloadProgress &progress) const;
int substepsInStep(Step step) const;
@@ -97,9 +89,6 @@ private:
Settings _settings;
Environment _environment;
Data::DialogsInfo _leftChannelsInfo;
int _leftChannelIndex = -1;
Data::DialogsInfo _dialogsInfo;
int _dialogIndex = -1;
@@ -241,9 +230,6 @@ void Controller::startExport(
void Controller::fillExportSteps() {
using Type = Settings::Type;
_steps.push_back(Step::Initializing);
if (_settings.types & Type::GroupsChannelsMask) {
_steps.push_back(Step::LeftChannelsList);
}
if (_settings.types & Type::AnyChatsMask) {
_steps.push_back(Step::DialogsList);
}
@@ -265,9 +251,6 @@ void Controller::fillExportSteps() {
if (_settings.types & Type::AnyChatsMask) {
_steps.push_back(Step::Dialogs);
}
if (_settings.types & Type::GroupsChannelsMask) {
_steps.push_back(Step::LeftChannels);
}
}
void Controller::fillSubstepsInSteps(const ApiWrap::StartInfo &info) {
@@ -280,9 +263,6 @@ void Controller::fillSubstepsInSteps(const ApiWrap::StartInfo &info) {
result[index] = count;
};
push(Step::Initializing, 1);
if (_settings.types & Settings::Type::GroupsChannelsMask) {
push(Step::LeftChannelsList, 1);
}
if (_settings.types & Settings::Type::AnyChatsMask) {
push(Step::DialogsList, 1);
}
@@ -301,9 +281,6 @@ void Controller::fillSubstepsInSteps(const ApiWrap::StartInfo &info) {
if (_settings.types & Settings::Type::OtherData) {
push(Step::OtherData, 1);
}
if (_settings.types & Settings::Type::GroupsChannelsMask) {
push(Step::LeftChannels, info.leftChannelsCount);
}
if (_settings.types & Settings::Type::AnyChatsMask) {
push(Step::Dialogs, info.dialogsCount);
}
@@ -330,14 +307,12 @@ void Controller::exportNext() {
const auto step = _steps[_stepIndex];
switch (step) {
case Step::Initializing: return initialize();
case Step::LeftChannelsList: return collectLeftChannels();
case Step::DialogsList: return collectDialogsList();
case Step::PersonalInfo: return exportPersonalInfo();
case Step::Userpics: return exportUserpics();
case Step::Contacts: return exportContacts();
case Step::Sessions: return exportSessions();
case Step::OtherData: return exportOtherData();
case Step::LeftChannels: return exportLeftChannels();
case Step::Dialogs: return exportDialogs();
}
Unexpected("Step in Controller::exportNext.");
@@ -358,17 +333,6 @@ void Controller::initialized(const ApiWrap::StartInfo &info) {
exportNext();
}
void Controller::collectLeftChannels() {
setState(stateLeftChannelsList(0));
_api.requestLeftChannelsList([=](int count) {
setState(stateLeftChannelsList(count));
return true;
}, [=](Data::DialogsInfo &&result) {
_leftChannelsInfo = std::move(result);
exportNext();
});
}
void Controller::collectDialogsList() {
setState(stateDialogsList(0));
_api.requestDialogsList([=](int count) {
@@ -457,9 +421,9 @@ void Controller::exportDialogs() {
void Controller::exportNextDialog() {
const auto index = ++_dialogIndex;
if (index < _dialogsInfo.list.size()) {
const auto &info = _dialogsInfo.list[index];
_api.requestMessages(info, [=](const Data::DialogInfo &info) {
const auto info = _dialogsInfo.item(index);
if (info) {
_api.requestMessages(*info, [=](const Data::DialogInfo &info) {
if (ioCatchError(_writer->writeDialogStart(info))) {
return false;
}
@@ -493,52 +457,6 @@ void Controller::exportNextDialog() {
exportNext();
}
void Controller::exportLeftChannels() {
if (ioCatchError(_writer->writeLeftChannelsStart(_leftChannelsInfo))) {
return;
}
exportNextLeftChannel();
}
void Controller::exportNextLeftChannel() {
const auto index = ++_leftChannelIndex;
if (index < _leftChannelsInfo.list.size()) {
const auto &info = _leftChannelsInfo.list[index];
_api.requestMessages(info, [=](const Data::DialogInfo &info) {
if (ioCatchError(_writer->writeLeftChannelStart(info))) {
return false;
}
_messagesWritten = 0;
_messagesCount = ranges::accumulate(
info.messagesCountPerSplit,
0);
setState(stateLeftChannels(DownloadProgress()));
return true;
}, [=](DownloadProgress progress) {
setState(stateLeftChannels(progress));
return true;
}, [=](Data::MessagesSlice &&result) {
if (ioCatchError(_writer->writeLeftChannelSlice(result))) {
return false;
}
_messagesWritten += result.list.size();
setState(stateLeftChannels(DownloadProgress()));
return true;
}, [=] {
if (ioCatchError(_writer->writeLeftChannelEnd())) {
return;
}
exportNextLeftChannel();
});
return;
}
if (ioCatchError(_writer->writeLeftChannelsEnd())) {
return;
}
exportNext();
}
template <typename Callback>
ProcessingState Controller::prepareState(
Step step,
@@ -561,22 +479,11 @@ ProcessingState Controller::stateInitializing() const {
return ProcessingState();
}
ProcessingState Controller::stateLeftChannelsList(int processed) const {
return prepareState(Step::LeftChannelsList, [&](
ProcessingState &result) {
result.entityIndex = processed;
result.entityCount = std::max(
processed,
substepsInStep(Step::LeftChannels))
+ substepsInStep(Step::Dialogs);
});
}
ProcessingState Controller::stateDialogsList(int processed) const {
const auto step = Step::DialogsList;
return prepareState(step, [&](ProcessingState &result) {
result.entityIndex = substepsInStep(Step::LeftChannels) + processed;
result.entityCount = substepsInStep(Step::LeftChannels) + std::max(
result.entityIndex = processed;
result.entityCount = std::max(
processed,
substepsInStep(Step::Dialogs));
});
@@ -612,35 +519,15 @@ ProcessingState Controller::stateOtherData() const {
return prepareState(Step::OtherData);
}
ProcessingState Controller::stateLeftChannels(
const DownloadProgress & progress) const {
const auto step = Step::LeftChannels;
return prepareState(step, [&](ProcessingState &result) {
const auto addIndex = _dialogsInfo.list.size();
const auto addCount = addIndex;
fillMessagesState(
result,
_leftChannelsInfo,
_leftChannelIndex,
progress,
addIndex,
addCount);
});
}
ProcessingState Controller::stateDialogs(
const DownloadProgress &progress) const {
const auto step = Step::Dialogs;
return prepareState(step, [&](ProcessingState &result) {
const auto addIndex = 0;
const auto addCount = _leftChannelsInfo.list.size();
fillMessagesState(
result,
_dialogsInfo,
_dialogIndex,
progress,
addIndex,
addCount);
progress);
});
}
@@ -648,14 +535,14 @@ void Controller::fillMessagesState(
ProcessingState &result,
const Data::DialogsInfo &info,
int index,
const DownloadProgress &progress,
int addIndex,
int addCount) const {
const auto &dialog = info.list[index];
result.entityIndex = index + addIndex;
result.entityCount = info.list.size() + addCount;
result.entityName = dialog.name;
result.entityType = (dialog.type == Data::DialogInfo::Type::Self)
const DownloadProgress &progress) const {
const auto dialog = info.item(index);
Assert(dialog != nullptr);
result.entityIndex = index;
result.entityCount = info.chats.size() + info.left.size();
result.entityName = dialog->name;
result.entityType = (dialog->type == Data::DialogInfo::Type::Self)
? ProcessingState::EntityType::SavedMessages
: ProcessingState::EntityType::Chat;
result.itemIndex = _messagesWritten + progress.itemIndex;