Add cleanup_cache function in unix

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

diff --git a/image_creator/disk.py b/image_creator/disk.py
index aebddc2..809a1a3 100644 (file)
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
-import losetup
+from image_creator.util import get_command
+from clint.textui import progress
+
 import stat
 import os
 import tempfile
@@ -9,14 +11,15 @@ import re
 import sys
 import guestfs
 
-from pbs import dmsetup
-from pbs import blockdev
-from pbs import dd
-
 
 class DiskError(Exception):
     pass
 
+dd = get_command('dd')
+dmsetup = get_command('dmsetup')
+losetup = get_command('losetup')
+blockdev = get_command('blockdev')
+
 
 class Disk(object):
     """This class represents a hard disk hosting an Operating System
@@ -37,10 +40,10 @@ class Disk(object):
         self._cleanup_jobs.append((job, args))
 
     def _losetup(self, fname):
-        loop = losetup.find_unused_loop_device()
-        loop.mount(fname)
-        self._add_cleanup(loop.unmount)
-        return loop.device
+        loop = losetup('-f', '--show', fname)
+        loop = loop.strip() # remove the new-line char
+        self._add_cleanup(losetup, '-d', loop)
+        return loop
 
     def _dir_to_disk(self):
         raise NotImplementedError
@@ -102,6 +105,15 @@ class Disk(object):
         device.destroy()
 
 
+def progress_generator(total):
+    position = 0;
+    for i in progress.bar(range(total)):
+        if i < position:
+            continue
+        position = yield
+    yield #suppress the StopIteration exception
+
+
 class DiskDevice(object):
     """This class represents a block device hosting an Operating System
     as created by the device-mapper.
@@ -111,13 +123,18 @@ class DiskDevice(object):
         """Create a new DiskDevice."""
         self.device = device
         self.bootable = bootable
+        self.progress_bar = None
 
         self.g = guestfs.GuestFS()
+        self.g.add_drive_opts(device, readonly=0)
 
-        self.g.set_trace(1)
+        #self.g.set_trace(1)
+        #self.g.set_verbose(1)
 
-        self.g.add_drive_opts(device, readonly=0)
+        eh = self.g.set_event_callback(self.progress_callback, guestfs.EVENT_PROGRESS)
         self.g.launch()
+        self.g.delete_event_callback(eh)
+        
         roots = self.g.inspect_os()
         if len(roots) == 0:
             raise DiskError("No operating system found")
@@ -135,6 +152,19 @@ class DiskDevice(object):
         # Close the guestfs handler
         self.g.close()
 
+    def progress_callback(self, ev, eh, buf, array):
+        position = array[2]
+        total = array[3]
+        
+        if self.progress_bar is None:
+            self.progress_bar = progress_generator(total)
+            self.progress_bar.next()
+
+        self.progress_bar.send(position)
+
+        if position == total:
+            self.progress_bar = None
+
     def mount(self):
         """Mount all disk partitions in a correct order."""
         mps = self.g.inspect_get_mountpoints(self.root)