d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Block notifications until the image has been downloaded

Browse source
This commit is contained in:
Loren Burkholder 2021-03-02 19:42:34 -05:00 committed by Nicolas Werner
parent 64dd10a6a0
commit 98b2fee71b
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/notifications/Manager.cpp
View file

@ -22,17 +22,22 @@ NotificationsManager::cacheImage(const mtx::events::collections::TimelineEvents
QString path{QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/" + QString path{QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/" +
filename}; filename};
bool downloadComplete = false;
http::client()->download( http::client()->download(
url, url,
[&path, url, encryptionInfo](const std::string &data, [&downloadComplete, &path, url, encryptionInfo](const std::string &data,
const std::string &, const std::string &,
const std::string &, const std::string &,
mtx::http::RequestErr err) { mtx::http::RequestErr err) {
if (err) { if (err) {
nhlog::net()->warn("failed to retrieve image {}: {} {}", nhlog::net()->warn("failed to retrieve image {}: {} {}",
url, url,
err->matrix_error.error, err->matrix_error.error,
static_cast<int>(err->status_code)); static_cast<int>(err->status_code));
// the image doesn't exist, so delete the path
path.clear();
downloadComplete = true;
return; return;
} }
@ -44,8 +49,11 @@ NotificationsManager::cacheImage(const mtx::events::collections::TimelineEvents
QFile file{path}; QFile file{path};
if (!file.open(QIODevice::WriteOnly)) if (!file.open(QIODevice::WriteOnly)) {
path.clear();
downloadComplete = true;
return; return;
}
// delete any existing file content // delete any existing file content
file.resize(0); file.resize(0);
@ -53,10 +61,10 @@ NotificationsManager::cacheImage(const mtx::events::collections::TimelineEvents
// resize the image // resize the image
QImage img{utils::readImage(QByteArray{temp.data()})}; QImage img{utils::readImage(QByteArray{temp.data()})};
if (img.isNull()) if (img.isNull()) {
{ path.clear();
path.clear(); downloadComplete = true;
return; return;
} }
#ifdef NHEKO_DBUS_SYS // the images in D-Bus notifications are to be 200x100 max #ifdef NHEKO_DBUS_SYS // the images in D-Bus notifications are to be 200x100 max
@ -68,11 +76,15 @@ NotificationsManager::cacheImage(const mtx::events::collections::TimelineEvents
file.close(); file.close();
downloadComplete = true;
return; return;
} catch (const std::exception &e) { } catch (const std::exception &e) {
nhlog::ui()->warn("Error while caching file to: {}", e.what()); nhlog::ui()->warn("Error while caching file to: {}", e.what());
} }
}); });
while (!downloadComplete)
continue;
return path.toHtmlEscaped(); return path.toHtmlEscaped();
} }