From 794667fecd1a885e0c31b468947fc7a6110acfbf Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Mon, 6 Dec 2021 11:32:25 +1300
Subject: [PATCH] move setting up installation source to SourceController

---
 subiquity/server/controllers/install.py | 14 +++-----------
 subiquity/server/controllers/source.py  | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/subiquity/server/controllers/install.py b/subiquity/server/controllers/install.py
index 21b292e1..594eb8a1 100644
--- a/subiquity/server/controllers/install.py
+++ b/subiquity/server/controllers/install.py
@@ -19,12 +19,11 @@ import os
 import re
 import shutil
 
-from curtin.commands.extract import get_handler_for_source
 from curtin.commands.install import (
     ERROR_TARFILE,
     INSTALL_LOG,
     )
-from curtin.util import sanitize_source, write_file
+from curtin.util import write_file
 
 import yaml
 
@@ -157,15 +156,8 @@ class InstallController(SubiquityController):
 
             self.app.update_state(ApplicationState.RUNNING)
 
-            handler = get_handler_for_source(
-                sanitize_source(self.model.source.get_source()))
-
-            if self.app.opts.dry_run:
-                path = '/'
-            else:
-                path = handler.setup()
-
-            self.apt_configurer = get_apt_configurer(self.app, path)
+            self.apt_configurer = get_apt_configurer(
+                self.app, self.app.controllers.Source.source_path)
 
             for_install_path = await self.configure_apt(context=context)
 
diff --git a/subiquity/server/controllers/source.py b/subiquity/server/controllers/source.py
index fe9d211b..c76f61ca 100644
--- a/subiquity/server/controllers/source.py
+++ b/subiquity/server/controllers/source.py
@@ -15,6 +15,9 @@
 
 import os
 
+from curtin.commands.extract import get_handler_for_source
+from curtin.util import sanitize_source
+
 from subiquity.common.apidef import API
 from subiquity.common.types import (
     SourceSelection,
@@ -48,6 +51,11 @@ class SourceController(SubiquityController):
 
     endpoint = API.source
 
+    def __init__(self, app):
+        super().__init__(app)
+        self._handler = None
+        self.source_path = None
+
     def start(self):
         path = '/cdrom/casper/install-sources.yaml'
         if self.app.opts.source_catalog is not None:
@@ -80,6 +88,14 @@ class SourceController(SubiquityController):
             self.model.current.id)
 
     async def configured(self):
+        if self._handler is not None:
+            self._handler.cleanup()
+        self._handler = get_handler_for_source(
+            sanitize_source(self.model.get_source()))
+        if self.app.opts.dry_run:
+            self.source_path = '/'
+        else:
+            self.source_path = self._handler.setup()
         await super().configured()
         self.app.base_model.set_source_variant(self.model.current.variant)