Use recovery option from distinst

pop-os · May 18, 2018 · dedfaca · dedfaca
1 parent 29a1d1e
commit dedfaca
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 407 deletions.
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -81,8 +81,8 @@ public class Installer.MainWindow : Gtk.Dialog {
         stack.visible_child = keyboard_layout_view;
 
         keyboard_layout_view.next_step.connect (() => {
-            var recovery = Recovery.get_default ();
-            if (recovery == null || !recovery.oem_mode) {
+            var options = InstallOptions.get_default ();
+            if (options.is_oem_mode ()) {
                 load_try_install_view ();
             } else {
                 load_encrypt_view ();

diff --git a/src/Objects/InstallOptions.vala b/src/Objects/InstallOptions.vala
@@ -20,6 +20,10 @@
 
 public class InstallOptions : GLib.Object {
     private static InstallOptions _options_object;
+    private Distinst.InstallOptions _options;
+    private Distinst.Disks disks;
+    public Distinst.InstallOption? selected_option;
+
     public static unowned InstallOptions get_default () {
         if (_options_object == null) {
             _options_object = new InstallOptions ();
@@ -28,21 +32,34 @@ public class InstallOptions : GLib.Object {
         return _options_object;
     }
 
-    private Distinst.InstallOptions _options;
-    private Distinst.Disks disks;
+    public bool has_recovery () {
+        return null != _options.get_recovery_option ();
+    }
+
+    public bool is_oem_mode () {
+        var recovery = _options.get_recovery_option ();
+        return null != recovery && recovery.get_oem_mode ();
+    }
 
     public unowned Distinst.InstallOptions new_options (uint64 minimum_disk_size) {
         disks = Distinst.Disks.probe ();
         _options = new Distinst.InstallOptions (disks, minimum_disk_size);
         return _options;
     }
 
+    public unowned Distinst.InstallOptions get_options () {
+        if (!has_recovery ()) {
+            disks = Distinst.Disks.probe ();
+            _options = new Distinst.InstallOptions (disks, 0);
+        }
+
+        return _options;
+    }
+
     public Distinst.Disks get_disks () {
         return (owned) disks;
     }
 
-    public Distinst.InstallOption? selected_option;
-
     public unowned Distinst.InstallOption? get_selected_option () {
         return selected_option;
     }

diff --git a/src/Objects/Recovery.vala b/src/Objects/Recovery.vala
diff --git a/src/Views/PartitioningView.vala b/src/Views/PartitioningView.vala
@@ -129,7 +129,7 @@ public class Installer.PartitioningView : AbstractInstallerView {
 
         foreach (unowned Distinst.Disk disk in disks.list ()) {
             // Skip root disk or live disk
-            if (Recovery.get_default() == null && (disk.contains_mount ("/") || disk.contains_mount ("/cdrom"))) {
+            if (!InstallOptions.get_default ().has_recovery () && (disk.contains_mount ("/") || disk.contains_mount ("/cdrom"))) {
                 continue;
             }