X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_directory.cc;h=9d0be414da7edee302ed307da83a435cf849713e;hb=456fb789d3adcdb52de3abd863c1bf64c973effa;hp=99a252ecb502be34d1abc960b1df93240d15b3b2;hpb=cc18cf3516cd67a1eec0f1e7ed188969c0c646f1;p=ardour.git diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc index 99a252ecb5..9d0be414da 100644 --- a/libs/ardour/session_directory.cc +++ b/libs/ardour/session_directory.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Tim Mayberry + Copyright (C) 2007 Tim Mayberry 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 @@ -21,138 +21,164 @@ #include #include -#include -#include -#include +#include "pbd/error.h" +#include "pbd/compose.h" +#include "pbd/file_utils.h" -#include -#include +#include "ardour/directory_names.h" +#include "ardour/session_directory.h" +#include "ardour/utils.h" #include "i18n.h" namespace ARDOUR { +using namespace std; using namespace PBD::sys; -SessionDirectory::SessionDirectory (const string& session_path) +SessionDirectory::SessionDirectory (const std::string& session_path) : m_root_path(session_path) { } +SessionDirectory& +SessionDirectory::operator= (const std::string& newpath) +{ + m_root_path = newpath; + return *this; +} + bool SessionDirectory::create () { - bool is_new = false; - - vector sub_dirs = sub_directories (); - for (vector::const_iterator i = sub_dirs.begin(); i != sub_dirs.end(); ++i) + vector sub_dirs = sub_directories (); + for (vector::const_iterator i = sub_dirs.begin(); i != sub_dirs.end(); ++i) { - try - { - if(create_directories(*i)) { - PBD::info << string_compose(_("Created Session directory at path %1"), (*i).to_string()) << endmsg; - is_new = true; - } - } - catch (PBD::sys::filesystem_error& ex) - { - // log the error - PBD::error << string_compose(_("Cannot create Session directory at path %1 Error: %2"), (*i).to_string(), ex.what()) << endmsg; - - // and rethrow - throw ex; + if (g_mkdir_with_parents (i->c_str(), 0755) != 0) { + PBD::error << string_compose(_("Cannot create Session directory at path %1 Error: %2"), *i, g_strerror(errno)) << endmsg; + return false; } } - return is_new; + return true; } bool SessionDirectory::is_valid () const { - if (!is_directory (m_root_path)) return false; + if (!Glib::file_test (m_root_path, Glib::FILE_TEST_IS_DIR)) return false; - vector sub_dirs = sub_directories (); + vector sub_dirs = sub_directories (); - for (vector::iterator i = sub_dirs.begin(); i != sub_dirs.end(); ++i) { - if (!is_directory (*i)) { - PBD::warning << string_compose(_("Session subdirectory does not exist at path %1"), (*i).to_string()) << endmsg; + for (vector::iterator i = sub_dirs.begin(); i != sub_dirs.end(); ++i) { + if (!Glib::file_test (*i, Glib::FILE_TEST_IS_DIR)) { + PBD::warning << string_compose(_("Session subdirectory does not exist at path %1"), *i) << endmsg; return false; } } return true; } -const path +const std::string SessionDirectory::old_sound_path () const { - return path(m_root_path) /= old_sound_dir_name; + return Glib::build_filename (m_root_path, old_sound_dir_name); } -const path -SessionDirectory::sound_path () const +const std::string +SessionDirectory::sources_root () const { - if(is_directory (old_sound_path ())) return old_sound_path(); + std::string p = m_root_path; + std::string filename = Glib::path_get_basename(p); - // the new style sound directory - path l_sound_path(m_root_path); + if (filename == ".") { + p = PBD::get_absolute_path (m_root_path); + } - l_sound_path /= interchange_dir_name; - l_sound_path /= basename(m_root_path); - l_sound_path /= sound_dir_name; + const string legalized_root (legalize_for_path (Glib::path_get_basename(p))); - return l_sound_path; + std::string sources_root_path = Glib::build_filename (m_root_path, interchange_dir_name); + return Glib::build_filename (sources_root_path, legalized_root); } -const path -SessionDirectory::midi_path () const +const std::string +SessionDirectory::sources_root_2X () const { + std::string p = m_root_path; + std::string filename = Glib::path_get_basename(p); + + if (filename == ".") { + p = PBD::get_absolute_path (m_root_path); + } + + const string legalized_root (legalize_for_path_2X (Glib::path_get_basename(p))); + + std::string sources_root_path = Glib::build_filename (m_root_path, interchange_dir_name); + return Glib::build_filename (sources_root_path, legalized_root); +} + +const std::string +SessionDirectory::sound_path () const +{ + if (Glib::file_test (old_sound_path (), Glib::FILE_TEST_IS_DIR)) return old_sound_path(); + // the new style sound directory - path l_midi_path(m_root_path); + return Glib::build_filename (sources_root(), sound_dir_name); +} - l_midi_path /= interchange_dir_name; - l_midi_path /= basename(m_root_path); - l_midi_path /= midi_dir_name; +const std::string +SessionDirectory::sound_path_2X () const +{ + return Glib::build_filename (sources_root_2X(), sound_dir_name); +} - return l_midi_path; +const std::string +SessionDirectory::midi_path () const +{ + return Glib::build_filename (sources_root(), midi_dir_name); } -const path -SessionDirectory::peak_path () const +const std::string +SessionDirectory::midi_patch_path () const { - return path(m_root_path) /= peak_dir_name; + return Glib::build_filename (sources_root(), midi_patch_dir_name); } -const path -SessionDirectory::dead_sound_path () const +const std::string +SessionDirectory::video_path () const +{ + return Glib::build_filename (sources_root(), video_dir_name); +} + +const std::string +SessionDirectory::peak_path () const { - return path(m_root_path) /= dead_sound_dir_name; + return Glib::build_filename (m_root_path, peak_dir_name); } -const path -SessionDirectory::dead_midi_path () const +const std::string +SessionDirectory::dead_path () const { - return path(m_root_path) /= dead_midi_dir_name; + return Glib::build_filename (m_root_path, dead_dir_name); } -const path +const std::string SessionDirectory::export_path () const { - return path(m_root_path) /= export_dir_name; + return Glib::build_filename (m_root_path, export_dir_name); } -const vector +const vector SessionDirectory::sub_directories () const { - vector tmp_paths; + vector tmp_paths; - tmp_paths.push_back ( sound_path () ); - tmp_paths.push_back ( midi_path () ); - tmp_paths.push_back ( peak_path () ); - tmp_paths.push_back ( dead_sound_path () ); - tmp_paths.push_back ( dead_midi_path () ); - tmp_paths.push_back ( export_path () ); + tmp_paths.push_back (sound_path ()); + tmp_paths.push_back (midi_path ()); + tmp_paths.push_back (peak_path ()); + tmp_paths.push_back (dead_path ()); + tmp_paths.push_back (export_path ()); return tmp_paths; }