X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Ffile_source.cc;h=de2783a1acc5cb908074b182f49f28ee220cf1cb;hb=16a8762dd494adb68756b8d549f349ed7bdccd9b;hp=ae7fbdc38c1d6e2bbda40c1e9580e6d604b79578;hpb=7ac5d03cb870acb429b7fb0c315dd5774d4e0b8c;p=ardour.git diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index ae7fbdc38c..de2783a1ac 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -28,22 +28,21 @@ #include "pbd/convert.h" #include "pbd/basename.h" -#include "pbd/mountpoint.h" #include "pbd/stl_delete.h" #include "pbd/strsplit.h" #include "pbd/shortpath.h" #include "pbd/enumwriter.h" +#include "pbd/file_utils.h" #include #include -#include +#include +#include "ardour/data_type.h" #include "ardour/file_source.h" -#include "ardour/directory_names.h" #include "ardour/session.h" -#include "ardour/session_directory.h" -#include "ardour/source_factory.h" -#include "ardour/filename_extensions.h" +#include "ardour/source.h" +#include "ardour/utils.h" #include "i18n.h" @@ -56,18 +55,17 @@ PBD::Signal3 > FileSource:: FileSource::FileSource (Session& session, DataType type, const string& path, const string& origin, Source::Flag flag) : Source(session, type, path, flag) - , _path(path) - , _file_is_new(true) + , _path (path) + , _file_is_new (!origin.empty()) // origin empty => new file VS. origin !empty => new file , _channel (0) , _origin (origin) + , _open (false) { set_within_session_from_path (path); - - prevent_deletion (); } FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist*/) - : Source(session, node) + : Source (session, node) , _file_is_new (false) { /* this setting of _path is temporary - we expect derived classes @@ -77,32 +75,36 @@ FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist _path = _name; _within_session = true; +} - prevent_deletion (); +FileSource::~FileSource() +{ } void -FileSource::prevent_deletion () +FileSource::existence_check () { - /* if this file already exists, it cannot be removed, ever - */ - if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)) { - if (!(_flags & Destructive)) { - mark_immutable (); - } else { - _flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy)); - } - } + prevent_deletion (); + } +} + +void +FileSource::prevent_deletion () +{ + if (!(_flags & Destructive)) { + mark_immutable (); + } else { + _flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy)); + } } bool FileSource::removable () const { - bool r = (_path.find (stub_dir_name) != string::npos) || - ((_flags & Removable) - && ((_flags & RemoveAtDestroy) || - ((_flags & RemovableIfEmpty) && empty() == 0))); + bool r = ((_flags & Removable) + && ((_flags & RemoveAtDestroy) || + ((_flags & RemovableIfEmpty) && empty()))); return r; } @@ -112,26 +114,24 @@ FileSource::init (const string& pathstr, bool must_exist) { _timeline_position = 0; - if (Stateful::loading_state_version < 3000) { - if (!find_2X (_session, _type, pathstr, must_exist, _file_is_new, _channel, _path)) { - throw MissingSource (pathstr, _type); - } - } else { - if (!find (_session, _type, pathstr, must_exist, _file_is_new, _channel, _path)) { - throw MissingSource (pathstr, _type); - } - } + if (Stateful::loading_state_version < 3000) { + if (!find_2X (_session, _type, pathstr, must_exist, _file_is_new, _channel, _path)) { + throw MissingSource (pathstr, _type); + } + } else { + if (!find (_session, _type, pathstr, must_exist, _file_is_new, _channel, _path)) { + throw MissingSource (pathstr, _type); + } + } set_within_session_from_path (_path); - if (!within_session()) { - _session.ensure_search_path_includes (Glib::path_get_dirname (_path), _type); - } - _name = Glib::path_get_basename (_path); - if (_file_is_new && must_exist) { - return -1; + if (must_exist) { + if (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS)) { + throw MissingSource (pathstr, _type); + } } return 0; @@ -191,7 +191,7 @@ FileSource::move_to_trash (const string& trash_dir_name) snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), version); newpath_v = buf; - while (access (newpath_v.c_str(), F_OK) == 0 && version < 999) { + while (Glib::file_test (newpath_v, Glib::FILE_TEST_EXISTS) && version < 999) { snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), ++version); newpath_v = buf; } @@ -235,17 +235,16 @@ FileSource::move_to_trash (const string& trash_dir_name) */ bool FileSource::find (Session& s, DataType type, const string& path, bool must_exist, - bool& isnew, uint16_t& chan, string& found_path) + bool& isnew, uint16_t& /* chan */, string& found_path) { bool ret = false; string keeppath; isnew = false; - + if (!Glib::path_is_absolute (path)) { vector dirs; vector hits; - int cnt; string fullpath; string search_path = s.source_search_path (type); @@ -256,33 +255,62 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist } split (search_path, dirs, ':'); - - cnt = 0; + hits.clear (); - + for (vector::iterator i = dirs.begin(); i != dirs.end(); ++i) { - + fullpath = Glib::build_filename (*i, path); - + if (Glib::file_test (fullpath, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) { keeppath = fullpath; hits.push_back (fullpath); - ++cnt; } } - - if (cnt > 1) { - - int which = FileSource::AmbiguousFileName (path, search_path, hits).get_value_or (-1); - + + /* Remove duplicate inodes from the list of ambiguous files, since if there are symlinks + in the session path it is possible to arrive at the same file via more than one path. + + I suppose this is not necessary on Windows. + */ + + vector de_duped_hits; + + for (vector::iterator i = hits.begin(); i != hits.end(); ++i) { + + vector::iterator j = i; + ++j; + + while (j != hits.end()) { + if (PBD::equivalent_paths (*i, *j)) { + /* *i and *j are the same file; break out of the loop early */ + break; + } + + ++j; + } + + if (j == hits.end ()) { + de_duped_hits.push_back (*i); + } + } + + if (de_duped_hits.size() > 1) { + + /* more than one match: ask the user */ + + int which = FileSource::AmbiguousFileName (path, search_path, de_duped_hits).get_value_or (-1); + if (which < 0) { goto out; } else { - keeppath = hits[which]; + keeppath = de_duped_hits[which]; } - - } else if (cnt == 0) { - + + } else if (de_duped_hits.size() == 0) { + + /* no match: error */ + if (must_exist) { error << string_compose( _("Filesource: cannot find required file (%1): while searching %2"), @@ -291,13 +319,19 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist } else { isnew = true; } - } + } else { + + /* only one match: happy days */ + + keeppath = de_duped_hits[0]; + } + } else { keeppath = path; } - + /* Current find() is unable to parse relative path names to yet non-existant - sources. QuickFix(tm) + sources. QuickFix(tm) */ if (keeppath == "") { if (must_exist) { @@ -306,11 +340,11 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist keeppath = path; } } - + found_path = keeppath; - + ret = true; - + out: return ret; } @@ -353,7 +387,7 @@ FileSource::find_2X (Session& s, DataType type, const string& path, bool must_ex cnt = 0; for (vector::iterator i = dirs.begin(); i != dirs.end(); ++i) { - + fullpath = Glib::build_filename (*i, pathstr); /* i (paul) made a nasty design error by using ':' as a special character in @@ -487,41 +521,21 @@ out: return ret; } -int -FileSource::set_source_name (const string& newname, bool destructive) +void +FileSource::mark_immutable () { - Glib::Mutex::Lock lm (_lock); - string oldpath = _path; - string newpath = _session.change_source_path_by_name (oldpath, _name, newname, destructive); - - if (newpath.empty()) { - error << string_compose (_("programming error: %1"), "cannot generate a changed file path") << endmsg; - return -1; - } - - // Test whether newpath exists, if yes notify the user but continue. - if (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)) { - error << string_compose (_("Programming error! %1 tried to rename a file over another file! It's safe to continue working, but please report this to the developers."), PROGRAM_NAME) << endmsg; - return -1; + /* destructive sources stay writable, and their other flags don't change. */ + if (!(_flags & Destructive)) { + _flags = Flag (_flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy|CanRename)); } - - if (::rename (oldpath.c_str(), newpath.c_str()) != 0) { - error << string_compose (_("cannot rename file %1 to %2 (%3)"), oldpath, newpath, strerror(errno)) << endmsg; - return -1; - } - - _name = Glib::path_get_basename (newpath); - _path = newpath; - - return 0; } void -FileSource::mark_immutable () +FileSource::mark_immutable_except_write () { /* destructive sources stay writable, and their other flags don't change. */ if (!(_flags & Destructive)) { - _flags = Flag (_flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy|CanRename)); + _flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy|CanRename)); } } @@ -537,41 +551,33 @@ FileSource::set_within_session_from_path (const std::string& path) _within_session = _session.path_is_within_session (path); } -int -FileSource::unstubify () -{ - string::size_type pos = _path.find (stub_dir_name); - - if (pos == string::npos || (_flags & Destructive)) { - return 0; - } - - vector v; - - v.push_back (Glib::path_get_dirname (Glib::path_get_dirname (_path))); - v.push_back (Glib::path_get_basename(_path)); - - string newpath = Glib::build_filename (v); - - if (::rename (_path.c_str(), newpath.c_str()) != 0) { - error << string_compose (_("rename from %1 to %2 failed: %3)"), _path, newpath, strerror (errno)) << endmsg; - return -1; - } - - set_path (newpath); - - return 0; -} - void FileSource::set_path (const std::string& newpath) { _path = newpath; } -void +void FileSource::inc_use_count () { Source::inc_use_count (); } - + +bool +FileSource::is_stub () const +{ + if (!empty()) { + return false; + } + + if (!removable()) { + return false; + } + + if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)) { + return false; + } + + return true; +} +