detail-view: Rewrite using unified data source

Author: mjakeman

src/exm-detail-view.c

@@ -25,6 +25,7 @@
 #include "exm-info-bar.h"
 #include "exm-comment-tile.h"
 #include "exm-comment-dialog.h"
+#include "exm-unified-data.h"
 
 #include "web/exm-data-provider.h"
 #include "web/exm-image-resolver.h"
@@ -75,6 +76,7 @@ struct _ExmDetailView
 
     AdwActionRow *link_homepage;
     gchar *uri_homepage;
+
     AdwActionRow *link_extensions;
     gchar *uri_extensions;
     int pk;
@@ -256,7 +258,7 @@ queue_resolve_comments (ExmDetailView *self,
                         GCancellable  *cancellable)
 {
     gtk_stack_set_visible_child_name (self->comment_stack, "page_spinner");
-    exm_comment_provider_get_comments_async (self->comment_provider, pk, false, cancellable,
+    exm_comment_provider_get_comments_async (self->comment_provider, pk, FALSE, cancellable,
                                              (GAsyncReadyCallback) on_get_comments,
                                              self);
 }
@@ -292,106 +294,117 @@ install_remote (GtkButton     *button,
                                 "(sb)", self->uuid, warn);
 }
 
+static ExmInstallButtonState
+get_install_state (ExmUnifiedData *data,
+                   ExmDetailView  *self)
+{
+    const char *uuid = exm_unified_data_get_uuid (data);
+    gboolean is_installed = exm_manager_is_installed_uuid (self->manager, uuid);
+
+    if (is_installed)
+        return EXM_INSTALL_BUTTON_STATE_INSTALLED;
+
+    ExmShellVersionMap *version_map;
+    version_map = exm_unified_data_get_shell_version_map (data);
+
+    g_return_val_if_fail (version_map != NULL, EXM_INSTALL_BUTTON_STATE_UNSUPPORTED);
+
+    return exm_shell_version_map_supports (version_map, self->shell_version)
+        ? EXM_INSTALL_BUTTON_STATE_DEFAULT
+        : EXM_INSTALL_BUTTON_STATE_UNSUPPORTED;
+}
+
 static void
-on_data_loaded (GObject      *source,
-                GAsyncResult *result,
-                gpointer      user_data)
+populate_with_data (ExmUnifiedData *data,
+                    ExmDetailView  *self)
 {
-    ExmSearchResult *data;
-    GError *error = NULL;
-    ExmDetailView *self;
     ExmInstallButtonState install_state;
-    GtkWidget *child;
-    GList *version_iter;
-    ExmShellVersionMap *version_map;
-    gchar *uri;
 
-    self = EXM_DETAIL_VIEW (user_data);
+    const char *name = exm_unified_data_get_name (data);
+    adw_window_title_set_title (self->title, name);
+    gtk_label_set_label (self->ext_title, name);
 
-    if ((data = exm_data_provider_get_finish (EXM_DATA_PROVIDER (source), result, &error)) != FALSE)
-    {
-        gint pk, downloads;
-        gboolean is_installed, is_supported;
-        gchar *uuid, *name, *creator, *icon_uri, *screenshot_uri, *link, *description, *url;
-        g_object_get (data,
-                      "uuid", &uuid,
-                      "name", &name,
-                      "creator", &creator,
-                      "icon", &icon_uri,
-                      "screenshot", &screenshot_uri,
-                      "link", &link,
-                      "description", &description,
-                      "shell_version_map", &version_map,
-                      "pk", &pk,
-                      "url", &url,
-                      "downloads", &downloads,
-                      NULL);
-
-        adw_window_title_set_title (self->title, name);
-        adw_window_title_set_subtitle (self->title, uuid);
-
-        is_installed = exm_manager_is_installed_uuid (self->manager, uuid);
-        is_supported = exm_search_result_supports_shell_version (data, self->shell_version);
-
-        gtk_image_set_from_icon_name (self->ext_icon, "puzzle-piece-symbolic");
-        gtk_label_set_label (self->ext_title, name);
-        gtk_label_set_label (self->ext_author, creator);
-        gtk_label_set_label (self->ext_description, description);
-        exm_info_bar_set_downloads (self->ext_info_bar, downloads);
-
-        if (self->resolver_cancel)
-        {
-            g_cancellable_cancel (self->resolver_cancel);
-            g_clear_object (&self->resolver_cancel);
-        }
+    const char *uuid = exm_unified_data_get_uuid (data);
+    adw_window_title_set_subtitle (self->title, uuid);
 
-        if (strcmp (icon_uri, "/static/images/plugin.png") != 0)
-        {
-            self->resolver_cancel = g_cancellable_new ();
+    const char *creator = exm_unified_data_get_creator (data);
+    gtk_label_set_label (self->ext_author, creator);
 
-            queue_resolve_image (self, icon_uri, self->resolver_cancel, TRUE);
-        }
+    const char *description = exm_unified_data_get_description (data);
+    gtk_label_set_label (self->ext_description, description);
 
-        if (screenshot_uri != NULL)
-        {
-            self->resolver_cancel = g_cancellable_new ();
+    if (self->resolver_cancel)
+    {
+        g_cancellable_cancel (self->resolver_cancel);
+        g_clear_object (&self->resolver_cancel);
+    }
 
-            exm_screenshot_set_paintable (self->ext_screenshot, NULL);
-			exm_zoom_picture_set_paintable (self->overlay_screenshot, NULL);
-            exm_screenshot_reset (self->ext_screenshot);
+    char *screenshot_uri;
+    if (exm_unified_data_get_screenshot_uri (data, &screenshot_uri) && screenshot_uri != NULL)
+    {
+        self->resolver_cancel = g_cancellable_new ();
 
-			gtk_widget_set_visible (GTK_WIDGET (self->ext_screenshot_container), TRUE);
-			gtk_widget_set_visible (GTK_WIDGET (self->ext_screenshot_popout_button), FALSE);
+        exm_screenshot_set_paintable (self->ext_screenshot, NULL);
+		exm_zoom_picture_set_paintable (self->overlay_screenshot, NULL);
+        exm_screenshot_reset (self->ext_screenshot);
 
-            queue_resolve_image (self, screenshot_uri, self->resolver_cancel, FALSE);
-        }
-        else
-        {
-            gtk_widget_set_visible (GTK_WIDGET (self->ext_screenshot_container), FALSE);
-        }
+        gtk_widget_set_visible (GTK_WIDGET (self->ext_screenshot_container), TRUE);
+        gtk_widget_set_visible (GTK_WIDGET (self->ext_screenshot_popout_button), FALSE);
 
-        install_state = is_installed
-            ? EXM_INSTALL_BUTTON_STATE_INSTALLED
-            : (is_supported
-               ? EXM_INSTALL_BUTTON_STATE_DEFAULT
-               : EXM_INSTALL_BUTTON_STATE_UNSUPPORTED);
+        queue_resolve_image (self, screenshot_uri, self->resolver_cancel, false);
 
-        g_object_set (self->ext_install, "state", install_state, NULL);
+        g_free (screenshot_uri);
+    }
+    else
+    {
+        gtk_widget_set_visible (GTK_WIDGET (self->ext_screenshot_container), FALSE);
+    }
 
-        self->uri_homepage = g_uri_resolve_relative (url,
-                                                     "",
-                                                     G_URI_FLAGS_NONE,
-                                                     NULL);
+    install_state = get_install_state (data, self);
+    g_object_set (self->ext_install, "state", install_state, NULL);
 
+    char *link;
+    if (exm_unified_data_get_link (data, &link))
+    {
         self->uri_extensions = g_uri_resolve_relative ("https://extensions.gnome.org/",
                                                        link,
                                                        G_URI_FLAGS_NONE,
                                                        NULL);
 
-        adw_action_row_set_subtitle (self->link_homepage, self->uri_homepage);
         adw_action_row_set_subtitle (self->link_extensions, self->uri_extensions);
+        gtk_widget_set_visible (GTK_WIDGET (self->link_extensions), TRUE);
+    }
+    else
+    {
+        gtk_widget_set_visible (GTK_WIDGET (self->link_extensions), FALSE);
+    }
 
-        exm_info_bar_set_version (self->ext_info_bar, -1);
+    char *homepage;
+    if (exm_unified_data_get_homepage (data, &homepage))
+    {
+        self->uri_homepage = g_uri_resolve_relative (homepage,
+                                                     "",
+                                                     G_URI_FLAGS_NONE,
+                                                     NULL);
+
+        adw_action_row_set_subtitle (self->link_homepage, self->uri_homepage);
+        gtk_widget_set_visible (GTK_WIDGET (self->link_homepage), TRUE);
+    }
+    else
+    {
+        gtk_widget_set_visible (GTK_WIDGET (self->link_homepage), FALSE);
+    }
+
+    // Clear Flowbox
+    // GtkWidget *child;
+    // while ((child = gtk_widget_get_first_child (GTK_WIDGET (self->supported_versions))))
+    //    gtk_flow_box_remove (self->supported_versions, child);
+
+    ExmShellVersionMap *version_map = exm_unified_data_get_shell_version_map (data);
+
+    if (version_map)
+    {
+        GList *version_iter;
 
         for (version_iter = version_map->map;
              version_iter != NULL;
@@ -412,30 +425,68 @@ on_data_loaded (GObject      *source,
 
             g_free (version);
         }
+    }
 
-        self->pk = pk;
-
-        if (self->signal_id > 0)
-            g_signal_handler_disconnect (self->show_more_btn, self->signal_id);
+    if (self->signal_id > 0)
+        g_signal_handler_disconnect (self->show_more_btn, self->signal_id);
 
+    int pk;
+    if (exm_unified_data_get_pk (data, &pk))
+    {
+        self->pk = pk;
         self->signal_id = g_signal_connect (self->show_more_btn,
-                                            "clicked",
-                                            G_CALLBACK (show_more_comments),
-                                            self);
+                                        "clicked",
+                                        G_CALLBACK (show_more_comments),
+                                        self);
 
         queue_resolve_comments (self, pk, self->resolver_cancel);
+    }
+    else
+    {
+        gtk_stack_set_visible_child_name (self->comment_stack, "page_empty");
+    }
+
+    // Reset scroll position
+    gtk_adjustment_set_value (gtk_scrolled_window_get_vadjustment (self->scroll_area), 0);
+
+    gtk_stack_set_visible_child_name (self->stack, "page_detail");
+}
+
+static void
+on_data_loaded (GObject      *source,
+                GAsyncResult *async_result,
+                gpointer      user_data)
+{
+    ExmUnifiedData *data;
+    ExmSearchResult *web_info;
+    ExmExtension *local_info;
+
+    GError *error = NULL;
+    ExmDetailView *self;
+
+    g_return_if_fail (EXM_IS_DETAIL_VIEW (user_data));
+
+    self = EXM_DETAIL_VIEW (user_data);
+
+    data = exm_unified_data_new ();
 
-        // Reset scroll position
-        gtk_adjustment_set_value (gtk_scrolled_window_get_vadjustment (self->scroll_area), 0);
+    // Build Unified Data Representation
+    if ((local_info = exm_manager_get_by_uuid (self->manager, self->uuid)))
+        exm_unified_data_set_local_data (data, local_info);
 
-        gtk_stack_set_visible_child_name (self->stack, "page_detail");
+    if ((web_info = exm_data_provider_get_finish (EXM_DATA_PROVIDER (source), async_result, &error)) != FALSE)
+        exm_unified_data_set_web_data (data, web_info);
 
+    // We need at least some data to proceed
+    if (!exm_unified_data_is_empty (data)) {
+        populate_with_data (data, self);
         return;
     }
 
     adw_window_title_set_title (self->title, _("An Error Occurred"));
     adw_window_title_set_subtitle (self->title, NULL);
     gtk_stack_set_visible_child_name (self->stack, "page_error");
+    return;
 }
 
 void
@@ -594,8 +645,8 @@ exm_detail_view_class_init (ExmDetailViewClass *klass)
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, comment_box);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, comment_stack);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, show_more_btn);
-	gtk_widget_class_bind_template_child (widget_class, ExmDetailView, image_overlay);
-	gtk_widget_class_bind_template_child (widget_class, ExmDetailView, overlay_screenshot);
+    gtk_widget_class_bind_template_child (widget_class, ExmDetailView, image_overlay);
+    gtk_widget_class_bind_template_child (widget_class, ExmDetailView, overlay_screenshot);
 
     gtk_widget_class_install_action (widget_class, "detail.open-extensions", NULL, open_link);
     gtk_widget_class_install_action (widget_class, "detail.open-homepage", NULL, open_link);