Anthony/open-story-teller
1
0
Fork 0
mirror of https://github.com/arabine/open-story-teller.git synced 2025-12-06 17:09:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Usage of CPM package manager for CMake, add CivetWeb
Some checks failed
build-story-editor / build_linux (push) Has been cancelled
Details
build-story-editor / build_win32 (push) Has been cancelled
Details
Deploy / deploy (push) Has been cancelled
Details

Browse source
This commit is contained in:
anthony@rabine.fr 2025-01-04 22:02:35 +01:00
parent fe920f4b15
commit 19b78b17a1
8 changed files with 1615 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vscode/launch.json vendored
View file

@ -53,7 +53,7 @@
"gdbPath": "gdb-multiarch",
"svdFile": "${workspaceRoot}/software/platform/raspberry-pico-w/rp2040.svd",
// "device": "STM32L431VC",
"runToMain": true,
"runToEntryPoint": "main",
"preRestartCommands": [
"cd ${workspaceRoot}/software/build/RaspberryPico",
"file open-story-teller.elf",

2
shared/downloader.cpp
View file

@ -1,4 +1,4 @@
#include <mbedtls/aes.h>
#include "downloader.h"
#include "json.hpp"

167
story-editor/CMakeLists.txt
View file

@ -21,7 +21,6 @@ endif()
find_package(OpenGL REQUIRED)
# set(OPENSSL_ROOT_DIR /libs/openssl)
# find_package(OpenSSL REQUIRED)
@ -29,63 +28,78 @@ set(IMGUI_VERSION 1.91.6)
include(FetchContent)
include(cmake/CPM.cmake)
# =========================================================================================================================
# MBedTLS
# =========================================================================================================================
CPMAddPackage("gh:Mbed-TLS/mbedtls#v3.6.2")
find_package(MbedTLS REQUIRED)
include_directories(${MbedTLS_INCLUDE_DIR})
# set(MBEDTLS_STATIC_LIBRARY ON)
# =========================================================================================================================
# CibetWeb
# =========================================================================================================================
CPMAddPackage(
NAME civetweb
GITHUB_REPOSITORY civetweb/civetweb
VERSION 1.16
OPTIONS
"CIVETWEB_BUILD_TESTING OFF"
"CIVETWEB_ENABLE_SERVER_EXECUTABLE OFF"
"CIVETWEB_ENABLE_CXX ON"
"CIVETWEB_ENABLE_WEBSOCKETS ON"
"CIVETWEB_ENABLE_ASAN OFF"
)
find_package(civetweb REQUIRED)
include_directories(${civetweb_SOURCE_DIR}/include)
# =========================================================================================================================
# CURL
# =========================================================================================================================
# Définit les options de cURL pour utiliser mBedTLS
set(CMAKE_USE_OPENSSL OFF)
set(CMAKE_USE_MBEDTLS ON)
set(CURL_USE_OPENSSL OFF CACHE BOOL "Disable OpenSSL." FORCE)
set(CURL_USE_MBEDTLS ON CACHE BOOL "Use MBED TLS." FORCE)
set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Disable SSH." FORCE)
set(MBEDTLS_INCLUDE_DIRS ${mbedtls_SOURCE_DIR}/include)
set(MBEDTLS_LIBRARY ${mbedtls_BINARY_DIR}/libmbedtls.a)
set(MBEDX509_LIBRARY ${mbedtls_BINARY_DIR}/libmbedx509.a)
set(MBEDCRYPTO_LIBRARY ${mbedtls_BINARY_DIR}/libmbedcrypto.a)
# Télécharge et configure cURL
FetchContent_Declare(
curl
GIT_REPOSITORY https://github.com/curl/curl.git
GIT_TAG curl-8_7_1
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
)
FetchContent_GetProperties(curl)
if(NOT curl_POPULATED)
FetchContent_Populate(curl)
set(BUILD_CURL_EXE FALSE)
set(BUILD_STATIC_LIBS TRUE)
add_subdirectory(${curl_SOURCE_DIR} ${curl_BINARY_DIR})
endif()
FetchContent_MakeAvailable(curl)
# Assurez-vous que votre projet trouve les headers de mBedTLS et cURL
include_directories(${mbedtls_SOURCE_DIR}/include)
include_directories(${curl_SOURCE_DIR}/include)
# FetchContent_Declare(curl
# URL https://github.com/curl/curl/archive/refs/tags/curl-8_6_0.zip
# )
# set(CURL_USE_mbedTLS ON CACHE BOOL "Use MBED TLS." FORCE)
# set(BUILD_TESTING OFF CACHE BOOL "No tests build, plz." FORCE)
# set(USE_MANUAL OFF CACHE BOOL "No manuals, plz." FORCE)
# set(BUILD_CURL_EXE OFF CACHE BOOL "No executable, plz. Only the lib" FORCE)
# set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "No installation build, plz." FORCE)
# set(CURL_DISABLE_IMAPS ON CACHE BOOL "Use MBED TLS." FORCE)
# set(BUILD_CURL_EXE FALSE)
# set(BUILD_STATIC_LIBS TRUE)
# FetchContent_MakeAvailable(curl)
# include_directories( ${CURL_INCLUDE_DIRS} )
# =========================================================================================================================
# IMGUI and plugins
# =========================================================================================================================
FetchContent_Declare(imgui
FetchContent_Declare(
imgui
URL https://github.com/ocornut/imgui/archive/refs/tags/v${IMGUI_VERSION}-docking.zip
)
FetchContent_GetProperties(imgui)
if(NOT imgui_POPULATED)
set(FETCHCONTENT_QUIET NO)
FetchContent_Populate(imgui)
endif()
FetchContent_MakeAvailable(imgui)
# ImGuiFileDialog
include_directories(${imgui_SOURCE_DIR})
@ -93,36 +107,6 @@ add_compile_definitions(CUSTOM_IMGUIFILEDIALOG_CONFIG="${CMAKE_SOURCE_DIR}/src/C
add_compile_definitions(IMGUI_INCLUDE="imgui.h")
add_subdirectory(libs/ImGuiFileDialog)
# =========================================================================================================================
# ImGui Text editor
# =========================================================================================================================
# FetchContent_Declare(
# te
# GIT_REPOSITORY https://github.com/ChemistAion/ImTextEdit
# GIT_TAG 81ec756b5627dd351fe0dac26a7403982349df68
# GIT_SHALLOW TRUE
# GIT_PROGRESS TRUE
# )
# FetchContent_MakeAvailable(te)
# =========================================================================================================================
# SDL2
# =========================================================================================================================
# FetchContent_Declare(
# sdl2
# GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
# GIT_TAG origin/SDL2
# GIT_SHALLOW TRUE
# GIT_PROGRESS TRUE
# )
# set(BUILD_SHARED_LIBS TRUE)
# set(SDL_STATIC TRUE)
# FetchContent_MakeAvailable(sdl2)
# =========================================================================================================================
# SDL3
# =========================================================================================================================
@ -143,20 +127,31 @@ include_directories(${sdl3_SOURCE_DIR}/include)
# =========================================================================================================================
# SDL3 MIXER
# =========================================================================================================================
FetchContent_Declare(
sdl3_mixer
GIT_REPOSITORY https://github.com/libsdl-org/SDL_mixer.git
GIT_TAG d4eba31e4ac23a81fffad02e91b17dcb2449a2cb
# GIT_SHALLOW TRUE
# GIT_PROGRESS TRUE
# GIT_SUBMODULES ""
CPMAddPackage(
NAME sdl3_mixer
URL https://github.com/libsdl-org/SDL_mixer/archive/d4eba31e4ac23a81fffad02e91b17dcb2449a2cb.tar.gz
OPTIONS
"BUILD_SHARED_LIBS TRUE"
"SDL_PULSEAUDIO_SHARED TRUE"
"SDL_PIPEWIRE_SHARED TRUE"
)
set(BUILD_SHARED_LIBS TRUE)
set(SDL_PULSEAUDIO_SHARED TRUE)
set(SDL_PIPEWIRE_SHARED TRUE)
FetchContent_MakeAvailable(sdl3_mixer)
include_directories(${sdl3_mixer_SOURCE_DIR}/include)
# FetchContent_Declare(
# sdl3_mixer
# GIT_REPOSITORY https://github.com/libsdl-org/SDL_mixer.git
# GIT_TAG d4eba31e4ac23a81fffad02e91b17dcb2449a2cb
# # GIT_SHALLOW TRUE # Ne pas activer shallow sinon le tag n'est pas trouvé
# # GIT_PROGRESS TRUE
# GIT_SUBMODULES ""
# )
# set(BUILD_SHARED_LIBS TRUE)
# set(SDL_PULSEAUDIO_SHARED TRUE)
# set(SDL_PIPEWIRE_SHARED TRUE)
# FetchContent_MakeAvailable(sdl3_mixer)
# include_directories(${sdl3_mixer_SOURCE_DIR}/include)
# =========================================================================================================================
@ -167,6 +162,7 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/libsdl-org/SDL_image.git
GIT_TAG bcc97c044266080256ef6ed0d690859677212b2b
GIT_PROGRESS TRUE
# GIT_SHALLOW TRUE # Ne pas activer shallow sinon le tag n'est pas trouvé
)
@ -202,9 +198,9 @@ set(SRCS
src/code_editor.cpp
src/media_converter.cpp
src/miniz.c
src/zip.cpp
src/web_server.cpp
src/importers/pack_archive.cpp
src/importers/ni_parser.c
@ -315,11 +311,16 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
endif()
target_compile_definitions(${STORY_EDITOR_PROJECT} PUBLIC cimg_display=0)
# target_compile_definitions(${STORY_EDITOR_PROJECT} PUBLIC cimg_display=0)
target_compile_definitions(${STORY_EDITOR_PROJECT} PUBLIC "$<$<CONFIG:DEBUG>:DEBUG>")
# target_compile_definitions(${STORY_EDITOR_PROJECT} PUBLIC "$<$<CONFIG:DEBUG>:DEBUG>")
target_link_directories(${STORY_EDITOR_PROJECT} PUBLIC ${sdl3_BINARY_DIR} ${curl_BINARY_DIR})
target_link_directories(${STORY_EDITOR_PROJECT} PUBLIC
${sdl3_BINARY_DIR}
${curl_BINARY_DIR}
${mbedtls_BINARY_DIR}
# ${CivetWeb_BINARY_DIR}
)
# On est obligé de passer par une variable pour injecter
# certaines informations à CPACK
@ -329,14 +330,18 @@ set(SDL_MIXER_BIN_DIR ${sdl3_mixer_BINARY_DIR})
if(UNIX)
target_link_libraries(${STORY_EDITOR_PROJECT}
pthread
OpenGL::GL
dl
SDL3::SDL3
SDL3_image::SDL3_image
SDL3_mixer::SDL3_mixer
libcurl_static
# OpenSSL::SSL OpenSSL::Crypto
MbedTLS::mbedtls
civetweb-cpp
pthread
OpenGL::GL
dl
)
elseif(WIN32)
target_link_libraries(${STORY_EDITOR_PROJECT}

44
story-editor/CMakePresets.json Normal file
View file

@ -0,0 +1,44 @@
{
"version": 10,
"cmakeMinimumRequired": {
"major": 3,
"minor": 23,
"patch": 0
},
"configurePresets": [
{
"name": "default",
"displayName": "Default configuration",
"description": "Default build using Ninja generator",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build",
"environment": {
"CPM_SOURCE_CACHE": "$env{HOME}/.cache/CPM"
}
},
{
"name": "Configure-StoryEditor-Debug",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "Configure-StoryEditor-Release",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
}
],
"buildPresets": [
{
"name": "Build-StoryEditor-Debug",
"configurePreset": "Configure-StoryEditor-Debug"
},
{
"name": "Build-StoryEditor-Release",
"configurePreset": "Configure-StoryEditor-Release"
}
]
}

1285
story-editor/cmake/CPM.cmake Normal file
View file

File diff suppressed because it is too large Load diff

3
story-editor/src/main_window.h
View file

@ -23,6 +23,7 @@
#include "library_window.h"
#include "cpu_window.h"
#include "story_machine.h"
#include "web_server.h"
struct DebugContext
{
@ -123,6 +124,8 @@ private:
ThreadSafeQueue<VmEvent> m_eventQueue;
WebServer m_webServer;
// From IStoryManager (proxy to StoryProject class)
virtual void OpenProject(const std::string &uuid) override;
virtual void ImportProject(const std::string &fileName, int format);

179
story-editor/src/web_server.cpp Normal file
View file

@ -0,0 +1,179 @@
#include <string.h>
#include "web_server.h"
#define DOCUMENT_ROOT "."
#define PORT "8081"
class FooHandler : public CivetHandler
{
public:
bool
handleGet(CivetServer *server, struct mg_connection *conn)
{
/* Handler may access the request info using mg_get_request_info */
const struct mg_request_info *req_info = mg_get_request_info(conn);
mg_printf(conn,
"HTTP/1.1 200 OK\r\nContent-Type: "
"text/html\r\nConnection: close\r\n\r\n");
mg_printf(conn, "<html><body>\n");
mg_printf(conn, "<h2>This is the Foo GET handler!!!</h2>\n");
mg_printf(conn,
"<p>The request was:<br><pre>%s %s HTTP/%s</pre></p>\n",
req_info->request_method,
req_info->request_uri,
req_info->http_version);
mg_printf(conn, "</body></html>\n");
return true;
}
bool
handlePost(CivetServer *server, struct mg_connection *conn)
{
/* Handler may access the request info using mg_get_request_info */
const struct mg_request_info *req_info = mg_get_request_info(conn);
long long rlen, wlen;
long long nlen = 0;
long long tlen = req_info->content_length;
char buf[1024];
mg_printf(conn,
"HTTP/1.1 200 OK\r\nContent-Type: "
"text/html\r\nConnection: close\r\n\r\n");
mg_printf(conn, "<html><body>\n");
mg_printf(conn, "<h2>This is the Foo POST handler!!!</h2>\n");
mg_printf(conn,
"<p>The request was:<br><pre>%s %s HTTP/%s</pre></p>\n",
req_info->request_method,
req_info->request_uri,
req_info->http_version);
mg_printf(conn, "<p>Content Length: %li</p>\n", (long)tlen);
mg_printf(conn, "<pre>\n");
while (nlen < tlen) {
rlen = tlen - nlen;
if (rlen > sizeof(buf)) {
rlen = sizeof(buf);
}
rlen = mg_read(conn, buf, (size_t)rlen);
if (rlen <= 0) {
break;
}
wlen = mg_write(conn, buf, (size_t)rlen);
if (wlen != rlen) {
break;
}
nlen += wlen;
}
mg_printf(conn, "\n</pre>\n");
mg_printf(conn, "</body></html>\n");
return true;
}
#define fopen_recursive fopen
bool
handlePut(CivetServer *server, struct mg_connection *conn)
{
/* Handler may access the request info using mg_get_request_info */
const struct mg_request_info *req_info = mg_get_request_info(conn);
long long rlen, wlen;
long long nlen = 0;
long long tlen = req_info->content_length;
FILE * f;
char buf[1024];
int fail = 0;
#ifdef _WIN32
_snprintf(buf, sizeof(buf), "D:\\somewhere\\%s\\%s", req_info->remote_user, req_info->local_uri);
buf[sizeof(buf)-1] = 0;
if (strlen(buf)>255) {
/* Windows will not work with path > 260 (MAX_PATH), unless we use
* the unicode API. However, this is just an example code: A real
* code will probably never store anything to D:\\somewhere and
* must be adapted to the specific needs anyhow. */
fail = 1;
f = NULL;
} else {
f = fopen_recursive(buf, "wb");
}
#else
snprintf(buf, sizeof(buf), "~/somewhere/%s/%s", req_info->remote_user, req_info->local_uri);
buf[sizeof(buf)-1] = 0;
if (strlen(buf)>1020) {
/* The string is too long and probably truncated. Make sure an
* UTF-8 string is never truncated between the UTF-8 code bytes.
* This example code must be adapted to the specific needs. */
fail = 1;
f = NULL;
} else {
f = fopen_recursive(buf, "w");
}
#endif
if (!f) {
fail = 1;
} else {
while (nlen < tlen) {
rlen = tlen - nlen;
if (rlen > sizeof(buf)) {
rlen = sizeof(buf);
}
rlen = mg_read(conn, buf, (size_t)rlen);
if (rlen <= 0) {
fail = 1;
break;
}
wlen = fwrite(buf, 1, (size_t)rlen, f);
if (wlen != rlen) {
fail = 1;
break;
}
nlen += wlen;
}
fclose(f);
}
if (fail) {
mg_printf(conn,
"HTTP/1.1 409 Conflict\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n");
} else {
mg_printf(conn,
"HTTP/1.1 201 Created\r\n"
"Content-Type: text/plain\r\n"
"Connection: close\r\n\r\n");
}
return true;
}
};
static const char *options[] = {
"document_root", DOCUMENT_ROOT,
"listening_ports", PORT,
0
};
WebServer::WebServer()
: m_server(options)
{
mg_init_library(0);
FooHandler h_foo;
m_server.addHandler("**.foo", h_foo);
printf("Browse files at http://localhost:%s/\n", PORT);
}
WebServer::~WebServer()
{
mg_exit_library();
}

16
story-editor/src/web_server.h Normal file
View file

@ -0,0 +1,16 @@
#pragma once
#include "CivetServer.h"
class WebServer : public CivetHandler
{
public:
WebServer();
~WebServer() {}
private:
CivetServer m_server;
};