vbatts/go-omaha
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5 from doodles526/working

Browse source 
terminated XMLName from appearing in json
This commit is contained in:
Brandon Philips 2013-06-28 23:20:44 -07:00
commit 17767637e0
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
omaha/omaha.go
View file

@ -43,7 +43,7 @@ func (r *Request) AddApp(id string, version string) *App {
/* Response /* Response
*/ */
type Response struct { type Response struct {
XMLName xml.Name `xml:"response" datastore:"-"` XMLName xml.Name `xml:"response" datastore:"-" json:"-"`
DayStart DayStart `xml:"daystart"` DayStart DayStart `xml:"daystart"`
Apps []*App `xml:"app"` Apps []*App `xml:"app"`
Protocol string `xml:"protocol,attr"` Protocol string `xml:"protocol,attr"`
@ -67,7 +67,7 @@ func (r *Response) AddApp(id string) *App {
} }
type App struct { type App struct {
XMLName xml.Name `xml:"app" datastore"-"` XMLName xml.Name `xml:"app" datastore"-" json:"-"`
Ping *Ping `xml:"ping"` Ping *Ping `xml:"ping"`
UpdateCheck *UpdateCheck `xml:"updatecheck"` UpdateCheck *UpdateCheck `xml:"updatecheck"`
Events []*Event `xml:"event"` Events []*Event `xml:"event"`
@ -103,7 +103,7 @@ func (a *App) AddEvent() *Event {
} }
type UpdateCheck struct { type UpdateCheck struct {
XMLName xml.Name `xml:"updatecheck" datastore:"-"` XMLName xml.Name `xml:"updatecheck" datastore:"-" json:"-"`
Urls *Urls `xml:"urls"` Urls *Urls `xml:"urls"`
Manifest *Manifest `xml:"manifest"` Manifest *Manifest `xml:"manifest"`
TargetVersionPrefix string `xml:"targetversionprefix,attr,omitempty"` TargetVersionPrefix string `xml:"targetversionprefix,attr,omitempty"`
@ -126,13 +126,13 @@ func (u *UpdateCheck) AddManifest(version string) *Manifest {
} }
type Ping struct { type Ping struct {
XMLName xml.Name `xml:"ping" datastore:"-"` XMLName xml.Name `xml:"ping" datastore:"-" json:"-"`
LastReportDays string `xml:"r,attr,omitempty"` LastReportDays string `xml:"r,attr,omitempty"`
Status string `xml:"status,attr,omitempty"` Status string `xml:"status,attr,omitempty"`
} }
type Os struct { type Os struct {
XMLName xml.Name `xml:"os" datastore:"-"` XMLName xml.Name `xml:"os" datastore:"-" json:"-"`
Platform string `xml:"platform,attr,omitempty"` Platform string `xml:"platform,attr,omitempty"`
Version string `xml:"version,attr,omitempty"` Version string `xml:"version,attr,omitempty"`
Sp string `xml:"sp,attr,omitempty"` Sp string `xml:"sp,attr,omitempty"`
@ -145,36 +145,36 @@ func NewOs(platform string, version string, sp string, arch string) *Os {
} }
type Event struct { type Event struct {
XMLName xml.Name `xml:"event" datastore:"-"` XMLName xml.Name `xml:"event" datastore:"-" json:"-"`
Type string `xml:"eventtype,attr,omitempty"` Type string `xml:"eventtype,attr,omitempty"`
Result string `xml:"eventresult,attr,omitempty"` Result string `xml:"eventresult,attr,omitempty"`
PreviousVersion string `xml:"previousversion,attr,omitempty"` PreviousVersion string `xml:"previousversion,attr,omitempty"`
} }
type Urls struct { type Urls struct {
XMLName xml.Name `xml:"urls" datastore:"-"` XMLName xml.Name `xml:"urls" datastore:"-" json:"-"`
Urls []Url `xml:"url"` Urls []Url `xml:"url"`
} }
type Url struct { type Url struct {
XMLName xml.Name `xml:"url" datastore:"-"` XMLName xml.Name `xml:"url" datastore:"-" json:"-"`
CodeBase string `xml:"codebase,attr"` CodeBase string `xml:"codebase,attr"`
} }
type Manifest struct { type Manifest struct {
XMLName xml.Name `xml:"manifest" datastore:"-"` XMLName xml.Name `xml:"manifest" datastore:"-" json:"-"`
Packages Packages `xml:"packages"` Packages Packages `xml:"packages"`
Actions Actions `xml:"actions"` Actions Actions `xml:"actions"`
Version string `xml:"version,attr"` Version string `xml:"version,attr"`
} }
type Packages struct { type Packages struct {
XMLName xml.Name `xml:"packages" datastore:"-"` XMLName xml.Name `xml:"packages" datastore:"-" json:"-"`
Packages []Package `xml:"package"` Packages []Package `xml:"package"`
} }
type Package struct { type Package struct {
XMLName xml.Name `xml:"package" datastore:"-"` XMLName xml.Name `xml:"package" datastore:"-" json:"-"`
Hash string `xml:"hash,attr"` Hash string `xml:"hash,attr"`
Name string `xml:"name,attr"` Name string `xml:"name,attr"`
Size string `xml:"size,attr"` Size string `xml:"size,attr"`
@ -188,12 +188,12 @@ func (m *Manifest) AddPackage(hash string, name string, size string, required bo
} }
type Actions struct { type Actions struct {
XMLName xml.Name `xml:"actions" datastore:"-"` XMLName xml.Name `xml:"actions" datastore:"-" json:"-"`
Actions []*Action `xml:"action"` Actions []*Action `xml:"action"`
} }
type Action struct { type Action struct {
XMLName xml.Name `xml:"action" datastore:"-"` XMLName xml.Name `xml:"action" datastore:"-" json:"-"`
Event string `xml:"event,attr"` Event string `xml:"event,attr"`
// Extensions added by update_engine // Extensions added by update_engine