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.

4 files changed, 10 insertions, 16 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);
 }
 
diff --git a/tests/empty.ingen/empty.ttl b/tests/empty.ingen/graph.ttl
index aaaf6087..aaaf6087 100644
--- a/tests/empty.ingen/empty.ttl
+++ b/tests/empty.ingen/graph.ttl
diff --git a/tests/empty.ingen/manifest.ttl b/tests/empty.ingen/manifest.ttl
index 0bd4224e..c02191ef 100644
--- a/tests/empty.ingen/manifest.ttl
+++ b/tests/empty.ingen/manifest.ttl
@@ -9,8 +9,8 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<empty.ttl>
+<graph.ttl>
 	lv2:prototype ingen:GraphPrototype ;
 	a ingen:Graph ,
 		lv2:Plugin ;
-	rdfs:seeAlso <empty.ttl> .
+	rdfs:seeAlso <graph.ttl> .