comparison scripts/hvresources/uploader.py @ 522:a084456960c9 prerelease

updated heavy uploader

 import json
 import os
 import requests
 import shutil
 import stat
-import sys
 import tempfile
 import time
 import urlparse
 import zipfile
 

             raise Exception("The target directory, zipped, is {0} bytes. The maximum upload size of 1MB.".format(
                 os.stat(zip_path).st_size))
     except Exception as e:
         print "{0}Error:{1} {2}".format(Colours.red, Colours.end, e)
         shutil.rmtree(temp_dir) # clean up the temporary directory
-        sys.exit(1)
+        return
 
     post_data["name"] = args.name
 
     # the outputs to generate (always include c)
     __SUPPORTED_GENERATOR_SET = {

     if len(r_json.get("errors",[])) > 0:
         shutil.rmtree(temp_dir) # clean up the temporary directory
         for i,x in enumerate(r_json["errors"]):
             print "{3}) {0}Error:{1} {2}".format(
                 Colours.red, Colours.end, x["detail"], i+1)
-        sys.exit(2)
+        return
 
     # retrieve all requested files
     for i,g in enumerate(args.gen):
         file_url = __get_file_url_for_generator(reply_json, g)
         if file_url is not None and (len(args.out) > i or args.b):

     # delete the temporary directory
     shutil.rmtree(temp_dir)
 
     print "Job URL:", reply_json["data"]["links"]["self"]
     print "Total request time: {0}ms".format(int(1000.0*(time.time()-tick)))
-    print "Heavy version:", reply_json["meta"]["version"]
-    sys.exit(0) # success!
+    print "Heavy release:", reply_json.get("meta",{}).get("release", "default")
 
 def __get_file_url_for_generator(json_api, g):
     """Returns the file link for a specific generator.
     Returns None if no link could be found.
     """