refactor: add a new level of abstraction

Author: CoelacanthusHex

cmake/lemon-base.cmake

@@ -14,6 +14,7 @@ set(LEMON_BASE_HEADERS
     ${LEMON_BASEDIR_BASE}/LemonTranslator.hpp
     ${LEMON_BASEDIR_BASE}/LemonUtils.hpp
     ${LEMON_BASEDIR_BASE}/LemonBaseApplication.hpp
+    ${LEMON_BASEDIR_BASE}/LemonApplicationInterface.hpp
     )
 
 set(LEMON_BASE_SOURCES
@@ -23,6 +24,7 @@ set(LEMON_BASE_SOURCES
     ${LEMON_BASEDIR_BASE}/LemonTranslator.cpp
     ${LEMON_BASEDIR_BASE}/LemonUtils.cpp
     ${LEMON_BASEDIR_BASE}/LemonBaseApplication.cpp
+    ${LEMON_BASEDIR_BASE}/LemonApplicationInterface.cpp
     )
 
 add_library(lemon-base STATIC

makespec/BUILDVERSION

@@ -1 +1 @@
-138
+139

src/base/LemonApplicationInterface.cpp

@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Project LemonLime
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#include "LemonApplicationInterface.hpp"
+//
+#include "base/LemonBase.hpp"
+#include "base/LemonLog.hpp"
+#include "base/LemonTranslator.hpp"
+#include "base/settings.h" // TODO: Config Refactor
+//
+#include <QCoreApplication>
+//
+#define LEMON_MODULE_NAME "LemonApplicationInterface"
+
+using namespace Lemon;
+
+LemonApplicationInterface::LemonApplicationInterface() {
+	// ConfigObject = new LemonConfigObject;
+	LemonCoreApplication = this;
+	LOG("LemonLime", LEMON_VERSION_STRING, "on", QSysInfo::prettyProductName(),
+	    QSysInfo::currentCpuArchitecture());
+	DEBUG("LemonLime Start Time: ", QTime::currentTime().msecsSinceStartOfDay());
+	DEBUG(LEMON_BUILD_INFO);
+	DEBUG(LEMON_BUILD_EXTRA_INFO);
+}
+
+LemonApplicationInterface::~LemonApplicationInterface() {
+	// delete ConfigObject;
+	LemonCoreApplication = nullptr;
+}

src/base/LemonApplicationInterface.hpp

@@ -0,0 +1,42 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Project LemonLime
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#pragma once
+//
+#include <QString>
+#include <QList>
+#include <QObject>
+
+namespace Lemon {
+	struct LemonStartupArguments {
+		enum Argument {
+			NORMAL = 0,
+			EXIT = 1,
+			LEMON_LINK = 2 // Maybe support URL...
+		};
+		QList<Argument> arguments;
+		QString version;
+		int buildVersion;
+		QString data;
+		QList<QString> links;
+		QList<QString> fullArgs;
+		//
+		bool debugLog;
+		bool exitLemon;
+	};
+
+	class LemonApplicationInterface {
+
+	  public:
+		explicit LemonApplicationInterface();
+		~LemonApplicationInterface();
+
+		Lemon::LemonStartupArguments StartupArguments;
+	};
+
+	inline LemonApplicationInterface *LemonCoreApplication = nullptr;
+} // namespace Lemon

src/base/LemonBaseApplication.hpp

@@ -8,38 +8,22 @@
 #pragma once
 //
 #include <SingleApplication>
+//
+#include "base/LemonApplicationInterface.hpp"
 
 namespace Lemon {
-	struct LemonStartupArguments {
-		enum Argument {
-			NORMAL = 0,
-			EXIT = 1,
-			LEMON_LINK = 2 // Maybe support URL...
-		};
-		QList<Argument> arguments;
-		QString version;
-		int buildVersion;
-		QString data;
-		QList<QString> links;
-		QList<QString> fullArgs;
-		//
-		bool debugLog;
-		bool exitLemon;
-	};
-} // namespace Lemon
-
-class LemonBaseApplication : public SingleApplication {
+class LemonBaseApplication : public SingleApplication, public LemonApplicationInterface {
 	Q_OBJECT
 
   public:
 	LemonBaseApplication(int &argc, char *argv[])
-	    : SingleApplication(argc, argv, true, User | ExcludeAppPath | ExcludeAppVersion){};
+	    : SingleApplication(argc, argv, true, User | ExcludeAppPath | ExcludeAppVersion), LemonApplicationInterface(){};
 	virtual ~LemonBaseApplication(){};
 
-	Lemon::LemonStartupArguments StartupArguments;
-
 	virtual bool Initialize() final;
 
   private:
 	bool parseCommandLine(bool *canContinue, QString *errorMessage);
 };
+} // namespace Lemon
+

src/base/LemonLog.hpp

@@ -56,7 +56,7 @@ namespace Lemon::base {
 		logStream << NEWLINE;
 #ifndef QT_DEBUG
 		// We only process DEBUG log in Release mode
-		if (t == LEMON_LOG_DEBUG && LemonBaseApplication && !LemonBaseApplication->StartupArguments.debugLog) {
+		if (t == LEMON_LOG_DEBUG && LemonCoreApplication && !LemonCoreApplication->StartupArguments.debugLog) {
 			// Discard debug log in non-debug Lemon version with
 			// no-debugLog mode.
 			return;

src/main.cpp

@@ -25,13 +25,7 @@ int main(int argc, char *argv[]) {
 	QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
 #endif
 
-	LemonBaseApplication app(argc, argv);
-
-	LOG("LemonLime " LEMON_VERSION_STRING " on " + QSysInfo::prettyProductName() + " " +
-	    QSysInfo::currentCpuArchitecture());
-	DEBUG("LemonLime Start Time: " + QString::number(QTime::currentTime().msecsSinceStartOfDay()));
-	DEBUG(LEMON_BUILD_INFO);
-	DEBUG(LEMON_BUILD_EXTRA_INFO);
+	Lemon::LemonBaseApplication app(argc, argv);
 
 	app.Initialize();