noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

ImageLoader

Browse source
This commit is contained in:
hemirt 2017-09-30 23:09:07 +02:00
parent 369b7c052b
commit f89761a9e3
5 changed files with 181 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chatterino.pro
View file

@ -99,7 +99,8 @@ SOURCES += \
src/twitch/twitchchannel.cpp \
src/widgets/rippleeffectlabel.cpp \
src/widgets/rippleeffectbutton.cpp \
src/messages/messagecolor.cpp
src/messages/messagecolor.cpp \
src/messages/imageloader.cpp
HEADERS += \
src/asyncexec.hpp \
@ -165,7 +166,8 @@ HEADERS += \
src/widgets/emotepopup.hpp \
src/messages/messagecolor.hpp \
src/util/nativeeventhelper.hpp \
src/debug/log.hpp
src/debug/log.hpp \
src/messages/imageloader.hpp
PRECOMPILED_HEADER =

116
src/messages/imageloader.cpp Normal file
View file

@ -0,0 +1,116 @@
#include "messages/imageloader.hpp"
#include "emotemanager.hpp"
#include "messages/lazyloadedimage.hpp"
#include "windowmanager.hpp"
#include <QBuffer>
#include <QDebug>
#include <QEventLoop>
#include <QImageReader>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QNetworkRequest>
#include <sstream>
namespace chatterino {
namespace messages {
ImageLoader::ImageLoader()
{
this->worker = std::thread(&ImageLoader::run, this);
}
ImageLoader::~ImageLoader()
{
{
std::lock_guard<std::mutex> lk(this->workerM);
this->exit = true;
this->ready = true;
}
this->cv.notify_all();
qDebug() << "notified waiting";
this->worker.join();
qDebug() << "destruct";
}
void ImageLoader::run()
{
this->eventLoop.reset(new QEventLoop());
while (true) {
std::unique_lock<std::mutex> lk(this->workerM);
if (!this->ready) {
this->cv.wait(lk, [this]() { return this->ready; });
}
if (this->exit) {
return;
}
std::vector<LazyLoadedImage *> current(std::move(this->toProcess));
// (hemirt)
// after move toProcess is guaranteed to be empty()
// and we start processing while more items can be added into toProcess
this->ready = false;
lk.unlock();
for (auto &lli : current) {
if (this->exit)
return;
QNetworkRequest request;
request.setUrl(QUrl(lli->url));
QNetworkAccessManager NaM;
QNetworkReply *reply = NaM.get(request);
QObject::connect(reply, &QNetworkReply::finished, this->eventLoop.get(),
&QEventLoop::quit);
qDebug() << "eve1";
this->eventLoop->exec(); // Wait until response is read.
qDebug() << "eve2";
qDebug() << "Received emote " << lli->url;
QByteArray array = reply->readAll();
QBuffer buffer(&array);
buffer.open(QIODevice::ReadOnly);
QImage image;
QImageReader reader(&buffer);
bool first = true;
for (int index = 0; index < reader.imageCount(); ++index) {
if (reader.read(&image)) {
auto pixmap = new QPixmap(QPixmap::fromImage(image));
if (first) {
first = false;
lli->currentPixmap = pixmap;
}
LazyLoadedImage::FrameData data;
data.duration = std::max(20, reader.nextImageDelay());
data.image = pixmap;
lli->allFrames.push_back(data);
}
}
if (lli->allFrames.size() > 1) {
lli->animated = true;
}
lli->emoteManager.incGeneration();
lli->windowManager.layoutVisibleChatWidgets();
delete reply;
}
}
}
void ImageLoader::push_back(chatterino::messages::LazyLoadedImage *lli)
{
{
std::lock_guard<std::mutex> lk(this->workerM);
this->toProcess.push_back(lli);
this->ready = true;
}
this->cv.notify_all();
}
} // namespace messages
} // namespace chatterino

35
src/messages/imageloader.hpp Normal file
View file

@ -0,0 +1,35 @@
#pragma once
#include <atomic>
#include <condition_variable>
#include <mutex>
#include <thread>
#include <vector>
#include <QEventLoop>
namespace chatterino {
namespace messages {
class LazyLoadedImage;
class ImageLoader
{
public:
ImageLoader();
~ImageLoader();
void push_back(chatterino::messages::LazyLoadedImage *lli);
private:
void run();
std::thread worker;
std::mutex workerM;
std::vector<chatterino::messages::LazyLoadedImage *> toProcess;
bool ready = false;
std::condition_variable cv;
bool exit = false;
std::unique_ptr<QEventLoop> eventLoop;
};
} // namespace messages
} // namespace chatterino

79
src/messages/lazyloadedimage.cpp
View file

@ -2,22 +2,25 @@
#include "asyncexec.hpp"
#include "emotemanager.hpp"
#include "ircmanager.hpp"
#include "messages/imageloader.hpp"
#include "util/urlfetch.hpp"
#include "windowmanager.hpp"
#include <thread>
#include <QBuffer>
#include <QImageReader>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QNetworkRequest>
#include <QTimer>
#include <thread>
#include <functional>
namespace chatterino {
namespace messages {
ImageLoader LazyLoadedImage::imageLoader;
LazyLoadedImage::LazyLoadedImage(EmoteManager &_emoteManager, WindowManager &_windowManager,
const QString &url, qreal scale, const QString &name,
const QString &tooltip, const QMargins &margin, bool isHat)
@ -51,70 +54,30 @@ LazyLoadedImage::LazyLoadedImage(EmoteManager &_emoteManager, WindowManager &_wi
void LazyLoadedImage::loadImage()
{
std::thread([=] () {
QNetworkRequest request;
request.setUrl(QUrl(this->url));
QNetworkAccessManager NaM;
QEventLoop eventLoop;
QNetworkReply *reply = NaM.get(request);
QObject::connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit);
eventLoop.exec(); // Wait until response is read.
LazyLoadedImage::imageLoader.push_back(this);
qDebug() << "Received emote " << this->url;
QByteArray array = reply->readAll();
QBuffer buffer(&array);
buffer.open(QIODevice::ReadOnly);
QImage image;
QImageReader reader(&buffer);
bool first = true;
for (int index = 0; index < reader.imageCount(); ++index) {
if (reader.read(&image)) {
auto pixmap = new QPixmap(QPixmap::fromImage(image));
if (first) {
first = false;
this->currentPixmap = pixmap;
}
FrameData data;
data.duration = std::max(20, reader.nextImageDelay());
data.image = pixmap;
this->allFrames.push_back(data);
}
}
if (this->allFrames.size() > 1) {
this->animated = true;
}
this->emoteManager.incGeneration();
this->windowManager.layoutVisibleChatWidgets();
delete reply;
}).detach();
this->emoteManager.getGifUpdateSignal().connect([=] () { this->gifUpdateTimout(); }); // For some reason when Boost signal is in thread scope and thread deletes the signal doesn't work, so this is the fix.
this->emoteManager.getGifUpdateSignal().connect([=]() {
this->gifUpdateTimout();
}); // For some reason when Boost signal is in thread scope and thread deletes the signal
// doesn't work, so this is the fix.
}
void LazyLoadedImage::gifUpdateTimout()
{
if (animated) {
this->currentFrameOffset += GIF_FRAME_LENGTH;
if (animated) {
this->currentFrameOffset += GIF_FRAME_LENGTH;
while (true) {
if (this->currentFrameOffset > this->allFrames.at(this->currentFrame).duration) {
this->currentFrameOffset -= this->allFrames.at(this->currentFrame).duration;
this->currentFrame = (this->currentFrame + 1) % this->allFrames.size();
} else {
break;
}
}
while (true) {
if (this->currentFrameOffset > this->allFrames.at(this->currentFrame).duration) {
this->currentFrameOffset -= this->allFrames.at(this->currentFrame).duration;
this->currentFrame = (this->currentFrame + 1) % this->allFrames.size();
} else {
break;
}
}
this->currentPixmap = this->allFrames[this->currentFrame].image;
}
this->currentPixmap = this->allFrames[this->currentFrame].image;
}
}
const QPixmap *LazyLoadedImage::getPixmap()

5
src/messages/lazyloadedimage.hpp
View file

@ -10,6 +10,8 @@ class WindowManager;
namespace messages {
class ImageLoader;
class LazyLoadedImage : QObject
{
public:
@ -64,6 +66,9 @@ private:
void loadImage();
void gifUpdateTimout();
static ImageLoader imageLoader;
friend class ImageLoader;
};
} // namespace messages