Merge lp:~vds/ubuntuone-windows-installer/fix_rss into lp:ubuntuone-windows-installer/beta

[Vincenzo Di Somma]

Switched from manifest to rss.

[Manuel de la Peña (mandel)]

I believe that each item of the RSS feed must have its own uuid, otherwise there use of an uuid does not make any sense, right?

review: Needs Fixing

[Vincenzo Di Somma (vds)]

Yes, but as it is only for tests there will always be one element right?

[Manuel de la Peña (mandel)]

> Yes, but as it is only for tests there will always be one element right?

Yes you are right, we can leave it like this for the time being until we move the content and the RSS somewhere else. Can you put a # TODO so that we remember to do it?

[Manuel de la Peña (mandel)]

review: Approve

[Rick McBride (rmcbride)]

+1

review: Approve

=== added file 'utils/__init__.py'
=== added file 'utils/rss_templates.py'
--- utils/rss_templates.py	1970-01-01 00:00:00 +0000
+++ utils/rss_templates.py	2010-07-29 12:24:49 +0000
@@ -0,0 +1,37 @@
+# Copyright 2010 Canonical Ltd.  All rights reserved.
+"""
+Parameters:
+
+ - lastBuildDate
+ - pubDate format
+ - version
+ - enclosure url
+ - enclosure lenght
+ - sha
+ 
+"""
+
+from string import Template
+
+
+RSS_TEMPLATE = Template("""
+<rss version="2.0" xmlns:as="http://appsyndication.org/schemas/appsyn">
+  <channel>
+    <title>Ubuntu One Windows Client</title>
+    <generator>WiX Toolset's ClickThrough for Isolated Applications</generator>
+    <lastBuildDate>$lastBuildDate</lastBuildDate>
+    <ttl>1440</ttl>
+    <as:application type="application/vnd.ms-msi">7bb74cea-a4a3-4904-9706-8f4dc764b368</as:application>
+    <item>
+      <guid isPermaLink="false">urn:msi:7bb74cea-a4a3-4904-9706-8f4dc764b368/$version</guid>
+      <pubDate>$pubDate</pubDate>
+      <title>Ubuntu One Windows Client</title>
+      <description>Ubuntu One Windows Client</description>
+      <as:application type="application/vnd.ms-msi">58cdea62-96b2-482b-b046-d884583c8ccd</as:application>
+      <as:version>$version</as:version>
+      <enclosure url="$url" length="$lenght" type="application/octet-stream" />
+      <as:digest algorithm="sha256">$sha</as:digest>
+    </item>
+  </channel>
+</rss>
+""")

=== modified file 'utils/upload_new_update.py'
--- utils/upload_new_update.py	2010-07-09 10:11:58 +0000
+++ utils/upload_new_update.py	2010-07-29 12:24:49 +0000
@@ -3,62 +3,81 @@
 
 """This utilities release an Ubuntu One windows update."""
 
+import os
+import time
+import hashlib
 import sys
-from zipfile import ZipFile
-from xml.dom.minidom import parseString
+
 import boto
 from boto.s3.key import Key
-
-
-MANIFEST_NAME = 'ubuntuone.manifest'
-PACKAGES_BUCKET_PREFIX = 'vds'
-MANIFEST_BUCKET = 'vds_manifest'
-
-def upload_package(name, version, conn, package_filename):
-    """Creates the bucket and upload the package"""
-    new_bucket_name = '%s-%s-%s' % (PACKAGES_BUCKET_PREFIX, name, version)
-    new_bucket_name = new_bucket_name.lower()
-    bucket = conn.create_bucket(new_bucket_name)
-    print 'New bucket created: %s' % new_bucket_name
-    k = Key(bucket)
-    k.key = package_filename
-    k.set_contents_from_filename(package_filename)
-    print 'Package uploaded: %s' % package_filename
-    bucket.set_acl('public-read', package_filename)
-    print 'Making package public: %s' % package_filename
-
-
-def update_manifest(conn, manifest):
-    bucket = conn.create_bucket((MANIFEST_BUCKET))
-    k = Key(bucket)
-    k.key = 'manifest'
-    k.set_contents_from_string(manifest)
-    print 'Manifest updated'
-    bucket.set_acl('public-read', 'manifest')
-    print 'Making manifest public'
-
-
-def main(package_filename):
+from boto.exception import S3ResponseError
+
+from rss_templates import RSS_TEMPLATE
+
+
+
+BUCKET = 'u1wintest'
+RSS_FILE_NAME = 'rss'
+
+
+def upload_package(bucket, filename):
+    """Upload the package"""
+    try:
+        print 'Removing %s...' % filename
+        bucket.delete_key(filename)
+    except S3ResponseError:
+        print 'No previous upload.'
+    print 'Uploading %s...' % filename
+    k = Key(bucket)
+    k.key = filename
+    k.set_contents_from_filename(filename)
+    bucket.set_acl('public-read', filename)
+    print "Uploaded!"
+
+
+def upload_rss(bucket, filename, rss_params):
+    """Upload the RSS"""
+    now = time.strftime('%d %b %Y %H:%M:%S %Z')
+    rss_params['lastBuildDate'] = rss_params['pubDate'] = now
+    fd = open(filename,'r')
+    rss_params['sha'] = hashlib.sha1(fd.read()).hexdigest()
+    rss_params['lenght'] = os.path.getsize(filename)
+    try:
+        print 'Removing rss...'
+        bucket.delete_key(RSS_FILE_NAME)
+    except S3ResponseError:
+        print 'No previous upload'
+    print 'Generating new rss...'
+    rss = RSS_TEMPLATE.substitute(rss_params)
+    print 'Uploading new rss...'
+    k = Key(bucket)
+    k.key = RSS_FILE_NAME
+    k.set_contents_from_string(rss)
+    bucket.set_acl('public-read', RSS_FILE_NAME)
+    print "Uploaded!"
+
+
+def main(filename, rss_params):
     """ """
-    # prepare to upload
-    packagezip = ZipFile(package_filename, 'r')
-    manifest = packagezip.read(MANIFEST_NAME)
-    manifest_dom = parseString(manifest)
-    identity = manifest_dom.getElementsByTagName('assemblyIdentity')[0]
-    name = identity.getAttribute('name')
-    version = identity.getAttribute('version')
     # connect to S3
     print 'Connecting to S3...'
     conn = boto.connect_s3()
     print 'Connected!'
-    upload_package(name, version, conn, package_filename)
-    update_manifest(conn, manifest)
+    bucket = conn.get_bucket(BUCKET)
+    upload_package(bucket, filename)
+    upload_rss(bucket, filename, rss_params)
 
 
 if __name__ == '__main__':
     argv = sys.argv
     #FIXME check we have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY in the env
-    if len (argv) != 2:
-        print "Usage: upload_new_update.py package_file"
+    if len (argv) != 4:
+        print "Usage: upload_new_update.py package_file version url"
+        print "example:"
+        print 'python upload_new_update.py u1client.msi 0.0.2 "/u1wintest"'
         sys.exit()
-    sys.exit(main(package_filename=argv[1]))
+    package_filename = argv[1]
+    rss_params = {}
+    rss_params['version'] =  argv[2]
+    rss_params['url'] = argv[3]
+    sys.exit(main(filename=argv[1], rss_params=rss_params))