[gnome-builder/gnome-builder-3-32] projects: translate symlinked project paths up front

[Christian Hergert <chergert src gnome org>]

commit 4b2791b5d69acbcb35a1aade1ecfbe252e6a336a
Author: Christian Hergert <chergert redhat com>
Date:   Tue Mar 26 15:35:10 2019 -0700

    projects: translate symlinked project paths up front
    
    Avoid symlinks early in the project loading cycle. This ensures
    that by time most subsystems see the project info, it already
    has paths translated to their native form.
    
    This can be useful when dealing with systems where home is a
    symlink (such as old Silverblue installs).

 src/libide/projects/ide-project-info-private.h | 30 +++++++++++++++++++++
 src/libide/projects/ide-project-info.c         | 37 +++++++++++++++++++++++---
 src/libide/projects/ide-recent-projects.c      |  6 +++--
 src/libide/projects/meson.build                |  6 ++++-
 4 files changed, 72 insertions(+), 7 deletions(-)
---
diff --git a/src/libide/projects/ide-project-info-private.h b/src/libide/projects/ide-project-info-private.h
new file mode 100644
index 000000000..8adfdfbe8
--- /dev/null
+++ b/src/libide/projects/ide-project-info-private.h
@@ -0,0 +1,30 @@
+/* ide-project-info-private.h
+ *
+ * Copyright 2019 Christian Hergert <chergert redhat com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#pragma once
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+GFile *_ide_project_info_get_real_file      (IdeProjectInfo *self);
+GFile *_ide_project_info_get_real_directory (IdeProjectInfo *self);
+
+G_END_DECLS
diff --git a/src/libide/projects/ide-project-info.c b/src/libide/projects/ide-project-info.c
index 252f8743a..8f071b6a9 100644
--- a/src/libide/projects/ide-project-info.c
+++ b/src/libide/projects/ide-project-info.c
@@ -29,7 +29,10 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
+#include "ide-gfile-private.h"
+
 #include "ide-project-info.h"
+#include "ide-project-info-private.h"
 
 /**
  * SECTION:ideprojectinfo:
@@ -50,7 +53,9 @@ struct _IdeProjectInfo
   IdeDoap    *doap;
   GDateTime  *last_modified_at;
   GFile      *directory;
+  GFile      *directory_translated;
   GFile      *file;
+  GFile      *file_translated;
   gchar      *build_system_name;
   gchar      *build_system_hint;
   gchar      *name;
@@ -181,7 +186,7 @@ ide_project_info_get_directory (IdeProjectInfo *self)
 {
   g_return_val_if_fail (IDE_IS_PROJECT_INFO (self), NULL);
 
-  return self->directory;
+  return self->directory_translated;
 }
 
 /**
@@ -200,7 +205,7 @@ ide_project_info_get_file (IdeProjectInfo *self)
 {
   g_return_val_if_fail (IDE_IS_PROJECT_INFO (self), NULL);
 
-  return self->file;
+  return self->file_translated;
 }
 
 /**
@@ -315,7 +320,11 @@ ide_project_info_set_directory (IdeProjectInfo *self,
   g_return_if_fail (!directory || G_IS_FILE (directory));
 
   if (g_set_object (&self->directory, directory))
-    g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_DIRECTORY]);
+    {
+      g_clear_object (&self->directory_translated);
+      self->directory_translated = _ide_g_file_readlink (directory);
+      g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_DIRECTORY]);
+    }
 }
 
 void
@@ -326,7 +335,11 @@ ide_project_info_set_file (IdeProjectInfo *self,
   g_return_if_fail (!file || G_IS_FILE (file));
 
   if (g_set_object (&self->file, file))
-    g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_FILE]);
+    {
+      g_clear_object (&self->file_translated);
+      self->file_translated = _ide_g_file_readlink (file);
+      g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_FILE]);
+    }
 }
 
 void
@@ -380,7 +393,9 @@ ide_project_info_finalize (GObject *object)
   g_clear_pointer (&self->vcs_uri, g_free);
   g_clear_pointer (&self->name, g_free);
   g_clear_object (&self->directory);
+  g_clear_object (&self->directory_translated);
   g_clear_object (&self->file);
+  g_clear_object (&self->file_translated);
   g_clear_object (&self->icon);
 
   G_OBJECT_CLASS (ide_project_info_parent_class)->finalize (object);
@@ -879,3 +894,17 @@ ide_project_info_set_icon_name (IdeProjectInfo *self,
     icon = g_themed_icon_new (icon_name);
   ide_project_info_set_icon (self, icon);
 }
+
+GFile *
+_ide_project_info_get_real_file (IdeProjectInfo *self)
+{
+  g_return_val_if_fail (IDE_IS_PROJECT_INFO (self), NULL);
+  return self->file;
+}
+
+GFile *
+_ide_project_info_get_real_directory (IdeProjectInfo *self)
+{
+  g_return_val_if_fail (IDE_IS_PROJECT_INFO (self), NULL);
+  return self->directory;
+}
diff --git a/src/libide/projects/ide-recent-projects.c b/src/libide/projects/ide-recent-projects.c
index 12c77111b..990dc2ef1 100644
--- a/src/libide/projects/ide-recent-projects.c
+++ b/src/libide/projects/ide-recent-projects.c
@@ -26,6 +26,8 @@
 #include <gtk/gtk.h>
 #include <libide-core.h>
 
+#include "ide-project-info.h"
+#include "ide-project-info-private.h"
 #include "ide-recent-projects.h"
 
 struct _IdeRecentProjects
@@ -85,7 +87,7 @@ ide_recent_projects_added (IdeRecentProjects *self,
   g_assert (IDE_IS_RECENT_PROJECTS (self));
   g_assert (IDE_IS_PROJECT_INFO (project_info));
 
-  file = ide_project_info_get_file (project_info);
+  file = _ide_project_info_get_real_file (project_info);
   uri = g_file_get_uri (file);
 
   if (!g_hash_table_contains (self->recent_uris, uri))
@@ -374,7 +376,7 @@ ide_recent_projects_remove (IdeRecentProjects *self,
           continue;
         }
 
-      file = ide_project_info_get_file (project_info);
+      file = _ide_project_info_get_real_file (project_info);
       file_uri = g_file_get_uri (file);
 
       if (!g_bookmark_file_remove_item (projects_file, file_uri, &error))
diff --git a/src/libide/projects/meson.build b/src/libide/projects/meson.build
index 0a68c01cb..463ff06bc 100644
--- a/src/libide/projects/meson.build
+++ b/src/libide/projects/meson.build
@@ -26,7 +26,11 @@ install_headers(libide_projects_public_headers, subdir: libide_projects_header_s
 # Sources
 #
 
-libide_projects_private_headers = [ 'xml-reader-private.h', ]
+libide_projects_private_headers = [
+  'ide-project-info-private.h',
+  'xml-reader-private.h',
+]
+
 libide_projects_private_sources = [ 'xml-reader.c', ]
 
 libide_projects_public_sources = [