Merge lp:~ddieter/appcenter/appcenter-version-info into lp:~elementary-apps/appcenter/appcenter

[Dieter Debast]

* Show package versions in update tabs instead of summary
* Show the version of available updates in the info view instead of installed version

The installed view now shows the versions of the packages that are installed. When an update is available, it will show the version of the update.

Now this also shows the version of an update in the info view of an application, as this wasn't the case before (bug or intentional?).

[Danielle Foré (danrabbit)]

It seems like with this branch there is now a wait before AppInfoView loads. Previously the view was shown instantly and the version information would populate when it was able to be fetched. This branch feels much slower since there is lag between clicking and when the page opens.

[lp:~ddieter/appcenter/appcenter-version-info]

313. By Dieter Debast on 2016-10-07

Fix lag when opening AppInfoView

[Dieter Debast (ddieter)]

I don't notice that delay on my computer. Is it better now after my latest commit?

[lp:~ddieter/appcenter/appcenter-version-info]

314. By Dieter Debast on 2017-02-04

Merge with trunk

[Dieter Debast (ddieter)]

Merged with the changes from trunk. Please check if I didn't break any changes during resolving conflicts.

[Jeremy Wootten (jeremywootten)]

It seems to work OK, I did not notice any significant speed hit.

There a few issues with the code style - see in line.

review: Needs Fixing (code)

[lp:~ddieter/appcenter/appcenter-version-info]

315. By Dieter Debast on 2017-02-05

Improved code style

[Dieter Debast (ddieter)]

Thanks, I removed the update_state method and made the class abstract as you suggested.

[Jeremy Wootten (jeremywootten)]

Thanks Dieter. Looks good now.

review: Approve (code, function)

=== modified file 'src/AbstractAppContainer.vala'
--- src/AbstractAppContainer.vala	2017-01-01 16:05:55 +0000
+++ src/AbstractAppContainer.vala	2017-02-05 15:49:51 +0000
@@ -104,11 +104,9 @@
 
         protected virtual void set_up_package (uint icon_size = 48) {
             package_name.label = package.get_name ();
-            package_summary.label = package.get_summary ();
-            package_summary.ellipsize = Pango.EllipsizeMode.END;
             image.gicon = package.get_icon (icon_size);
 
-            package.notify["state"].connect (update_state);
+            package.notify["state"].connect (() => update_state ());
 
             package.change_information.bind_property ("can-cancel", cancel_button, "sensitive", GLib.BindingFlags.SYNC_CREATE);
             package.change_information.progress_changed.connect (update_progress);
@@ -116,10 +114,10 @@
 
             update_progress_status ();
             update_progress ();
-            update_state ();
+            update_state (true);
         }
 
-        protected virtual void update_state () {
+        protected virtual void update_state (bool first_update = false) {
             update_action ();
         }
 
@@ -171,6 +169,9 @@
                 case AppCenterCore.Package.State.UPDATE_AVAILABLE:
                     action_button.label = _("Update");
 
+                    action_button.no_show_all = false;
+                    action_button.show_all ();
+
                     if (show_open && package.get_can_launch ()) {
                         open_button.no_show_all = false;
                         open_button.show ();

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2016-12-28 16:29:00 +0000
+++ src/Core/Client.vala	2017-02-05 15:49:51 +0000
@@ -189,6 +189,11 @@
             string[] packages_array = {};
             results.get_package_array ().foreach ((pk_package) => {
                 packages_array += pk_package.get_id ();
+                unowned string pkg_name = pk_package.get_name ();
+                var package = package_list.get (pkg_name);
+                if (package != null) {
+                    package.latest_version = pk_package.get_version ();
+                }
             });
 
             // We need a null to show to PackageKit that it's then end of the array.
@@ -238,6 +243,7 @@
             var package = package_list.get (pk_package.get_name ());
             if (package != null) {
                 package.installed_packages.add (pk_package);
+                package.latest_version = pk_package.get_version ();
                 package.update_state ();
                 packages.add (package);
             }

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2017-01-01 16:05:55 +0000
+++ src/Core/Package.vala	2017-02-05 15:49:51 +0000
@@ -82,7 +82,11 @@
 
     private string? name = null;
     private string? summary = null;
-    private string? version = null;
+    private string? _latest_version = null;
+    public string? latest_version {
+        private get { return _latest_version; }
+        internal set { _latest_version = convert_version (value); }
+    }
     private Pk.Package? pk_package = null;
 
     construct {
@@ -303,24 +307,28 @@
     }
 
     public string? get_version () {
-        if (version != null) {
-            return version;
+        if (latest_version != null) {
+            return latest_version;
         }
 
         var package = find_package ();
         if (package != null) {
-            string returned = package.get_version ();
-            returned = returned.split ("+", 2)[0];
-            returned = returned.split ("-", 2)[0];
-            returned = returned.split ("~", 2)[0];
-            if (":" in returned) {
-                returned = returned.split (":", 2)[1];
-            }
-
-            version = returned;
-        }
-
-        return version;
+            latest_version = package.get_version ();
+        }
+
+        return latest_version;
+    }
+
+    private string convert_version (string version) {
+        string returned = version;
+        returned = returned.split ("+", 2)[0];
+        returned = returned.split ("-", 2)[0];
+        returned = returned.split ("~", 2)[0];
+        if (":" in returned) {
+            returned = returned.split (":", 2)[1];
+        }
+
+        return returned;
     }
 
     public bool get_can_launch () {

=== modified file 'src/Views/AppInfoView.vala'
--- src/Views/AppInfoView.vala	2017-01-01 16:05:55 +0000
+++ src/Views/AppInfoView.vala	2017-02-05 15:49:51 +0000
@@ -141,9 +141,23 @@
             open_button.get_style_context ().add_class ("h3");
         }
 
+        protected override void set_up_package (uint icon_size = 48) {                
+            package_summary.label = package.get_summary ();
+            package_summary.ellipsize = Pango.EllipsizeMode.END;
+            base.set_up_package (icon_size);
+        }
+        
+        protected override void update_state (bool first_update = false) {
+            if (!first_update) {
+                app_version.label = package.get_version ();
+            }
+
+            update_action ();
+        }
+
         private async void load_extensions () {
             package.component.get_addons ().@foreach ((extension) => {
-                var row = new Widgets.PackageRow (new AppCenterCore.Package (extension), null);
+                var row = new Widgets.PackageRow.list (new AppCenterCore.Package (extension), null, false);
                 if (extension_box != null) {
                     extension_box.add (row);
                 }

=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2017-01-01 16:05:55 +0000
+++ src/Views/AppListView.vala	2017-02-05 15:49:51 +0000
@@ -26,7 +26,7 @@
         public AppListView () {}
 
         protected override Widgets.AppListRow make_row (AppCenterCore.Package package)  {
-            return (Widgets.AppListRow)(new Widgets.PackageRow (package, action_button_group));
+            return (Widgets.AppListRow)(new Widgets.PackageRow.list (package, action_button_group, false));
         }
     }
 
@@ -88,7 +88,7 @@
         protected override void after_add_remove_change_row () {update_headers ();}
 
         protected override Widgets.AppListRow make_row (AppCenterCore.Package package) {
-            return (Widgets.AppListRow)(new Widgets.PackageRow (package, action_button_group));
+            return (Widgets.AppListRow)(new Widgets.PackageRow.installed (package, action_button_group, false));
         }
 
         protected override void on_package_changing (AppCenterCore.Package package, bool is_changing) {

=== modified file 'src/Widgets/PackageRow.vala'
--- src/Widgets/PackageRow.vala	2017-01-01 16:05:55 +0000
+++ src/Widgets/PackageRow.vala	2017-02-05 15:49:51 +0000
@@ -20,10 +20,18 @@
 
 namespace AppCenter.Widgets {
     public class PackageRow : Gtk.ListBoxRow, AppListRow {
-        PackageRowGrid grid;
+        AbstractPackageRowGrid grid;
 
-        public PackageRow (AppCenterCore.Package package, Gtk.SizeGroup? size_group) {
-            grid = new PackageRowGrid (package, size_group);
+        public PackageRow.installed (AppCenterCore.Package package, Gtk.SizeGroup? size_group, bool show_uninstall = true) {
+            grid = new InstalledPackageRowGrid (package, size_group, show_uninstall);
+            add (grid);
+            grid.changed.connect (() => {
+                changed ();
+            });
+        }
+        
+        public PackageRow.list (AppCenterCore.Package package, Gtk.SizeGroup? size_group, bool show_uninstall = true) {
+            grid = new ListPackageRowGrid (package, size_group, show_uninstall);
             add (grid);
             grid.changed.connect (() => {
                 changed ();
@@ -58,7 +66,7 @@
             return true;
         }
 
-        private class PackageRowGrid : AbstractAppContainer {
+        private abstract class AbstractPackageRowGrid : AbstractAppContainer {
             public signal void changed ();
 
             construct {
@@ -79,24 +87,15 @@
                 package_name.valign = Gtk.Align.END;
                 ((Gtk.Misc) package_name).xalign = 0;
 
-                package_summary = new Gtk.Label (null);
-                package_summary.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
-                package_summary.hexpand = true;
-                package_summary.valign = Gtk.Align.START;
-                ((Gtk.Misc) package_summary).xalign = 0;
-
-
                 attach (image, 0, 0, 1, 2);
                 attach (package_name, 1, 0, 1, 1);
-                attach (package_summary, 1, 1, 1, 1);
                 attach (action_stack, 2, 0, 1, 2);
             }
 
-            public PackageRowGrid (AppCenterCore.Package package, Gtk.SizeGroup? size_group) {
+            public AbstractPackageRowGrid (AppCenterCore.Package package, Gtk.SizeGroup? size_group, bool show_uninstall = true) {
                 this.package = package;
-                this.show_uninstall = false;
+                this.show_uninstall = show_uninstall;
                 this.show_open = false;
-                set_up_package ();
 
                 if (size_group != null) {
                     size_group.add_widget (action_button);
@@ -104,11 +103,65 @@
                     size_group.add_widget (uninstall_button);
                 }
             }
-
-            protected override void update_state () {
+        }
+
+        private class InstalledPackageRowGrid : AbstractPackageRowGrid {        
+            Gtk.Label app_version;
+
+            construct {
+                app_version = new Gtk.Label (null);
+                app_version.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
+                app_version.hexpand = true;
+                app_version.valign = Gtk.Align.START;
+                ((Gtk.Misc) app_version).xalign = 0;
+
+                attach (app_version, 1, 1, 1, 1);
+            }
+
+            public InstalledPackageRowGrid (AppCenterCore.Package package, Gtk.SizeGroup? size_group, bool show_uninstall = true) {         
+                base (package, size_group, show_uninstall);                
+                set_up_package ();
+            }
+            
+            protected override void set_up_package (uint icon_size = 48) {
+                app_version.label = package.get_version ();
+                app_version.ellipsize = Pango.EllipsizeMode.END;
+
+                base.set_up_package (icon_size);
+            }
+            
+            protected override void update_state (bool first_update = false) {
+                if (!first_update) {
+                    app_version.label = package.get_version ();
+                }
+
                 update_action ();
                 changed ();
             }
         }
+
+        private class ListPackageRowGrid : AbstractPackageRowGrid {
+
+            construct {
+                package_summary = new Gtk.Label (null);
+                package_summary.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
+                package_summary.hexpand = true;
+                package_summary.valign = Gtk.Align.START;
+                ((Gtk.Misc) package_summary).xalign = 0;
+
+                attach (package_summary, 1, 1, 1, 1);
+            }
+
+            public ListPackageRowGrid (AppCenterCore.Package package, Gtk.SizeGroup? size_group, bool show_uninstall = true) {
+                base (package, size_group, show_uninstall);
+                set_up_package ();
+            }
+            
+            protected override void set_up_package (uint icon_size = 48) {                
+                package_summary.label = package.get_summary ();
+                package_summary.ellipsize = Pango.EllipsizeMode.END;
+                base.set_up_package (icon_size);
+            }
+        }
     }
 }