Merge lp:~chipaca/ubuntu-push/gsettings into lp:ubuntu-push/automatic

[John Lenton]

Minimal wrapper for some gsettings bits.

Minimal wrapper for some gsettings bits.

[Guillermo Gonzalez (verterok)]

nice

review: Approve

Unmerged revisions

335. By John Lenton on 2014-09-16

gsettings

=== modified file 'click/cblacklist/cblacklist.go'
--- click/cblacklist/cblacklist.go	2014-08-01 23:25:43 +0000
+++ click/cblacklist/cblacklist.go	2014-09-16 19:41:21 +0000
@@ -37,7 +37,7 @@
 
     if (!pushSettings) {
         GSettingsSchemaSource * source = g_settings_schema_source_get_default ();
-        if (!g_settings_schema_source_lookup (g_settings_schema_source_get_default (), BLACKLIST_CONFIG_SCHEMA_ID, TRUE)) {
+        if (!g_settings_schema_source_lookup (source, BLACKLIST_CONFIG_SCHEMA_ID, TRUE)) {
             return -1;
         }
         pushSettings = g_settings_new(BLACKLIST_CONFIG_SCHEMA_ID);

=== modified file 'debian/control'
--- debian/control	2014-09-05 10:48:36 +0000
+++ debian/control	2014-09-16 19:41:21 +0000
@@ -24,6 +24,7 @@
                libaccounts-glib-dev,
                cmake,
                python3,
+               gsettings-ubuntu-schemas,
 Standards-Version: 3.9.5
 Homepage: http://launchpad.net/ubuntu-push
 Vcs-Bzr: lp:ubuntu-push

=== added directory 'gsettings'
=== added file 'gsettings/gsettings.go'
--- gsettings/gsettings.go	1970-01-01 00:00:00 +0000
+++ gsettings/gsettings.go	2014-09-16 19:41:21 +0000
@@ -0,0 +1,86 @@
+/*
+ Copyright 2014 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// package gsettings is a very incomplete wrapper to gio's gsettings,
+// only exposing the bits used in the project.
+package gsettings
+
+/*
+#cgo pkg-config: gio-2.0
+
+#include <gio/gio.h>
+
+*/
+import "C"
+
+import (
+	"errors"
+	"runtime"
+)
+
+type GSettings struct {
+	inner  *C.GSettings
+	schema *C.GSettingsSchema
+}
+
+var (
+	ErrSchemaNotFound = errors.New("Schema not found")
+	ErrKeyNotFound    = errors.New("Key not found")
+)
+
+func gstring(s string) *C.gchar {
+	return (*C.gchar)(C.CString(s))
+}
+
+func gostring(s *C.gchar) string {
+	return C.GoString((*C.char)(s))
+}
+
+func gfree(s *C.gchar) {
+	C.g_free(C.gpointer(s))
+}
+
+func New(schema string) (*GSettings, error) {
+	src := C.g_settings_schema_source_get_default()
+	cs := gstring(schema)
+	defer gfree(cs)
+	cschema := C.g_settings_schema_source_lookup(src, cs, C.TRUE)
+	if cschema == nil {
+		return nil, ErrSchemaNotFound
+	}
+	settings := &GSettings{inner: C.g_settings_new(cs), schema: cschema}
+
+	runtime.SetFinalizer(settings, func(s *GSettings) {
+		C.g_settings_schema_unref(s.schema)
+		C.g_object_unref(C.gpointer(s.inner))
+	})
+
+	return settings, nil
+}
+
+func (settings *GSettings) GetString(key string) (string, error) {
+	ckey := gstring(key)
+	defer gfree(ckey)
+
+	if C.g_settings_schema_has_key(settings.schema, ckey) != C.TRUE {
+		return "", ErrKeyNotFound
+	}
+
+	cstr := C.g_settings_get_string(settings.inner, ckey)
+	defer gfree(cstr)
+	str := gostring(cstr)
+	return str, nil
+}

=== added file 'gsettings/gsettings_test.go'
--- gsettings/gsettings_test.go	1970-01-01 00:00:00 +0000
+++ gsettings/gsettings_test.go	2014-09-16 19:41:21 +0000
@@ -0,0 +1,53 @@
+/*
+ Copyright 2014 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package gsettings
+
+import (
+	"testing"
+
+	. "launchpad.net/gocheck"
+)
+
+func TestGSettings(t *testing.T) { TestingT(t) }
+
+type gssuite struct{}
+
+var _ = Suite(&gssuite{})
+
+func (gs *gssuite) TestBadSchema(c *C) {
+	s, e := New("potato")
+	c.Check(e, Equals, ErrSchemaNotFound)
+	c.Check(s, IsNil)
+}
+
+func (gs *gssuite) TestBadKey(c *C) {
+	s, e := New("com.ubuntu.touch.sound")
+	c.Assert(e, IsNil)
+	c.Assert(s, NotNil)
+	k, e := s.GetString("potato")
+	c.Check(e, Equals, ErrKeyNotFound)
+	c.Check(k, Equals, "")
+}
+
+func (gs *gssuite) TestGoodKey(c *C) {
+	s, e := New("com.ubuntu.touch.sound")
+	c.Assert(e, IsNil)
+	c.Assert(s, NotNil)
+	k, e := s.GetString("incoming-message-sound")
+	c.Check(e, IsNil)
+	c.Check(k, Matches, ".*/sounds/.*")
+}