X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Ftemplate_utils.cc;h=7797440f0e0a1720e52108e221196ccbcf313422;hp=6dac270a501425ce7077dc2b4ee2b80d26600918;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=c287ebec9b92d7abb48a92daf11bac0152cc6789 diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc index 6dac270a50..7797440f0e 100644 --- a/libs/ardour/template_utils.cc +++ b/libs/ardour/template_utils.cc @@ -1,128 +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 #include -#include "pbd/filesystem.h" +#include + #include "pbd/basename.h" -#include "pbd/pathscanner.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); - - if (i == spath.end()) return sys::path(); - - return *i; + return Glib::build_filename (user_config_directory(), route_templates_dir_name); } -sys::path -user_template_directory () +static bool +template_filter (const string &str, void* /*arg*/) { - sys::path p(user_config_directory()); - p /= templates_dir_name; + if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) { + return false; + } - return p; + return true; } -sys::path -user_route_template_directory () +static bool +route_template_filter (const string &str, void* /*arg*/) { - sys::path p(user_config_directory()); - p /= route_templates_dir_name; + if (str.find (template_suffix) == str.length() - strlen (template_suffix)) { + return true; + } - return p; + return false; } -static bool -template_filter (const string &str, void *arg) +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))); + return Glib::build_filename (dir, Glib::path_get_basename(dir) + template_suffix); } + void find_session_templates (vector& template_names) { - vector *templates; - PathScanner scanner; - SearchPath spath (system_template_directory()); - spath += user_template_directory (); - - templates = scanner (spath.to_string(), template_filter, 0, false, true); - - if (!templates) { - cerr << "Found nothing along " << spath.to_string() << endl; + vector 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 " << spath.to_string() << endl; - - for (vector::iterator i = templates->begin(); i != templates->end(); ++i) { - string fullpath = *(*i); + cerr << "Found " << templates.size() << " along " << template_search_path().to_string() << endl; + + for (vector::iterator i = templates.begin(); i != templates.end(); ++i) { + string file = session_template_dir_to_file (*i); XMLTree tree; - if (!tree.read (fullpath.c_str())) { + if (!tree.read (file.c_str())) { continue; } - XMLNode* root = tree.root(); - TemplateInfo rti; - rti.name = basename_nosuffix (fullpath); - rti.path = fullpath; + rti.name = basename_nosuffix (*i); + rti.path = *i; template_names.push_back (rti); } - - free (templates); } void find_route_templates (vector& template_names) { - vector *templates; - PathScanner scanner; - SearchPath spath (system_route_template_directory()); - spath += user_route_template_directory (); - - templates = scanner (spath.to_string(), template_filter, 0, false, true); - - if (!templates) { + vector templates; + + find_files_matching_filter (templates, route_template_search_path(), route_template_filter, 0, false, true); + + if (templates.empty()) { return; } - - for (vector::iterator i = templates->begin(); i != templates->end(); ++i) { - string fullpath = *(*i); + + for (vector::iterator i = templates.begin(); i != templates.end(); ++i) { + string fullpath = *i; XMLTree tree; @@ -131,7 +131,7 @@ find_route_templates (vector& template_names) } XMLNode* root = tree.root(); - + TemplateInfo rti; rti.name = IO::name_from_state (*root->children().front()); @@ -139,8 +139,6 @@ find_route_templates (vector& template_names) template_names.push_back (rti); } - - free (templates); } }