Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

[ardour.git] / libs / ardour / template_utils.cc

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index a7a7eee321c946041cb61417efd8e9c03c6e1325..825a24d3e10a39406414899186f9ecc9a81dbd36 100644 (file)
--- 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"
@@ -64,13 +66,25 @@ user_route_template_directory ()
 }
 
 static bool
-template_filter (const string &str, void *arg)
+template_filter (const string &str, void */*arg*/)
+{
+       if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) {
+               return false;
+       }
+       
+       return true;
+}
+
+string
+session_template_dir_to_file (string const & dir)
 {
-       cerr << "Checking into " << str << " using " << template_suffix << endl;
-       return (str.length() > strlen(template_suffix) &&
-               str.find (template_suffix) == (str.length() - strlen (template_suffix)));
+       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)
 {
@@ -79,28 +93,28 @@ find_session_templates (vector<TemplateInfo>& template_names)
        SearchPath spath (system_template_directory());
        spath += user_template_directory ();
 
-       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;
                return;
        }
 
        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);
        }
@@ -117,11 +131,11 @@ find_route_templates (vector<TemplateInfo>& template_names)
        spath += user_route_template_directory ();
 
        templates = scanner (spath.to_string(), template_filter, 0, false, true);
-       
+
        if (!templates) {
                return;
        }
-       
+
        for (vector<string*>::iterator i = templates->begin(); i != templates->end(); ++i) {
                string fullpath = *(*i);
 
@@ -132,7 +146,7 @@ find_route_templates (vector<TemplateInfo>& template_names)
                }
 
                XMLNode* root = tree.root();
-               
+
                TemplateInfo rti;
 
                rti.name = IO::name_from_state (*root->children().front());
@@ -141,7 +155,7 @@ find_route_templates (vector<TemplateInfo>& template_names)
                template_names.push_back (rti);
        }
 
-       free (templates);
+       delete templates;
 }
 
 }