diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-05-05 21:30:00 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-05-05 21:30:00 -0400 |
| commit | 31acba8305e6e624c7cd13d7153b21814265e08d (patch) | |
| tree | 172316cf74adc098ba63950f7814bfdd1fa0ee91 /libs | |
| parent | 4a301595bdfb8ada086c501630181c07594f52a8 (diff) | |
debugging rename/save-as
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/session_state.cc | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index ae10b281fc..780c5802f0 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -3670,29 +3670,25 @@ Session::rename (const std::string& new_name, bool after_copy) for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) { - if (first) { - /* primary session directory */ - newstr = _path; - first = false; - } else { - oldstr = (*i).path; - - /* this is a stupid hack because Glib::path_get_dirname() is - * lexical-only, and so passing it /a/b/c/ gives a different - * result than passing it /a/b/c ... - */ - - if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) { - oldstr = oldstr.substr (0, oldstr.length() - 1); - } - - string base = Glib::path_get_dirname (oldstr); - string p = Glib::path_get_basename (oldstr); - - newstr = Glib::build_filename (base, legal_name); + oldstr = (*i).path; + + /* this is a stupid hack because Glib::path_get_dirname() is + * lexical-only, and so passing it /a/b/c/ gives a different + * result than passing it /a/b/c ... + */ + + if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) { + oldstr = oldstr.substr (0, oldstr.length() - 1); } + string base = Glib::path_get_dirname (oldstr); + + newstr = Glib::build_filename (base, legal_name); + + cerr << "Looking for " << newstr << endl; + if (Glib::file_test (newstr, Glib::FILE_TEST_EXISTS)) { + cerr << " exists\n"; return -1; } } @@ -3727,6 +3723,7 @@ Session::rename (const std::string& new_name, bool after_copy) if (!after_copy) { cerr << "Rename " << oldstr << " => " << newstr << endl; if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) { + cerr << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl; error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg; return 1; } @@ -3768,6 +3765,10 @@ Session::rename (const std::string& new_name, bool after_copy) cerr << "Rename " << old_interchange_dir << " => " << new_interchange_dir << endl; if (::g_rename (old_interchange_dir.c_str(), new_interchange_dir.c_str()) != 0) { + cerr << string_compose (_("renaming %s as %2 failed (%3)"), + old_interchange_dir, new_interchange_dir, + g_strerror (errno)) + << endl; error << string_compose (_("renaming %s as %2 failed (%3)"), old_interchange_dir, new_interchange_dir, g_strerror (errno)) @@ -3784,6 +3785,7 @@ Session::rename (const std::string& new_name, bool after_copy) cerr << "Rename " << oldstr << " => " << newstr << endl; if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) { + cerr << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl; error << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg; return 1; } @@ -3798,6 +3800,7 @@ Session::rename (const std::string& new_name, bool after_copy) cerr << "Rename " << oldstr << " => " << newstr << endl; if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) { + cerr << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl; error << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg; return 1; } |