diff options
| author | David Robillard <d@drobilla.net> | 2022-12-13 01:16:41 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2022-12-14 18:04:27 -0500 |
| commit | 4b56cdf7a925dafd5e4ac085874d2afe294ec456 (patch) | |
| tree | b0fd7ab1b58c1cc4eb4ec0f211b3221522ea2a7f /src/Serialiser.cpp | |
| parent | f6ee1ce7bb45d0f6267b2dad61f6b87c79a5906c (diff) | |
| download | ingen-4b56cdf7a925dafd5e4ac085874d2afe294ec456.tar.gz ingen-4b56cdf7a925dafd5e4ac085874d2afe294ec456.tar.bz2 ingen-4b56cdf7a925dafd5e4ac085874d2afe294ec456.zip | |
Use std::filesystem and std::make_unique
Diffstat (limited to 'src/Serialiser.cpp')
| -rw-r--r-- | src/Serialiser.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp index 21d8286f..7bfa4211 100644 --- a/src/Serialiser.cpp +++ b/src/Serialiser.cpp @@ -28,7 +28,6 @@ #include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" -#include "ingen/filesystem.hpp" #include "ingen/runtime_paths.hpp" #include "lv2/core/lv2.h" #include "lv2/state/state.h" @@ -44,11 +43,14 @@ #include <cassert> #include <cstdint> #include <cstring> +#include <filesystem> #include <map> #include <memory> #include <set> +#include <sstream> #include <stdexcept> #include <string> +#include <string_view> #include <utility> namespace ingen { @@ -190,12 +192,12 @@ Serialiser::Impl::write_bundle(const std::shared_ptr<const Node>& graph, const URI& uri) { FilePath path(uri.path()); - if (filesystem::exists(path) && !filesystem::is_directory(path)) { + if (std::filesystem::exists(path) && !std::filesystem::is_directory(path)) { path = path.parent_path(); } _world.log().info("Writing bundle %1%\n", path); - filesystem::create_directories(path); + std::filesystem::create_directories(path); const FilePath main_file = path / "main.ttl"; const raul::Path old_root_path = _root_path; @@ -454,7 +456,7 @@ Serialiser::Impl::serialise_block(const std::shared_ptr<const Node>& block, if (_base_uri.scheme() == "file") { const FilePath base_path = _base_uri.file_path(); const FilePath graph_dir = base_path.parent_path(); - const FilePath state_dir = graph_dir / block->symbol(); + const FilePath state_dir = graph_dir / std::string(block->symbol()); const FilePath state_file = state_dir / "state.ttl"; if (block->save_state(state_dir)) { _model->add_statement(block_id, |