[Summary] Adding informative message to failed file copy exception in Session::save_as.
[ardour.git] / libs / ardour / session_state.cc
index 30b4eaeb62da627f53062d46b4d15253293145f1..669517bdfb3fa24b95d26de8d139209584811ad4 100644 (file)
 #include "ardour/playlist_source.h"
 #include "ardour/port.h"
 #include "ardour/processor.h"
+#include "ardour/profile.h"
 #include "ardour/proxy_controllable.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/region_factory.h"
@@ -490,7 +491,7 @@ Session::create (const string& session_template, BusProfile* bus_profile)
        _writable = exists_and_writable (_path);
 
        if (!session_template.empty()) {
-               std::string in_path = session_template_dir_to_file (session_template);
+               std::string in_path = (ARDOUR::Profile->get_trx () ? session_template : session_template_dir_to_file (session_template));
 
                ifstream in(in_path.c_str());
 
@@ -1045,17 +1046,31 @@ Session::state (bool full_state)
                        }
                }
        }
+       
+       
 
        if (full_state) {
-               node->add_child_nocopy (_locations->get_state());
+               
+               if (_locations) {
+                       node->add_child_nocopy (_locations->get_state());       
+               }
        } else {
+               Locations loc (*this);
                // for a template, just create a new Locations, populate it
                // with the default start and end, and get the state for that.
-               Locations loc (*this);
                Location* range = new Location (*this, 0, 0, _("session"), Location::IsSessionRange);
                range->set (max_framepos, 0);
                loc.add (range);
-               node->add_child_nocopy (loc.get_state());
+               XMLNode& locations_state = loc.get_state();
+               
+               if (ARDOUR::Profile->get_trx() && _locations) {
+                       for (Locations::LocationList::const_iterator i = _locations->list ().begin (); i != _locations->list ().end (); ++i) {
+                               if ((*i)->is_mark () || (*i)->is_auto_loop ()) {
+                                       locations_state.add_child_nocopy ((*i)->get_state ());
+                               }
+                       }
+               }
+               node->add_child_nocopy (locations_state);
        }
 
        child = node->add_child ("Bundles");
@@ -1076,12 +1091,12 @@ Session::state (bool full_state)
                RoutePublicOrderSorter cmp;
                RouteList public_order (*r);
                public_order.sort (cmp);
-
-                /* the sort should have put control outs first */
-
-                if (_monitor_out) {
-                        assert (_monitor_out == public_order.front());
-                }
+               
+               /* the sort should have put control outs first */
+               
+               if (_monitor_out) {
+                       assert (_monitor_out == public_order.front());
+               }
 
                for (RouteList::iterator i = public_order.begin(); i != public_order.end(); ++i) {
                        if (!(*i)->is_auditioner()) {
@@ -2008,26 +2023,35 @@ Session::save_template (string template_name)
                template_dir_path = template_name;
        }
 
-       if (Glib::file_test (template_dir_path, Glib::FILE_TEST_EXISTS)) {
-               warning << string_compose(_("Template \"%1\" already exists - new version not created"),
-                               template_dir_path) << endmsg;
-               return -1;
-       }
-       
-       if (g_mkdir_with_parents (template_dir_path.c_str(), 0755) != 0) {
-               error << string_compose(_("Could not create directory for Session template\"%1\" (%2)"),
-                               template_dir_path, g_strerror (errno)) << endmsg;
-               return -1;
+       if (!ARDOUR::Profile->get_trx()) {
+               if (Glib::file_test (template_dir_path, Glib::FILE_TEST_EXISTS)) {
+                       warning << string_compose(_("Template \"%1\" already exists - new version not created"),
+                                                                         template_dir_path) << endmsg;
+                       return -1;
+               }
+               
+               if (g_mkdir_with_parents (template_dir_path.c_str(), 0755) != 0) {
+                       error << string_compose(_("Could not create directory for Session template\"%1\" (%2)"),
+                                                                       template_dir_path, g_strerror (errno)) << endmsg;
+                       return -1;
+               }
        }
 
        /* file to write */
        std::string template_file_path;
-       if (absolute_path) {
-               template_file_path = Glib::build_filename (template_dir_path, Glib::path_get_basename (template_dir_path) + template_suffix);
+       
+       if (ARDOUR::Profile->get_trx()) {
+               template_file_path = template_name;
        } else {
-               template_file_path = Glib::build_filename (template_dir_path, template_name + template_suffix);
+               if (absolute_path) {
+                       template_file_path = Glib::build_filename (template_dir_path, Glib::path_get_basename (template_dir_path) + template_suffix);
+               } else {
+                       template_file_path = Glib::build_filename (template_dir_path, template_name + template_suffix);
+               }
        }
 
+       SessionSaveUnderway (); /* EMIT SIGNAL */
+       
        XMLTree tree;
 
        tree.set_root (&get_template());
@@ -2036,17 +2060,20 @@ Session::save_template (string template_name)
                return -1;
        }
 
-       /* copy plugin state directory */
+       if (!ARDOUR::Profile->get_trx()) {
+               /* copy plugin state directory */
 
-       std::string template_plugin_state_path (Glib::build_filename (template_dir_path, X_("plugins")));
+               std::string template_plugin_state_path (Glib::build_filename (template_dir_path, X_("plugins")));
 
-       if (g_mkdir_with_parents (template_plugin_state_path.c_str(), 0755) != 0) {
-               error << string_compose(_("Could not create directory for Session template plugin state\"%1\" (%2)"),
-                               template_plugin_state_path, g_strerror (errno)) << endmsg;
-               return -1;
+               if (g_mkdir_with_parents (template_plugin_state_path.c_str(), 0755) != 0) {
+                       error << string_compose(_("Could not create directory for Session template plugin state\"%1\" (%2)"),
+                                                                       template_plugin_state_path, g_strerror (errno)) << endmsg;
+                       return -1;
+               }
+               copy_files (plugins_dir(), template_plugin_state_path);
        }
 
-       copy_recurse (plugins_dir(), template_plugin_state_path);
+       store_recent_templates (template_file_path);
 
        return 0;
 }
@@ -4160,7 +4187,15 @@ Session::save_as (SaveAs& saveas)
 
                                std::string from = *i;
 
-                               if ((*i).find (audiofile_dir_string) != string::npos) {
+#ifdef __APPLE__
+                               string filename = Glib::path_get_basename (from);
+                               std::transform (filename.begin(), filename.end(), filename.begin(), ::toupper);
+                               if (filename == ".DS_STORE") {
+                                       continue;
+                               }
+#endif
+                               
+                               if (from.find (audiofile_dir_string) != string::npos) {
                                        
                                        /* audio file: only copy if asked */
 
@@ -4171,7 +4206,8 @@ Session::save_as (SaveAs& saveas)
                                                info << "media file copying from " << from << " to " << to << endmsg;
                                                
                                                if (!copy_file (from, to)) {
-                                                       throw Glib::FileError (Glib::FileError::IO_ERROR, "copy failed");
+                                                       throw Glib::FileError (Glib::FileError::IO_ERROR,
+                                                                                                  string_compose(_("\ncopying \"%1\" failed !"), from));
                                                }
                                        }
                                        
@@ -4179,7 +4215,7 @@ Session::save_as (SaveAs& saveas)
                                        
                                        internal_file_cnt++;
 
-                               } else if ((*i).find (midifile_dir_string) != string::npos) {
+                               } else if (from.find (midifile_dir_string) != string::npos) {
 
                                        /* midi file: always copy unless
                                         * creating an empty new session
@@ -4200,7 +4236,7 @@ Session::save_as (SaveAs& saveas)
                                                
                                        internal_file_cnt++;
                                        
-                               } else if ((*i).find (analysis_dir_string) != string::npos) {
+                               } else if (from.find (analysis_dir_string) != string::npos) {
 
                                        /*  make sure analysis dir exists in
                                         *  new session folder, but we're not
@@ -4219,14 +4255,14 @@ Session::save_as (SaveAs& saveas)
                                        bool do_copy = true;
                                        
                                        for (vector<string>::iterator v = do_not_copy_extensions.begin(); v != do_not_copy_extensions.end(); ++v) {
-                                               if (((*i).length() > (*v).length()) && ((*i).find (*v) == (*i).length() - (*v).length())) {
+                                               if ((from.length() > (*v).length()) && (from.find (*v) == from.length() - (*v).length())) {
                                                        /* end of filename matches extension, do not copy file */
                                                        do_copy = false;
                                                        break;
                                                } 
                                        }
 
-                                       if (!saveas.copy_media && (*i).find (peakfile_suffix) != string::npos) {
+                                       if (!saveas.copy_media && from.find (peakfile_suffix) != string::npos) {
                                                /* don't copy peakfiles if
                                                 * we're not copying media
                                                 */
@@ -4234,7 +4270,7 @@ Session::save_as (SaveAs& saveas)
                                        }
                                        
                                        if (do_copy) {
-                                               string to = Glib::build_filename (to_dir, (*i).substr (prefix_len));
+                                               string to = Glib::build_filename (to_dir, from.substr (prefix_len));
                                                
                                                info << "attempting to make directory/folder " << to << endmsg;
 
@@ -4245,7 +4281,8 @@ Session::save_as (SaveAs& saveas)
                                                info << "attempting to copy " << from << " to " << to << endmsg;
                                                
                                                if (!copy_file (from, to)) {
-                                                       throw Glib::FileError (Glib::FileError::IO_ERROR, "copy failed");
+                                                       throw Glib::FileError (Glib::FileError::IO_ERROR,
+                                                                                                  string_compose(_("\ncopying \"%1\" failed !"), from));
                                                }
                                        }
                                }
@@ -4256,7 +4293,7 @@ Session::save_as (SaveAs& saveas)
                                */
                                
                                GStatBuf gsb;
-                               g_stat ((*i).c_str(), &gsb);
+                               g_stat (from.c_str(), &gsb);
                                copied += gsb.st_size;
                                cnt++;