diff options
| author | David Robillard <d@drobilla.net> | 2016-07-29 19:41:19 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-07-29 19:43:43 -0400 |
| commit | 50a6edb088ead6d8f6287aeca55e4d704add61a2 (patch) | |
| tree | 71a14257ba1ea107f8f454544b30bce7e4c4ec90 /src | |
| parent | 9ff60e9058080ccbea85eee603642a577dd258cf (diff) | |
| download | ingen-50a6edb088ead6d8f6287aeca55e4d704add61a2.tar.gz ingen-50a6edb088ead6d8f6287aeca55e4d704add61a2.tar.bz2 ingen-50a6edb088ead6d8f6287aeca55e4d704add61a2.zip | |
Save bundled graphs to graph.ttl by default
This avoids a lot of hassle with filename construction and renaming,
while ensuring that the internal structure of any graph bundle is the
same.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Parser.cpp | 5 | ||||
| -rw-r--r-- | src/Serialiser.cpp | 17 |
2 files changed, 8 insertions, 14 deletions
diff --git a/src/Parser.cpp b/src/Parser.cpp index 50ccb975..31ab4245 100644 --- a/src/Parser.cpp +++ b/src/Parser.cpp @@ -1,6 +1,6 @@ /* This file is part of Ingen. - Copyright 2007-2015 David Robillard <http://drobilla.net/> + Copyright 2007-2016 David Robillard <http://drobilla.net/> Ingen is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free @@ -312,8 +312,7 @@ parse_block(Ingen::World* world, &ignored); const std::string sub_uri_str = (const char*)sub_uri.buf; - const std::string basename = get_basename(sub_uri_str); - const std::string sub_file = sub_uri_str + '/' + basename + ".ttl"; + const std::string sub_file = sub_uri_str + "/graph.ttl"; const SerdNode sub_base = serd_node_from_string( SERD_URI, (const uint8_t*)sub_file.c_str()); diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp index bb185e9a..ea090f8c 100644 --- a/src/Serialiser.cpp +++ b/src/Serialiser.cpp @@ -1,6 +1,6 @@ /* This file is part of Ingen. - Copyright 2007-2015 David Robillard <http://drobilla.net/> + Copyright 2007-2016 David Robillard <http://drobilla.net/> Ingen is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free @@ -90,8 +90,7 @@ struct Serialiser::Impl { Sord::Node path_rdf_node(const Raul::Path& path); void write_manifest(const std::string& bundle_path, - SPtr<const Node> graph, - const std::string& graph_symbol); + SPtr<const Node> graph); void write_plugins(const std::string& bundle_path, const std::set<const Resource*> plugins); @@ -121,8 +120,7 @@ Serialiser::~Serialiser() void Serialiser::Impl::write_manifest(const std::string& bundle_path, - SPtr<const Node> graph, - const std::string& graph_symbol) + SPtr<const Node> graph) { const string manifest_path(Glib::build_filename(bundle_path, "manifest.ttl")); const string binary_path(Glib::Module::build_path("", "ingen_lv2")); @@ -132,7 +130,7 @@ Serialiser::Impl::write_manifest(const std::string& bundle_path, Sord::World& world = _model->world(); const URIs& uris = _world.uris(); - const string filename(graph_symbol + ".ttl"); + const string filename("graph.ttl"); const Sord::URI subject(world, filename, _base_uri); _model->add_statement(subject, @@ -207,10 +205,7 @@ Serialiser::Impl::write_bundle(SPtr<const Node> graph, g_mkdir_with_parents(path.c_str(), 0744); - string symbol = Glib::path_get_basename(path); - symbol = symbol.substr(0, symbol.find(".")); - - const string root_file = Glib::build_filename(path, symbol + ".ttl"); + const string root_file = Glib::build_filename(path, "graph.ttl"); start_to_filename(root_file); const Raul::Path old_root_path = _root_path; @@ -222,7 +217,7 @@ Serialiser::Impl::write_bundle(SPtr<const Node> graph, _root_path = old_root_path; finish(); - write_manifest(path, graph, symbol); + write_manifest(path, graph); write_plugins(path, plugins); } |