torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
108 lines
2.4 KiB
C++
108 lines
2.4 KiB
C++
#pragma once
|
|
|
|
#include <NGLLogger/INGLLogger.h>
|
|
|
|
#include <httq/AbstractServer.h>
|
|
#include <httq/Logger.h>
|
|
|
|
|
|
class QTemporaryFile;
|
|
class QUrlQuery;
|
|
|
|
|
|
namespace FileManagement
|
|
{
|
|
struct ThpServerInformation
|
|
{
|
|
int exerciseId { 0 };
|
|
int scriptId { 0 };
|
|
qint64 uploadTime { 0 }; // msecs / epoch
|
|
qint64 fileSize { 0 };
|
|
QString exerciseName;
|
|
QString description;
|
|
QString md5sumHex;
|
|
};
|
|
|
|
|
|
class HttpException
|
|
{
|
|
public:
|
|
HttpException(const QString &error, int status = 500)
|
|
: error(error)
|
|
, status(status)
|
|
{}
|
|
|
|
QString error;
|
|
int status { 500 };
|
|
};
|
|
|
|
|
|
class LoggerFactory;
|
|
|
|
|
|
class Logger : public httq::Logger
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
Logger(LoggerFactory *loggerFactory, QObject *parent);
|
|
|
|
void debug(const QString &message) override;
|
|
void warning(const QString &message) override;
|
|
void error(const QString &message) override;
|
|
|
|
private:
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
|
|
|
|
class LoggerFactory : public httq::LoggerFactory
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
LoggerFactory(QObject *parent);
|
|
|
|
virtual Logger *createLogger(QObject *parent);
|
|
};
|
|
|
|
|
|
class ThpScriptServer : public httq::AbstractServer
|
|
{
|
|
Q_OBJECT
|
|
|
|
public :
|
|
ThpScriptServer(QObject *parent = nullptr);
|
|
|
|
private:
|
|
QWebSocketServer *mWsSvr;
|
|
NGL::INGLLogger &m_logger;
|
|
|
|
static QJsonObject noError();
|
|
bool newHttpConnection(httq::HttpRequest *request) override;
|
|
virtual QWebSocketServer *webSocketServer() const override { return mWsSvr; }
|
|
bool handleRequestSync(httq::HttpRequest &request) noexcept(false);
|
|
bool handleRequest(httq::HttpRequest *request) noexcept(false);
|
|
const QString readScriptsJsFile() const;
|
|
const QString readContentFile() const;
|
|
void changeList(const ThpServerInformation &tsi, httq::HttpRequest *request, bool remove);
|
|
void errorHandler(httq::HttpRequest *request, const HttpException &e) const;
|
|
int queryGetInt(const QUrlQuery &q, const QString &key);
|
|
QString queryGetString(const QUrlQuery &q, const QString &key);
|
|
LoggerFactory *createLoggerFactory() override;
|
|
|
|
static QString thpDirectory();
|
|
static QString thpDirectory(int exerciseId);
|
|
static QString thpFileName(int exerciseId, int scriptId);
|
|
|
|
static QJsonObject toJson(const ThpServerInformation &tsi);
|
|
static ThpServerInformation fromJson(const QJsonValue &val);
|
|
|
|
signals:
|
|
void signalBroadcastNewContentFile();
|
|
void signalBroadcastNewScriptsJsFile();
|
|
void signalBroadcastMessage(const QString &msg);
|
|
void signalBroadcastMessage2(const QString &msg);
|
|
};
|
|
} // namespace FileManagement
|