modifiable paths, settings file created by default

Author: flipcoder

README.md

@@ -24,12 +24,16 @@ qmake
 make
 ```
 
-Fig looks for the settings files in the bin directory.
+Fig looks for the schema file in the program's directory.  The default filename is "settings.schema.json".
 
-The file names should be:
+You can load a different schema by passing it in:
 
-- settings.json (this is where it saves, should contain "{}" at first)
-- settings.schema.json (your schema here)
+```
+./fig schema.json
+```
+
+The default save path is settings.json in the program's directory.
+See *Schema / Application Info* on how to change where it saves.
 
 ## How it Works
 
@@ -204,6 +208,7 @@ To customize the dialog further, use these options.  They are all optional.
     ".icon-width": 64,
     ".icon-height": 64,
     ".footer": "Visit our website at : <a href=\"http://website.com\">website.com</a>",
+    ".settings": "settings.json"
 }
 ```
 

bin/settings.json

@@ -1,41 +1,58 @@
 #include "FigApp.h"
 #include "FigWindow.h"
 #include <vector>
+#include <fstream>
 #include "kit/kit.h"
 #include "kit/log/log.h"
 #include <QDialogButtonBox>
+#include <boost/filesystem.hpp>
 using namespace std;
 using kit::make_unique;
+namespace fs = boost::filesystem;
+using path = boost::filesystem::path;
 
 FigApp :: FigApp(int& argc, char* argv[]):
     QApplication(argc,argv),
     m_Args(argc, (const char**)argv),
     m_FigAppPath(argv[0])
 {
+    path appPath = path(m_FigAppPath).parent_path();
+    
     if(m_Args.size()>0)
-        m_SettingsFn = m_Args.get(m_Args.size()-1);
+        m_SchemaFn = m_Args.get(m_Args.size()-1);
     else
-        m_SettingsFn = "settings.json";
-    
-    m_SchemaFn = m_Args.value_or("schema", "settings.schema.json");
-    
-    try{
-        m_pSettings = make_shared<Meta>(m_SettingsFn);
-    }catch(Error& e){
-        QMessageBox::critical(m_pWindow.get(), "Error", "Could not load settings file.");
-        fail();
-        goto return_ctor;
-    }
+        m_SchemaFn = (appPath / m_SchemaFn).string();
+
+    path schemaPath = path(m_SchemaFn).parent_path();
 
     try{
         m_pSchema = make_shared<Meta>(m_SchemaFn);
-        //m_pSchema = make_shared<Schema>(make_shared<Meta>(m_SchemaFn));
     }catch(Error& e){
         QMessageBox::critical(m_pWindow.get(), "Error", "Could not load schema file.");
         fail();
         goto return_ctor;
     }
+
+    // use .settings path or default to same path as schema
+    if(m_pSchema->has(".settings"))
+        m_SettingsFn = m_pSchema->at<string>(".settings");
+    else
+        m_SettingsFn = (schemaPath / m_SettingsFn).string();
 
+    if(fs::exists(m_SettingsFn))
+    {
+        try{
+            m_pSettings = make_shared<Meta>(m_SettingsFn);
+        }catch(...){
+            QMessageBox::critical(m_pWindow.get(), "Error",
+                "Unable to load settings.  The file may be corrupt."
+            );
+            m_pSettings = make_shared<Meta>();
+        }
+    }
+    else
+        m_pSettings = make_shared<Meta>();
+        
     m_Title = m_Args.value_or("title", "Settings");
     if(m_pSchema->has(".title"))
         m_Title = m_pSchema->at<string>(".title");
@@ -452,7 +469,16 @@ bool FigApp :: save()
         }
     }
     if(not fail)
-        m_pSettings->serialize();
+    {
+        try{
+            m_pSettings->serialize(m_SettingsFn);
+        }catch(...){
+            QMessageBox::critical(m_pWindow.get(), "Error",
+                "Unable to save settings."
+            );
+            fail = true;
+        }
+    }
     return not fail;
 }
 

src/FigApp.cpp

@@ -9,7 +9,6 @@
 #include "FigWindow.h"
 #include "kit/args/args.h"
 #include "kit/meta/meta.h"
-#include "kit/meta/schema.h"
 
 class FigApp:
     public QApplication
@@ -63,8 +62,8 @@ class FigApp:
 
         std::string m_FigAppPath;
 
-        std::string m_SettingsFn;
-        std::string m_SchemaFn;
+        std::string m_SettingsFn = "settings.json";
+        std::string m_SchemaFn = "settings.schema.json";
         std::shared_ptr<Meta> m_pSettings;
         std::shared_ptr<Meta> m_pSchema;
         std::string m_Title;