Merge lp:~donadigo/appcenter/refactor-package-class into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

Package.vala:
* Use GObject-style construction
* Cache properties

This branch refactors package class, to improve performance and reduce unneded operations.

The class now uses GObject construction. In addition, instead of always getting the property of the class like name, summary and version, it has each property saved, so there is no need for getting the property again, the packagekit package is also cached.

[Danielle Foré (danrabbit)]

Looks good. I haven't noticed any issues with this branch :)

review: Approve

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-09-14 16:58:13 +0000
+++ src/Core/Package.vala	2016-12-26 21:41:27 +0000
@@ -33,7 +33,7 @@
 
     public const string OS_UPDATES_ID = "xxx-os-updates";
 
-    public AppStream.Component component { public get; private set; }
+    public AppStream.Component component { get; construct; }
     public ChangeInformation change_information { public get; private set; }
     public Gee.TreeSet<Pk.Package> installed_packages { public get; private set; }
     public GLib.Cancellable action_cancellable { public get; private set; }
@@ -72,20 +72,26 @@
     public bool is_os_updates {
         get {
             return component.id == "xxx-os-updates";
-         }
-     }
-
-    public Package (AppStream.Component component) {
-        this.component = component;
+        }
+    }
+
+    private string? name = null;
+    private string? summary = null;
+    private string? version = null;
+    private Pk.Package? pk_package = null;
+
+    construct {
         installed_packages = new Gee.TreeSet<Pk.Package> ();
         change_information = new ChangeInformation ();
-        change_information.status_changed.connect (() => {
-            info_changed (change_information.status);
-        });
+        change_information.status_changed.connect (() => info_changed (change_information.status));
 
         action_cancellable = new GLib.Cancellable ();
     }
 
+    public Package (AppStream.Component component) {
+        Object (component: component);
+    }
+
     public void update_state () {
         if (installed) {
             if (change_information.has_changes ()) {
@@ -102,6 +108,7 @@
         if (state != State.UPDATE_AVAILABLE) {
             return false;
         }
+
         return yield perform_operation (State.UPDATING, State.INSTALLED, State.UPDATE_AVAILABLE);
     }
 
@@ -109,6 +116,7 @@
         if (state != State.NOT_INSTALLED) {
             return false;
         }
+
         if (yield perform_operation (State.INSTALLING, State.INSTALLED, State.NOT_INSTALLED)) {
             /* TODO: Move this to a higher level */
             var application = (Gtk.Application)Application.get_default ();
@@ -121,6 +129,7 @@
 
                 application.send_notification ("installed", notification);
             }
+
             return true;
         }
 
@@ -131,6 +140,7 @@
         if (state != State.INSTALLED) {
             return false;
         }
+
         return yield perform_operation (State.REMOVING, State.NOT_INSTALLED, State.INSTALLED);
     }
 
@@ -144,6 +154,7 @@
         } finally {
             clean_up_package_operation (exit_status, after_success, after_fail);
         }
+
         return (exit_status == Pk.Exit.SUCCESS);
     }
 
@@ -184,31 +195,35 @@
      }
 
     public string? get_name () {
-        var _name = component.get_name ();
-        if (_name != null) {
-            return _name;
-        }
-
-        var package = find_package ();
-        if (package != null) {
-            return package.get_name ();
-        }
-
-        return null;
+        if (name != null) {
+            return name;
+        }
+
+        name = component.get_name ();
+        if (name == null) {
+            var package = find_package ();
+            if (package != null) {
+                name = package.get_name ();
+            }
+        }
+
+        return name;
     }
 
     public string? get_summary () {
-        var summary = component.get_summary ();
         if (summary != null) {
             return summary;
         }
 
-        var package = find_package ();
-        if (package != null) {
-            return package.get_summary ();
+        summary = component.get_summary ();
+        if (summary == null) {
+            var package = find_package ();
+            if (package != null) {
+                summary = package.get_summary ();
+            }
         }
 
-        return null;
+        return summary;
     }
 
     public string get_progress_description () {
@@ -265,6 +280,10 @@
     }
 
     public string? get_version () {
+        if (version != null) {
+            return version;
+        }
+
         var package = find_package ();
         if (package != null) {
             string returned = package.get_version ();
@@ -275,27 +294,28 @@
                 returned = returned.split (":", 2)[1];
             }
 
-            return returned;
+            version = returned;
         }
 
-        return null;
+        return version;
     }
 
-    private Pk.Package? find_package (bool installed = false) {
+    private Pk.Package? find_package () {
         if (component.id == OS_UPDATES_ID) {
             return null;
         }
 
+        if (pk_package != null) {
+            return pk_package;
+        }
+
         try {
-            Pk.Bitfield filter = 0;
-            if (installed) {
-                filter = Pk.Bitfield.from_enums (Pk.Filter.INSTALLED);
-            }
-
-            return AppCenterCore.Client.get_default ().get_app_package (component.get_pkgnames ()[0], filter);
+            pk_package = AppCenterCore.Client.get_default ().get_app_package (component.get_pkgnames ()[0], 0);
         } catch (Error e) {
-            critical (e.message);
+            warning (e.message);
             return null;
         }
+
+        return pk_package;
     }
 }