1
=== modified file 'ubuntu-device-flash/args.go'
2
--- ubuntu-device-flash/args.go	2014-09-03 12:53:40 +0000
3
+++ ubuntu-device-flash/args.go	2014-10-02 08:49:00 +0000
4
@@ -28,6 +28,7 @@
5
28
	Revision      int    `long:"revision" description:"revision to flash, absolute or relative allowed"`
28
	Revision      int    `long:"revision" description:"revision to flash, absolute or relative allowed"`
6
29
	Bootstrap     bool   `long:"bootstrap" description:"bootstrap the system, do this from the bootloader"`
29
	Bootstrap     bool   `long:"bootstrap" description:"bootstrap the system, do this from the bootloader"`
7
30
	ListChannels  bool   `long:"list-channels" description:"List available channels"`
30
	ListChannels  bool   `long:"list-channels" description:"List available channels"`
8
31
	ListImages    bool   `long:"list-images" description:"List available images for a channel"`
9
31
	Wipe          bool   `long:"wipe" description:"Clear all data after flashing"`
32
	Wipe          bool   `long:"wipe" description:"Clear all data after flashing"`
10
32
	Channel       string `long:"channel" description:"Specify an alternate channel"`
33
	Channel       string `long:"channel" description:"Specify an alternate channel"`
11
33
	ShowImage     bool   `long:"show-image" description:"Show information for an image in the given channel"`
34
	ShowImage     bool   `long:"show-image" description:"Show information for an image in the given channel"`
12
34
35
13
=== modified file 'ubuntu-device-flash/main.go'
14
--- ubuntu-device-flash/main.go	2014-09-25 13:40:20 +0000
15
+++ ubuntu-device-flash/main.go	2014-10-02 08:49:00 +0000
16
@@ -98,6 +98,25 @@
17
98
		}
98
		}
18
99
		return
99
		return
19
100
	}
100
	}
20
101
21
102
	if args.ListImages {
22
103
		if args.Device == "" {
23
104
			log.Fatal("You must specify a device type")
24
105
		}
25
106
26
107
		deviceChannel, err := channels.GetDeviceChannel(
27
108
			args.Server, args.Channel, args.Device)
28
109
		if err != nil {
29
110
			log.Fatal(err)
30
111
		}
31
112
32
113
		err = deviceChannel.ListImageVersions()
33
114
		if err != nil {
34
115
			log.Fatal(err)
35
116
		}
36
117
		return
37
118
	}
38
119
39
101
	cacheDir := ubuntuimage.GetCacheDir()
120
	cacheDir := ubuntuimage.GetCacheDir()
40
102
	if args.CleanCache {
121
	if args.CleanCache {
41
103
		log.Print("Cleaning prevously downloaded content")
122
		log.Print("Cleaning prevously downloaded content")
42
104
123
43
=== modified file 'ubuntuimage/channels.go'
44
--- ubuntuimage/channels.go	2014-04-16 17:00:53 +0000
45
+++ ubuntuimage/channels.go	2014-10-02 08:49:00 +0000
46
@@ -26,10 +26,12 @@
47
26
	"errors"
26
	"errors"
48
27
	"fmt"
27
	"fmt"
49
28
	"net/http"
28
	"net/http"
50
29
	"io/ioutil"
51
29
)
30
)
52
30
31
53
31
const (
32
const (
54
32
	channelsPath = "/channels.json"
33
	channelsPath = "/channels.json"
55
34
	indexName    = "index.json"
56
33
	FULL_IMAGE   = "full"
35
	FULL_IMAGE   = "full"
57
34
)
36
)
58
35
37
59
@@ -80,6 +82,8 @@
60
80
		return i1.Version > i2.Version
82
		return i1.Version > i2.Version
61
81
	}
83
	}
62
82
	ImageBy(order).ImageSort(deviceChannel.Images)
84
	ImageBy(order).ImageSort(deviceChannel.Images)
63
85
64
86
	deviceChannel.Url = channelUri
65
83
	return deviceChannel, err
87
	return deviceChannel, err
66
84
}
88
}
67
85
89
68
@@ -93,6 +97,53 @@
69
93
	return image, fmt.Errorf("Failed to locate image %d", revision)
97
	return image, fmt.Errorf("Failed to locate image %d", revision)
70
94
}
98
}
71
95
99
72
100
func (deviceChannel *DeviceChannel) ListImageVersions() (err error) {
73
101
74
102
	jsonData := map[string]interface{}{}
75
103
76
104
	resp, err := client.Get(deviceChannel.Url)
77
105
	if err != nil {
78
106
		return err
79
107
	}
80
108
81
109
	if (resp.StatusCode != 200) {
82
110
		statusErr := errors.New(fmt.Sprintf("Invalid HTTP response: %d", resp.StatusCode))
83
111
		return statusErr
84
112
	}
85
113
86
114
	defer resp.Body.Close()
87
115
88
116
	body, err := ioutil.ReadAll(resp.Body)
89
117
	if err != nil {
90
118
		return err
91
119
	}
92
120
93
121
	err = json.Unmarshal(body, &jsonData)
94
122
	if err != nil {
95
123
		return err
96
124
	}
97
125
98
126
	images := jsonData["images"].([]interface{})
99
127
100
128
	for i := range images {
101
129
		entry := images[i].(map[string]interface{})
102
130
103
131
		imageType := entry["type"]
104
132
105
133
		if imageType != FULL_IMAGE {
106
134
			// ignore delta images as they cannot be used to
107
135
			// perform an initial device flash
108
136
			continue
109
137
		}
110
138
111
139
		fmt.Printf("%d: description='%s'\n",
112
140
			int(entry["version"].(float64)),
113
141
			entry["description"])
114
142
	}
115
143
116
144
	return nil
117
145
}
118
146
119
96
func (deviceChannel *DeviceChannel) GetRelativeImage(revision int) (image Image, err error) {
147
func (deviceChannel *DeviceChannel) GetRelativeImage(revision int) (image Image, err error) {
120
97
	var steps int
148
	var steps int
121
98
	if revision < 0 {
149
	if revision < 0 {
122
99
150
123
=== modified file 'ubuntuimage/types.go'
124
--- ubuntuimage/types.go	2014-04-16 11:43:38 +0000
125
+++ ubuntuimage/types.go	2014-10-02 08:49:00 +0000
126
@@ -30,6 +30,12 @@
127
30
30
128
31
type Channels map[string]Channel
31
type Channels map[string]Channel
129
32
32
130
33
type ImageVersion struct {
131
34
	Description               string
132
35
}
133
36
134
37
type ImageVersions map[int]ImageVersion
135
38
136
33
type File struct {
39
type File struct {
137
34
	Server                    string
40
	Server                    string
138
35
	Checksum, Path, Signature string
41
	Checksum, Path, Signature string
139
@@ -43,6 +49,7 @@
140
43
}
49
}
141
44
50
142
45
type DeviceChannel struct {
51
type DeviceChannel struct {
143
52
	Url    string
144
46
	Alias  string
53
	Alias  string
145
47
	Images []Image
54
	Images []Image
146
48
}
55
}
Status:	Merged
Approved by:	Sergio Schvezov on 2014-10-02
Approved revision:	75
Merged at revision:	75
Proposed branch:	lp:~jamesodhunt/goget-ubuntu-touch/add-list-images-option
Merge into:	lp:goget-ubuntu-touch
Diff against target:	146 lines (+78/-0) 4 files modified ubuntu-device-flash/args.go (+1/-0) ubuntu-device-flash/main.go (+19/-0) ubuntuimage/channels.go (+51/-0) ubuntuimage/types.go (+7/-0)
To merge this branch:	bzr merge lp:~jamesodhunt/goget-ubuntu-touch/add-list-images-option
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Sergio Schvezov		2014-09-30	Approve on 2014-10-02
PS Jenkins bot	continuous-integration		Approve on 2014-10-02
Review via email: mp+236510@code.launchpad.net