#include "pbd/error.h"
#include "pbd/compose.h"
#include "pbd/file_utils.h"
+#include "pbd/openuri.h"
#include "ardour/directory_names.h"
#include "ardour/session_directory.h"
#include "ardour/utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
namespace ARDOUR {
return Glib::build_filename (m_root_path, old_sound_dir_name);
}
-static bool leading_dot (const std::string& value) { return value.at(0) == '.'; }
-
const std::string
SessionDirectory::sources_root () const
{
try {
Glib::Dir dir(sources_root_path);
- std::list<std::string> entries (dir.begin(), dir.end());
+ std::list<std::string> entries;
- // filter out dirs starting with a dot. e.g ".DS_Store"
- entries.remove_if (leading_dot);
+ for (Glib::DirIterator di = dir.begin(); di != dir.end(); di++) {
+ // ignore hidden files (eg. OS X ".DS_Store")
+ if ((*di).at(0) == '.') {
+ continue;
+ }
+ // and skip regular files (eg. Win Thumbs.db)
+ string fullpath = Glib::build_filename (sources_root_path, *di);
+ if (!Glib::file_test (fullpath, Glib::FILE_TEST_IS_DIR)) {
+ continue;
+ }
+ entries.push_back(*di);
+ }
if (entries.size() == 1) {
if (entries.front() != legalized_root) {
root_cache[m_root_path] = Glib::build_filename (sources_root_path, entries.front());
}
else if (entries.size() > 1) {
+ PBD::open_folder (sources_root_path);
PBD::fatal << string_compose (_("The session's interchange dir is tainted.\nThere is more than one folder in '%1'.\nPlease remove extra subdirs to reduce possible filename ambiguties."), sources_root_path) << endmsg;
assert (0); // not reached
}