separate out the log parsing, will throw events

This commit is contained in:
Green Sky 2024-06-11 09:45:52 +02:00
parent 06bd55c165
commit 4295c6cc53
No known key found for this signature in database
6 changed files with 44 additions and 17 deletions

View File

@ -3,10 +3,12 @@
#include <entt/entt.hpp> #include <entt/entt.hpp>
#include <entt/fwd.hpp> #include <entt/fwd.hpp>
#include "factorio_log_parser.hpp"
#include "factorio.hpp" #include "factorio.hpp"
#include <iostream> #include <iostream>
static std::unique_ptr<FactorioLogParser> g_flp = nullptr;
static std::unique_ptr<Factorio> g_f = nullptr; static std::unique_ptr<Factorio> g_f = nullptr;
constexpr const char* plugin_name = "Factorio"; constexpr const char* plugin_name = "Factorio";
@ -34,9 +36,11 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
// static store, could be anywhere tho // static store, could be anywhere tho
// construct with fetched dependencies // construct with fetched dependencies
g_flp = std::make_unique<FactorioLogParser>();
g_f = std::make_unique<Factorio>(*cr, *rmm); g_f = std::make_unique<Factorio>(*cr, *rmm);
// register types // register types
PLUG_PROVIDE_INSTANCE(FactorioLogParser, plugin_name, g_flp.get());
PLUG_PROVIDE_INSTANCE(Factorio, plugin_name, g_f.get()); PLUG_PROVIDE_INSTANCE(Factorio, plugin_name, g_f.get());
} catch (const ResolveException& e) { } catch (const ResolveException& e) {
std::cerr << "PLUGIN " << plugin_name << " " << e.what << "\n"; std::cerr << "PLUGIN " << plugin_name << " " << e.what << "\n";
@ -50,6 +54,7 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
std::cout << "PLUGIN " << plugin_name << " STOP()\n"; std::cout << "PLUGIN " << plugin_name << " STOP()\n";
g_f.reset(); g_f.reset();
g_flp.reset();
} }
SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float) { SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float) {

View File

@ -5,6 +5,8 @@ project(solanaceae)
add_library(solanaceae_factorio add_library(solanaceae_factorio
./log_parse.hpp ./log_parse.hpp
./log_parse.cpp ./log_parse.cpp
./factorio_log_parser.hpp
./factorio_log_parser.cpp
./factorio.hpp ./factorio.hpp
./factorio.cpp ./factorio.cpp
) )

View File

@ -3,12 +3,9 @@
#include <solanaceae/message3/components.hpp> #include <solanaceae/message3/components.hpp>
#include <solanaceae/contact/components.hpp> #include <solanaceae/contact/components.hpp>
#include "./log_parse.hpp"
Factorio::Factorio(Contact3Registry& cr, RegistryMessageModel& rmm) : Factorio::Factorio(Contact3Registry& cr, RegistryMessageModel& rmm) :
_cr(cr), _cr(cr),
_rmm(rmm), _rmm(rmm)
_fw("test.txt", [this](const auto& path, const auto event){ this->onFileEvent(path, event);})
{ {
@ -22,7 +19,3 @@ bool Factorio::onEvent(const Message::Events::MessageConstruct& e) {
return false; return false;
} }
void Factorio::onFileEvent(const std::string& path, const filewatch::Event change_type) {
std::cout << "file even " << filewatch::event_to_string(change_type) << " on '" << path << "'\n";
}

View File

@ -2,24 +2,15 @@
#include <solanaceae/message3/registry_message_model.hpp> #include <solanaceae/message3/registry_message_model.hpp>
#include <FileWatch.hpp>
#include <string>
class Factorio : public RegistryMessageModelEventI { class Factorio : public RegistryMessageModelEventI {
Contact3Registry& _cr; Contact3Registry& _cr;
RegistryMessageModel& _rmm; RegistryMessageModel& _rmm;
filewatch::FileWatch<std::string> _fw;
public: public:
Factorio(Contact3Registry& cr, RegistryMessageModel& rmm); Factorio(Contact3Registry& cr, RegistryMessageModel& rmm);
virtual ~Factorio(void); virtual ~Factorio(void);
protected: // rmm protected: // rmm
bool onEvent(const Message::Events::MessageConstruct& e) override; bool onEvent(const Message::Events::MessageConstruct& e) override;
protected:
void onFileEvent(const std::string& path, const filewatch::Event change_type);
}; };

View File

@ -0,0 +1,19 @@
#include "./factorio_log_parser.hpp"
#include "./log_parse.hpp"
FactorioLogParser::FactorioLogParser(void) :
_fw("test.txt", [this](const auto& path, const auto event){ this->onFileEvent(path, event);})
{
}
FactorioLogParser::~FactorioLogParser(void) {
}
void FactorioLogParser::onFileEvent(const std::string& path, const filewatch::Event change_type) {
std::cout << "file even " << filewatch::event_to_string(change_type) << " on '" << path << "'\n";
// on create, close open log file and reopen and skip to end
// on mod (?), read line, parse
}

View File

@ -0,0 +1,17 @@
#pragma once
#include <FileWatch.hpp>
#include <string>
class FactorioLogParser {
filewatch::FileWatch<std::string> _fw;
public:
FactorioLogParser(void);
virtual ~FactorioLogParser(void);
protected:
void onFileEvent(const std::string& path, const filewatch::Event change_type);
};