X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Ftemplate_utils.cc;h=7797440f0e0a1720e52108e221196ccbcf313422;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=ae7f653fb8abf405c0f222752c08cc6410c0e540;hpb=c21479a3aae97923e1c5f2e784784b28f8cf883e;p=ardour.git

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index ae7f653fb8..7797440f0e 100644
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -1,89 +1,128 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <algorithm>
 #include <cstring>
 
-#include "pbd/filesystem.h"
-#include "pbd/pathscanner.h"
+#include <glibmm.h>
+
+#include "pbd/basename.h"
+#include "pbd/file_utils.h"
+#include "pbd/stl_delete.h"
 #include "pbd/xml++.h"
 
 #include "ardour/template_utils.h"
 #include "ardour/directory_names.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/filename_extensions.h"
+#include "ardour/search_paths.h"
 #include "ardour/io.h"
 
+using namespace std;
+using namespace PBD;
+
 namespace ARDOUR {
 
-sys::path
-system_template_directory ()
+std::string
+user_template_directory ()
 {
-	SearchPath spath(system_data_search_path());
-	spath.add_subdirectory_to_paths(templates_dir_name);
-
-	// just return the first directory in the search path that exists
-	SearchPath::const_iterator i = std::find_if(spath.begin(), spath.end(), sys::exists);
-
-	if (i == spath.end()) return sys::path();
-
-	return *i;
+	return Glib::build_filename (user_config_directory(), templates_dir_name);
 }
 
-sys::path
-system_route_template_directory ()
+std::string
+user_route_template_directory ()
 {
-	SearchPath spath(system_data_search_path());
-	spath.add_subdirectory_to_paths(route_templates_dir_name);
-
-	// just return the first directory in the search path that exists
-	SearchPath::const_iterator i = std::find_if(spath.begin(), spath.end(), sys::exists);
+	return Glib::build_filename (user_config_directory(), route_templates_dir_name);
+}
 
-	if (i == spath.end()) return sys::path();
+static bool
+template_filter (const string &str, void* /*arg*/)
+{
+	if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) {
+		return false;
+	}
 
-	return *i;
+	return true;
 }
 
-sys::path
-user_template_directory ()
+static bool
+route_template_filter (const string &str, void* /*arg*/)
 {
-	sys::path p(user_config_directory());
-	p /= templates_dir_name;
+	if (str.find (template_suffix) == str.length() - strlen (template_suffix)) {
+		return true;
+	}
 
-	return p;
+	return false;
 }
 
-sys::path
-user_route_template_directory ()
+string
+session_template_dir_to_file (string const & dir)
 {
-	sys::path p(user_config_directory());
-	p /= route_templates_dir_name;
-
-	return p;
+	return Glib::build_filename (dir, Glib::path_get_basename(dir) + template_suffix);
 }
 
-static bool
-template_filter (const string &str, void *arg)
+
+void
+find_session_templates (vector<TemplateInfo>& template_names)
 {
-	return (str.length() > strlen(temp_suffix) &&
-		str.find (temp_suffix) == (str.length() - strlen (temp_suffix)));
+	vector<string> templates;
+
+	find_paths_matching_filter (templates, template_search_path(), template_filter, 0, true, true);
+
+	if (templates.empty()) {
+		cerr << "Found nothing along " << template_search_path().to_string() << endl;
+		return;
+	}
+
+	cerr << "Found " << templates.size() << " along " << template_search_path().to_string() << endl;
+
+	for (vector<string>::iterator i = templates.begin(); i != templates.end(); ++i) {
+		string file = session_template_dir_to_file (*i);
+
+		XMLTree tree;
+
+		if (!tree.read (file.c_str())) {
+			continue;
+		}
+
+		TemplateInfo rti;
+
+		rti.name = basename_nosuffix (*i);
+		rti.path = *i;
+
+		template_names.push_back (rti);
+	}
 }
 
 void
-find_route_templates (vector<RouteTemplateInfo>& template_names)
+find_route_templates (vector<TemplateInfo>& template_names)
 {
-	vector<string *> *templates;
-	PathScanner scanner;
-	SearchPath spath (system_data_search_path());
+	vector<string> templates;
 
-	spath += user_config_directory();
-	spath.add_subdirectory_to_paths(route_templates_dir_name);
+	find_files_matching_filter (templates, route_template_search_path(), route_template_filter, 0, false, true);
 
-	templates = scanner (spath.to_string(), template_filter, 0, false, true);
-	
-	if (!templates) {
+	if (templates.empty()) {
 		return;
 	}
-	
-	for (vector<string*>::iterator i = templates->begin(); i != templates->end(); ++i) {
-		string fullpath = *(*i);
+
+	for (vector<string>::iterator i = templates.begin(); i != templates.end(); ++i) {
+		string fullpath = *i;
 
 		XMLTree tree;
 
@@ -92,16 +131,14 @@ find_route_templates (vector<RouteTemplateInfo>& template_names)
 		}
 
 		XMLNode* root = tree.root();
-		
-		RouteTemplateInfo rti;
+
+		TemplateInfo rti;
 
 		rti.name = IO::name_from_state (*root->children().front());
 		rti.path = fullpath;
 
 		template_names.push_back (rti);
 	}
-
-	free (templates);
 }
 
-} // namespace ARDOUR
+}