drivers: show different words when online vs offline

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>

subiquity/client/controllers/drivers.py

@@ -38,7 +38,8 @@ class DriversController(SubiquityTuiController):
             raise Skip
 
         response: DriversResponse = await self.endpoint.GET()
-        return DriversView(self, response.drivers, response.install)
+        return DriversView(self, response.drivers,
+                           response.install, response.local_only)
 
     async def _wait_drivers(self) -> List[str]:
         response: DriversResponse = await self.endpoint.GET(wait=True)

subiquity/common/types.py

@@ -398,9 +398,11 @@ class DriversResponse:
     :drivers: tells what third-party drivers will be installed should we decide
     to do it. It will bet set to None until we figure out what drivers are
     available.
+    :local_only: tells if we are looking for drivers only from the ISO.
     """
     install: bool
     drivers: Optional[List[str]]
+    local_only: bool
 
 
 @attr.s(auto_attribs=True)

subiquity/server/controllers/drivers.py

@@ -98,10 +98,13 @@ class DriversController(SubiquityController):
             await self.configured()
 
     async def GET(self, wait: bool = False) -> DriversResponse:
+        local_only = not self.app.base_model.network.has_network
         if wait:
             await asyncio.shield(self._drivers_task)
+
         return DriversResponse(install=self.model.do_install,
-                               drivers=self.drivers)
+                               drivers=self.drivers,
+                               local_only=local_only)
 
     async def POST(self, data: DriversPayload) -> None:
         self.model.do_install = data.install

subiquity/ui/views/drivers.py

@@ -69,12 +69,14 @@ class DriversView(BaseView):
     form = None
 
     def __init__(self, controller, drivers: Optional[List[str]],
-                 install: bool) -> None:
+                 install: bool, local_only: bool) -> None:
         self.controller = controller
+        self.local_only = local_only
 
         self.search_later = [
-            Text(_("Note: You can search again later for third-party " +
+            Text(_("Note: Once the installation has finished and you are " +
-                   "drivers using the command:")),
+                   "connected to a network, you can search again for " +
+                   "third-party drivers using the following command:")),
             Text(""),
             Text("  $ ubuntu-drivers list --recommended --gpgpu"),
         ]
@@ -91,8 +93,17 @@ class DriversView(BaseView):
         asynchronously. """
         self.spinner = Spinner(self.controller.app.aio_loop, style='dots')
         self.spinner.start()
+
+        if self.local_only:
+            looking_for_drivers = _("Not connected to a network. " +
+                                    "Looking for applicable third-party " +
+                                    "drivers available locally...")
+        else:
+            looking_for_drivers = _("Looking for applicable third-party " +
+                                    "drivers available locally or online...")
+
         rows = [
-            Text(_("Looking for applicable third-party drivers...")),
+            Text(looking_for_drivers),
             Text(""),
             self.spinner,
             ]
@@ -117,10 +128,18 @@ class DriversView(BaseView):
         """ Change the view into an information page that shows that no
         third-party drivers are available for installation. """
 
-        rows = [
+        if self.local_only:
-            Text(_("No applicable third-party drivers were found.")),
+            no_drivers_found = _("No applicable third-party drivers are " +
-            Text(""),
+                                 "available locally.")
-        ] + self.search_later
+        else:
+            no_drivers_found = _("No applicable third-party drivers are " +
+                                 "available locally or online.")
+
+        rows = [Text(no_drivers_found)]
+        if self.local_only:
+            rows.append(Text(""))
+            rows.extend(self.search_later)
+
         self.cont_btn = ok_btn(
                 _("Continue"),
                 on_press=lambda sender: self.done(False))
@@ -149,6 +168,8 @@ class DriversView(BaseView):
         rows = [Text(f"* {driver}") for driver in drivers]
         rows.append(Text(""))
         rows.extend(self.form.as_rows())
+
+        if self.local_only:
             rows.append(Text(""))
             rows.extend(self.search_later)