diff --git a/src/logic/scripting/io_descriptors.cpp b/src/logic/scripting/io_descriptors.cpp index ead8566d1..71811141a 100644 --- a/src/logic/scripting/io_descriptors.cpp +++ b/src/logic/scripting/io_descriptors.cpp @@ -19,6 +19,18 @@ namespace { std::unique_ptr out; }; std::vector> descriptors; + + int add_descriptor(StreamDescriptor descriptor) { + for (int i = 0; i < static_cast(descriptors.size()); ++i) { + if (!descriptors[i].has_value()) { + descriptors[i] = std::move(descriptor); + return i; + } + } + + descriptors.emplace_back(std::move(descriptor)); + return static_cast(descriptors.size() - 1); + } } std::istream* io_descriptors::get_input(int id) { @@ -121,6 +133,18 @@ void io_descriptors::close(int id) { ::descriptors[id] = std::nullopt; } +int io_descriptors::add_descriptor(std::unique_ptr stream) { + return add_descriptor(StreamDescriptor { + std::move(stream), nullptr + }); +} + +int io_descriptors::add_descriptor(std::unique_ptr stream) { + return add_descriptor(StreamDescriptor { + nullptr, std::move(stream) + }); +} + int io_descriptors::open_descriptor(const io::path& path, bool write, bool read) { std::unique_ptr in; std::unique_ptr out; @@ -138,15 +162,9 @@ int io_descriptors::open_descriptor(const io::path& path, bool write, bool read) return -1; } - for (int i = 0; i < static_cast(descriptors.size()); ++i) { - if (!descriptors[i].has_value()) { - descriptors[i] = StreamDescriptor{ std::move(in), std::move(out) }; - return i; - } - } - - ::descriptors.emplace_back(StreamDescriptor{ std::move(in), std::move(out) }); - return static_cast(::descriptors.size() - 1); + return add_descriptor(StreamDescriptor{ + std::move(in), std::move(out) + }); } diff --git a/src/logic/scripting/io_descriptors.hpp b/src/logic/scripting/io_descriptors.hpp index 56ed21a7a..c3dd5985d 100644 --- a/src/logic/scripting/io_descriptors.hpp +++ b/src/logic/scripting/io_descriptors.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include "io/fwd.hpp" @@ -22,6 +23,8 @@ namespace scripting::io_descriptors { void close(int id); int open_descriptor(const io::path& path, bool write, bool read); + int add_descriptor(std::unique_ptr stream); + int add_descriptor(std::unique_ptr stream); void close_all_descriptors(); }