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

Make WebLoadManager live on the main thread only.

Browse source
This commit is contained in:
John Preston 2021-04-19 10:31:57 +04:00
parent 336405b3c7
commit 286cb74620
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Telegram/SourceFiles/storage/file_download_web.cpp
View file

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/cache/storage_cache_types.h" #include "storage/cache/storage_cache_types.h"
#include "base/qt_adapters.h" #include "base/qt_adapters.h"
#include "base/weak_ptr.h"
#include <QtNetwork/QAuthenticator> #include <QtNetwork/QAuthenticator>
@ -51,7 +52,7 @@ struct UpdateForLoader {
} // namespace } // namespace
class WebLoadManager final : public QObject { class WebLoadManager final : public base::has_weak_ptr {
public: public:
WebLoadManager(); WebLoadManager();
~WebLoadManager(); ~WebLoadManager();
@ -115,7 +116,7 @@ private:
void sendUpdate(int id, Update &&data); void sendUpdate(int id, Update &&data);
QThread _thread; QThread _thread;
QNetworkAccessManager _network; std::unique_ptr<QNetworkAccessManager> _network;
base::Timer _resetGenerationTimer; base::Timer _resetGenerationTimer;
// Main thread. // Main thread.
@ -132,16 +133,15 @@ private:
}; };
WebLoadManager::WebLoadManager() WebLoadManager::WebLoadManager()
: _resetGenerationTimer(&_thread, [=] { resetGeneration(); }) { : _network(std::make_unique<QNetworkAccessManager>())
, _resetGenerationTimer(&_thread, [=] { resetGeneration(); }) {
handleNetworkErrors(); handleNetworkErrors();
const auto original = QThread::currentThread(); const auto original = QThread::currentThread();
moveToThread(&_thread); _network->moveToThread(&_thread);
_network.moveToThread(&_thread); QObject::connect(&_thread, &QThread::finished, [=] {
connect(&_thread, &QThread::finished, [=] {
clear(); clear();
moveToThread(original); _network = nullptr;
_network.moveToThread(original);
}); });
_thread.start(); _thread.start();
} }
@ -155,8 +155,14 @@ void WebLoadManager::handleNetworkErrors() {
} }
} }
}; };
connect(&_network, &QNetworkAccessManager::authenticationRequired, fail); QObject::connect(
connect(&_network, &QNetworkAccessManager::sslErrors, fail); _network.get(),
&QNetworkAccessManager::authenticationRequired,
fail);
QObject::connect(
_network.get(),
&QNetworkAccessManager::sslErrors,
fail);
} }
WebLoadManager::~WebLoadManager() { WebLoadManager::~WebLoadManager() {
@ -182,7 +188,7 @@ void WebLoadManager::enqueue(not_null<webFileLoader*> loader) {
: _ids.emplace(loader, ++_autoincrement).first->second; : _ids.emplace(loader, ++_autoincrement).first->second;
}(); }();
const auto url = loader->url(); const auto url = loader->url();
InvokeQueued(this, [=] { InvokeQueued(_network.get(), [=] {
enqueue(id, url); enqueue(id, url);
}); });
} }
@ -194,7 +200,7 @@ void WebLoadManager::remove(not_null<webFileLoader*> loader) {
} }
const auto id = i->second; const auto id = i->second;
_ids.erase(i); _ids.erase(i);
InvokeQueued(this, [=] { InvokeQueued(_network.get(), [=] {
remove(id); remove(id);
}); });
} }
@ -260,15 +266,18 @@ void WebLoadManager::removeSent(int id) {
} }
not_null<QNetworkReply*> WebLoadManager::send(int id, const QString &url) { not_null<QNetworkReply*> WebLoadManager::send(int id, const QString &url) {
const auto result = _network.get(QNetworkRequest(url)); const auto result = _network->get(QNetworkRequest(url));
const auto handleProgress = [=](qint64 ready, qint64 total) { const auto handleProgress = [=](qint64 ready, qint64 total) {
progress(id, result, ready, total); progress(id, result, ready, total);
}; };
const auto handleError = [=](QNetworkReply::NetworkError error) { const auto handleError = [=](QNetworkReply::NetworkError error) {
failed(id, result, error); failed(id, result, error);
}; };
connect(result, &QNetworkReply::downloadProgress, handleProgress); QObject::connect(
connect(result, base::QNetworkReply_error, handleError); result,
&QNetworkReply::downloadProgress,
handleProgress);
QObject::connect(result, base::QNetworkReply_error, handleError);
return result; return result;
} }
@ -412,14 +421,11 @@ void WebLoadManager::queueFailedUpdate(int id) {
void WebLoadManager::queueFinishedUpdate(int id, const QByteArray &data) { void WebLoadManager::queueFinishedUpdate(int id, const QByteArray &data) {
crl::on_main(this, [=] { crl::on_main(this, [=] {
LOG(("FINISHED UPDATE FOR: %1").arg(id));
for (const auto &[loader, loaderId] : _ids) { for (const auto &[loader, loaderId] : _ids) {
if (loaderId == id) { if (loaderId == id) {
LOG(("LOADER ID: %2").arg(quintptr(loader.get())));
break; break;
} }
} }
LOG(("SENT"));
sendUpdate(id, QByteArray(data)); sendUpdate(id, QByteArray(data));
}); });
} }