Merge lp:~ricotz/appcenter/optimizations into lp:~elementary-apps/appcenter/appcenter

[Rico Tzschichholz]

Unmerged revisions

330. By Rico Tzschichholz on 2016-10-26

Retrieve matching Pk.Package only once when required

329. By Rico Tzschichholz on 2016-10-26

Avoid a bunch of string copying

=== modified file 'src/Core/ChangeInformation.vala'
--- src/Core/ChangeInformation.vala	2016-10-07 17:44:50 +0000
+++ src/Core/ChangeInformation.vala	2016-10-26 18:22:34 +0000
@@ -48,7 +48,7 @@
         return changes.size > 0;
     }
 
-    public string get_status_string () {
+    public unowned string get_status_string () {
         switch (status) {
             case Pk.Status.SETUP:
                 return _("Starting");

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2016-10-26 12:59:05 +0000
+++ src/Core/Client.vala	2016-10-26 18:22:34 +0000
@@ -38,7 +38,7 @@
     private Client () {
         appstream_pool.get_components ().foreach ((comp) => {
             var package = new AppCenterCore.Package (comp);
-            foreach (var pkg_name in comp.get_pkgnames ()) {
+            foreach (unowned string pkg_name in comp.get_pkgnames ()) {
                 package_list.set (pkg_name, package);
             }
         });
@@ -103,7 +103,7 @@
         AppCenter.Task install_task = request_task ();
         AppCenter.Task search_task = request_task ();
         string[] packages_ids = {};
-        foreach (var pkg_name in package.component.get_pkgnames ()) {
+        foreach (unowned string pkg_name in package.component.get_pkgnames ()) {
             packages_ids += pkg_name;
         }
 
@@ -175,7 +175,7 @@
         AppCenter.Task remove_task = request_task ();
         AppCenter.Task search_task = request_task ();
         string[] packages_ids = {};
-        foreach (var pkg_name in package.component.get_pkgnames ()) {
+        foreach (unowned string pkg_name in package.component.get_pkgnames ()) {
             packages_ids += pkg_name;
         }
         packages_ids += null;

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-09-14 16:58:13 +0000
+++ src/Core/Package.vala	2016-10-26 18:22:34 +0000
@@ -39,6 +39,9 @@
     public GLib.Cancellable action_cancellable { public get; private set; }
     public State state { public get; private set; default = State.NOT_INSTALLED; }
 
+    private Pk.Package? package = null;
+    private bool package_retrieved = false;
+
     public double progress {
         get {
             return change_information.progress;
@@ -183,13 +186,13 @@
         }
      }
 
-    public string? get_name () {
-        var _name = component.get_name ();
+    public unowned string? get_name () {
+        unowned string _name = component.get_name ();
         if (_name != null) {
             return _name;
         }
 
-        var package = find_package ();
+        unowned Pk.Package? package = find_package ();
         if (package != null) {
             return package.get_name ();
         }
@@ -197,13 +200,13 @@
         return null;
     }
 
-    public string? get_summary () {
-        var summary = component.get_summary ();
+    public unowned string? get_summary () {
+        unowned string summary = component.get_summary ();
         if (summary != null) {
             return summary;
         }
 
-        var package = find_package ();
+        unowned Pk.Package? package = find_package ();
         if (package != null) {
             return package.get_summary ();
         }
@@ -211,7 +214,7 @@
         return null;
     }
 
-    public string get_progress_description () {
+    public unowned string get_progress_description () {
         return change_information.get_status_string ();
     }
 
@@ -265,7 +268,7 @@
     }
 
     public string? get_version () {
-        var package = find_package ();
+        unowned Pk.Package? package = find_package ();
         if (package != null) {
             string returned = package.get_version ();
             returned = returned.split ("+", 2)[0];
@@ -281,21 +284,21 @@
         return null;
     }
 
-    private Pk.Package? find_package (bool installed = false) {
+    private unowned Pk.Package? find_package () {
         if (component.id == OS_UPDATES_ID) {
             return null;
         }
 
+        if (package_retrieved)
+            return 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);
+            package = AppCenterCore.Client.get_default ().get_app_package (component.get_pkgnames ()[0], 0LL);
         } catch (Error e) {
             critical (e.message);
-            return null;
         }
+
+        package_retrieved = true;
+        return package;
     }
 }

=== modified file 'src/Views/FeaturedView.vala'
--- src/Views/FeaturedView.vala	2015-10-30 17:53:09 +0000
+++ src/Views/FeaturedView.vala	2016-10-26 18:22:34 +0000
@@ -46,8 +46,8 @@
         Gdk.RGBA background_color = {0, 0, 0, 1};
         background_color.parse ("#3689e6");
         Gdk.RGBA text_color = {1, 1, 1, 1};
-        string title = "Apport";
-        string subtitle = "Crash Reporting Tool";
+        unowned string title = "Apport";
+        unowned string subtitle = "Crash Reporting Tool";
         var icon = new ThemedIcon ("apport");
         var left_placeholder = new Widgets.FeaturedButton (background_color, text_color, title, subtitle, icon);
         return left_placeholder;
@@ -57,8 +57,8 @@
         Gdk.RGBA background_color = {0, 0, 0, 1};
         background_color.parse ("#999999");
         Gdk.RGBA text_color = {1, 1, 1, 1};
-        string title = "Database";
-        string subtitle = "It's grown up and professional";
+        unowned string title = "Database";
+        unowned string subtitle = "It's grown up and professional";
         var icon = new ThemedIcon ("office-database");
         var left_placeholder = new Widgets.FeaturedButton (background_color, text_color, title, subtitle, icon);
         return left_placeholder;

=== modified file 'src/Widgets/AppCellRenderer.vala'
--- src/Widgets/AppCellRenderer.vala	2015-11-17 18:35:04 +0000
+++ src/Widgets/AppCellRenderer.vala	2016-10-26 18:22:34 +0000
@@ -57,8 +57,8 @@
 
     /* render method */
     public override void render (Cairo.Context cr, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags) {
-        var title = package.get_name ();
-        var summary = package.get_summary ();
+        unowned string title = package.get_name ();
+        unowned string summary = package.get_summary ();
 
         int x = background_area.x;
         int y = background_area.y + MARGIN;