🙈 Hide alongside / erase options if they belong to the install device

Author: mmstick

src/Objects/InstallOptions.vala

@@ -29,6 +29,9 @@ public class InstallOptions : GLib.Object {
 
     private Gee.ArrayList<string> unlocked_devices { get; set; default = new Gee.ArrayList<string> (); }
 
+    private unowned Distinst.Disk? install_device;
+    private string? install_device_path;
+
     // The amount of free space that should be retained when shrinking (20 GiB).
     public const uint64 SHRINK_OVERHEAD = 20 * 2 * 1024 * 1024;
 
@@ -40,6 +43,25 @@ public class InstallOptions : GLib.Object {
         return _options_object;
     }
 
+    public unowned Distinst.Disk? get_install_device () {
+        if (install_device == null) {
+            install_device = disks.get_disk_with_mount ("/cdrom");
+        }
+
+        return install_device;
+    }
+
+    public unowned string? get_install_device_path () {
+        if (install_device_path == null) {
+            unowned Distinst.Disk? install_device = get_install_device ();
+            if (install_device != null) {
+                install_device_path = Utils.string_from_utf8 (install_device.get_device_path ());
+            }
+        }
+
+        return install_device_path;
+    }
+
     public void set_minimum_size (uint64 size) {
         minimum_size = size;
     }
@@ -118,6 +140,7 @@ public class InstallOptions : GLib.Object {
     // Transder ownership of the disks to the caller.
     public Distinst.Disks take_disks () {
         disks_moved = true;
+        install_device = null;
         return (owned) disks;
     }
 

src/Views/AlongsideView.vala

@@ -47,9 +47,11 @@ public class AlongsideView: OptionsView {
     public void update_options () {
         base.clear_options ();
 
+        var options = InstallOptions.get_default ();
+
         add_alongside_options ();
 
-        if (InstallOptions.get_default ().get_options ().has_erase_options ()) {
+        if (options.get_options ().has_erase_options ()) {
             add_erase_options ();
         }
 
@@ -59,16 +61,24 @@ public class AlongsideView: OptionsView {
 
     private void add_alongside_options () {
         var install_options = InstallOptions.get_default ();
+        unowned string? install_device = install_options.get_install_device_path ();
 
         foreach (var option in install_options.get_options ().get_alongside_options ()) {
+            unowned uint8[] device_path = option.get_path ();
+            var device = Utils.string_from_utf8 (option.get_device ());
+
+            if (install_device != null && install_device == device) {
+                debug ("skipping %s because it is on the install device\n", device);
+                continue;
+            }
+
             string? os = Utils.string_from_utf8 (option.get_os ());
             os = os == "none" ? null : os;
 
-            var device = Utils.string_from_utf8 (option.get_device ());
             var free = option.get_sectors_free ();
             var total = option.get_sectors_total ();
             var partition = option.get_partition ();
-            var path = Utils.string_from_utf8 (option.get_path ());
+            var path = Utils.string_from_utf8 (device_path);
             string logo = Utils.get_distribution_logo_from_alongside (option);
 
             string label;
@@ -129,11 +139,18 @@ public class AlongsideView: OptionsView {
     private void add_erase_options () {
         var install_options = InstallOptions.get_default ();
         unowned Distinst.InstallOptions options = install_options.get_updated_options ();
+        unowned string? install_device = install_options.get_install_device_path ();
 
         foreach (unowned Distinst.EraseOption disk in options.get_erase_options ()) {
+            string device_path = Utils.string_from_utf8 (disk.get_device_path ());
+
+            if (install_device != null && install_device == device_path && !install_options.has_recovery ()) {
+                continue;
+            }
+
             string logo = Utils.string_from_utf8 (disk.get_linux_icon ());
             string label = Utils.string_from_utf8 (disk.get_model ());
-            string details = "Erase %s %.1f GiB".printf (
+            string details = "%s %.1f GiB".printf (
                 Utils.string_from_utf8 (disk.get_device_path ()),
                 (double) disk.get_sectors () / SECTORS_AS_GIB
             );

src/Views/DiskView.vala

@@ -42,8 +42,15 @@ public class Installer.DiskView : OptionsView {
     public async void load (uint64 minimum_disk_size) {
         var install_options = InstallOptions.get_default ();
         unowned Distinst.InstallOptions options = install_options.get_updated_options ();
+        unowned string? install_device = install_options.get_install_device_path ();
 
         foreach (unowned Distinst.EraseOption disk in options.get_erase_options ()) {
+            string device_path = Utils.string_from_utf8 (disk.get_device_path ());
+
+            if (install_device != null && install_device == device_path && !install_options.has_recovery ()) {
+                continue;
+            }
+
             string logo = Utils.string_from_utf8 (disk.get_linux_icon ());
             string label = Utils.string_from_utf8 (disk.get_model ());
             string details = "%s %.1f GiB".printf (

src/Views/TryInstallView.vala

@@ -155,7 +155,7 @@ public class Installer.TryInstallView : AbstractInstallerView {
         InstallTypeButton alongside_button = null;
 
         // Disallow the alongside OS option if the live media is the recovery partition.
-        if (!options.has_recovery ()) {
+        if (options.has_recovery ()) {
             alongside_button = button_creator.new_button (
                 _("Install Alongside OS"),
                 "drive-multidisk",