refactor: move compiler to base

Author: CoelacanthusHex

cmake/lemon-base.cmake

@@ -9,13 +9,17 @@ set(LEMON_BASE_HEADERS
     ${LEMON_BASEDIR_BASE}/LemonLog.hpp
     ${LEMON_BASEDIR_BASE}/LemonType.hpp
     ${LEMON_BASEDIR_BASE}/LemonConfig.hpp
+    ${LEMON_BASEDIR_BASE}/settings.h
+    ${LEMON_BASEDIR_BASE}/compiler.h
     ${LEMON_BASEDIR_BASE}/LemonTranslator.hpp
     ${LEMON_BASEDIR_BASE}/LemonUtils.hpp
     ${LEMON_BASEDIR_BASE}/LemonBaseApplication.hpp
     )
 
 set(LEMON_BASE_SOURCES
     ${LEMON_BASEDIR_BASE}/LemonConfig.cpp
+    ${LEMON_BASEDIR_BASE}/settings.cpp
+    ${LEMON_BASEDIR_BASE}/compiler.cpp
     ${LEMON_BASEDIR_BASE}/LemonTranslator.cpp
     ${LEMON_BASEDIR_BASE}/LemonUtils.cpp
     ${LEMON_BASEDIR_BASE}/LemonBaseApplication.cpp

cmake/lemon-core.cmake

@@ -5,10 +5,6 @@
 set(LEMON_BASEDIR_CORE ${CMAKE_SOURCE_DIR}/src/core)
 
 set(LEMON_CORE_SOURCES
-    ${LEMON_BASEDIR_CORE}/settings.h
-    ${LEMON_BASEDIR_CORE}/settings.cpp
-    ${LEMON_BASEDIR_CORE}/compiler.h
-    ${LEMON_BASEDIR_CORE}/compiler.cpp
     ${LEMON_BASEDIR_CORE}/contest.cpp
     ${LEMON_BASEDIR_CORE}/contest.h
     ${LEMON_BASEDIR_CORE}/testcase.h

makespec/BUILDVERSION

@@ -1 +1 @@
-88
+89

src/addcompilerwizard.cpp

@@ -10,7 +10,7 @@
 #include "addcompilerwizard.h"
 #include "ui_addcompilerwizard.h"
 //
-#include "core/compiler.h"
+#include "base/compiler.h"
 //
 #include <QFileDialog>
 #include <QMessageBox>

src/addtaskdialog.cpp

@@ -10,7 +10,7 @@
 #include "addtaskdialog.h"
 #include "ui_addtaskdialog.h"
 //
-#include "core/settings.h"
+#include "base/settings.h"
 //
 
 AddTaskDialog::AddTaskDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AddTaskDialog)

src/addtestcaseswizard.cpp

@@ -10,7 +10,7 @@
 #include "addtestcaseswizard.h"
 #include "ui_addtestcaseswizard.h"
 //
-#include "core/settings.h"
+#include "base/settings.h"
 //
 #include <QMessageBox>
 #include <algorithm>

src/advancedcompilersettingsdialog.cpp

@@ -10,7 +10,7 @@
 #include "advancedcompilersettingsdialog.h"
 #include "ui_advancedcompilersettingsdialog.h"
 //
-#include "core/compiler.h"
+#include "base/compiler.h"
 #include "environmentvariablesdialog.h"
 //
 #include <QFileDialog>

src/base/LemonBaseApplication.cpp

@@ -9,7 +9,7 @@
 //
 #include "base/LemonLog.hpp"
 #include "base/LemonTranslator.hpp"
-#include "core/settings.h" // TODO: Config Refactor
+#include "base/settings.h" // TODO: Config Refactor
 //
 #include <QCoreApplication>
 //

src/base/LemonConfig.cpp

@@ -6,3 +6,47 @@
  */
 
 #include "LemonConfig.hpp"
+//
+#include "base/LemonUtils.hpp"
+#include "base/compiler.h"
+
+namespace Lemon::base::config
+{
+
+	void LemonConfigJudge::read(const QJsonObject &json)
+	{
+		READ_JSON_INT(defaultFullScore)
+		READ_JSON_INT(defaultTimeLimit)
+		READ_JSON_INT(defaultMemoryLimit)
+		READ_JSON_INT(compileTimeLimit)
+		READ_JSON_INT(specialJudgeTimeLimit)
+		READ_JSON_INT(fileSizeLimit)
+		READ_JSON_INT(rejudgeTimes)
+		
+		READ_JSON_STR(defaultInputFileExtension)
+		READ_JSON_STR(defaultOutputFileExtension)
+		READ_JSON_STR(diffPath)
+		
+		READ_JSON_STRLIST(inputFileExtensions)
+		READ_JSON_STRLIST(outputFileExtensions)
+		READ_JSON_STRLIST(recentContest)
+		
+		// CompilerList
+		if (json.contains("compilerList") && json["compilerList"].isArray()) {
+			QJsonArray _compilerList = json["compilerList"].toArray();
+			compilerList.clear();
+			compilerList.reserve(_compilerList.size());
+			for (int compilerIndex = 0; compilerIndex < _compilerList.size(); ++compilerIndex) {
+				QJsonObject compilerObject = _compilerList[compilerIndex].toObject();
+				Compiler *compiler = new Compiler();
+				compiler->read(compilerObject);
+				compilerList.append(compiler);
+			}
+		}
+	}
+	
+	void LemonConfigJudge::write(QJsonObject &json) const {
+		
+	}
+
+} // namespace Lemon::base::config

src/base/LemonConfig.hpp

@@ -9,14 +9,17 @@
 //
 
 #include <base/LemonBase.hpp>
-#include <core/compiler.h>
 //
+#include <QJsonObject>
+
+class Compiler;
 
 namespace Lemon::base::config
 {
 
-	struct LemonConfigJudge
+	class LemonConfigJudge
 	{
+	  private:
 		QList<Compiler *> compilerList;
 		int defaultFullScore{};
 		int defaultTimeLimit{};
@@ -31,13 +34,41 @@ namespace Lemon::base::config
 		QStringList outputFileExtensions;
 		QStringList recentContest;
 		QString diffPath;
+
+	  public:
+		void read(const QJsonObject &json);
+		void write(QJsonObject &json) const;
 	};
 
-	struct LemonConfigUI
+	class LemonConfigUI
 	{
+	  private:
 		QString language = "en_US";
 		// Prepare for theme setting
 		// QString theme = ;
+	  public:
+		void read(const QJsonObject &json);
+		void write(QJsonObject &json) const;
+	};
+
+	class LemonConfig
+	{
+	  private:
+		LemonConfigJudge judgeConfig;
+		LemonConfigUI uiConfig;
+		int splashTime{};
+
+	  public:
+		enum SaveFormat
+		{
+			Json,
+			Binary,
+			Yaml
+		};
+		void read(const QJsonObject &json);
+		void write(QJsonObject &json) const;
+		bool loadConfig(SaveFormat saveFormat);
+		bool saveConfig(SaveFormat saveFormat) const;
 	};
 
 } // namespace Lemon::base::config