noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Completion models are now updated on-demand (whenever user presses Tab)

Browse source 
We might want some dirty-checking here, but for now it's okay
This commit is contained in:
Rasmus Karlsson 2017-12-17 03:06:39 +01:00
parent 266ad36de3
commit 633423640e
3 changed files with 77 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
src/completionmanager.cpp
View file

@ -1,9 +1,65 @@
#include "completionmanager.hpp"
#include "common.hpp"
#include "debug/log.hpp"
#include "emotemanager.hpp"
namespace chatterino {
CompletionModel::CompletionModel(const std::string &_channelName)
: channelName(_channelName)
{
}
void CompletionModel::refresh()
{
// debug::Log("[CompletionModel:{}] Refreshing...]", this->channelName);
auto &emoteManager = EmoteManager::getInstance();
this->emotes.clear();
// User-specific: Twitch Emotes
// TODO: Fix this so it properly updates with the proper api. oauth token needs proper scope
for (const auto &m : emoteManager.twitchAccountEmotes) {
for (const auto &emoteName : m.second.emoteCodes) {
this->addString(emoteName);
}
}
// Global: BTTV Global Emotes
std::vector<std::string> &bttvGlobalEmoteCodes = emoteManager.bttvGlobalEmoteCodes;
for (const auto &m : bttvGlobalEmoteCodes) {
this->addString(m);
}
// Global: FFZ Global Emotes
std::vector<std::string> &ffzGlobalEmoteCodes = emoteManager.ffzGlobalEmoteCodes;
for (const auto &m : ffzGlobalEmoteCodes) {
this->addString(m);
}
// Channel-specific: BTTV Channel Emotes
std::vector<std::string> &bttvChannelEmoteCodes =
emoteManager.bttvChannelEmoteCodes[this->channelName];
for (const auto &m : bttvChannelEmoteCodes) {
this->addString(m);
}
// Channel-specific: FFZ Channel Emotes
std::vector<std::string> &ffzChannelEmoteCodes =
emoteManager.ffzChannelEmoteCodes[this->channelName];
for (const auto &m : ffzChannelEmoteCodes) {
this->addString(m);
}
// Global: Emojis
const auto &emojiShortCodes = emoteManager.emojiShortCodes;
for (const auto &m : emojiShortCodes) {
this->addString(":" + m + ":");
}
// TODO: Add Channel-specific: Usernames
}
void CompletionModel::addString(const std::string &str)
{
// Always add a space at the end of completions
@ -12,67 +68,15 @@ void CompletionModel::addString(const std::string &str)
CompletionModel *CompletionManager::createModel(const std::string &channelName)
{
CompletionModel *ret = new CompletionModel();
auto &emoteManager = EmoteManager::getInstance();
auto it = this->models.find(channelName);
if (it != this->models.end()) {
return it->second;
}
this->updateModel(ret, channelName);
emoteManager.bttvGlobalEmoteCodes.updated.connect([=]() {
this->updateModel(ret, channelName); //
});
emoteManager.ffzGlobalEmoteCodes.updated.connect([=]() {
this->updateModel(ret, channelName); //
});
emoteManager.bttvChannelEmoteCodes[channelName].updated.connect([=]() {
this->updateModel(ret, channelName); //
});
emoteManager.ffzChannelEmoteCodes[channelName].updated.connect([=]() {
this->updateModel(ret, channelName); //
});
CompletionModel *ret = new CompletionModel(channelName);
this->models[channelName] = ret;
return ret;
}
void CompletionManager::updateModel(CompletionModel *model, const std::string &channelName)
{
auto &emoteManager = EmoteManager::getInstance();
model->emotes.clear();
for (const auto &m : emoteManager.twitchAccountEmotes) {
for (const auto &emoteName : m.second.emoteCodes) {
model->addString(emoteName);
}
}
std::vector<std::string> &bttvGlobalEmoteCodes = emoteManager.bttvGlobalEmoteCodes;
for (const auto &m : bttvGlobalEmoteCodes) {
model->addString(m);
}
std::vector<std::string> &ffzGlobalEmoteCodes = emoteManager.ffzGlobalEmoteCodes;
for (const auto &m : ffzGlobalEmoteCodes) {
model->addString(m);
}
std::vector<std::string> &bttvChannelEmoteCodes =
emoteManager.bttvChannelEmoteCodes[channelName];
for (const auto &m : bttvChannelEmoteCodes) {
model->addString(m);
}
std::vector<std::string> &ffzChannelEmoteCodes = emoteManager.ffzChannelEmoteCodes[channelName];
for (const auto &m : ffzChannelEmoteCodes) {
model->addString(m);
}
const auto &emojiShortCodes = emoteManager.emojiShortCodes;
for (const auto &m : emojiShortCodes) {
model->addString(":" + m + ":");
}
}
} // namespace chatterino

13
src/completionmanager.hpp
View file

@ -3,15 +3,16 @@
#include <QAbstractListModel>
#include <QVector>
#include <map>
#include <string>
namespace chatterino {
class EmoteManager;
class CompletionModel : public QAbstractListModel
{
public:
CompletionModel(const std::string &_channelName);
virtual int columnCount(const QModelIndex & /*parent*/) const override
{
return 1;
@ -28,15 +29,22 @@ public:
return this->emotes.size();
}
void refresh();
private:
void addString(const std::string &str);
QVector<QString> emotes;
std::string channelName;
};
class CompletionManager
{
CompletionManager() = default;
std::map<std::string, CompletionModel *> models;
public:
static CompletionManager &getInstance()
{
@ -45,7 +53,6 @@ public:
}
CompletionModel *createModel(const std::string &channelName);
void updateModel(CompletionModel *model, const std::string &channelName = std::string());
};
} // namespace chatterino

5
src/widgets/helper/resizingtextedit.cpp
View file

@ -1,4 +1,5 @@
#include "widgets/helper/resizingtextedit.hpp"
#include "completionmanager.hpp"
ResizingTextEdit::ResizingTextEdit()
{
@ -86,6 +87,10 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)
return;
}
auto *completionModel =
static_cast<chatterino::CompletionModel *>(this->completer->model());
completionModel->refresh();
if (!this->nextCompletion) {
// first selection
this->completer->setCompletionPrefix(currentCompletionPrefix);