reduce answers-related boilerplate
This commit is contained in:
parent
81b9c883f3
commit
7096501a6d
|
@ -62,7 +62,6 @@ class FilesystemController(BaseController):
|
|||
if self.opts.dry_run and self.opts.bootloader:
|
||||
name = self.opts.bootloader.upper()
|
||||
self.model.bootloader = getattr(Bootloader, name)
|
||||
self.answers = app.answers.get("Filesystem", {})
|
||||
self.answers.setdefault('guided', False)
|
||||
self.answers.setdefault('guided-index', 0)
|
||||
self.answers.setdefault('manual', [])
|
||||
|
|
|
@ -27,7 +27,6 @@ class IdentityController(BaseController):
|
|||
def __init__(self, app):
|
||||
super().__init__(app)
|
||||
self.model = app.base_model.identity
|
||||
self.answers = app.answers.get('Identity', {})
|
||||
|
||||
def default(self):
|
||||
self.ui.set_body(IdentityView(self.model, self))
|
||||
|
|
|
@ -208,7 +208,6 @@ class InstallProgressController(BaseController):
|
|||
def __init__(self, app):
|
||||
super().__init__(app)
|
||||
self.model = app.base_model
|
||||
self.answers = app.answers.get('InstallProgress', {})
|
||||
self.answers.setdefault('reboot', False)
|
||||
self.progress_view = None
|
||||
self.progress_view_showing = False
|
||||
|
|
|
@ -32,7 +32,6 @@ class KeyboardController(BaseController):
|
|||
def __init__(self, app):
|
||||
super().__init__(app)
|
||||
self.model = app.base_model.keyboard
|
||||
self.answers = app.answers.get("Keyboard", {})
|
||||
|
||||
def language_selected(self, code):
|
||||
log.debug("language_selected %s", code)
|
||||
|
|
|
@ -41,7 +41,6 @@ class MirrorController(BaseController):
|
|||
super().__init__(app)
|
||||
self.model = app.base_model.mirror
|
||||
self.check_state = CheckState.NOT_STARTED
|
||||
self.answers = app.answers.get('Mirror', {})
|
||||
if 'country-code' in self.answers:
|
||||
self.check_state = CheckState.DONE
|
||||
self.model.set_country(self.answers['country-code'])
|
||||
|
|
|
@ -28,7 +28,6 @@ class ProxyController(BaseController):
|
|||
def __init__(self, app):
|
||||
super().__init__(app)
|
||||
self.model = app.base_model.proxy
|
||||
self.answers = app.answers.get('Proxy', {})
|
||||
|
||||
def default(self):
|
||||
self.ui.set_body(ProxyView(self.model, self))
|
||||
|
|
|
@ -62,7 +62,6 @@ class RefreshController(BaseController):
|
|||
|
||||
self.view = None
|
||||
self.offered_first_time = False
|
||||
self.answers = app.answers.get("Refresh", {})
|
||||
|
||||
def start(self):
|
||||
self.switch_state = SwitchState.SWITCHING
|
||||
|
|
|
@ -143,7 +143,6 @@ class SnapListController(BaseController):
|
|||
super().__init__(app)
|
||||
self.model = app.base_model.snaplist
|
||||
self.loader = self._make_loader()
|
||||
self.answers = app.answers.get('SnapList', {})
|
||||
|
||||
def snapd_network_changed(self):
|
||||
# If the loader managed to load the list of snaps, the
|
||||
|
|
|
@ -34,7 +34,6 @@ class SSHController(BaseController):
|
|||
def __init__(self, app):
|
||||
super().__init__(app)
|
||||
self.model = app.base_model.ssh
|
||||
self.answers = app.answers.get('SSH', {})
|
||||
|
||||
def default(self):
|
||||
self.ui.set_body(SSHView(self.model, self))
|
||||
|
|
|
@ -29,7 +29,6 @@ class WelcomeController(BaseController):
|
|||
def __init__(self, app):
|
||||
super().__init__(app)
|
||||
self.model = app.base_model.locale
|
||||
self.answers = app.answers.get("Welcome", {})
|
||||
log.debug("Welcome: answers=%s", self.answers)
|
||||
|
||||
def start(self):
|
||||
|
|
|
@ -631,7 +631,6 @@ class ZdevController(BaseController):
|
|||
|
||||
def __init__(self, app):
|
||||
super().__init__(app)
|
||||
self.answers = app.answers.get('Zdev', {})
|
||||
if self.opts.dry_run:
|
||||
if platform.machine() == 's390x':
|
||||
zdevinfos = self.lszdev()
|
||||
|
|
|
@ -25,6 +25,10 @@ class BaseController(ABC):
|
|||
|
||||
signals = []
|
||||
|
||||
@classmethod
|
||||
def _controller_name(cls):
|
||||
return cls.__name__[:-len("Controller")]
|
||||
|
||||
def __init__(self, app):
|
||||
self.ui = app.ui
|
||||
self.signal = app.signal
|
||||
|
@ -32,6 +36,7 @@ class BaseController(ABC):
|
|||
self.loop = app.loop
|
||||
self.run_in_bg = app.run_in_bg
|
||||
self.app = app
|
||||
self.answers = app.answers.get(self._controller_name(), {})
|
||||
|
||||
def register_signals(self):
|
||||
"""Defines signals associated with controller from model."""
|
||||
|
|
|
@ -186,7 +186,6 @@ class NetworkController(BaseController):
|
|||
def __init__(self, app):
|
||||
super().__init__(app)
|
||||
self.model = app.base_model.network
|
||||
self.answers = app.answers.get("Network", {})
|
||||
self.view = None
|
||||
self.view_shown = False
|
||||
self.dhcp_check_handle = None
|
||||
|
|
Loading…
Reference in New Issue