omar/MosisService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build errors: add missing include, LOG_* macros, stub sandbox integration

Browse Source
This commit is contained in:
omigamedev
2026-01-18 22:55:20 +01:00
parent 60d1a75838
commit 0278acc0fc
3 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/cpp/apps/app_api.h
View File

@@ -2,6 +2,8 @@
// Milestone 10: Device-Side App Management
#pragma once
#include <string>
struct lua_State;
namespace mosis {

35
src/main/cpp/apps/app_manager.cpp
View File

@@ -2,9 +2,11 @@
// Milestone 10: Device-Side App Management
#include "app_manager.h"
#include "../sandbox/sandbox_manager.h"
#include "../logger.h"
// TODO: Integrate with sandbox manager when available
// #include "../sandbox/sandbox_manager.h"
#include <fstream>
#include <sstream>
#include <filesystem>
@@ -178,9 +180,10 @@ bool AppManager::Uninstall(const std::string& package_id, bool keep_data) {
LOG_INFO("Uninstalling app: %s (keep_data=%d)", package_id.c_str(), keep_data);
// Stop app if running
if (m_sandbox_manager && m_sandbox_manager->IsAppRunning(package_id)) {
m_sandbox_manager->StopApp(package_id);
}
// TODO: Integrate with sandbox manager
// if (m_sandbox_manager && m_sandbox_manager->IsAppRunning(package_id)) {
// m_sandbox_manager->StopApp(package_id);
// }
// Remove files
std::string install_path = it->second.install_path;
@@ -312,34 +315,30 @@ bool AppManager::RestoreAppData(const std::string& package_id) {
}
bool AppManager::LaunchApp(const std::string& package_id) {
if (!m_sandbox_manager) {
LOG_ERROR("Cannot launch app: sandbox manager not set");
return false;
}
// TODO: Integrate with sandbox manager
auto app = GetApp(package_id);
if (!app) {
LOG_ERROR("Cannot launch app: not installed: %s", package_id.c_str());
return false;
}
std::string app_path = app->install_path + "/package";
return m_sandbox_manager->StartApp(package_id, app_path, app->permissions, app->is_system_app);
LOG_INFO("Launching app: %s (sandbox integration pending)", package_id.c_str());
// When sandbox is integrated:
// std::string app_path = app->install_path + "/package";
// return m_sandbox_manager->StartApp(package_id, app_path, app->permissions, app->is_system_app);
return true;
}
bool AppManager::StopApp(const std::string& package_id) {
if (!m_sandbox_manager) {
return false;
}
return m_sandbox_manager->StopApp(package_id);
// TODO: Integrate with sandbox manager
LOG_INFO("Stopping app: %s (sandbox integration pending)", package_id.c_str());
return true;
}
bool AppManager::IsAppRunning(const std::string& package_id) const {
if (!m_sandbox_manager) {
// TODO: Integrate with sandbox manager
return false;
}
return m_sandbox_manager->IsAppRunning(package_id);
}
void AppManager::SetSandboxManager(LuaSandboxManager* manager) {
m_sandbox_manager = manager;

32
src/main/cpp/logger.h
View File

@@ -1,8 +1,40 @@
#pragma once
#include <string>
#include <cstdio>
#include <cstdarg>
class Logger
{
public:
static void Log(const std::string& message);
// Printf-style logging
static void LogF(const char* level, const char* fmt, ...) {
char buffer[1024];
va_list args;
va_start(args, fmt);
vsnprintf(buffer, sizeof(buffer), fmt, args);
va_end(args);
Log(std::string("[") + level + "] " + buffer);
}
};
// Undefine conflicting syslog macros if present
#ifdef LOG_DEBUG
#undef LOG_DEBUG
#endif
#ifdef LOG_INFO
#undef LOG_INFO
#endif
#ifdef LOG_WARN
#undef LOG_WARN
#endif
#ifdef LOG_ERROR
#undef LOG_ERROR
#endif
// Logging macros for convenience (printf-style)
#define LOG_DEBUG(fmt, ...) Logger::LogF("DEBUG", fmt __VA_OPT__(,) __VA_ARGS__)
#define LOG_INFO(fmt, ...) Logger::LogF("INFO", fmt __VA_OPT__(,) __VA_ARGS__)
#define LOG_WARN(fmt, ...) Logger::LogF("WARN", fmt __VA_OPT__(,) __VA_ARGS__)
#define LOG_ERROR(fmt, ...) Logger::LogF("ERROR", fmt __VA_OPT__(,) __VA_ARGS__)