WIP Part 8: Refactor

src/models/launchers/bottles.vala

@@ -1,7 +1,7 @@
 namespace ProtonPlus.Models.Launchers {
     public class Bottles : Launcher {
         public Bottles (Launcher.InstallationTypes installation_type) {
-            string[] directories = null;;
+            string[] directories = null;
 
             switch (installation_type) {
             case Launcher.InstallationTypes.SYSTEM:

src/models/launchers/hgl.vala

@@ -1,7 +1,7 @@
 namespace ProtonPlus.Models.Launchers {
     public class HeroicGamesLauncher : Launcher {
         public HeroicGamesLauncher (Launcher.InstallationTypes installation_type) {
-            string[] directories = null;;
+            string[] directories = null;
 
             switch (installation_type) {
             case Launcher.InstallationTypes.SYSTEM:

src/models/launchers/lutris.vala

@@ -1,7 +1,7 @@
 namespace ProtonPlus.Models.Launchers {
     public class Lutris : Launcher {
         public Lutris (Launcher.InstallationTypes installation_type) {
-            string[] directories = null;;
+            string[] directories = null;
 
             switch (installation_type) {
             case Launcher.InstallationTypes.SYSTEM:

src/models/release.vala

@@ -1,17 +1,14 @@
 namespace ProtonPlus.Models {
     public abstract class Release : Object {
-        public Widgets.ReleaseRow row { get; set; }
-
         public Runner runner { get; set; }
         public string title { get; set; }
+        public string displayed_title { get; set; }
         public string description { get; set; }
         public string release_date { get; set; }
         public string download_url { get; set; }
         public string page_url { get; set; }
-
-        public bool installed { get; set; }
-        internal bool canceled { get; set; }
-
+        public bool canceled { get; set; }
+        public string progress { get; set; }
         public signal void send_message (string message);
     }
 }

src/models/releases/basic.vala

@@ -2,6 +2,14 @@ namespace ProtonPlus.Models.Releases {
     public class Basic : Release {
         public string install_location { get; set; }
         public int64 download_size { get; set; }
+        public State state { get; set; }
+
+        public enum State {
+            NOT_INSTALLED,
+            INSTALLED,
+            BUSY_INSTALLING,
+            BUSY_REMOVING,
+        }
 
         public Basic.github (Runners.Basic runner, string title, string description, string release_date, int64 download_size, string download_url, string page_url) {
             this.description = description;
@@ -19,32 +27,46 @@ namespace ProtonPlus.Models.Releases {
         internal void shared (Runners.Basic runner, string title, string release_date, string download_url, string page_url) {
             this.runner = runner;
             this.title = title;
+            this.displayed_title = title;
             this.description = description;
             this.release_date = release_date;
             this.download_url = download_url;
             this.page_url = page_url;
 
             install_location = runner.group.launcher.directory + runner.group.directory + "/" + runner.get_directory_name (title);
+        }
 
-            var row = new Widgets.ReleaseRows.Basic ();
-            row.initialize (this);
-
-            this.row = row;
-
-            installed = FileUtils.test (install_location, FileTest.IS_DIR);
+        protected void refresh_state () {
+            state = FileUtils.test (install_location, FileTest.IS_DIR) ? State.INSTALLED : State.NOT_INSTALLED;
         }
 
-        public virtual async bool install () {
+        public async bool install () {
+            state = State.BUSY_INSTALLING;
+
             send_message (_("The installation of %s has begun.").printf (title));
 
+            var install_success = yield start_install ();
+
+            if (canceled)
+                send_message (_("The installation of %s was canceled.").printf (title));
+            else if (install_success)
+                send_message (_("The installation of %s is complete.").printf (title));
+            else
+                send_message (_("An unexpected error occurred while installing %s.").printf (title));
+
+            refresh_state ();
+
+            return true;
+        }
+
+        protected virtual async bool start_install () {
             send_message (_("Downloading..."));
 
             string path = runner.group.launcher.directory + runner.group.directory + "/" + title + ".tar.gz";
 
-            var download_valid = yield Utils.Web.Download (download_url, path, () => canceled, (is_percent, progress) => row.install_dialog.progress_text = is_percent? @"$progress%" : Utils.Filesystem.convert_bytes_to_string (progress));
+            var download_valid = yield Utils.Web.Download (download_url, path, () => canceled, (is_percent, progress) => this.progress = is_percent? @"$progress%" : Utils.Filesystem.convert_bytes_to_string (progress));
 
             if (!download_valid) {
-                install_error ();
                 return false;
             }
 
@@ -54,63 +76,55 @@ namespace ProtonPlus.Models.Releases {
 
             string source_path = yield Utils.Filesystem.extract (directory, title, ".tar.gz", () => canceled);
 
-            if (source_path == "") {
-                install_error ();
+            if (source_path == "")
                 return false;
-            }
 
             send_message (_("Renaming..."));
 
             var runner = this.runner as Runners.Basic;
 
             var renaming_valid = yield Utils.Filesystem.rename (source_path, directory + runner.get_directory_name (title));
 
-            if (!renaming_valid) {
-                install_error ();
+            if (!renaming_valid)
                 return false;
-            }
 
-            send_message (_("Running post installation script..."));
+            send_message (_("Running installation script..."));
 
             runner.group.launcher.install (this);
 
-            send_message (_("The installation of %s is complete.").printf (title));
-
-            installed = true;
-
             return true;
         }
 
-        protected void install_error () {
-            if (canceled)
-                send_message (_("The installation of %s was canceled.").printf (title));
+        public async bool remove () {
+            state = State.BUSY_REMOVING;
+
+            send_message (_("The removal of %s has begun.").printf (title));
+
+            var remove_success = yield start_remove ();
+
+            if (remove_success)
+                send_message (_("The removal of %s is complete.").printf (title));
             else
-                send_message (_("An unexpected error occurred while installing %s.").printf (title));
+                send_message (_("An unexpected error occurred while removing %s.").printf (title));
+
+            refresh_state ();
+
+            return true;
         }
 
-        public virtual async bool remove () {
-            send_message (_("The removal of %s has begun.").printf (title));
+        protected virtual async bool start_remove () {
+            send_message (_("Deleting..."));
 
             var deleted = yield Utils.Filesystem.delete_directory (install_location);
 
-            if (!deleted) {
-                remove_error ();
+            if (!deleted)
                 return false;
-            }
 
-            send_message (_("Running post removal script..."));
+            send_message (_("Running removal script..."));
 
             runner.group.launcher.uninstall (this);
 
-            send_message (_("The removal of %s is complete.").printf (title));
-
-            installed = false;
-
             return true;
         }
-
-        protected void remove_error () {
-            send_message (_("An unexpected error occurred while removing %s.").printf (title));
-        }
     }
 }

src/models/releases/github-action.vala

@@ -7,49 +7,44 @@ namespace ProtonPlus.Models.Releases {
 
             shared (runner, title, release_date, download_url, page_url);
 
-            row.set_title (@"$title ($release_date)");
+            displayed_title = @"$title ($release_date)";
         }
 
-        public override async bool install () {
-            send_message (_("The installation of %s has begun.").printf (title));
-
+        protected override async bool start_install () {
             send_message (_("Downloading..."));
 
-            string path = runner.group.launcher.directory + runner.group.directory + "/" + title + ".zip";
+            string path = runner.group.launcher.directory + runner.group.directory + "/" + title + ".tar.gz";
 
-            var download_valid = yield Utils.Web.Download (download_url, path, () => canceled, (is_percent, progress) => row.install_dialog.progress_text = is_percent? @"$progress%" : Utils.Filesystem.convert_bytes_to_string (progress));
+            var download_valid = yield Utils.Web.Download (download_url, path, () => canceled, (is_percent, progress) => this.progress = is_percent? @"$progress%" : Utils.Filesystem.convert_bytes_to_string (progress));
 
-            if (!download_valid) {
-                install_error ();
+            if (!download_valid)
                 return false;
-            }
 
             send_message (_("Extracting..."));
 
             string directory = runner.group.launcher.directory + "/" + runner.group.directory + "/";
 
-            string source_path = yield Utils.Filesystem.extract (directory, title, ".zip", () => canceled);
+            string source_path = yield Utils.Filesystem.extract (directory, title, ".tar.gz", () => canceled);
 
-            if (source_path == "") {
-                install_error ();
+            if (source_path == "")
                 return false;
-            }
 
             source_path = yield Utils.Filesystem.extract (directory, source_path.substring (0, source_path.length - 4).replace (directory, ""), ".tar", () => canceled);
 
+            // TODO Check if the second extraction was good
+
             send_message (_("Renaming..."));
 
             var runner = this.runner as Runners.Basic;
 
-            yield Utils.Filesystem.rename (source_path, directory + runner.get_directory_name (title));
-
-            send_message (_("Running post installation script..."));
+            var renaming_valid = yield Utils.Filesystem.rename (source_path, directory + runner.get_directory_name (title));
 
-            runner.group.launcher.install (this);
+            if (!renaming_valid)
+                return false;
 
-            send_message (_("The installation of %s is complete.").printf (title));
+            send_message (_("Running installation script..."));
 
-            installed = true;
+            runner.group.launcher.install (this);
 
             return true;
         }