Merge lp:~yuningdodo/usb-creator/usb-creator.lp1413494v2-update-free-space-after-format into lp:usb-creator

[Yu Ning]

In usbcreator udisks backend it will try to mount the new partition and calculate the free space in the _udisks_partition_added() callback, however it will always skip the operation since the device is marked as "formatting".

To fix this issue we can keep the new partition in a list and do the job after formatting completed.

[lp:~yuningdodo/usb-creator/usb-creator.lp1413494v2-update-free-space-after-format]

463. By Yu Ning on 2015-02-19

Update free space after formatting. (LP: #1413494)

[Yu Ning (yuningdodo)]

Sorry, I forgot to commit my changes previously, the branch is updated now.

Unmerged revisions

463. By Yu Ning on 2015-02-19

Update free space after formatting. (LP: #1413494)

=== modified file 'usbcreator/backends/udisks/backend.py'
--- usbcreator/backends/udisks/backend.py	2015-01-17 00:03:17 +0000
+++ usbcreator/backends/udisks/backend.py	2015-02-19 06:53:06 +0000
@@ -24,6 +24,7 @@
         self.mounted_source = ''
         self.formatting = []
         self.handles = []
+        self.new_parts = set()
         self.show_all = show_all
         self.allow_system_internal = allow_system_internal
         logging.debug('UDisks2Backend')
@@ -151,6 +152,7 @@
         parent = partition.get_cached_property('Table').get_string()
         fs = obj.get_filesystem()
         if fs:
+            self.new_parts.add((obj, block, drive, path))
             mount_points = fs.get_cached_property('MountPoints').get_bytestring_array()
             if (
                     fstype == 'vfat' and
@@ -290,6 +292,24 @@
                 dev = p
             self.targets[dev]['formatting'] = False
             self.formatting.remove(dev)
+        # try to mount and update the free spaces
+        for obj,block,drive,path in self.new_parts:
+            fstype = block.get_cached_property('IdType').get_string()
+            fs = obj.get_filesystem()
+            mount_points = fs.get_cached_property('MountPoints').get_bytestring_array()
+            if (fstype == 'vfat' and len(mount_points) == 0):
+                try:
+                    mount = self.retry_mount(fs)
+                except:
+                    logging.exception('Could not mount the device: %s' % path)
+                    continue
+            else:
+                mount = mount_points and mount_points[0]
+            if mount:
+                total, free = misc.fs_size(mount)
+            if total > 1:
+                self._update_free(path)
+        self.new_parts.clear()
 
     def format_ended(self, dev=None):
         self.format_done(dev)