- # Upload image file
- with open(session['snapshot'], 'rb') as f:
- session["upload"] = kamaki.upload(f, size, filename,
- "Calculating block hashes",
- "Uploading missing blocks")
- # Upload metadata file
- out.output("Uploading metadata file...")
- metastring = '\n'.join(
- ['%s=%s' % (k, v) for (k, v) in session['metadata'].items()])
- metastring += '\n'
- kamaki.upload(StringIO.StringIO(metastring), size=len(metastring),
- remote_path="%s.meta" % filename)
- out.success("done")
-
- # Upload md5sum file
- out.output("Uploading md5sum file...")
- md5str = "%s %s\n" % (session['checksum'], filename)
- kamaki.upload(StringIO.StringIO(md5str), size=len(md5str),
- remote_path="%s.md5sum" % filename)
- out.success("done")
-
- except ClientError as e:
- d.msgbox("Error in pithos+ client: %s" % e.message,
- title="Pithos+ Client Error", width=MSGBOX_WIDTH)
- if 'upload' in session:
- del session['upload']
- return False
+ if 'checksum' not in session:
+ md5 = MD5(out)
+ session['checksum'] = md5.compute(session['snapshot'], size)
+
+ kamaki = Kamaki(session['account'], session['token'], out)
+ try:
+ # Upload image file
+ with open(session['snapshot'], 'rb') as f:
+ session["pithos_uri"] = kamaki.upload(f, size, filename,
+ "Calculating block hashes",
+ "Uploading missing blocks")
+ # Upload metadata file
+ out.output("Uploading metadata file...")
+ metastring = extract_metadata_string(session)
+ kamaki.upload(StringIO.StringIO(metastring),
+ size=len(metastring),
+ remote_path="%s.meta" % filename)
+ out.success("done")
+
+ # Upload md5sum file
+ out.output("Uploading md5sum file...")
+ md5str = "%s %s\n" % (session['checksum'], filename)
+ kamaki.upload(StringIO.StringIO(md5str), size=len(md5str),
+ remote_path="%s.md5sum" % filename)
+ out.success("done")
+
+ except ClientError as e:
+ d.msgbox("Error in pithos+ client: %s" % e.message,
+ title="Pithos+ Client Error", width=MSGBOX_WIDTH)
+ if 'pithos_uri' in session:
+ del session['pithos_uri']
+ return False
+ finally:
+ out.remove(gauge)