1
=== added file 'utils/__init__.py'
2
=== added file 'utils/rss_templates.py'
3
--- utils/rss_templates.py	1970-01-01 00:00:00 +0000
4
+++ utils/rss_templates.py	2010-07-29 12:24:49 +0000
5
@@ -0,0 +1,37 @@
6
1
# Copyright 2010 Canonical Ltd.  All rights reserved.
7
2
"""
8
3
Parameters:
9
4
10
5
 - lastBuildDate
11
6
 - pubDate format
12
7
 - version
13
8
 - enclosure url
14
9
 - enclosure lenght
15
10
 - sha
16
11
 
17
12
"""
18
13
19
14
from string import Template
20
15
21
16
22
17
RSS_TEMPLATE = Template("""
23
18
<rss version="2.0" xmlns:as="http://appsyndication.org/schemas/appsyn">
24
19
  <channel>
25
20
    <title>Ubuntu One Windows Client</title>
26
21
    <generator>WiX Toolset's ClickThrough for Isolated Applications</generator>
27
22
    <lastBuildDate>$lastBuildDate</lastBuildDate>
28
23
    <ttl>1440</ttl>
29
24
    <as:application type="application/vnd.ms-msi">7bb74cea-a4a3-4904-9706-8f4dc764b368</as:application>
30
25
    <item>
31
26
      <guid isPermaLink="false">urn:msi:7bb74cea-a4a3-4904-9706-8f4dc764b368/$version</guid>
32
27
      <pubDate>$pubDate</pubDate>
33
28
      <title>Ubuntu One Windows Client</title>
34
29
      <description>Ubuntu One Windows Client</description>
35
30
      <as:application type="application/vnd.ms-msi">58cdea62-96b2-482b-b046-d884583c8ccd</as:application>
36
31
      <as:version>$version</as:version>
37
32
      <enclosure url="$url" length="$lenght" type="application/octet-stream" />
38
33
      <as:digest algorithm="sha256">$sha</as:digest>
39
34
    </item>
40
35
  </channel>
41
36
</rss>
42
37
""")
43
0
38
44
=== modified file 'utils/upload_new_update.py'
45
--- utils/upload_new_update.py	2010-07-09 10:11:58 +0000
46
+++ utils/upload_new_update.py	2010-07-29 12:24:49 +0000
47
@@ -3,62 +3,81 @@
48
3
3
49
4
"""This utilities release an Ubuntu One windows update."""
4
"""This utilities release an Ubuntu One windows update."""
50
5
5
51
6
import os
52
7
import time
53
8
import hashlib
54
6
import sys
9
import sys
57
7
from zipfile import ZipFile
10
56
8
from xml.dom.minidom import parseString
58
9
import boto
11
import boto
59
10
from boto.s3.key import Key
12
from boto.s3.key import Key
91
11
13
from boto.exception import S3ResponseError
92
12
14
93
13
MANIFEST_NAME = 'ubuntuone.manifest'
15
from rss_templates import RSS_TEMPLATE
94
14
PACKAGES_BUCKET_PREFIX = 'vds'
16
95
15
MANIFEST_BUCKET = 'vds_manifest'
17
96
16
18
97
17
def upload_package(name, version, conn, package_filename):
19
BUCKET = 'u1wintest'
98
18
    """Creates the bucket and upload the package"""
20
RSS_FILE_NAME = 'rss'
99
19
    new_bucket_name = '%s-%s-%s' % (PACKAGES_BUCKET_PREFIX, name, version)
21
100
20
    new_bucket_name = new_bucket_name.lower()
22
101
21
    bucket = conn.create_bucket(new_bucket_name)
23
def upload_package(bucket, filename):
102
22
    print 'New bucket created: %s' % new_bucket_name
24
    """Upload the package"""
103
23
    k = Key(bucket)
25
    try:
104
24
    k.key = package_filename
26
        print 'Removing %s...' % filename
105
25
    k.set_contents_from_filename(package_filename)
27
        bucket.delete_key(filename)
106
26
    print 'Package uploaded: %s' % package_filename
28
    except S3ResponseError:
107
27
    bucket.set_acl('public-read', package_filename)
29
        print 'No previous upload.'
108
28
    print 'Making package public: %s' % package_filename
30
    print 'Uploading %s...' % filename
109
29
31
    k = Key(bucket)
110
30
32
    k.key = filename
111
31
def update_manifest(conn, manifest):
33
    k.set_contents_from_filename(filename)
112
32
    bucket = conn.create_bucket((MANIFEST_BUCKET))
34
    bucket.set_acl('public-read', filename)
113
33
    k = Key(bucket)
35
    print "Uploaded!"
114
34
    k.key = 'manifest'
36
115
35
    k.set_contents_from_string(manifest)
37
116
36
    print 'Manifest updated'
38
def upload_rss(bucket, filename, rss_params):
117
37
    bucket.set_acl('public-read', 'manifest')
39
    """Upload the RSS"""
118
38
    print 'Making manifest public'
40
    now = time.strftime('%d %b %Y %H:%M:%S %Z')
119
39
41
    rss_params['lastBuildDate'] = rss_params['pubDate'] = now
120
40
42
    fd = open(filename,'r')
121
41
def main(package_filename):
43
    rss_params['sha'] = hashlib.sha1(fd.read()).hexdigest()
122
44
    rss_params['lenght'] = os.path.getsize(filename)
123
45
    try:
124
46
        print 'Removing rss...'
125
47
        bucket.delete_key(RSS_FILE_NAME)
126
48
    except S3ResponseError:
127
49
        print 'No previous upload'
128
50
    print 'Generating new rss...'
129
51
    rss = RSS_TEMPLATE.substitute(rss_params)
130
52
    print 'Uploading new rss...'
131
53
    k = Key(bucket)
132
54
    k.key = RSS_FILE_NAME
133
55
    k.set_contents_from_string(rss)
134
56
    bucket.set_acl('public-read', RSS_FILE_NAME)
135
57
    print "Uploaded!"
136
58
137
59
138
60
def main(filename, rss_params):
139
42
    """ """
61
    """ """
140
43
    # prepare to upload
141
44
    packagezip = ZipFile(package_filename, 'r')
142
45
    manifest = packagezip.read(MANIFEST_NAME)
143
46
    manifest_dom = parseString(manifest)
144
47
    identity = manifest_dom.getElementsByTagName('assemblyIdentity')[0]
145
48
    name = identity.getAttribute('name')
146
49
    version = identity.getAttribute('version')
147
50
    # connect to S3
62
    # connect to S3
148
51
    print 'Connecting to S3...'
63
    print 'Connecting to S3...'
149
52
    conn = boto.connect_s3()
64
    conn = boto.connect_s3()
150
53
    print 'Connected!'
65
    print 'Connected!'
153
54
    upload_package(name, version, conn, package_filename)
66
    bucket = conn.get_bucket(BUCKET)
154
55
    update_manifest(conn, manifest)
67
    upload_package(bucket, filename)
155
68
    upload_rss(bucket, filename, rss_params)
156
56
69
157
57
70
158
58
if __name__ == '__main__':
71
if __name__ == '__main__':
159
59
    argv = sys.argv
72
    argv = sys.argv
160
60
    #FIXME check we have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY in the env
73
    #FIXME check we have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY in the env
163
61
    if len (argv) != 2:
74
    if len (argv) != 4:
164
62
        print "Usage: upload_new_update.py package_file"
75
        print "Usage: upload_new_update.py package_file version url"
165
76
        print "example:"
166
77
        print 'python upload_new_update.py u1client.msi 0.0.2 "/u1wintest"'
167
63
        sys.exit()
78
        sys.exit()
169
64
    sys.exit(main(package_filename=argv[1]))
79
    package_filename = argv[1]
170
80
    rss_params = {}
171
81
    rss_params['version'] =  argv[2]
172
82
    rss_params['url'] = argv[3]
173
83
    sys.exit(main(filename=argv[1], rss_params=rss_params))
Status:	Merged
Approved by:	Rick McBride on 2010-08-13
Approved revision:	17
Merged at revision:	65
Proposed branch:	lp:~vds/ubuntuone-windows-installer/fix_rss
Merge into:	lp:ubuntuone-windows-installer/beta
Diff against target:	173 lines (+101/-45) 2 files modified utils/rss_templates.py (+37/-0) utils/upload_new_update.py (+64/-45)
To merge this branch:	bzr merge lp:~vds/ubuntuone-windows-installer/fix_rss
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Rick McBride (community)		Approve on 2010-08-13
Manuel de la Peña (community)	2010-07-29	Approve on 2010-08-04
Review via email: mp+31272@code.launchpad.net