Merge lp:~sergiusens/snappy/storeSnapType into lp:~snappy-dev/snappy/snappy-moved-to-github

[Sergio Schvezov]

Setup proper SnapType's from the store

[Michael Vogt (mvo)]

Thanks! Code looks fine, I wonder if the store could send us "app" instead of application but I guess thats problematic for click(?).

review: Approve

[Sergio Schvezov (sergiusens)]

On Thu, May 07, 2015 at 06:03:36AM -0000, Michael Vogt wrote:
> Review: Approve
>
> Thanks! Code looks fine, I wonder if the store could send us "app" instead of application but I guess thats problematic for click(?).

I argued for app in the original bug feature request and was told no,
reason for this to exist :-/

[Michael Vogt (mvo)]

What is the original bugreport? If there is no reason for app vs application I think we should ask again for app to avoid client side mangling.

[Sergio Schvezov (sergiusens)]

On Fri, May 08, 2015 at 07:13:12AM -0000, Michael Vogt wrote:
> What is the original bugreport? If there is no reason for app vs application I think we should ask again for app to avoid client side mangling.

http://pad.lv/1443537

In any case we need to add support for 'os', 'gadget' and 'kernel'

We also need an API name cleanup (for consistency between the store and
snappy) and I already requested Ursula, whom is gathering requirements
for the store now, to take a look at adding that story.

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-05-05 15:25:55 +0000
+++ snappy/parts.go	2015-05-06 23:27:22 +0000
@@ -18,6 +18,7 @@
 package snappy
 
 import (
+	"encoding/json"
 	"fmt"
 	"net"
 	"net/url"
@@ -30,6 +31,29 @@
 // SnapType represents the kind of snap (app, core, frameworks, oem)
 type SnapType string
 
+// MarshalJSON returns *m as the JSON encoding of m.
+func (m SnapType) MarshalJSON() ([]byte, error) {
+	return json.Marshal(string(m))
+}
+
+// UnmarshalJSON sets *m to a copy of data.
+func (m *SnapType) UnmarshalJSON(data []byte) error {
+	var str string
+	if err := json.Unmarshal(data, &str); err != nil {
+		return err
+	}
+
+	// this is a workaround as the store sends "application" but snappy uses
+	// "app" for SnapTypeApp
+	if str == "application" {
+		*m = SnapTypeApp
+	} else {
+		*m = SnapType(str)
+	}
+
+	return nil
+}
+
 // SystemConfig is a config map holding configs for multiple packages
 type SystemConfig map[string]interface{}
 

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-05-06 12:26:38 +0000
+++ snappy/snapp.go	2015-05-06 23:27:22 +0000
@@ -240,7 +240,7 @@
 	RatingsAverage  float64            `json:"ratings_average,omitempty"`
 	SupportURL      string             `json:"support_url"`
 	Title           string             `json:"title"`
-	Type            string             `json:"content,omitempty"`
+	Type            SnapType           `json:"content,omitempty"`
 	Version         string             `json:"version"`
 }
 
@@ -872,8 +872,7 @@
 
 // Type returns the type of the SnapPart (app, oem, ...)
 func (s *RemoteSnapPart) Type() SnapType {
-	// FIXME: the store does not publish this info
-	return SnapTypeApp
+	return s.pkg.Type
 }
 
 // Name returns the name

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-05-05 16:42:09 +0000
+++ snappy/snapp_test.go	2015-05-06 23:27:22 +0000
@@ -18,6 +18,7 @@
 package snappy
 
 import (
+	"encoding/json"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -1384,3 +1385,33 @@
 	c.Assert(cmds[1], DeepEquals, aCmd{"udevadm", "trigger"})
 	c.Assert(cmds, HasLen, 2)
 }
+
+type SnapTypeSuite struct{}
+
+var _ = Suite(&SnapTypeSuite{})
+
+func (s *SnapTypeSuite) TestMarshalTypes(c *C) {
+	out, err := json.Marshal(SnapTypeApp)
+	c.Assert(err, IsNil)
+	c.Check(string(out), Equals, "\"app\"")
+
+	out, err = json.Marshal(SnapTypeOem)
+	c.Assert(err, IsNil)
+	c.Check(string(out), Equals, "\"oem\"")
+}
+
+func (s *SnapTypeSuite) TestUnmarshalTypes(c *C) {
+	var st SnapType
+
+	err := json.Unmarshal([]byte("\"application\""), &st)
+	c.Assert(err, IsNil)
+	c.Check(st, Equals, SnapTypeApp)
+
+	err = json.Unmarshal([]byte("\"app\""), &st)
+	c.Assert(err, IsNil)
+	c.Check(st, Equals, SnapTypeApp)
+
+	err = json.Unmarshal([]byte("\"oem\""), &st)
+	c.Assert(err, IsNil)
+	c.Check(st, Equals, SnapTypeOem)
+}