summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugingui/pluginconfig.cc12
-rw-r--r--plugingui/pluginconfig.h4
-rw-r--r--plugingui/plugingui.cc6
-rw-r--r--src/audioinputenginemidi.cc10
-rw-r--r--src/configfile.cc184
-rw-r--r--src/configfile.h7
-rw-r--r--src/drumkitparser.cc10
-rw-r--r--test/Makefile.am11
-rw-r--r--test/configtest.cc219
-rw-r--r--test/test.cc2
10 files changed, 418 insertions, 47 deletions
diff --git a/plugingui/pluginconfig.cc b/plugingui/pluginconfig.cc
index 0beef6e..d4c4477 100644
--- a/plugingui/pluginconfig.cc
+++ b/plugingui/pluginconfig.cc
@@ -39,21 +39,25 @@ Config::~Config()
{
}
-void Config::load()
+bool Config::load()
{
lastkit.clear();
lastmidimap.clear();
- ConfigFile::load();
+ if(!ConfigFile::load()) {
+ return false;
+ }
lastkit = getValue("lastkit");
lastmidimap = getValue("lastmidimap");
+
+ return true;
}
-void Config::save()
+bool Config::save()
{
setValue("lastkit", lastkit);
setValue("lastmidimap", lastmidimap);
- ConfigFile::save();
+ return ConfigFile::save();
}
diff --git a/plugingui/pluginconfig.h b/plugingui/pluginconfig.h
index 29d2ef5..9bef1f0 100644
--- a/plugingui/pluginconfig.h
+++ b/plugingui/pluginconfig.h
@@ -34,8 +34,8 @@ public:
Config();
~Config();
- void load();
- void save();
+ bool load();
+ bool save();
std::string lastkit;
std::string lastmidimap;
diff --git a/plugingui/plugingui.cc b/plugingui/plugingui.cc
index 60a75fc..170f4f9 100644
--- a/plugingui/plugingui.cc
+++ b/plugingui/plugingui.cc
@@ -169,10 +169,10 @@ void closeClick(void *ptr)
*/
PluginGUI::PluginGUI()
- : MessageReceiver(MSGRCV_UI), sem("plugingui")
+ : MessageReceiver(MSGRCV_UI)
+ , initialised(false)
+ , sem("plugingui")
{
- initialised = false;
-
windowClosedHandler = NULL;
changeMidimapHandler = NULL;
diff --git a/src/audioinputenginemidi.cc b/src/audioinputenginemidi.cc
index 5494462..7c1e13d 100644
--- a/src/audioinputenginemidi.cc
+++ b/src/audioinputenginemidi.cc
@@ -35,15 +35,19 @@
AudioInputEngineMidi::AudioInputEngineMidi()
: refs(REFSFILE)
{
- refs.load();
is_valid = false;
}
bool AudioInputEngineMidi::loadMidiMap(std::string _f, Instruments &instruments)
{
std::string f = _f;
- if(_f.size() > 1 && _f[0] == '@') {
- f = refs.getValue(_f.substr(1));
+
+ if(refs.load()) {
+ if(_f.size() > 1 && _f[0] == '@') {
+ f = refs.getValue(_f.substr(1));
+ }
+ } else {
+ ERR(drumkitparser, "Error reading refs.conf");
}
file = "";
diff --git a/src/configfile.cc b/src/configfile.cc
index bb7155f..6b0d14f 100644
--- a/src/configfile.cc
+++ b/src/configfile.cc
@@ -46,12 +46,12 @@
#ifdef WIN32
#define SEP "\\"
- #define CONFIGDIRNAME ".drumgizmo"
#else
#define SEP "/"
- #define CONFIGDIRNAME ".drumgizmo"
#endif
+#define CONFIGDIRNAME ".drumgizmo"
+
/**
* Return the path containing the config files.
*/
@@ -89,7 +89,7 @@ static bool createConfigPath()
#else
if(mkdir(configpath.c_str(), 0755) < 0) {
#endif
- DEBUG(pluginconfig, "Could not create config directory\n");
+ DEBUG(configfile, "Could not create config directory\n");
}
return false;
@@ -108,10 +108,12 @@ ConfigFile::~ConfigFile()
{
}
-void ConfigFile::load()
+bool ConfigFile::load()
{
- DEBUG(pluginconfig, "Loading config file...\n");
- if(!open("r")) return;
+ DEBUG(configfile, "Loading config file...\n");
+ if(!open("r")) {
+ return false;
+ }
values.clear();
@@ -120,35 +122,26 @@ void ConfigFile::load()
line = readLine();
if(line == "") break;
-
- if(line[line.size() - 1] == '\n') {
- line = line.substr(0, line.size() - 1); // strip ending newline.
- }
-
- std::size_t colon = line.find(':');
-
- if(colon == std::string::npos) break; // malformed line
-
- std::string key = line.substr(0, colon);
- std::string value = line.substr(colon + 1);
-
- printf("key['%s'] value['%s']\n", key.c_str(), value.c_str());
-
- if(key != "") {
- values[key] = value;
+
+ if(!parseLine(line)) {
+ return false;
}
}
close();
+
+ return true;
}
-void ConfigFile::save()
+bool ConfigFile::save()
{
- DEBUG(pluginconfig, "Saving configuration...\n");
+ DEBUG(configfile, "Saving configuration...\n");
createConfigPath();
- if(!open("w")) return;
+ if(!open("w")) {
+ return false;
+ }
std::map<std::string, std::string>::iterator v = values.begin();
for(; v != values.end(); ++v) {
@@ -156,6 +149,8 @@ void ConfigFile::save()
}
close();
+
+ return true;
}
std::string ConfigFile::getValue(const std::string& key)
@@ -182,7 +177,7 @@ bool ConfigFile::open(std::string mode)
configfile += SEP;
configfile += filename;
- DEBUG(pluginconfig, "Opening config file '%s'\n", configfile.c_str());
+ DEBUG(configfile, "Opening config file '%s'\n", configfile.c_str());
fp = fopen(configfile.c_str(), mode.c_str());
if(!fp) return false;
@@ -213,3 +208,140 @@ std::string ConfigFile::readLine()
return line;
}
+
+bool ConfigFile::parseLine(const std::string& line)
+{
+ std::string key;
+ std::string value;
+ enum {
+ before_key,
+ in_key,
+ after_key,
+ before_value,
+ in_value,
+ in_value_single_quoted,
+ in_value_double_quoted,
+ after_value,
+ } state = before_key;
+
+ for(std::size_t p = 0; p < line.size(); ++p) {
+ switch(state) {
+ case before_key:
+ if(line[p] == '#') {
+ // Comment: Ignore line.
+ p = line.size();
+ continue;
+ }
+ if(std::isspace(line[p])) {
+ continue;
+ }
+ key += line[p];
+ state = in_key;
+ break;
+
+ case in_key:
+ if(std::isspace(line[p])) {
+ state = after_key;
+ continue;
+ }
+ if(line[p] == ':' || line[p] == '=') {
+ state = before_value;
+ continue;
+ }
+ key += line[p];
+ break;
+
+ case after_key:
+ if(std::isspace(line[p])) {
+ continue;
+ }
+ if(line[p] == ':' || line[p] == '=') {
+ state = before_value;
+ continue;
+ }
+ ERR(configfile, "Bad symbol."
+ " Expecting only whitespace or key/value seperator: '%s'",
+ line.c_str());
+ return false;
+
+ case before_value:
+ if(std::isspace(line[p])) {
+ continue;
+ }
+ if(line[p] == '\'') {
+ state = in_value_single_quoted;
+ continue;
+ }
+ if(line[p] == '"') {
+ state = in_value_double_quoted;
+ continue;
+ }
+ value += line[p];
+ state = in_value;
+ break;
+
+ case in_value:
+ if(std::isspace(line[p])) {
+ state = after_value;
+ continue;
+ }
+ if(line[p] == '#') {
+ // Comment: Ignore the rest of the line.
+ p = line.size();
+ state = after_value;
+ continue;
+ }
+ value += line[p];
+ break;
+
+ case in_value_single_quoted:
+ if(line[p] == '\'') {
+ state = after_value;
+ continue;
+ }
+ value += line[p];
+ break;
+
+ case in_value_double_quoted:
+ if(line[p] == '"') {
+ state = after_value;
+ continue;
+ }
+ value += line[p];
+ break;
+
+ case after_value:
+ if(std::isspace(line[p])) {
+ continue;
+ }
+ if(line[p] == '#') {
+ // Comment: Ignore the rest of the line.
+ p = line.size();
+ continue;
+ }
+ ERR(configfile, "Bad symbol."
+ " Expecting only whitespace or key/value seperator: '%s'",
+ line.c_str());
+ return false;
+ }
+ }
+
+ if(state == before_key) {
+ // Line did not contain any data (empty or comment)
+ return true;
+ }
+
+ // If state == in_value_XXX_quoted here, the string was not terminated.
+ if(state != after_value && state != in_value) {
+ ERR(configfile,"Malformed line: '%s'", line.c_str());
+ return false;
+ }
+
+ DEBUG(configfile, "key['%s'] value['%s']\n", key.c_str(), value.c_str());
+
+ if(key != "") {
+ values[key] = value;
+ }
+
+ return true;
+}
diff --git a/src/configfile.h b/src/configfile.h
index 21a6b88..a6c50bd 100644
--- a/src/configfile.h
+++ b/src/configfile.h
@@ -36,8 +36,8 @@ public:
ConfigFile(std::string filename);
virtual ~ConfigFile();
- virtual void load();
- virtual void save();
+ virtual bool load();
+ virtual bool save();
virtual std::string getValue(const std::string& key);
virtual void setValue(const std::string& key, const std::string& value);
@@ -46,9 +46,10 @@ protected:
std::map<std::string, std::string> values;
std::string filename;
- bool open(std::string mode);
+ virtual bool open(std::string mode);
void close();
std::string readLine();
+ bool parseLine(const std::string& line);
FILE* fp;
};
diff --git a/src/drumkitparser.cc b/src/drumkitparser.cc
index 00232b2..f7bfe40 100644
--- a/src/drumkitparser.cc
+++ b/src/drumkitparser.cc
@@ -38,12 +38,14 @@ DrumKitParser::DrumKitParser(const std::string &file, DrumKit &k)
: kit(k)
, refs(REFSFILE)
{
- refs.load();
-
std::string kitfile = file;
- if(file.size() > 1 && file[0] == '@') {
- kitfile = refs.getValue(file.substr(1));
+ if(refs.load()) {
+ if(file.size() > 1 && file[0] == '@') {
+ kitfile = refs.getValue(file.substr(1));
+ }
+ } else {
+ ERR(drumkitparser, "Error reading refs.conf");
}
// instr = NULL;
diff --git a/test/Makefile.am b/test/Makefile.am
index e5760c8..6526f22 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,7 @@
# Rules for the test code (use `make check` to execute)
include $(top_srcdir)/src/Makefile.am.drumgizmo
-TESTS = engine gui resampler lv2 cachemanager
+TESTS = engine gui resampler lv2 configfile cachemanager
check_PROGRAMS = $(TESTS)
@@ -54,3 +54,12 @@ lv2_SOURCES = \
test.cc \
lv2_test_host.cc \
lv2.cc
+
+configfile_CXXFLAGS = -DOUTPUT=\"configfile\" $(CPPUNIT_CFLAGS) \
+ -I$(top_srcdir)/hugin
+configfile_LDFLAGS = $(CPPUNIT_LIBS)
+configfile_SOURCES = \
+ $(top_srcdir)/src/configfile.cc \
+ $(top_srcdir)/hugin/hugin.c \
+ test.cc \
+ configtest.cc
diff --git a/test/configtest.cc b/test/configtest.cc
new file mode 100644
index 0000000..24a7048
--- /dev/null
+++ b/test/configtest.cc
@@ -0,0 +1,219 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ * configtest.cc
+ *
+ * Thu May 14 20:58:29 CEST 2015
+ * Copyright 2015 Bent Bisballe Nyeng
+ * deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ * This file is part of DrumGizmo.
+ *
+ * DrumGizmo is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * DrumGizmo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with DrumGizmo; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <unistd.h>
+#include <stdio.h>
+
+#include "../src/configfile.h"
+
+class TestConfigFile : public ConfigFile {
+public:
+ TestConfigFile() : ConfigFile("") {}
+
+protected:
+ // Overload the built-in open method to use local file instead of homedir.
+ virtual bool open(std::string mode)
+ {
+ fp = fopen("test.conf", mode.c_str());
+ return fp != NULL;
+ }
+};
+
+class test_configtest : public CppUnit::TestFixture
+{
+ CPPUNIT_TEST_SUITE(test_configtest);
+ CPPUNIT_TEST(loading_no_newline);
+ CPPUNIT_TEST(loading_equal_sign);
+ CPPUNIT_TEST(loading_newline);
+ CPPUNIT_TEST(loading_padding_space);
+ CPPUNIT_TEST(loading_padding_space_newline);
+ CPPUNIT_TEST(loading_padding_tab);
+ CPPUNIT_TEST(loading_padding_tab_newline);
+ CPPUNIT_TEST(loading_comment);
+ CPPUNIT_TEST(loading_inline_comment);
+ CPPUNIT_TEST(loading_single_quoted_string);
+ CPPUNIT_TEST(loading_double_quoted_string);
+ CPPUNIT_TEST(loading_error_no_key);
+ CPPUNIT_TEST(loading_error_no_value);
+ CPPUNIT_TEST(loading_error_string_not_terminated_single);
+ CPPUNIT_TEST(loading_error_string_not_terminated_double);
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ void setUp()
+ {
+ }
+
+ void tearDown()
+ {
+ unlink("test.conf");
+ }
+
+ void writeFile(const char* str)
+ {
+ FILE* fp = fopen("test.conf", "w");
+ fprintf(fp, "%s", str);
+ fclose(fp);
+ }
+
+ void loading_no_newline()
+ {
+ writeFile("a:b");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_equal_sign()
+ {
+ writeFile(" a =\tb\t\n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_newline()
+ {
+ writeFile("a:b\n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_padding_space()
+ {
+ writeFile(" a : b ");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_padding_tab()
+ {
+ writeFile("\ta\t:\tb\t");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_padding_space_newline()
+ {
+ writeFile(" a : b \n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_padding_tab_newline()
+ {
+ writeFile("\ta\t:\tb\t\n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_comment()
+ {
+ writeFile("# comment\na:b\n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_inline_comment()
+ {
+ writeFile("a:b #comment\n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a"));
+ }
+
+ void loading_single_quoted_string()
+ {
+ writeFile("a: '#\"b\" ' \n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("#\"b\" "), cf.getValue("a"));
+ }
+
+ void loading_double_quoted_string()
+ {
+ writeFile("a: \"#'b' \" \n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(true, cf.load());
+ CPPUNIT_ASSERT_EQUAL(std::string("#'b' "), cf.getValue("a"));
+ }
+
+ void loading_error_no_key()
+ {
+ writeFile(":foo");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(false, cf.load());
+ }
+
+ void loading_error_no_value()
+ {
+ writeFile("key");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(false, cf.load());
+ }
+
+ void loading_error_string_not_terminated_single()
+ {
+ writeFile("a:'b\n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(false, cf.load());
+ }
+
+ void loading_error_string_not_terminated_double()
+ {
+ writeFile("a:\"b\n");
+
+ TestConfigFile cf;
+ CPPUNIT_ASSERT_EQUAL(false, cf.load());
+ }
+};
+
+// Registers the fixture into the 'registry'
+CPPUNIT_TEST_SUITE_REGISTRATION(test_configtest);
+
+
diff --git a/test/test.cc b/test/test.cc
index 88c72e6..282062d 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
runner.addTest( suite );
std::ofstream myfile;
- myfile.open("result_"OUTPUT".xml");
+ myfile.open("result_" OUTPUT ".xml");
runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), myfile));
// Run the tests.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:30:22 +0000