Save As refactor (#217)

Save as now discards unsaved changes to current project
Unsaved changes only written to project under new name
Adds filesystem function Delete(Path&)
Adds optional argument to PersistencyService::Save(const char* name)


Save temp file
Copy temp file to new location
Delete temp file
Bump CHANGELOG

#212

* Guard against forbidden paths 

Call ACTION_SAVE_AS NewProjectDialog with "root:" as path
Change default currentPath to "root:" (fix regression caused in #215)
Disallow accidental root folder access in FileSystem::Descend #219

Author: djdiskmachine

CHANGELOG

@@ -9,6 +9,7 @@
     Fixes:
     Add 64 bit soundfont support (#211)
     Skip randomly generated project name if a directory with that name already exists (#175)
+    Save Song As" saves to current as well as new project (#212) 
 
 1.5.0-bacon3
     Contributions:

sources/Application/Persistency/PersistencyService.cpp

@@ -7,12 +7,12 @@
 PersistencyService::PersistencyService():Service(MAKE_FOURCC('S','V','P','S')) {
 } ;
 
-void PersistencyService::Save() {
+void PersistencyService::Save(const char *name) {
 
-	Path filename("project:lgptsav.dat") ;
+    Path filename(name);
 
-	TiXmlDocument doc(filename.GetPath()) ;
-	TiXmlElement first("LITTLEGPTRACKER") ;
+    TiXmlDocument doc(filename.GetPath());
+    TiXmlElement first("LITTLEGPTRACKER") ;
 	TiXmlNode *node=doc.InsertEndChild(first) ;
 
 	// Loop on all registered service
@@ -25,7 +25,7 @@ void PersistencyService::Save() {
 	} ;
 
 	doc.SaveFile() ;
-} ;
+};
 
 bool PersistencyService::Load() {
 

sources/Application/Persistency/PersistencyService.h

@@ -8,8 +8,8 @@
 class PersistencyService: public Service,public T_Singleton<PersistencyService> {
 public:
 	PersistencyService() ;
-	void Save() ;
-	bool Load() ;
+    void Save(const char *name = "project:lgptsav.dat");
+    bool Load() ;
 } ;
 
 class PersistencyDocument: public TiXmlDocument {

sources/Application/Views/ModalDialogs/NewProjectDialog.h

@@ -9,7 +9,7 @@
 
 class NewProjectDialog:public ModalView {
 public:
-  NewProjectDialog(View &view, Path currentPath = "");
+  NewProjectDialog(View &view, Path currentPath = "root:");
   virtual ~NewProjectDialog();
 
   virtual void DrawView();

sources/Application/Views/ProjectView.cpp

@@ -38,8 +38,8 @@ static void SaveAsProjectCallback(View &v,ModalView &dialog) {
 		Path path_dstprjdir = Path(str_dstprjdir);
 		Path path_dstsmpdir = Path(str_dstsmpdir);
 
-		Path path_srclgptdatsav = path_srcprjdir.GetPath() + "lgptsav.dat";
-		Path path_dstlgptdatsav = path_dstprjdir.GetPath() + "/lgptsav.dat";
+        Path path_srclgptdatsav = path_srcprjdir.GetPath() + "lgptsav_tmp.dat";
+        Path path_dstlgptdatsav = path_dstprjdir.GetPath() + "/lgptsav.dat";
 
 		if (path_dstprjdir.Exists()) {
 			Trace::Log("ProjectView", "Dst Dir '%s' Exist == true",
@@ -55,10 +55,13 @@ static void SaveAsProjectCallback(View &v,ModalView &dialog) {
 			return;
 		};
 
-		FSS.Copy(path_srclgptdatsav,path_dstlgptdatsav);
+        if (FSS.Copy(path_srclgptdatsav, path_dstlgptdatsav) > -1) {
+            FSS.Delete(path_srclgptdatsav);
+        }
 
-		I_Dir *idir_srcsmpdir=FileSystem::GetInstance()->Open(path_srcsmpdir.GetPath().c_str());
-		if (idir_srcsmpdir) {
+        I_Dir *idir_srcsmpdir =
+            FileSystem::GetInstance()->Open(path_srcsmpdir.GetPath().c_str());
+        if (idir_srcsmpdir) {
 				idir_srcsmpdir->GetContent("*");
 				idir_srcsmpdir->Sort();
 				IteratorPtr<Path>it(idir_srcsmpdir->GetIterator());
@@ -270,8 +273,8 @@ void ProjectView::Update(Observable &,I_ObservableData *data) {
         }
         case ACTION_SAVE_AS: {
             PersistencyService *service = PersistencyService::GetInstance();
-            service->Save();
-            NewProjectDialog *mb = new NewProjectDialog(*this);
+            service->Save("project:lgptsav_tmp.dat");
+            NewProjectDialog *mb = new NewProjectDialog(*this, "root:");
             DoModal(mb, SaveAsProjectCallback);
             break;
         }

sources/System/FileSystem/FileSystem.cpp

@@ -76,9 +76,8 @@ std::string Path::GetCanonicalPath() {
 Path Path::Descend(const std::string& leaf)
 {
   std::string currentPath = GetPath();
-  if (currentPath[currentPath.size()-1] != '/')
-  {
-    currentPath += "/";
+  if (!currentPath.empty() && currentPath[currentPath.size() - 1] != '/') {
+      currentPath += "/";
   }
   return Path(currentPath+leaf);
 }
@@ -215,4 +214,20 @@ int FileSystemService::Copy(const Path &src,const Path &dst)
   isrc->Close();
   idst->Close();
   return nbwrite;
+}
+
+int FileSystemService::Delete(const Path &path) {
+    int result = -1;
+    std::string pathString = path.GetPath();
+    FileSystem * fs = FileSystem::GetInstance();
+
+    if (fs->GetFileType(pathString.c_str()) != FT_UNKNOWN) {
+		fs->Delete(pathString.c_str());
+        result += 1;
+		Trace::Log("FileSystemService"," Delete %s ", pathString.c_str());
+    } else {
+        Trace::Log("FS Delete","path does not exist: %s", pathString.c_str());
+    }
+
+    return result;
 }

sources/System/FileSystem/FileSystem.h

@@ -111,6 +111,7 @@ class FileSystem: public T_Factory<FileSystem> {
 class FileSystemService {
  public:
   int Copy(const Path &src,const Path &dst);
+  int Delete(const Path &path);
 };
 
 #endif