forked from blue/squawk
debugged a crash, keys are now fetching, refactored main, added some exceptions instead of ints, debugged termination process
This commit is contained in:
parent
927bdf0dab
commit
4b68da458f
GPG key ID:
9B203B252A63EE38
9 changed files with 321 additions and 130 deletions
104
main/main.cpp
104
main/main.cpp
|
|
@ -17,22 +17,11 @@
|
|||
*/
|
||||
|
||||
#include "root.h"
|
||||
#include "shared/global.h"
|
||||
#include "shared/messageinfo.h"
|
||||
#include "shared/pathcheck.h"
|
||||
#include "shared/identity.h"
|
||||
#include "shared/info.h"
|
||||
#include "main/application.h"
|
||||
#include "core/signalcatcher.h"
|
||||
#include "core/squawk.h"
|
||||
|
||||
#include <QLibraryInfo>
|
||||
#include <QSettings>
|
||||
#include <QStandardPaths>
|
||||
#include <QTranslator>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QThread>
|
||||
#include <QDir>
|
||||
#include <QObject>
|
||||
|
||||
#ifdef WITH_OMEMO
|
||||
#include <QXmppOmemoStorage.h>
|
||||
|
|
@ -60,97 +49,10 @@ int main(int argc, char *argv[])
|
|||
#endif
|
||||
|
||||
Root app(argc, argv);
|
||||
SignalCatcher sc(&app);
|
||||
|
||||
Root::setApplicationName("squawk");
|
||||
Root::setOrganizationName("macaw.me");
|
||||
Root::setApplicationDisplayName("Squawk");
|
||||
Root::setApplicationVersion("0.2.3");
|
||||
app.setDesktopFileName("squawk");
|
||||
|
||||
QTranslator qtTranslator;
|
||||
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
|
||||
app.installTranslator(&qtTranslator);
|
||||
|
||||
QTranslator myappTranslator;
|
||||
QStringList shares = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
|
||||
bool found = false;
|
||||
for (QString share : shares) {
|
||||
found = myappTranslator.load(QLocale(), QLatin1String("squawk"), ".", share + "/l10n");
|
||||
if (found) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
myappTranslator.load(QLocale(), QLatin1String("squawk"), ".", QCoreApplication::applicationDirPath());
|
||||
}
|
||||
|
||||
app.installTranslator(&myappTranslator);
|
||||
|
||||
QIcon icon;
|
||||
icon.addFile(":images/logo.svg", QSize(16, 16));
|
||||
icon.addFile(":images/logo.svg", QSize(24, 24));
|
||||
icon.addFile(":images/logo.svg", QSize(32, 32));
|
||||
icon.addFile(":images/logo.svg", QSize(48, 48));
|
||||
icon.addFile(":images/logo.svg", QSize(64, 64));
|
||||
icon.addFile(":images/logo.svg", QSize(96, 96));
|
||||
icon.addFile(":images/logo.svg", QSize(128, 128));
|
||||
icon.addFile(":images/logo.svg", QSize(256, 256));
|
||||
icon.addFile(":images/logo.svg", QSize(512, 512));
|
||||
Root::setWindowIcon(icon);
|
||||
|
||||
new Shared::Global(); //translates enums
|
||||
|
||||
QSettings settings;
|
||||
QVariant vs = settings.value("style");
|
||||
if (vs.isValid()) {
|
||||
QString style = vs.toString().toLower();
|
||||
if (style != "system") {
|
||||
Shared::Global::setStyle(style);
|
||||
}
|
||||
}
|
||||
if (Shared::Global::supported("colorSchemeTools")) {
|
||||
QVariant vt = settings.value("theme");
|
||||
if (vt.isValid()) {
|
||||
QString theme = vt.toString();
|
||||
if (theme.toLower() != "system") {
|
||||
Shared::Global::setTheme(theme);
|
||||
}
|
||||
}
|
||||
}
|
||||
QString path = Shared::downloadsPathCheck();
|
||||
if (path.size() > 0) {
|
||||
settings.setValue("downloadsPath", path);
|
||||
} else {
|
||||
qDebug() << "couldn't initialize directory for downloads, quitting";
|
||||
if (!app.initializeSettings())
|
||||
return -1;
|
||||
}
|
||||
|
||||
Core::Squawk* squawk = new Core::Squawk();
|
||||
QThread* coreThread = new QThread();
|
||||
squawk->moveToThread(coreThread);
|
||||
|
||||
Application application(squawk);
|
||||
|
||||
QObject::connect(&sc, &SignalCatcher::interrupt, &application, &Application::quit);
|
||||
|
||||
QObject::connect(coreThread, &QThread::started, squawk, &Core::Squawk::start);
|
||||
QObject::connect(&application, &Application::quitting, squawk, &Core::Squawk::stop);
|
||||
//QObject::connect(&app, &QApplication::aboutToQuit, &w, &QMainWindow::close);
|
||||
QObject::connect(squawk, &Core::Squawk::quit, squawk, &Core::Squawk::deleteLater);
|
||||
QObject::connect(squawk, &Core::Squawk::destroyed, coreThread, &QThread::quit, Qt::QueuedConnection);
|
||||
QObject::connect(coreThread, &QThread::finished, &app, &Root::quit, Qt::QueuedConnection);
|
||||
|
||||
coreThread->start();
|
||||
int result = app.exec();
|
||||
|
||||
if (coreThread->isRunning()) {
|
||||
//coreThread->wait();
|
||||
//todo if I uncomment that, the app will not quit if it has reconnected at least once
|
||||
//it feels like a symptom of something badly desinged in the core thread
|
||||
//need to investigate;
|
||||
}
|
||||
|
||||
return result;
|
||||
return app.run();
|
||||
}
|
||||
|
||||
|
|
|
|||
167
main/root.cpp
167
main/root.cpp
|
|
@ -17,27 +17,174 @@
|
|||
#include "root.h"
|
||||
#include <QDebug>
|
||||
#include <QThread>
|
||||
#include <QLibraryInfo>
|
||||
#include <QStandardPaths>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <shared/pathcheck.h>
|
||||
|
||||
const std::vector<unsigned int> Root::appIconSizes({
|
||||
16, 24, 32, 48, 64, 96, 128, 256, 512
|
||||
});
|
||||
|
||||
Root::Root(int& argc, char *argv[]) :
|
||||
QApplication(argc, argv)
|
||||
{}
|
||||
QApplication(argc, argv),
|
||||
signalCatcher(this),
|
||||
defaultTranslator(),
|
||||
currentTranslator(),
|
||||
appIcon(),
|
||||
settings(),
|
||||
componentsInitialized(false),
|
||||
global(nullptr),
|
||||
coreThread(nullptr),
|
||||
core(nullptr),
|
||||
gui(nullptr)
|
||||
{
|
||||
setApplicationName("squawk");
|
||||
setOrganizationName("macaw.me");
|
||||
setApplicationDisplayName("Squawk");
|
||||
setApplicationVersion("0.2.3");
|
||||
setDesktopFileName("squawk");
|
||||
|
||||
initializeTranslation();
|
||||
initializeAppIcon();
|
||||
|
||||
global = new Shared::Global(); //important to instantiate after initialization of translations;
|
||||
}
|
||||
|
||||
Root::~Root() {
|
||||
if (componentsInitialized) {
|
||||
delete gui;
|
||||
if (core != nullptr)
|
||||
delete core;
|
||||
delete coreThread;
|
||||
}
|
||||
delete global;
|
||||
}
|
||||
|
||||
|
||||
void Root::initializeTranslation() {
|
||||
defaultTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
|
||||
installTranslator(&defaultTranslator);
|
||||
|
||||
QStringList shares = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
|
||||
bool found = false;
|
||||
for (QString share : shares) {
|
||||
found = currentTranslator.load(QLocale(), QLatin1String("squawk"), ".", share + "/l10n");
|
||||
if (found) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
currentTranslator.load(QLocale(), QLatin1String("squawk"), ".", QCoreApplication::applicationDirPath());
|
||||
}
|
||||
|
||||
installTranslator(¤tTranslator);
|
||||
}
|
||||
|
||||
void Root::initializeAppIcon() {
|
||||
for (std::vector<unsigned int>::size_type i = 0; i < appIconSizes.size(); ++i)
|
||||
appIcon.addFile(":images/logo.svg", QSize(appIconSizes[i], appIconSizes[i]));
|
||||
|
||||
Root::setWindowIcon(appIcon);
|
||||
}
|
||||
|
||||
bool Root::initializeSettings() {
|
||||
QVariant vs = settings.value("style");
|
||||
if (vs.isValid()) {
|
||||
QString style = vs.toString().toLower();
|
||||
if (style != "system") {
|
||||
Shared::Global::setStyle(style);
|
||||
}
|
||||
}
|
||||
|
||||
if (Shared::Global::supported("colorSchemeTools")) {
|
||||
QVariant vt = settings.value("theme");
|
||||
if (vt.isValid()) {
|
||||
QString theme = vt.toString();
|
||||
if (theme.toLower() != "system") {
|
||||
Shared::Global::setTheme(theme);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QString path = Shared::downloadsPathCheck();
|
||||
if (path.size() > 0) {
|
||||
settings.setValue("downloadsPath", path);
|
||||
} else {
|
||||
qDebug() << "couldn't initialize directory for downloads, quitting";
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int Root::run() {
|
||||
if (!componentsInitialized)
|
||||
initializeComponents();
|
||||
|
||||
coreThread->start();
|
||||
int result = exec();
|
||||
qDebug("Event loop stopped");
|
||||
|
||||
if (result == 0) {
|
||||
processEvents(); //I dont like all of this mess
|
||||
if (coreThread->isRunning()) { //but it's the best solution for now
|
||||
if (core != nullptr) { //Ideally, following line should never appear in the log
|
||||
qDebug() << "Core is still seems to be running, killing manually";
|
||||
core->deleteLater();
|
||||
coreThread->quit();
|
||||
processEvents();
|
||||
core = nullptr;
|
||||
}
|
||||
coreThread->wait();
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void Root::initializeComponents() {
|
||||
core = new Core::Squawk();
|
||||
coreThread = new QThread();
|
||||
core->moveToThread(coreThread);
|
||||
gui = new Application(core);
|
||||
|
||||
QObject::connect(&signalCatcher, &SignalCatcher::interrupt, gui, &Application::quit);
|
||||
|
||||
QObject::connect(coreThread, &QThread::started, core, &Core::Squawk::start);
|
||||
QObject::connect(gui, &Application::quitting, core, &Core::Squawk::stop);
|
||||
|
||||
QObject::connect(core, &Core::Squawk::quit, core, &Core::Squawk::deleteLater);
|
||||
QObject::connect(core, &Core::Squawk::destroyed, this, &Root::onCoreDestroyed);
|
||||
QObject::connect(core, &Core::Squawk::destroyed, coreThread, &QThread::quit, Qt::QueuedConnection);
|
||||
QObject::connect(coreThread, &QThread::finished, this, &Root::quit, Qt::QueuedConnection);
|
||||
|
||||
componentsInitialized = true;
|
||||
}
|
||||
|
||||
bool Root::notify(QObject* receiver, QEvent* e) {
|
||||
try {
|
||||
return QApplication::notify(receiver, e);
|
||||
} catch(const std::runtime_error& e) {
|
||||
qDebug() << "std::runtime_error in thread : " << QThread::currentThreadId();
|
||||
qDebug() << e.what();
|
||||
qDebug() << "std::runtime_error in thread:" << QThread::currentThreadId();
|
||||
qDebug() << "error message:" << e.what();
|
||||
} catch(const std::exception& e) {
|
||||
qDebug() << "std::exception in thread : " << QThread::currentThreadId();
|
||||
qDebug() << e.what();
|
||||
qDebug() << "std::exception in thread:" << QThread::currentThreadId();
|
||||
qDebug() << "error message:" << e.what();
|
||||
} catch(const int& e) {
|
||||
qDebug() << "int exception in thread : " << QThread::currentThreadId();
|
||||
qDebug() << e;
|
||||
qDebug() << "integer exception in thread:" << QThread::currentThreadId();
|
||||
qDebug() << "thrown integer:" << std::to_string(e).c_str();
|
||||
} catch(...) {
|
||||
qDebug() << "exception thread : " << QThread::currentThreadId();
|
||||
qDebug() << "unhandled exception thread:" << QThread::currentThreadId();
|
||||
}
|
||||
|
||||
qDebug() << "catch in notify ";
|
||||
qDebug() << "Squawk is crashing...";
|
||||
exit(1);
|
||||
return false;
|
||||
}
|
||||
|
||||
void Root::onCoreDestroyed() {
|
||||
core = nullptr;
|
||||
}
|
||||
|
|
|
|||
42
main/root.h
42
main/root.h
|
|
@ -18,11 +18,53 @@
|
|||
#define ROOT_H
|
||||
|
||||
#include <QApplication>
|
||||
#include <QTranslator>
|
||||
#include <QIcon>
|
||||
#include <QSettings>
|
||||
#include <QThread>
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include <core/squawk.h>
|
||||
#include <core/signalcatcher.h>
|
||||
|
||||
#include <shared/global.h>
|
||||
|
||||
#include "application.h"
|
||||
|
||||
class Root : public QApplication {
|
||||
Q_OBJECT
|
||||
public:
|
||||
Root(int& argc, char* argv[]);
|
||||
~Root();
|
||||
bool notify(QObject* receiver, QEvent* e) override;
|
||||
int run();
|
||||
|
||||
bool initializeSettings();
|
||||
|
||||
private slots:
|
||||
void onCoreDestroyed();
|
||||
|
||||
private:
|
||||
void initializeTranslation();
|
||||
void initializeAppIcon();
|
||||
void initializeComponents();
|
||||
|
||||
private:
|
||||
static const std::vector<unsigned int> appIconSizes;
|
||||
|
||||
SignalCatcher signalCatcher;
|
||||
QTranslator defaultTranslator;
|
||||
QTranslator currentTranslator;
|
||||
QIcon appIcon;
|
||||
QSettings settings;
|
||||
bool componentsInitialized;
|
||||
|
||||
Shared::Global* global;
|
||||
QThread* coreThread;
|
||||
Core::Squawk* core;
|
||||
Application* gui;
|
||||
|
||||
};
|
||||
|
||||
#endif // ROOT_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue