remove file manager LRU cache from code.

[ardour.git] / libs / pbd / file_utils.cc

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index 632347c41aadf056eccbe9f8bb61383174031ac5..89f6818704c9d8c05d0ad2dc7c668cadc8e2d05d 100644 (file)
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -141,18 +141,18 @@ bool accept_all_files (string const &, void *)
 
 void
 get_paths (vector<string>& result,
-           const std::string& directory_path,
+           const Searchpath& paths,
            bool files_only,
            bool recurse)
 {
-       run_functor_for_paths (result, directory_path, accept_all_files, 0,
+       run_functor_for_paths (result, paths, accept_all_files, 0,
                               files_only, true, true, recurse);
 }
 
 void
-get_files (vector<string>& result, const std::string& directory_path)
+get_files (vector<string>& result, const Searchpath& paths)
 {
-       return get_paths (result, directory_path, true, false);
+       return get_paths (result, paths, true, false);
 }
 
 static
@@ -259,10 +259,10 @@ find_paths_matching_filter (vector<string>& result,
                             const Searchpath& paths,
                             bool (*filter)(const string &, void *),
                             void *arg,
-                            bool match_fullpath, bool return_fullpath,
+                            bool pass_fullpath, bool return_fullpath,
                             bool recurse)
 {
-       run_functor_for_paths (result, paths, filter, arg, false, match_fullpath, return_fullpath, recurse);
+       run_functor_for_paths (result, paths, filter, arg, false, pass_fullpath, return_fullpath, recurse);
 }
 
 void
@@ -270,10 +270,10 @@ find_files_matching_filter (vector<string>& result,
                             const Searchpath& paths,
                             bool (*filter)(const string &, void *),
                             void *arg,
-                            bool match_fullpath, bool return_fullpath,
+                            bool pass_fullpath, bool return_fullpath,
                             bool recurse)
 {
-       run_functor_for_paths (result, paths, filter, arg, true, match_fullpath, return_fullpath, recurse);
+       run_functor_for_paths (result, paths, filter, arg, true, pass_fullpath, return_fullpath, recurse);
 }
 
 bool
@@ -281,19 +281,17 @@ copy_file(const std::string & from_path, const std::string & to_path)
 {
        if (!Glib::file_test (from_path, Glib::FILE_TEST_EXISTS)) return false;
 
-       int fd_from = -1;
-       int fd_to = -1;
+       int fd_from (::open (from_path.c_str(), O_RDONLY));
+       int fd_to (::open (to_path.c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666));
+
        char buf[4096]; // BUFSIZ  ??
        ssize_t nread;
 
-       fd_from = ::open(from_path.c_str(), O_RDONLY);
-       if (fd_from < 0) {
-               goto copy_error;
-       }
-
-       fd_to = ::open(to_path.c_str(), O_WRONLY | O_CREAT, 0666);
-       if (fd_to < 0) {
-               goto copy_error;
+       if ((fd_from < 0) || (fd_to < 0)) {
+               error << string_compose (_("Unable to Open files %1 to %2 for Copying(%3)"),
+                               from_path, to_path, g_strerror(errno))
+                     << endmsg;
+               return false;
        }
 
        while (nread = ::read(fd_from, buf, sizeof(buf)), nread > 0) {
@@ -304,34 +302,15 @@ copy_file(const std::string & from_path, const std::string & to_path)
                                nread -= nwritten;
                                out_ptr += nwritten;
                        } else if (errno != EINTR) {
-                               goto copy_error;
+                               error << string_compose (_("Unable to Copy files %1 to %2(%3)"),
+                                               from_path, to_path, g_strerror(errno))
+                                       << endmsg;
+                               return false;
                        }
                } while (nread > 0);
        }
 
-       if (nread == 0) {
-               if (::close(fd_to)) {
-                       fd_to = -1;
-                       goto copy_error;
-               }
-               ::close(fd_from);
-               return true;
-       }
-
-copy_error:
-       int saved_errno = errno;
-
-       if (fd_from >= 0) {
-               ::close(fd_from);
-       }
-       if (fd_to >= 0) {
-               ::close(fd_to);
-       }
-
-       error << string_compose (_("Unable to Copy file %1 to %2 (%3)"),
-                       from_path, to_path, strerror(saved_errno))
-               << endmsg;
-       return false;
+       return true;
 }
 
 void
@@ -347,6 +326,21 @@ copy_files(const std::string & from_path, const std::string & to_dir)
        }
 }
 
+void
+copy_recurse(const std::string & from_path, const std::string & to_dir)
+{
+       vector<string> files;
+       find_files_matching_filter (files, from_path, accept_all_files, 0, false, true, true);
+
+       const size_t prefix_len = from_path.size();
+       for (vector<string>::iterator i = files.begin(); i != files.end(); ++i) {
+               std::string from = *i;
+               std::string to = Glib::build_filename (to_dir, (*i).substr(prefix_len));
+               g_mkdir_with_parents (Glib::path_get_dirname (to).c_str(), 0755);
+               copy_file (from, to);
+       }
+}
+
 std::string
 get_absolute_path (const std::string & p)
 {
@@ -354,6 +348,16 @@ get_absolute_path (const std::string & p)
        return Glib::build_filename (Glib::get_current_dir(), p);
 }
 
+std::string
+get_suffix (const std::string & p)
+{
+       string::size_type period = p.find_last_of ('.');
+       if (period == string::npos || period == p.length() - 1) {
+               return string();
+       }
+       return p.substr (period+1);
+}
+
 bool
 equivalent_paths (const std::string& a, const std::string& b)
 {
@@ -417,7 +421,7 @@ remove_directory_internal (const string& dir, size_t* size, vector<string>* path
                            bool just_remove_files)
 {
        vector<string> tmp_paths;
-       struct stat statbuf;
+       GStatBuf statbuf;
        int ret = 0;
 
        get_paths (tmp_paths, dir, just_remove_files, true);
@@ -461,4 +465,21 @@ remove_directory (const std::string& dir)
        remove_directory_internal (dir, 0, 0, false);
 }
 
+string
+tmp_writable_directory (const char* domain, const string& prefix)
+{
+       std::string tmp_dir = Glib::build_filename (g_get_tmp_dir(), domain);
+       std::string dir_name;
+       std::string new_test_dir;
+       do {
+               ostringstream oss;
+               oss << prefix;
+               oss << g_random_int ();
+               dir_name = oss.str();
+               new_test_dir = Glib::build_filename (tmp_dir, dir_name);
+               if (Glib::file_test (new_test_dir, Glib::FILE_TEST_EXISTS)) continue;
+       } while (g_mkdir_with_parents (new_test_dir.c_str(), 0755) != 0);
+       return new_test_dir;
+}
+
 } // namespace PBD