[improvement][trim] 'disk.trim_after_update' changed to 'disk.trim.after_upgrade'

This commit is contained in:
Vinicius Moreira
2020-04-22 14:01:36 -03:00
parent 700a6ca9ce
commit 827d31e495
12 changed files with 48 additions and 38 deletions

View File

@@ -284,9 +284,8 @@ class UpgradeSelected(AsyncAction):
return FormComponent(label=lb, components=comps), (required_size, extra_size)
def _trim_disk(self, root_password: str):
if self.request_confirmation(title=self.i18n['confirmation'].capitalize(),
body=self.i18n['action.trim_disk.ask']):
def _trim_disk(self, root_password: str, ask: bool):
if not ask or self.request_confirmation(title=self.i18n['confirmation'].capitalize(), body=self.i18n['action.trim_disk.ask']):
pwd = root_password
@@ -296,7 +295,7 @@ class UpgradeSelected(AsyncAction):
if not success:
return
self.change_status(self.i18n['action.disk_trim'].capitalize())
self.change_status('{}...'.format(self.i18n['action.disk_trim'].capitalize()))
self.change_substatus('')
success, output = ProcessHandler(self).handle_simple(SimpleProcess(['fstrim', '/', '-v'], root_password=pwd))
@@ -461,8 +460,8 @@ class UpgradeSelected(AsyncAction):
updated = len(requirements.to_upgrade)
updated_types.update((req.pkg.__class__ for req in requirements.to_upgrade))
if bool(app_config['disk']['trim_after_update']):
self._trim_disk(root_password)
if app_config['disk']['trim']['after_upgrade'] is not False:
self._trim_disk(root_password, ask=app_config['disk']['trim']['after_upgrade'] is None)
msg = '<p>{}</p>{}</p><br/><p>{}</p>'.format(self.i18n['action.update.success.reboot.line1'],
self.i18n['action.update.success.reboot.line2'],