X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ffile_source.cc;h=09214981861f142536d714b894b44adeb8e2d2a1;hb=9cb678ebcc2ca0c7993bdd182c9e6ad1f8adf09a;hp=e6990aa487bfa09f2f1e896bde3add2632f6ee57;hpb=41d0052d19b44474b09b8066838c2479d9788d83;p=ardour.git diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index e6990aa487..0921498186 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,8 +55,8 @@ 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) @@ -68,7 +67,7 @@ FileSource::FileSource (Session& session, DataType type, const string& path, con } 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 @@ -87,7 +86,7 @@ FileSource::prevent_deletion () { /* if this file already exists, it cannot be removed, ever */ - + if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)) { if (!(_flags & Destructive)) { mark_immutable (); @@ -101,9 +100,9 @@ bool FileSource::removable () const { bool r = ((_flags & Removable) - && ((_flags & RemoveAtDestroy) || + && ((_flags & RemoveAtDestroy) || ((_flags & RemovableIfEmpty) && empty() == 0))); - + return r; } @@ -112,26 +111,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; @@ -235,17 +232,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 +252,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 +316,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 +337,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 +384,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 @@ -490,7 +521,7 @@ out: int FileSource::set_source_name (const string& newname, bool destructive) { - Glib::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_lock); string oldpath = _path; string newpath = _session.change_source_path_by_name (oldpath, _name, newname, destructive); @@ -504,7 +535,7 @@ FileSource::set_source_name (const string& newname, bool destructive) 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; } - + 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; @@ -525,6 +556,15 @@ FileSource::mark_immutable () } } +void +FileSource::mark_immutable_except_write () +{ + /* destructive sources stay writable, and their other flags don't change. */ + if (!(_flags & Destructive)) { + _flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy|CanRename)); + } +} + void FileSource::mark_nonremovable () { @@ -543,9 +583,9 @@ FileSource::set_path (const std::string& newpath) _path = newpath; } -void +void FileSource::inc_use_count () { Source::inc_use_count (); } - +