Archives/multibootusb
2
0
Fork 0
mirror of https://github.com/mbusb/multibootusb synced 2024-11-01 15:40:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128 from alindt/safe-usb-info-access

Browse Source 
Safely access usb info dict
This commit is contained in:
multibootusb 2017-04-18 06:58:02 +05:30 committed by GitHub
commit 552085a73d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/mbusb_gui.py
View File

@ -146,7 +146,7 @@ Are you SURE you want to enable it?",
self.usb_details = usb.details(config.usb_disk) self.usb_details = usb.details(config.usb_disk)
# print(self.usb_details) # print(self.usb_details)
config.usb_mount = self.usb_details['mount_point'] config.usb_mount = self.usb_details.get('mount_point', "")
self.ui.usb_dev.setText(config.usb_disk) self.ui.usb_dev.setText(config.usb_disk)
# if platform.system() == 'Windows': # if platform.system() == 'Windows':
@ -158,12 +158,12 @@ Are you SURE you want to enable it?",
# self.ui.usb_vendor.setText(self.usb_details['vendor']) # self.ui.usb_vendor.setText(self.usb_details['vendor'])
# self.ui.usb_model.setText(self.usb_details['model']) # self.ui.usb_model.setText(self.usb_details['model'])
self.ui.usb_vendor.setText(self.usb_details['vendor']) self.ui.usb_vendor.setText(self.usb_details.get('vendor', ""))
self.ui.usb_model.setText(self.usb_details['model']) self.ui.usb_model.setText(self.usb_details.get('model', ""))
self.ui.usb_size.setText(str(usb.bytes2human(self.usb_details['size_total']))) self.ui.usb_size.setText(str(usb.bytes2human(self.usb_details.get('size_total', ""))))
self.ui.usb_mount.setText(self.usb_details['mount_point']) self.ui.usb_mount.setText(self.usb_details.get('mount_point', ""))
self.ui.usb_type.setText(self.usb_details['devtype']) self.ui.usb_type.setText(self.usb_details.get('devtype', ""))
self.ui.usb_fs.setText(self.usb_details['file_system']) self.ui.usb_fs.setText(self.usb_details.get('file_system', ""))
self.update_list_box(config.usb_disk) self.update_list_box(config.usb_disk)
self.ui_update_persistence() self.ui_update_persistence()
@ -225,7 +225,7 @@ Are you SURE you want to enable it?",
for name in distro_list: for name in distro_list:
self.ui.installed_distros.addItem(name) self.ui.installed_distros.addItem(name)
else: else:
if config.usb_mount == 'No_Mount': if not config.usb_mount:
log("USB disk is not mounted and can't update list widget...") log("USB disk is not mounted and can't update list widget...")
#QtWidgets.QMessageBox.information(self, 'No Install...', #QtWidgets.QMessageBox.information(self, 'No Install...',
# 'syslinux.cfg does not exist for updating list widget.') # 'syslinux.cfg does not exist for updating list widget.')