mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-18 20:56:28 +01:00
merge 12717:12954 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12955 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
f1fd9c7bdc
commit
6e824e7797
174 changed files with 2923 additions and 2899 deletions
|
|
@ -19,26 +19,34 @@
|
|||
|
||||
#include <algorithm>
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include <glibmm/fileutils.h>
|
||||
#include <glibmm/miscutils.h>
|
||||
#include <glibmm/pattern.h>
|
||||
|
||||
#include <giomm/file.h>
|
||||
|
||||
#include "pbd/compose.h"
|
||||
#include "pbd/file_utils.h"
|
||||
|
||||
#include "pbd/error.h"
|
||||
#include "pbd/pathscanner.h"
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace PBD {
|
||||
|
||||
void
|
||||
get_files_in_directory (const sys::path& directory_path, vector<string>& result)
|
||||
get_files_in_directory (const std::string& directory_path, vector<string>& result)
|
||||
{
|
||||
if (!is_directory(directory_path)) return;
|
||||
if (!Glib::file_test (directory_path, Glib::FILE_TEST_IS_DIR)) return;
|
||||
|
||||
try
|
||||
{
|
||||
Glib::Dir dir(directory_path.to_string());
|
||||
Glib::Dir dir(directory_path);
|
||||
std::copy(dir.begin(), dir.end(), std::back_inserter(result));
|
||||
}
|
||||
catch (Glib::FileError& err)
|
||||
|
|
@ -48,9 +56,9 @@ get_files_in_directory (const sys::path& directory_path, vector<string>& result)
|
|||
}
|
||||
|
||||
void
|
||||
find_matching_files_in_directory (const sys::path& directory,
|
||||
find_matching_files_in_directory (const std::string& directory,
|
||||
const Glib::PatternSpec& pattern,
|
||||
vector<sys::path>& result)
|
||||
vector<std::string>& result)
|
||||
{
|
||||
vector<string> tmp_files;
|
||||
|
||||
|
|
@ -63,19 +71,19 @@ find_matching_files_in_directory (const sys::path& directory,
|
|||
{
|
||||
if (!pattern.match(*file_iter)) continue;
|
||||
|
||||
sys::path full_path(directory);
|
||||
full_path /= *file_iter;
|
||||
std::string full_path(directory);
|
||||
full_path = Glib::build_filename (full_path, *file_iter);
|
||||
|
||||
result.push_back(full_path);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
find_matching_files_in_directories (const vector<sys::path>& paths,
|
||||
find_matching_files_in_directories (const vector<std::string>& paths,
|
||||
const Glib::PatternSpec& pattern,
|
||||
vector<sys::path>& result)
|
||||
vector<std::string>& result)
|
||||
{
|
||||
for (vector<sys::path>::const_iterator path_iter = paths.begin();
|
||||
for (vector<std::string>::const_iterator path_iter = paths.begin();
|
||||
path_iter != paths.end();
|
||||
++path_iter)
|
||||
{
|
||||
|
|
@ -86,7 +94,7 @@ find_matching_files_in_directories (const vector<sys::path>& paths,
|
|||
void
|
||||
find_matching_files_in_search_path (const SearchPath& search_path,
|
||||
const Glib::PatternSpec& pattern,
|
||||
vector<sys::path>& result)
|
||||
vector<std::string>& result)
|
||||
{
|
||||
find_matching_files_in_directories (search_path, pattern, result);
|
||||
}
|
||||
|
|
@ -94,9 +102,9 @@ find_matching_files_in_search_path (const SearchPath& search_path,
|
|||
bool
|
||||
find_file_in_search_path(const SearchPath& search_path,
|
||||
const string& filename,
|
||||
sys::path& result)
|
||||
std::string& result)
|
||||
{
|
||||
vector<sys::path> tmp;
|
||||
vector<std::string> tmp;
|
||||
Glib::PatternSpec tmp_pattern(filename);
|
||||
|
||||
find_matching_files_in_search_path (search_path, tmp_pattern, tmp);
|
||||
|
|
@ -113,7 +121,7 @@ find_file_in_search_path(const SearchPath& search_path,
|
|||
(
|
||||
"Found more than one file matching %1 in search path %2",
|
||||
filename,
|
||||
search_path.to_string ()
|
||||
search_path ()
|
||||
)
|
||||
<< endmsg;
|
||||
}
|
||||
|
|
@ -124,4 +132,109 @@ find_file_in_search_path(const SearchPath& search_path,
|
|||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
copy_file(const std::string & from_path, const std::string & to_path)
|
||||
{
|
||||
if (!Glib::file_test (from_path, Glib::FILE_TEST_EXISTS)) return false;
|
||||
|
||||
Glib::RefPtr<Gio::File> from_file = Gio::File::create_for_path(from_path);
|
||||
Glib::RefPtr<Gio::File> to_file = Gio::File::create_for_path(to_path);
|
||||
|
||||
try
|
||||
{
|
||||
from_file->copy (to_file, Gio::FILE_COPY_OVERWRITE);
|
||||
}
|
||||
catch(const Glib::Exception& ex)
|
||||
{
|
||||
error << string_compose (_("Unable to Copy file %1 to %2 (%3)"),
|
||||
from_path, to_path, ex.what())
|
||||
<< endmsg;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
static
|
||||
bool accept_all_files (string const &, void *)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
copy_files(const std::string & from_path, const std::string & to_dir)
|
||||
{
|
||||
PathScanner scanner;
|
||||
vector<string*>* files = scanner (from_path, accept_all_files, 0, true, false);
|
||||
for (vector<string*>::iterator i = files->begin(); i != files->end(); ++i) {
|
||||
std::string from = Glib::build_filename (from_path, **i);
|
||||
std::string to = Glib::build_filename (to_dir, **i);
|
||||
copy_file (from, to);
|
||||
}
|
||||
}
|
||||
|
||||
std::string
|
||||
get_absolute_path (const std::string & p)
|
||||
{
|
||||
Glib::RefPtr<Gio::File> f = Gio::File::create_for_path (p);
|
||||
return f->get_path ();
|
||||
}
|
||||
|
||||
bool
|
||||
equivalent_paths (const std::string& a, const std::string& b)
|
||||
{
|
||||
struct stat bA;
|
||||
int const rA = g_stat (a.c_str(), &bA);
|
||||
struct stat bB;
|
||||
int const rB = g_stat (b.c_str(), &bB);
|
||||
|
||||
return (rA == 0 && rB == 0 && bA.st_dev == bB.st_dev && bA.st_ino == bB.st_ino);
|
||||
}
|
||||
|
||||
bool
|
||||
path_is_within (std::string const & haystack, std::string needle)
|
||||
{
|
||||
while (1) {
|
||||
if (equivalent_paths (haystack, needle)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
needle = Glib::path_get_dirname (needle);
|
||||
if (needle == "." || needle == "/") {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool
|
||||
exists_and_writable (const std::string & p)
|
||||
{
|
||||
/* writable() really reflects the whole folder, but if for any
|
||||
reason the session state file can't be written to, still
|
||||
make us unwritable.
|
||||
*/
|
||||
|
||||
struct stat statbuf;
|
||||
|
||||
if (g_stat (p.c_str(), &statbuf) != 0) {
|
||||
/* doesn't exist - not writable */
|
||||
return false;
|
||||
} else {
|
||||
if (!(statbuf.st_mode & S_IWUSR)) {
|
||||
/* exists and is not writable */
|
||||
return false;
|
||||
}
|
||||
/* filesystem may be mounted read-only, so even though file
|
||||
* permissions permit access, the mount status does not.
|
||||
* access(2) seems like the best test for this.
|
||||
*/
|
||||
if (g_access (p.c_str(), W_OK) != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace PBD
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue