GNOME.org
 

[anjuta] libanjuta: Allow to store relative URI in anjuta saved session

commit 7616cdfa27148cbb473fdcd28959f5c4683f8258
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Wed Feb 1 21:29:20 2012 +0100

    libanjuta: Allow to store relative URI in anjuta saved session
    
    This is useful to allow to move a whole project without loosing settings like opened files.

 libanjuta/anjuta-session.c |  257 ++++++++++++++++++++++++++++++++-----------
 libanjuta/anjuta-session.h |   14 ++-
 2 files changed, 202 insertions(+), 69 deletions(-)
---
diff --git a/libanjuta/anjuta-session.c b/libanjuta/anjuta-session.c
index b6c3b46..5b65607 100644
--- a/libanjuta/anjuta-session.c
+++ b/libanjuta/anjuta-session.c
@@ -2,7 +2,7 @@
 /*
  * anjuta-session.c
  * Copyright (c) 2005 Naba Kumar  <naba gnome org>
- *  
+ *
  * 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 2 of the License, or
@@ -21,10 +21,10 @@
 /**
  * SECTION:anjuta-session
  * @short_description: Program session
- * @see_also: 
+ * @see_also:
  * @stability: Unstable
  * @include: libanjuta/anjuta-session.h
- * 
+ *
  */
 
 #include <stdlib.h>
@@ -32,7 +32,7 @@
 
 #include "anjuta-session.h"
 #include "anjuta-utils.h"
- 
+
 struct _AnjutaSessionPriv {
 	gchar *dir_path;
 	GKeyFile *key_file;
@@ -45,7 +45,7 @@ anjuta_session_finalize (GObject *object)
 {
 	AnjutaSession *cobj;
 	cobj = ANJUTA_SESSION (object);
-	
+
 	g_free (cobj->priv->dir_path);
 	g_key_file_free (cobj->priv->key_file);
 	g_free (cobj->priv);
@@ -72,11 +72,11 @@ anjuta_session_instance_init (AnjutaSession *obj)
 /**
  * anjuta_session_new:
  * @session_directory: Directory where session is loaded from/saved to.
- * 
+ *
  * Created a new session object. @session_directory is the directory
  * where session information will be stored or loaded in case of existing
  * session.
- * 
+ *
  * Returns: an #AnjutaSession Object
  */
 AnjutaSession*
@@ -84,20 +84,20 @@ anjuta_session_new (const gchar *session_directory)
 {
 	AnjutaSession *obj;
 	gchar *filename;
-	
+
 	g_return_val_if_fail (session_directory != NULL, NULL);
 	g_return_val_if_fail (g_path_is_absolute (session_directory), NULL);
-	
+
 	obj = ANJUTA_SESSION (g_object_new (ANJUTA_TYPE_SESSION, NULL));
 	obj->priv->dir_path = g_strdup (session_directory);
-	
+
 	obj->priv->key_file = g_key_file_new ();
-	
+
 	filename = anjuta_session_get_session_filename (obj);
 	g_key_file_load_from_file (obj->priv->key_file, filename,
 							   G_KEY_FILE_NONE, NULL);
 	g_free (filename);
-	 
+
 	return obj;
 }
 
@@ -106,9 +106,9 @@ ANJUTA_TYPE_BOILERPLATE (AnjutaSession, anjuta_session, G_TYPE_OBJECT)
 /**
  * anjuta_session_get_session_directory:
  * @session: an #AnjutaSession object
- * 
+ *
  * Returns the directory corresponding to this session object.
- * 
+ *
  * Returns: session directory
  */
 const gchar*
@@ -120,16 +120,16 @@ anjuta_session_get_session_directory (AnjutaSession *session)
 /**
  * anjuta_session_get_session_filename:
  * @session: an #AnjutaSession object
- * 
+ *
  * Gets the session filename corresponding to this session object.
- * 
+ *
  * Returns: session (absolute) filename
  */
 gchar*
 anjuta_session_get_session_filename (AnjutaSession *session)
 {
 	g_return_val_if_fail (ANJUTA_IS_SESSION (session), NULL);
-	
+
 	return g_build_filename (session->priv->dir_path,
 							 "anjuta.session", NULL);
 }
@@ -137,20 +137,20 @@ anjuta_session_get_session_filename (AnjutaSession *session)
 /**
  * anjuta_session_sync:
  * @session: an #AnjutaSession object
- * 
+ *
  * Synchronizes session object with session file
  */
 void
 anjuta_session_sync (AnjutaSession *session)
 {
 	gchar *filename, *data;
-	
+
 	g_return_if_fail (ANJUTA_IS_SESSION (session));
-	
+
 	filename = anjuta_session_get_session_filename (session);
 	data = g_key_file_to_data (session->priv->key_file, NULL, NULL);
 	g_file_set_contents (filename, data, -1, NULL);
-	
+
 	g_free (filename);
 	g_free (data);
 }
@@ -158,7 +158,7 @@ anjuta_session_sync (AnjutaSession *session)
 /**
  * anjuta_session_clear:
  * @session: an #AnjutaSession object
- * 
+ *
  * Clears the session.
  */
 void
@@ -167,15 +167,15 @@ anjuta_session_clear (AnjutaSession *session)
 	gchar *cmd;
 	gchar *quoted;
 	gint ret;
-	
+
 	g_return_if_fail (ANJUTA_IS_SESSION (session));
-	
+
 	g_key_file_free (session->priv->key_file);
 	session->priv->key_file = g_key_file_new ();
-	
+
 	anjuta_session_sync (session);
 
-	quoted = g_shell_quote (session->priv->dir_path);	
+	quoted = g_shell_quote (session->priv->dir_path);
 	cmd = g_strconcat ("rm -fr ", quoted, NULL);
 	ret = system (cmd);
 	g_free (cmd);
@@ -190,26 +190,26 @@ anjuta_session_clear (AnjutaSession *session)
  * anjuta_session_clear_section:
  * @session: an #AnjutaSession object.
  * @section: Section to clear.
- * 
+ *
  * Clears the given section in session object.
  */
 void
 anjuta_session_clear_section (AnjutaSession *session,
 							  const gchar *section)
-{	
+{
 	g_return_if_fail (ANJUTA_IS_SESSION (session));
 	g_return_if_fail (section != NULL);
 
 	g_key_file_remove_group (session->priv->key_file, section, NULL);
 }
- 
+
 /**
  * anjuta_session_set_int:
  * @session: an #AnjutaSession object
  * @section: Section.
  * @key: Key name.
  * @value: Key value
- * 
+ *
  * Set an integer @value to @key in given @section.
  */
 void
@@ -219,13 +219,13 @@ anjuta_session_set_int (AnjutaSession *session, const gchar *section,
 	g_return_if_fail (ANJUTA_IS_SESSION (session));
 	g_return_if_fail (section != NULL);
 	g_return_if_fail (key != NULL);
-	
+
 	if (!value)
 	{
 		g_key_file_remove_key (session->priv->key_file, section, key, NULL);
 		return;
 	}
-	
+
 	g_key_file_set_integer (session->priv->key_file, section, key, value);
 }
 
@@ -235,7 +235,7 @@ anjuta_session_set_int (AnjutaSession *session, const gchar *section,
  * @section: Section.
  * @key: Key name.
  * @value: Key value
- * 
+ *
  * Set a float @value to @key in given @section.
  */
 void
@@ -245,13 +245,13 @@ anjuta_session_set_float (AnjutaSession *session, const gchar *section,
 	g_return_if_fail (ANJUTA_IS_SESSION (session));
 	g_return_if_fail (section != NULL);
 	g_return_if_fail (key != NULL);
-	
+
 	if (!value)
 	{
 		g_key_file_remove_key (session->priv->key_file, section, key, NULL);
 		return;
 	}
-	
+
 	g_key_file_set_double (session->priv->key_file, section, key, value);
 }
 
@@ -261,7 +261,7 @@ anjuta_session_set_float (AnjutaSession *session, const gchar *section,
  * @section: Section.
  * @key: Key name.
  * @value: Key value
- * 
+ *
  * Set a string @value to @key in given @section.
  */
 void
@@ -271,13 +271,13 @@ anjuta_session_set_string (AnjutaSession *session, const gchar *section,
 	g_return_if_fail (ANJUTA_IS_SESSION (session));
 	g_return_if_fail (section != NULL);
 	g_return_if_fail (key != NULL);
-	
+
 	if (!value)
 	{
 		g_key_file_remove_key (session->priv->key_file, section, key, NULL);
 		return;
 	}
-	
+
 	g_key_file_set_string (session->priv->key_file, section, key, value);
 }
 
@@ -287,7 +287,7 @@ anjuta_session_set_string (AnjutaSession *session, const gchar *section,
  * @section: Section.
  * @key: Key name.
  * @value: Key value
- * 
+ *
  * Set a list of strings @value to @key in given @section.
  */
 void
@@ -299,17 +299,17 @@ anjuta_session_set_string_list (AnjutaSession *session,
 	GString *str;
 	GList *node;
 	gboolean first_item = TRUE;
-	
+
 	g_return_if_fail (ANJUTA_IS_SESSION (session));
 	g_return_if_fail (section != NULL);
 	g_return_if_fail (key != NULL);
-	
+
 	if (!value)
 	{
 		g_key_file_remove_key (session->priv->key_file, section, key, NULL);
 		return;
 	}
-	
+
 	str = g_string_new ("");
 	node = value;
 	while (node)
@@ -325,10 +325,10 @@ anjuta_session_set_string_list (AnjutaSession *session,
 		}
 		node = g_list_next (node);
 	}
-	
+
 	value_str = g_string_free (str, FALSE);
 	g_key_file_set_string (session->priv->key_file, section, key, value_str);
-	
+
 	g_free (value_str);
 }
 
@@ -337,9 +337,9 @@ anjuta_session_set_string_list (AnjutaSession *session,
  * @session: an #AnjutaSession object
  * @section: Section.
  * @key: Key name.
- * 
+ *
  * Get an integer @value of @key in given @section.
- * 
+ *
  * Returns: Key value
  */
 gint
@@ -347,13 +347,13 @@ anjuta_session_get_int (AnjutaSession *session, const gchar *section,
 						const gchar *key)
 {
 	gint value;
-	
+
 	g_return_val_if_fail (ANJUTA_IS_SESSION (session), 0);
 	g_return_val_if_fail (section != NULL, 0);
 	g_return_val_if_fail (key != NULL, 0);
-	
+
 	value = g_key_file_get_integer (session->priv->key_file, section, key, NULL);
-	
+
 	return value;
 }
 
@@ -362,9 +362,9 @@ anjuta_session_get_int (AnjutaSession *session, const gchar *section,
  * @session: an #AnjutaSession object
  * @section: Section.
  * @key: Key name.
- * 
+ *
  * Get a float @value of @key in given @section.
- * 
+ *
  * Returns: Key value
  */
 gfloat
@@ -372,13 +372,13 @@ anjuta_session_get_float (AnjutaSession *session, const gchar *section,
 						  const gchar *key)
 {
 	gfloat value;
-	
+
 	g_return_val_if_fail (ANJUTA_IS_SESSION (session), 0);
 	g_return_val_if_fail (section != NULL, 0);
 	g_return_val_if_fail (key != NULL, 0);
-	
+
 	value = (float)g_key_file_get_double (session->priv->key_file, section, key, NULL);
-	
+
 	return value;
 }
 
@@ -387,9 +387,9 @@ anjuta_session_get_float (AnjutaSession *session, const gchar *section,
  * @session: an #AnjutaSession object
  * @section: Section.
  * @key: Key name.
- * 
+ *
  * Get a string @value of @key in given @section.
- * 
+ *
  * Returns: Key value
  */
 gchar*
@@ -397,13 +397,13 @@ anjuta_session_get_string (AnjutaSession *session, const gchar *section,
 						   const gchar *key)
 {
 	gchar *value;
-	
+
 	g_return_val_if_fail (ANJUTA_IS_SESSION (session), NULL);
 	g_return_val_if_fail (section != NULL, NULL);
 	g_return_val_if_fail (key != NULL, NULL);
-	
+
 	value = g_key_file_get_string (session->priv->key_file, section, key, NULL);
-	
+
 	return value;
 }
 
@@ -412,9 +412,9 @@ anjuta_session_get_string (AnjutaSession *session, const gchar *section,
  * @session: an #AnjutaSession object
  * @section: Section.
  * @key: Key name.
- * 
+ *
  * Get a list of strings @value of @key in given @section.
- * 
+ *
  * Returns: Key value
  */
 GList*
@@ -424,14 +424,14 @@ anjuta_session_get_string_list (AnjutaSession *session,
 {
 	gchar *val, **str, **ptr;
 	GList *value;
-	
+
 	g_return_val_if_fail (ANJUTA_IS_SESSION (session), NULL);
 	g_return_val_if_fail (section != NULL, NULL);
 	g_return_val_if_fail (key != NULL, NULL);
-	
+
 	val = g_key_file_get_string (session->priv->key_file, section, key, NULL);
-	
-	
+
+
 	value = NULL;
 	if (val)
 	{
@@ -449,6 +449,131 @@ anjuta_session_get_string_list (AnjutaSession *session,
 		}
 		g_free (val);
 	}
-	
+
 	return g_list_reverse (value);
 }
+
+
+/**
+ * anjuta_session_get_relative_uri_from_file:
+ * @session: an #AnjutaSession object
+ * @file: a GFile
+ * @fragme: an optional fragment
+ *
+ * Return an URI relative to the session directory file with an optional
+ * fragment.
+ * It is useful to keep only relative file paths in a session file to be able
+ * to copy the whole project without breaking references.
+ *
+ * Returns: A string that has to be freed with g_free().
+ */
+gchar *
+anjuta_session_get_relative_uri_from_file (AnjutaSession *session,
+                                           GFile *file,
+                                           const gchar *fragment)
+{
+	GFile *parent;
+	gchar *uri;
+	gint level;
+
+	parent = g_file_new_for_path (session->priv->dir_path);
+	for (level = 0; (parent != NULL) && !g_file_has_prefix (file, parent); level++)
+	{
+		GFile *next = g_file_get_parent (parent);
+		g_object_unref (parent);
+		parent = next;
+	}
+
+	if (parent == NULL)
+	{
+		uri = g_file_get_uri (file);
+	}
+	else
+	{
+		gchar *path;
+
+		path = g_file_get_relative_path (parent, file);
+		uri = g_uri_escape_string (path, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
+		g_free (path);
+		if (level != 0)
+		{
+			gsize len;
+			gchar *buffer;
+			gchar *ptr;
+
+			len = strlen (uri);
+			buffer = g_new (gchar, len + level * 3 + 1);
+			for (ptr = buffer; level; level--)
+			{
+				memcpy (ptr, ".." G_DIR_SEPARATOR_S, 3);
+				ptr += 3;
+			}
+			memcpy (ptr, uri, len + 1);
+			g_free (uri);
+
+			uri = buffer;
+		}
+	}
+
+	if (fragment != NULL)
+	{
+		gchar *with_fragment;
+
+		with_fragment = g_strconcat (uri, "#", fragment, NULL);
+		g_free (uri);
+		uri = with_fragment;
+	}
+
+	return uri;
+}
+
+
+/**
+ * anjuta_session_get_file_from_relative_uri:
+ * @session: an #AnjutaSession object
+ * @uri: a relative URI from a key
+ * @fragment: fragment part of the URI if existing, cal be NULL
+ *
+ * Return a GFile corresponding to the URI and and optional fragment,
+ * normally read from a session key.
+ * The path is expected to be relative to the session directory but it works
+ * with an absolute URI, in this case it returns the same file than
+ * g_file_new_for_uri.
+ * It is useful to keep only relative file paths in a session file to be able
+ * to copy the whole project without breaking references.
+ *
+ * Returns: A new GFile that has to be freed with g_object_unref().
+ */
+GFile*
+anjuta_session_get_file_from_relative_uri (AnjutaSession *session,
+                                           const gchar *uri,
+                                           const gchar **fragment)
+{
+	GFile *file;
+	gchar *scheme;
+
+	scheme =g_uri_parse_scheme (uri);
+	if (scheme != NULL)
+	{
+		free (scheme);
+		file = g_file_new_for_uri (uri);
+	}
+	else
+	{
+		gchar *parent_uri = g_filename_to_uri (session->priv->dir_path, NULL, NULL);
+		gchar *full_uri;
+
+		full_uri = g_strconcat (parent_uri, G_DIR_SEPARATOR_S, uri, NULL);
+		file = g_file_new_for_uri (full_uri);
+		g_free (full_uri);
+		g_free (parent_uri);
+	}
+	if (fragment != NULL)
+	{
+		*fragment = strchr (uri, '#');
+		if (*fragment != NULL) (*fragment)++;
+	}
+
+	return file;
+}
+
diff --git a/libanjuta/anjuta-session.h b/libanjuta/anjuta-session.h
index ebdf8aa..528106b 100644
--- a/libanjuta/anjuta-session.h
+++ b/libanjuta/anjuta-session.h
@@ -2,12 +2,12 @@
 /*
  * anjuta-session.h
  * Copyright (c) 2005 Naba Kumar  <naba gnome org>
- *  
+ *
  * 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 2 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
@@ -23,6 +23,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
@@ -84,7 +85,14 @@ gchar* anjuta_session_get_string (AnjutaSession *session, const gchar *section,
 GList* anjuta_session_get_string_list (AnjutaSession *session,
 									   const gchar *section,
 									   const gchar *key);
-									   
+
+gchar *anjuta_session_get_relative_uri_from_file (AnjutaSession *session,
+                                                  GFile *file,
+                                                  const gchar *fragment);
+GFile* anjuta_session_get_file_from_relative_uri (AnjutaSession *session,
+                                                  const gchar *uri,
+                                                  const gchar **fragment);
+
 G_END_DECLS
 
 #endif /* _ANJUTA_SESSION_H_ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]