Don't check the token if -t is not defined

[snf-image-creator] / image_creator / util.py

diff --git a/image_creator/util.py b/image_creator/util.py
index 50304f0..8730143 100644 (file)
--- a/image_creator/util.py
+++ b/image_creator/util.py
@@ -31,8 +31,15 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-import pbs
-from clint.textui import puts, puts_err, colored, progress
+import sys
+import sh
+import hashlib
+import time
+import os
+
+
+class FatalError(Exception):
+    pass
 
 
 def get_command(command):
@@ -40,33 +47,61 @@ def get_command(command):
         search_paths = ['/usr/local/sbin', '/usr/sbin', '/sbin']
         for fullpath in map(lambda x: "%s/%s" % (x, command), search_paths):
             if os.path.exists(fullpath) and os.access(fullpath, os.X_OK):
-                return pbs.Command(fullpath)
+                return sh.Command(fullpath)
         raise exception
 
     try:
-        return pbs.__getattr__(command)
-    except pbs.CommadNotFount as e:
+        return sh.__getattr__(command)
+    except sh.CommadNotFount as e:
         return find_sbin_command(command, e)
 
 
-def error(msg, new_line=True):
-    puts_err(colored.red("Error: %s\n" % msg), new_line)
+def try_fail_repeat(command, *args):
+
+    times = (0.1, 0.5, 1, 2)
+    i = iter(times)
+    while True:
+        try:
+            command(*args)
+            return
+        except sh.ErrorReturnCode:
+            try:
+                wait = i.next()
+            except StopIteration:
+                break
+            time.sleep(wait)
+
+    raise FatalError("Command: `%s %s' failed" % (command, " ".join(args)))
+
+
+def free_space(dirname):
+    stat = os.statvfs(dirname)
+    return stat.f_bavail * stat.f_frsize
 
 
-def warn(msg, new_line=True):
-    puts_err(colored.yellow("Warning: %s" % msg), new_line)
+class MD5:
+    def __init__(self, output):
+        self.out = output
 
+    def compute(self, filename, size):
+        MB = 2 ** 20
+        BLOCKSIZE = 4 * MB  # 4MB
 
-def success(msg, new_line=True):
-    puts(colored.green(msg), new_line)
+        prog_size = ((size + MB - 1) // MB)  # in MB
+        progressbar = self.out.Progress(prog_size, "Calculating md5sum", 'mb')
+        md5 = hashlib.md5()
+        with open(filename, "r") as src:
+            left = size
+            while left > 0:
+                length = min(left, BLOCKSIZE)
+                data = src.read(length)
+                md5.update(data)
+                left -= length
+                progressbar.goto((size - left) // MB)
 
+        checksum = md5.hexdigest()
+        progressbar.success(checksum)
 
-def progress_generator(label='', n=100):
-    position = 0
-    for i in progress.bar(range(n), label):
-        if i < position:
-            continue
-        position = yield
-    yield  # suppress the StopIteration exception
+        return checksum
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :