X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ffile_source.cc;h=e35ee81364ce17afd9353b5137d16fa1ec633ca8;hb=204baa31d842d4c2f833d319b6fa55e402a1bfb8;hp=95ab3e9f3dca3c83cc77de12ad65d12077e415db;hpb=5c6ba165f684fbd45be33c83d41083567d4dd88f;p=ardour.git diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index 95ab3e9f3d..e35ee81364 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -54,17 +54,21 @@ using namespace Glib; PBD::Signal3 > FileSource::AmbiguousFileName; -FileSource::FileSource (Session& session, DataType type, const string& path, Source::Flag flag) +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) , _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 @@ -74,15 +78,31 @@ FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist _path = _name; _within_session = true; + + prevent_deletion (); +} + +void +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 (); + } 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() == 0))); return r; } @@ -102,11 +122,13 @@ FileSource::init (const string& pathstr, bool must_exist) } } - set_within_session_from_path (pathstr); + set_within_session_from_path (_path); - if (_within_session) { - _name = Glib::path_get_basename (_name); - } + 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; @@ -126,6 +148,10 @@ FileSource::set_state (const XMLNode& node, int /*version*/) _channel = 0; } + if ((prop = node.property (X_("origin"))) != 0) { + _origin = prop->value(); + } + return 0; } @@ -165,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; } @@ -209,83 +235,120 @@ 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) { - string search_path = s.source_search_path (type); - - string pathstr = path; bool ret = false; - - cerr << "Searching along " << search_path << endl; + string keeppath; isnew = false; - vector dirs; - vector hits; - int cnt; - string fullpath; - string keeppath; - - if (search_path.length() == 0) { - error << _("FileSource: search path not set") << endmsg; - goto out; - } - - split (search_path, dirs, ':'); - - cnt = 0; - hits.clear (); - - for (vector::iterator i = dirs.begin(); i != dirs.end(); ++i) { - - cerr << "Searching in " << *i << " for " << pathstr << endl; - - fullpath = Glib::build_filename (*i, pathstr); - - 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 (pathstr, search_path, hits).get_value_or (-1); + if (!Glib::path_is_absolute (path)) { + vector dirs; + vector hits; + string fullpath; + + string search_path = s.source_search_path (type); - if (which < 0) { + if (search_path.length() == 0) { + error << _("FileSource: search path not set") << endmsg; goto out; - } else { - keeppath = hits[which]; } - - } else if (cnt == 0) { - - if (must_exist) { - error << string_compose( - _("Filesource: cannot find required file (%1): while searching %2"), - pathstr, search_path) << endmsg; - goto out; - } else { - isnew = true; + + split (search_path, dirs, ':'); + + 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); + } } + + /* 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. + */ + + vector de_duped_hits; + + for (vector::iterator i = hits.begin(); i != hits.end(); ++i) { + + vector::iterator j = i; + ++j; + + while (j != hits.end()) { + + struct stat bufA; + int const rA = stat (i->c_str(), &bufA); + struct stat bufB; + int const rB = stat (j->c_str(), &bufB); + + if (rA == 0 && rB == 0 && bufA.st_ino == bufB.st_ino) { + /* *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 = de_duped_hits[which]; + } + + } 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"), + path, search_path) << endmsg; + goto out; + } 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) { error << "FileSource::find(), keeppath = \"\", but the file must exist" << endl; } else { - keeppath = pathstr; + keeppath = path; } } - + found_path = keeppath; - + ret = true; - + out: return ret; } @@ -328,7 +391,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 @@ -479,7 +542,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; @@ -512,41 +575,15 @@ 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 (); } - +