nf7/nf7
nf7/nf7
1
0
Fork 0
Code Issues 9 Pull Requests Projects 3 Releases 5 Wiki Activity

replace System/Node file with System/Dir

Browse Source
This commit is contained in:
falsycat 2022-11-13 15:25:18 +09:00
parent 9038511525
commit 6887410e19
4 changed files with 82 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -115,6 +115,7 @@ target_sources(nf7
common/node_link_store.hh
common/node_root_lambda.hh
common/ptr_selector.hh
common/pure_node_file.hh
common/queue.hh
common/ring_buffer.hh
common/sequencer.hh

59
common/pure_node_file.hh Normal file
View File

@ -0,0 +1,59 @@
#pragma once
#include <memory>
#include <typeinfo>
#include "nf7.hh"
#include "common/file_base.hh"
#include "common/logger_ref.hh"
#include "common/node.hh"
#include "common/ptr_selector.hh"
namespace nf7 {
template <typename T>
concept PureNodeFile_LoggerRef =
requires (T& t, const std::shared_ptr<nf7::LoggerRef>& f) { t.log_ = f; };
template <typename T>
class PureNodeFile final : public nf7::FileBase, public nf7::Node {
public:
PureNodeFile(nf7::Env& env) noexcept :
nf7::FileBase(T::kType, env),
nf7::Node(nf7::Node::kNone) {
if constexpr (PureNodeFile_LoggerRef<T>) {
log_ = std::make_shared<nf7::LoggerRef>(*this);
}
}
PureNodeFile(nf7::Deserializer& ar) : PureNodeFile(ar.env()) {
}
void Serialize(nf7::Serializer&) const noexcept override {}
std::unique_ptr<nf7::File> Clone(nf7::Env& env) const noexcept override {
return std::make_unique<nf7::PureNodeFile<T>>(env);
}
std::shared_ptr<nf7::Node::Lambda> CreateLambda(
const std::shared_ptr<nf7::Node::Lambda>& parent) noexcept override {
auto la = std::make_shared<T>(*this, parent);
if constexpr (PureNodeFile_LoggerRef<T>) {
la->log_ = log_;
}
return la;
}
nf7::Node::Meta GetMeta() const noexcept override {
return T::kMeta;
}
nf7::File::Interface* interface(const std::type_info& t) noexcept override {
return nf7::InterfaceSelector<nf7::Node>(t).Select(this);
}
private:
std::shared_ptr<nf7::LoggerRef> log_;
};
} // namespace nf7

155
file/system_node.cc
View File

@ -1,27 +1,11 @@
#include <cstdint>
#include <cstdlib>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>
#include <imgui.h>
#include <ImNodes.h>
#include "nf7.hh"
#include "common/dir_item.hh"
#include "common/file_base.hh"
#include "common/generic_context.hh"
#include "common/generic_dir.hh"
#include "common/generic_type_info.hh"
#include "common/gui.hh"
#include "common/gui_dnd.hh"
#include "common/node.hh"
#include "common/ptr_selector.hh"
#include "common/yas_std_atomic.hh"
#include "common/pure_node_file.hh"
using namespace std::literals;
@ -29,120 +13,15 @@ using namespace std::literals;
namespace nf7 {
namespace {
class SysNode final : public nf7::FileBase, public nf7::DirItem {
public:
static inline const nf7::GenericTypeInfo<SysNode> kType = {
"System/Node", {}};
static void UpdateTypeTooltip() noexcept {
ImGui::TextUnformatted("Node system features.");
ImGui::Bullet(); ImGui::TextUnformatted("implements nf7::Node");
}
template <typename T> class NodeFile;
class Save;
class Exit;
class Panic;
SysNode(nf7::Env& env) noexcept :
nf7::FileBase(kType, env),
nf7::DirItem(nf7::DirItem::kTree |
nf7::DirItem::kImportant),
dir_(*this, CreateItems(env)) {
}
SysNode(nf7::Deserializer& ar) : SysNode(ar.env()) {
}
void Serialize(nf7::Serializer&) const noexcept override {
}
std::unique_ptr<nf7::File> Clone(nf7::Env& env) const noexcept override {
return std::make_unique<SysNode>(env);
}
void UpdateTree() noexcept override;
nf7::File::Interface* interface(const std::type_info& t) noexcept override {
return nf7::InterfaceSelector<nf7::DirItem>(t).Select(this);
}
private:
nf7::GenericDir dir_;
static nf7::GenericDir::ItemMap CreateItems(nf7::Env& env) noexcept {
nf7::GenericDir::ItemMap items;
items["save"] = CreateItem<Save>(env);
items["exit"] = CreateItem<Exit>(env);
items["panic"] = CreateItem<Panic>(env);
return items;
}
template <typename T>
static std::unique_ptr<nf7::File> CreateItem(nf7::Env& env) noexcept {
static nf7::GenericTypeInfo<NodeFile<T>> kType = {T::kTypeName, {}};
return std::make_unique<NodeFile<T>>(kType, env);
}
};
void SysNode::UpdateTree() noexcept {
for (const auto& p : dir_.items()) {
auto& f = *p.second;
constexpr auto kFlags =
ImGuiTreeNodeFlags_Leaf |
ImGuiTreeNodeFlags_NoTreePushOnOpen |
ImGuiTreeNodeFlags_SpanFullWidth;
ImGui::TreeNodeEx(p.first.c_str(), kFlags);
if (ImGui::IsItemHovered()) {
ImGui::BeginTooltip();
p.second->type().UpdateTooltip();
ImGui::EndTooltip();
}
if (ImGui::BeginDragDropSource()) {
gui::dnd::Send(gui::dnd::kFilePath, f.abspath());
ImGui::TextDisabled(f.abspath().Stringify().c_str());
ImGui::EndDragDropSource();
}
}
}
template <typename T>
class SysNode::NodeFile final : public nf7::File, public nf7::Node {
public:
static inline const char* kTypeDescription = T::kTypeDescription;
NodeFile(const nf7::File::TypeInfo& t, nf7::Env& env) noexcept :
nf7::File(t, env),
nf7::Node(nf7::Node::kNone) {
}
void Serialize(nf7::Serializer&) const noexcept override {}
std::unique_ptr<nf7::File> Clone(nf7::Env& env) const noexcept override {
return std::make_unique<NodeFile<T>>(type(), env);
}
std::shared_ptr<nf7::Node::Lambda> CreateLambda(
const std::shared_ptr<nf7::Node::Lambda>& parent) noexcept override {
return std::make_shared<T>(*this, parent);
}
nf7::Node::Meta GetMeta() const noexcept override {
return T::kMeta;
}
nf7::File::Interface* interface(const std::type_info& t) noexcept override {
return nf7::InterfaceSelector<nf7::Node>(t).Select(this);
}
};
class SysNode::Save final : public nf7::Node::Lambda,
class Save final : public nf7::Node::Lambda,
public std::enable_shared_from_this<Save> {
public:
using nf7::Node::Lambda::Lambda;
static inline const char* kTypeName = "System/Node/Save";
static inline const char* kTypeDescription = "Persists the filesystem root";
static inline nf7::GenericTypeInfo<nf7::PureNodeFile<Save>> kType = {
"System/Node/Save", {"nf7::DirItem"},
};
static inline const nf7::Node::Meta kMeta = { {"exec"}, {}, };
using nf7::Node::Lambda::Lambda;
void Handle(const nf7::Node::Lambda::Msg&) noexcept override {
env().ExecMain(shared_from_this(), [this]() {
env().Save();
@ -150,29 +29,27 @@ class SysNode::Save final : public nf7::Node::Lambda,
}
};
class SysNode::Exit final : public nf7::Node::Lambda {
class Exit final : public nf7::Node::Lambda {
public:
using nf7::Node::Lambda::Lambda;
static inline const char* kTypeName = "System/Node/Exit";
static inline const char* kTypeDescription = "Terminates Nf7 immediately";
static inline nf7::GenericTypeInfo<nf7::PureNodeFile<Exit>> kType = {
"System/Node/Exit", {"nf7::DirItem"},
};
static inline const nf7::Node::Meta kMeta = { {"exec"}, {}, };
using nf7::Node::Lambda::Lambda;
void Handle(const nf7::Node::Lambda::Msg&) noexcept override {
env().Exit();
}
};
class SysNode::Panic final : public nf7::Node::Lambda {
class Panic final : public nf7::Node::Lambda {
public:
using nf7::Node::Lambda::Lambda;
static inline const char* kTypeName = "System/Node/Panic";
static inline const char* kTypeDescription = "Causes a panic";
static inline nf7::GenericTypeInfo<nf7::PureNodeFile<Panic>> kType = {
"System/Node/Panic", {"nf7::DirItem"},
};
static inline const nf7::Node::Meta kMeta = { {"exec"}, {}, };
using nf7::Node::Lambda::Lambda;
void Handle(const nf7::Node::Lambda::Msg& in) noexcept override {
try {
if (in.value.isString()) {

7
init.hh
View File

@ -21,7 +21,12 @@ inline std::unique_ptr<nf7::File> CreateRoot(nf7::Env& env) noexcept {
auto& node = Add(root, "node", "System/Dir").interfaceOrThrow<nf7::Dir>();
{
Add(node, "system", "System/Node");
auto& system = Add(node, "system", "System/Node").interfaceOrThrow<nf7::Dir>();
{
Add(system, "save", "System/Node/Save");
Add(system, "exit", "System/Node/Exit");
Add(system, "panic", "System/Node/Panic");
}
}
Add(root, "home", "System/Dir").interfaceOrThrow<nf7::Dir>();