void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-07-26 23:43:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove not-needed requests for file parts above real size.

Browse source
This commit is contained in:
John Preston 2021-01-11 12:38:47 +04:00
parent 838a3b23c7
commit a483eb98a1
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Telegram/SourceFiles/storage/download_manager_mtproto.cpp
View file

@ -171,6 +171,10 @@ void DownloadManagerMtproto::checkSendNext(MTP::DcId dcId, Queue &queue) {
} }
} }
void DownloadManagerMtproto::checkSendNextAfterSuccess(MTP::DcId dcId) {
checkSendNext(dcId, _queues[dcId]);
}
bool DownloadManagerMtproto::trySendNextPart(MTP::DcId dcId, Queue &queue) { bool DownloadManagerMtproto::trySendNextPart(MTP::DcId dcId, Queue &queue) {
auto &balanceData = _balanceData[dcId]; auto &balanceData = _balanceData[dcId];
const auto &sessions = balanceData.sessions; const auto &sessions = balanceData.sessions;
@ -227,10 +231,6 @@ void DownloadManagerMtproto::requestSucceeded(
crl::time timeAtRequestStart) { crl::time timeAtRequestStart) {
using namespace rpl::mappers; using namespace rpl::mappers;
const auto guard = gsl::finally([&] {
checkSendNext(dcId, _queues[dcId]);
});
const auto i = _balanceData.find(dcId); const auto i = _balanceData.find(dcId);
Assert(i != end(_balanceData)); Assert(i != end(_balanceData));
auto &dc = i->second; auto &dc = i->second;
@ -606,24 +606,34 @@ void DownloadMtprotoTask::normalPartLoaded(
const auto requestData = finishSentRequest( const auto requestData = finishSentRequest(
requestId, requestId,
FinishRequestReason::Success); FinishRequestReason::Success);
const auto owner = _owner;
const auto dcId = this->dcId();
result.match([&](const MTPDupload_fileCdnRedirect &data) { result.match([&](const MTPDupload_fileCdnRedirect &data) {
switchToCDN(requestData, data); switchToCDN(requestData, data);
}, [&](const MTPDupload_file &data) { }, [&](const MTPDupload_file &data) {
partLoaded(requestData.offset, data.vbytes().v); partLoaded(requestData.offset, data.vbytes().v);
}); });
// 'this' may be deleted at this point.
owner->checkSendNextAfterSuccess(dcId);
} }
void DownloadMtprotoTask::webPartLoaded( void DownloadMtprotoTask::webPartLoaded(
const MTPupload_WebFile &result, const MTPupload_WebFile &result,
mtpRequestId requestId) { mtpRequestId requestId) {
const auto requestData = finishSentRequest(
requestId,
FinishRequestReason::Success);
const auto owner = _owner;
const auto dcId = this->dcId();
result.match([&](const MTPDupload_webFile &data) { result.match([&](const MTPDupload_webFile &data) {
const auto requestData = finishSentRequest(
requestId,
FinishRequestReason::Success);
if (setWebFileSizeHook(data.vsize().v)) { if (setWebFileSizeHook(data.vsize().v)) {
partLoaded(requestData.offset, data.vbytes().v); partLoaded(requestData.offset, data.vbytes().v);
} }
}); });
// 'this' may be deleted at this point.
owner->checkSendNextAfterSuccess(dcId);
} }
void DownloadMtprotoTask::cdnPartLoaded(const MTPupload_CdnFile &result, mtpRequestId requestId) { void DownloadMtprotoTask::cdnPartLoaded(const MTPupload_CdnFile &result, mtpRequestId requestId) {
@ -647,6 +657,13 @@ void DownloadMtprotoTask::cdnPartLoaded(const MTPupload_CdnFile &result, mtpRequ
const auto requestData = finishSentRequest( const auto requestData = finishSentRequest(
requestId, requestId,
FinishRequestReason::Success); FinishRequestReason::Success);
const auto owner = _owner;
const auto dcId = this->dcId();
const auto guard = gsl::finally([=] {
// 'this' may be deleted at this point.
owner->checkSendNextAfterSuccess(dcId);
});
auto key = bytes::make_span(_cdnEncryptionKey); auto key = bytes::make_span(_cdnEncryptionKey);
auto iv = bytes::make_span(_cdnEncryptionIV); auto iv = bytes::make_span(_cdnEncryptionIV);
Expects(key.size() == MTP::CTRState::KeySize); Expects(key.size() == MTP::CTRState::KeySize);

1
Telegram/SourceFiles/storage/download_manager_mtproto.h
View file

@ -51,6 +51,7 @@ public:
int index, int index,
int amountAtRequestStart, int amountAtRequestStart,
crl::time timeAtRequestStart); crl::time timeAtRequestStart);
void checkSendNextAfterSuccess(MTP::DcId dcId);
[[nodiscard]] int chooseSessionIndex(MTP::DcId dcId) const; [[nodiscard]] int chooseSessionIndex(MTP::DcId dcId) const;
private: private: