Add App class

Author: adazem009

src/app/CMakeLists.txt

@@ -2,6 +2,8 @@ set(APP_TARGET scratchcpp-player CACHE INTERNAL "")
 
 qt_add_executable(${APP_TARGET}
     main.cpp
+    app.cpp
+    app.h
 )
 
 qt_add_qml_module(${APP_TARGET}
@@ -20,7 +22,10 @@ set_target_properties(${APP_TARGET} PROPERTIES
 
 target_compile_definitions(${APP_TARGET}
     PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+target_compile_definitions(${APP_TARGET} PRIVATE BUILD_VERSION="${CMAKE_PROJECT_VERSION}")
 target_link_libraries(${APP_TARGET}
     PRIVATE Qt6::Quick Qt6::QuickControls2)
+target_include_directories(${APP_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
+target_include_directories(${APP_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../global)
 
 target_link_libraries(${APP_TARGET} PRIVATE scratchcpp-render scratchcpp-renderplugin)

src/app/app.cpp

@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+#include <QQuickStyle>
+#include <QIcon>
+#include <cassert>
+
+#include "app.h"
+#include "globalmodule.h"
+#include "modularity/ioc.h"
+
+using namespace scratchcpp;
+using namespace scratchcpp::modularity;
+
+App::App()
+{
+    addModule(new GlobalModule);
+}
+
+int App::run(int argc, char **argv)
+{
+    qputenv("QSG_RENDER_LOOP", "basic");
+
+    // Set up application object
+    QGuiApplication app(argc, argv);
+    QCoreApplication::setOrganizationDomain("scratchcpp.github.io");
+    QCoreApplication::setOrganizationName("ScratchCPP");
+    QCoreApplication::setApplicationName("ScratchCPP");
+    QCoreApplication::setApplicationVersion(BUILD_VERSION);
+
+    // Set style and icon theme name
+    QQuickStyle::setStyle("Material");
+    QIcon::setThemeName("scratchcpp");
+
+    // Register exports
+    for (IModuleSetup *module : m_modules)
+        module->registerExports();
+
+    // Init settings
+    for (IModuleSetup *module : m_modules)
+        module->initSettings();
+
+    // Setup modules: onPreInit
+    for (IModuleSetup *module : m_modules)
+        module->onPreInit();
+
+    /* Splash screen should show now, if any. */
+
+    // Setup modules: onInit
+    for (IModuleSetup *module : m_modules)
+        module->onInit();
+
+    // Setup modules: onStartApp (on next event loop)
+    QMetaObject::invokeMethod(
+        qApp,
+        [this]() {
+            for (IModuleSetup *m : m_modules) {
+                m->onStartApp();
+            }
+        },
+        Qt::QueuedConnection);
+
+    // Load main.qml
+    QQmlApplicationEngine engine;
+    engine.addImportPath(":/");
+
+    const QUrl url(u"qrc:/ScratchCPP/main.qml"_qs);
+    QObject::connect(
+        &engine,
+        &QQmlApplicationEngine::objectCreated,
+        &app,
+        [url](QObject *obj, const QUrl &objUrl) {
+            if (!obj && url == objUrl)
+                QCoreApplication::exit(-1);
+        },
+        Qt::QueuedConnection);
+    engine.load(url);
+
+    // Run the event loop
+    int exitCode = app.exec();
+
+    // Deinit modules
+    for (IModuleSetup *module : m_modules)
+        module->onDeinit();
+
+    for (IModuleSetup *module : m_modules)
+        module->onDestroy();
+
+    // Remove all modules
+    removeModules();
+
+    return exitCode;
+}
+
+void App::addModule(IModuleSetup *module)
+{
+    assert(module);
+    assert(std::find_if(m_modules.begin(), m_modules.end(), [module](IModuleSetup *m) { return m->moduleName() == module->moduleName(); }) == m_modules.end());
+    m_modules.push_back(module);
+}
+
+void App::removeModules()
+{
+    for (IModuleSetup *module : m_modules)
+        delete module;
+
+    m_modules.clear();
+    ioc()->reset();
+}

src/app/app.h

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <vector>
+
+namespace scratchcpp
+{
+
+namespace modularity
+{
+
+class IModuleSetup;
+
+}
+
+class App
+{
+    public:
+        App();
+
+        int run(int argc, char **argv);
+        void addModule(modularity::IModuleSetup *module);
+
+    private:
+        void removeModules();
+
+        std::vector<modularity::IModuleSetup *> m_modules;
+};
+
+} // namespace scratchcpp

src/app/main.cpp

@@ -1,32 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
-#include <QQuickStyle>
-#include <QIcon>
+#include "app.h"
+
+using namespace scratchcpp;
 
 int main(int argc, char *argv[])
 {
-    qputenv("QSG_RENDER_LOOP", "basic");
-
-    QGuiApplication app(argc, argv);
-    QQuickStyle::setStyle("Material");
-    QIcon::setThemeName("scratchcpp");
-
-    QQmlApplicationEngine engine;
-    engine.addImportPath(":/");
-
-    const QUrl url(u"qrc:/ScratchCPP/main.qml"_qs);
-    QObject::connect(
-        &engine,
-        &QQmlApplicationEngine::objectCreated,
-        &app,
-        [url](QObject *obj, const QUrl &objUrl) {
-            if (!obj && url == objUrl)
-                QCoreApplication::exit(-1);
-        },
-        Qt::QueuedConnection);
-    engine.load(url);
+    App app;
 
-    return app.exec();
+    return app.run(argc, argv);
 }