Merge pull request #150 from alindt/fixes

linux: display total size of disk 			
reduce redundant calls

scripts/mbusb_gui.py

@@ -143,28 +143,18 @@ Are you SURE you want to enable it?",
 
         if config.usb_disk:
             log("Selected device " + config.usb_disk)
-            config.persistence_max_size = persistence.max_disk_persistence(config.usb_disk)
 
-            self.usb_details = usb.details(config.usb_disk)
-#             print(self.usb_details)
-            config.usb_mount = self.usb_details.get('mount_point', "")
+            config.usb_details = usb.details(config.usb_disk)
+            config.persistence_max_size = persistence.max_disk_persistence(config.usb_disk)
+            config.usb_mount = config.usb_details.get('mount_point', "")
             self.ui.usb_dev.setText(config.usb_disk)
 
-#             if platform.system() == 'Windows':
-#                 self.ui.label_usb_vendor.setText("FileSystem:")
-#                 self.ui.usb_vendor.setText(self.usb_details['file_system'])
-#                 self.ui.label_usb_model.setText("Label: ")
-#                 self.ui.usb_model.setText(self.usb_details['label'])
-#             else:
-#                 self.ui.usb_vendor.setText(self.usb_details['vendor'])
-#                 self.ui.usb_model.setText(self.usb_details['model'])
-
-            self.ui.usb_vendor.setText(self.usb_details.get('vendor', ""))
-            self.ui.usb_model.setText(self.usb_details.get('model', ""))
-            self.ui.usb_size.setText(str(usb.bytes2human(self.usb_details.get('size_total', ""))))
-            self.ui.usb_mount.setText(self.usb_details.get('mount_point', ""))
-            self.ui.usb_type.setText(self.usb_details.get('devtype', ""))
-            self.ui.usb_fs.setText(self.usb_details.get('file_system', ""))
+            self.ui.usb_vendor.setText(config.usb_details.get('vendor', ""))
+            self.ui.usb_model.setText(config.usb_details.get('model', ""))
+            self.ui.usb_size.setText(str(usb.bytes2human(config.usb_details.get('size_total', ""))))
+            self.ui.usb_mount.setText(config.usb_details.get('mount_point', ""))
+            self.ui.usb_type.setText(config.usb_details.get('devtype', ""))
+            self.ui.usb_fs.setText(config.usb_details.get('file_system', ""))
 
             self.update_list_box(config.usb_disk)
             self.ui_update_persistence()

scripts/persistence.py

@@ -25,7 +25,7 @@ def max_disk_persistence(usb_disk):
     assert usb_disk is not None
 
     fat_max_size = (4096 * 1024 * 1024)
-    usb_details = usb.details(usb_disk)
+    usb_details = config.usb_details
     config.usb_uuid = usb_details['uuid']
     config.usb_label = usb_details['label']
 

scripts/uninstall_distro.py

@@ -21,7 +21,7 @@ def install_distro_list():
     List all distro names installed by previous install
     :return:  List of distro names as list
     """
-    usb_details = details(config.usb_disk)
+    usb_details = config.usb_details
     config.usb_mount = usb_details['mount_point']
     sys_cfg_file = os.path.join(config.usb_mount, "multibootusb", "syslinux.cfg")
 

scripts/usb.py

@@ -258,7 +258,8 @@ def details_udev(usb_disk_part):
         size_free = shutil.disk_usage(mount_point)[2]
 
     else:
-        size_total = device.get('UDISKS_PARTITION_SIZE') or ""
+        fdisk_cmd = 'fdisk -l ' + usb_disk_part + ' | grep "^Disk /" | sed -re "s/.*\s([0-9]+)\sbytes.*/\\1/"'
+        size_total = subprocess.check_output(fdisk_cmd, shell=True).strip()
         size_used = ""
         size_free = ""
         mount_point = ""