From 51a7b1c2afb78484d9cd24b8e4e1fbea9c56cf71 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harryhaaren@gmail.com>
Date: Mon, 2 Dec 2013 18:12:21 +0000
Subject: [PATCH] -Updated directory naming for saving: now has .luppp
 extension, fixed diskwriter tests

---
 src/diskwriter.cxx           | 4 ++--
 src/tests/diskwritertest.cxx | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/diskwriter.cxx b/src/diskwriter.cxx
index 1e2915b..e3c4fa9 100644
--- a/src/diskwriter.cxx
+++ b/src/diskwriter.cxx
@@ -35,7 +35,7 @@ DiskWriter::DiskWriter()
   controllerInfo[CONTROLLER_LINK] = "no link";
   
   sessionDir = getenv("HOME");
-  sessionName = "lupppSession";
+  sessionName = "session";
   foldersCreated = false;
   
   // create .config/openAV/luppp/ directory
@@ -99,7 +99,7 @@ void DiskWriter::initialize(std::string path, std::string name )
   sessionDirStream << path;
   
   if ( !gui->getNsm() )
-   sessionDirStream << "/" << sessionName;
+   sessionDirStream << "/" << sessionName << ".luppp";
   
   sessionDir = sessionDirStream.str();
   
diff --git a/src/tests/diskwritertest.cxx b/src/tests/diskwritertest.cxx
index e91252e..f857bda 100644
--- a/src/tests/diskwritertest.cxx
+++ b/src/tests/diskwritertest.cxx
@@ -45,21 +45,21 @@ int DiskWriter::runTests()
   std::string author = "dummy author";
   std::string link = "www.dummylink.com";
   
-  int d = gui->getDiskWriter()->writeControllerFile( name, author, link, dummy );
+  int d = gui->getDiskWriter()->writeControllerFile( dummy );
   QUNIT_IS_TRUE( d == LUPPP_RETURN_OK );
   
   dummy->setupBinding( Event::TRACK_VOLUME, 176, 7, 0, 0, 0, 0 );
   dummy->setupBinding( Event::GRID_LAUNCH_SCENE, 144, 60, 0, 2, 0, 0 );
   
-  int d1 = gui->getDiskWriter()->writeControllerFile( name, author, link, dummy );
+  int d1 = gui->getDiskWriter()->writeControllerFile( dummy );
   QUNIT_IS_TRUE( d1 == LUPPP_RETURN_OK );
   
   /// test dynamic cast, null, and invalid Controller* type
-  int r1 = gui->getDiskWriter()->writeControllerFile(name, author, link, 0);
+  int r1 = gui->getDiskWriter()->writeControllerFile( 0 );
   QUNIT_IS_TRUE( r1 == LUPPP_RETURN_ERROR );
   
   Controller* non = new NonSeq();
-  int r2 = gui->getDiskWriter()->writeControllerFile(name, author, link, non);
+  int r2 = gui->getDiskWriter()->writeControllerFile( non);
   QUNIT_IS_TRUE( r2 == LUPPP_RETURN_ERROR );
   
   return qunit.errors();