X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ftemplate_utils.cc;h=3e4797dac1de8bbf361a531f07c11709e5481f4c;hb=39becbeb70aa4ab82b963669d87995a32141981c;hp=aa0a583af4d982771658c92786720ad4108e2448;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index aa0a583af4..3e4797dac1 100644
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -1,6 +1,8 @@
 #include <algorithm>
 #include <cstring>
 
+#include <glibmm.h>
+
 #include "pbd/filesystem.h"
 #include "pbd/basename.h"
 #include "pbd/pathscanner.h"
@@ -17,32 +19,20 @@ using namespace PBD;
 
 namespace ARDOUR {
 
-sys::path
-system_template_directory ()
+SearchPath
+template_search_path ()
 {
-	SearchPath spath(system_data_search_path());
+	SearchPath spath (ardour_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 spath;
 }
 
-sys::path
-system_route_template_directory ()
+SearchPath
+route_template_search_path ()
 {
-	SearchPath spath(system_data_search_path());
+	SearchPath spath (ardour_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);
-
-	if (i == spath.end()) return sys::path();
-
-	return *i;
+	return spath;
 }
 
 sys::path
@@ -59,27 +49,48 @@ user_route_template_directory ()
 {
 	sys::path p(user_config_directory());
 	p /= route_templates_dir_name;
-
+	
 	return p;
 }
 
 static bool
 template_filter (const string &str, void */*arg*/)
 {
-	cerr << "Checking into " << str << " using " << template_suffix << endl;
-	return (str.length() > strlen(template_suffix) &&
-		str.find (template_suffix) == (str.length() - strlen (template_suffix)));
+	if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) {
+		return false;
+	}
+	
+	return true;
 }
 
+static bool
+route_template_filter (const string &str, void */*arg*/)
+{
+	if (str.find (template_suffix) == str.length() - strlen (template_suffix)) {
+		return true;
+	}
+	
+	return false;
+}
+
+string
+session_template_dir_to_file (string const & dir)
+{
+	sys::path dir_path = dir;
+	sys::path file_path = dir;
+	file_path /= dir_path.leaf() + template_suffix;
+	return file_path.to_string ();
+}
+
+
 void
 find_session_templates (vector<TemplateInfo>& template_names)
 {
 	vector<string *> *templates;
 	PathScanner scanner;
-	SearchPath spath (system_template_directory());
-	spath += user_template_directory ();
+	SearchPath spath (template_search_path());
 
-	templates = scanner (spath.to_string(), template_filter, 0, false, true);
+	templates = scanner (spath.to_string(), template_filter, 0, true, true);
 
 	if (!templates) {
 		cerr << "Found nothing along " << spath.to_string() << endl;
@@ -89,18 +100,18 @@ find_session_templates (vector<TemplateInfo>& template_names)
 	cerr << "Found " << templates->size() << " along " << spath.to_string() << endl;
 
 	for (vector<string*>::iterator i = templates->begin(); i != templates->end(); ++i) {
-		string fullpath = *(*i);
+		string file = session_template_dir_to_file (**i);
 
 		XMLTree tree;
 
-		if (!tree.read (fullpath.c_str())) {
+		if (!tree.read (file.c_str())) {
 			continue;
 		}
 
 		TemplateInfo rti;
 
-		rti.name = basename_nosuffix (fullpath);
-		rti.path = fullpath;
+		rti.name = basename_nosuffix (**i);
+		rti.path = **i;
 
 		template_names.push_back (rti);
 	}
@@ -113,10 +124,9 @@ find_route_templates (vector<TemplateInfo>& template_names)
 {
 	vector<string *> *templates;
 	PathScanner scanner;
-	SearchPath spath (system_route_template_directory());
-	spath += user_route_template_directory ();
+	SearchPath spath (route_template_search_path());
 
-	templates = scanner (spath.to_string(), template_filter, 0, false, true);
+	templates = scanner (spath.to_string(), route_template_filter, 0, false, true);
 
 	if (!templates) {
 		return;