X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/3f70f242172fce46e5df36df1d8a9e60c29faeb7..0144d7c741cb742f52ef8755fc315afaa7ea4747:/image_creator/main.py

diff --git a/image_creator/main.py b/image_creator/main.py
index 40bc880..ab69b2d 100755
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -37,10 +37,8 @@ from image_creator import get_os_class
 from image_creator import __version__ as version
 from image_creator import FatalError
 from image_creator.disk import Disk
-from image_creator.util import get_command, error, progress_generator, success
-from clint.textui import puts, indent
-from sendfile import sendfile
-
+from image_creator.util import get_command, error, success, output
+from image_creator import util
 import sys
 import os
 import optparse
@@ -65,31 +63,29 @@ def parse_options(input_args):
     parser = optparse.OptionParser(version=version, usage=usage)
 
     parser.add_option("-f", "--force", dest="force", default=False,
-        action="store_true", help="Overwrite output files if they exist")
+        action="store_true", help="overwrite output files if they exist")
 
     parser.add_option("--no-cleanup", dest="cleanup", default=True,
-        help="Don't cleanup sensitive data before extracting the image",
-        action="store_false")
+        help="don't cleanup sensitive data", action="store_false")
 
     parser.add_option("--no-sysprep", dest="sysprep", default=True,
-        help="Don't perform system preperation before extracting the image",
-        action="store_false")
+        help="don't perform system preperation", action="store_false")
 
     parser.add_option("--no-shrink", dest="shrink", default=True,
-        help="Don't shrink any partition before extracting the image",
-        action="store_false")
+        help="don't shrink any partition", action="store_false")
 
     parser.add_option("-o", "--outfile", type="string", dest="outfile",
         default=None, action="callback", callback=check_writable_dir,
-        help="Output image file",
-        metavar="FILE")
+        help="dump image to FILE", metavar="FILE")
+
+    parser.add_option("-s", "--silent", dest="silent", default=False,
+        help="silent mode, only output error", action="store_true")
 
     parser.add_option("-u", "--upload", dest="upload", default=False,
-        help="Upload image to a pithos repository using kamaki",
-        action="store_true")
+        help="upload the image to pithos", action="store_true")
 
     parser.add_option("-r", "--register", dest="register", default=False,
-        help="Register image to okeanos using kamaki", action="store_true")
+        help="register the image to ~okeanos", action="store_true")
 
     options, args = parser.parse_args(input_args)
 
@@ -108,42 +104,19 @@ def parse_options(input_args):
     return options
 
 
-def extract_image(device, outfile, size):
-    blocksize = 4194304  # 4MB
-    progress_size = (size + 1048575) // 1048576  # in MB
-    progressbar = progress_generator("Dumping image file: ",
-                                                    progress_size)
-    source = open(device, "r")
-    try:
-        dest = open(outfile, "w")
-        try:
-            left = size
-            offset = 0
-            progressbar.next()
-            while left > 0:
-                length = min(left, blocksize)
-                sent = sendfile(dest.fileno(), source.fileno(), offset, length)
-                offset += sent
-                left -= sent
-                for i in range(4):
-                    progressbar.next()
-        finally:
-            dest.close()
-    finally:
-        source.close()
-
-    success('Image file %s was successfully created' % outfile)
-
-
 def image_creator():
-    puts('snf-image-creator %s\n' % version)
     options = parse_options(sys.argv[1:])
 
+    if options.silent:
+        util.silent = True
+
+    output('snf-image-creator %s\n' % version)
+
     if os.geteuid() != 0:
         raise FatalError("You must run %s as root" \
                         % os.path.basename(sys.argv[0]))
 
-    if not options.force:
+    if not options.force and options.outfile is not None:
         for extension in ('', '.meta'):
             filename = "%s%s" % (options.outfile, extension)
             if os.path.exists(filename):
@@ -159,7 +132,7 @@ def image_creator():
         image_os = osclass(dev.root, dev.g)
         metadata = image_os.get_metadata()
 
-        puts()
+        output()
 
         if options.sysprep:
             image_os.sysprep()
@@ -170,7 +143,7 @@ def image_creator():
         dev.umount()
 
         size = options.shrink and dev.shrink() or dev.size()
-        metadata['size'] = str(size // 2 ** 20)
+        metadata['SIZE'] = str(size // 2 ** 20)
 
         if options.outfile is not None:
             f = open('%s.%s' % (options.outfile, 'meta'), 'w')
@@ -180,9 +153,9 @@ def image_creator():
             finally:
                 f.close()
 
-            extract_image(dev.device, options.outfile, size)
+            dev.dump(options.outfile)
     finally:
-        puts('cleaning up...')
+        output('cleaning up...')
         disk.cleanup()
 
     return 0