Add initialization function. Implement scheme mapping. (others to follow

* src/ntl-uri-map.[ch]: Add initialization function. Implement scheme mapping.
(others to follow this)

ChangeLog-20000414

 1999-12-22  Elliot Lee  <sopwith@redhat.com>
 
+	* src/ntl-uri-map.[ch]: Add initialization function. Implement scheme mapping.
+
 	* components/history/ntl-history-view.c: Testbed for UIHandler usage.
 	* src/ntl-*view*.c: Better error checking, support UIHandler usage.
 	* src/ntl-window-msgs.c: Better error checking.

TODO

 - Allow passing document title around
+- src/ntl-uri-map.c:
+	Have nautilus_navinfo_init() read in the 'scheme_mappings' table from disk or wherever.

components/help/Makefile.am

@@ -11,10 +11,13 @@ hyperbola_SOURCES=		\
 	hyperbola-filefmt.c	\
 	hyperbola-filefmt.h
 
-EXTRA_DIST=pages.map hyperbola.goad
+EXTRA_DIST=pages.map hyperbola.goad hyperbola.schemes
 
 goaddir=$(sysconfdir)/CORBA/servers
 goad_DATA=hyperbola.goad
 
 mapdatadir=$(datadir)/hyperbola/maps
 mapdata_DATA=pages.map
+
+smapdir=$(sysconfdir)/nautilus/scheme-mappings
+smap_DATA=hyperbola.schemes

components/help/hyperbola.schemes

+# Format:
+# SCHEME TYPE OUTPUT DATA
+#
+# Where SCHEME is the name of the URI scheme being mapped,
+# TYPE is the mapping type (either "component" or "transform"), OUTPUT is
+# the MIME type that this results in (NULL to try and use gnome-mime),
+# and DATA is the data associated with the mapping type.
+#
+# Mapping type of "transform" would have DATA be the part of the URI after the ':'.
+# Mapping type of "component" would have DATA be the component's IID
+
+info transform text/html pipe:gnome-info2html2 %s
+man transform text/html pipe:gnome-man2html2 %s

src/nautilus-applicable-views.c

@@ -27,6 +27,170 @@
 
 #include "ntl-uri-map.h"
 #include <libgnorba/gnorba.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <limits.h>
+#include <ctype.h>
+
+typedef struct {
+  enum { MAP_COMPONENT, MAP_TRANSFORM } type;
+  union {
+    char *component_iid;
+    char *transform_info;
+  } u;
+  char *output_mimetype;
+} SchemeMapping;
+
+static GHashTable *scheme_mappings = NULL;
+
+static void
+nautilus_navinfo_add_mapping(const char *scheme, int type, const char *data, const char *mimetype)
+{
+  SchemeMapping *ent;
+
+  ent = g_new0(SchemeMapping, 1);
+
+  ent->type = type;
+  ent->u.component_iid = g_strdup(data);
+  ent->output_mimetype = g_strdup(mimetype);
+
+  g_hash_table_insert(scheme_mappings, g_strdup(scheme), ent);
+}
+
+static void
+navinfo_read_map_file(const char *fn)
+{
+  FILE *fh;
+  char aline[LINE_MAX];
+
+  fh = fopen(fn, "r");
+  if(!fh)
+    return;
+
+  while(fgets(aline, sizeof(aline), fh))
+    {
+      char *sname, *type, *mimetype, *data;
+      int typeval;
+
+      if(isspace(aline[0]) || aline[0] == '#')
+        continue;
+
+      sname = strtok(aline, " \t");
+      type = strtok(NULL, " \t");
+      mimetype = strtok(NULL, " \t");
+      data = strtok(NULL, "\n");
+
+      if(!sname || !type || !mimetype || !data)
+        continue;
+
+      if(!strcasecmp(type, "component"))
+        typeval = MAP_COMPONENT;
+      else if(!strcasecmp(type, "transform"))
+        typeval = MAP_TRANSFORM;
+      else
+        {
+          g_warning("Unrecognized scheme mapping type %s", type);
+          continue;
+        }
+
+      if(!strcasecmp(mimetype, "NULL"))
+        mimetype = NULL;
+
+      g_message("Adding mapping of %s -> [%s, %s, %s]",
+                sname, type, mimetype, data);
+
+      nautilus_navinfo_add_mapping(sname, typeval, data, mimetype);
+    }
+  
+
+  fclose(fh);
+}
+
+static void
+navinfo_load_mappings(char *dir)
+{
+  DIR *dirh;
+  struct dirent *dent;
+
+  dirh = opendir(dir);
+  if(!dirh)
+    goto out;
+
+  readdir(dirh);
+  readdir(dirh);
+
+  while((dent = readdir(dirh))) {
+    char full_name[PATH_MAX];
+
+    g_snprintf(full_name, sizeof(full_name), "%s/%s", dir, dent->d_name);
+    navinfo_read_map_file(full_name);
+  }
+  closedir(dirh);
+  
+ out:
+  g_free(dir);
+}
+
+void
+nautilus_navinfo_init(void)
+{
+  GSList *dirs = NULL;
+
+  if(!scheme_mappings)
+    scheme_mappings = g_hash_table_new(g_str_hash, g_str_equal);
+
+#if 0
+  gnome_file_locate(gnome_file_domain_config, "nautilus/scheme-mappings", TRUE, &dirs);
+#else
+  {
+    char *ctmp;
+    ctmp = gnome_config_file("nautilus/scheme-mappings");
+    if(ctmp)
+      dirs = g_slist_append(NULL, ctmp);
+  }
+#endif
+
+  g_slist_foreach(dirs, (GFunc)navinfo_load_mappings, NULL);
+  g_slist_free(dirs); /* The contents are already freed by navinfo_load_mappings */
+}
+
+static void
+nautilus_navinfo_map(NautilusNavigationInfo *navinfo)
+{
+  SchemeMapping *mapping;
+  char scheme[128], *ctmp;
+
+  g_assert(scheme_mappings);
+
+  ctmp = strchr(navinfo->navinfo.requested_uri, ':');
+
+  if(!ctmp)
+    goto out;
+  g_snprintf(scheme, sizeof(scheme), "%.*s", (int)(ctmp - navinfo->navinfo.requested_uri), navinfo->navinfo.requested_uri);
+
+  mapping = g_hash_table_lookup(scheme_mappings, scheme);
+  if(!mapping)
+    goto out;
+
+  switch(mapping->type)
+    {
+    case MAP_COMPONENT:
+      navinfo->navinfo.actual_uri = g_strdup_printf("component:%s", mapping->u.component_iid);
+      break;
+    case MAP_TRANSFORM:
+      navinfo->navinfo.actual_uri = g_strdup_printf(mapping->u.transform_info,
+                                                    ctmp+1, ctmp+1, ctmp+1, /* hello, lame hack! :) */
+                                                    ctmp+1, ctmp+1, ctmp+1);
+      break;
+    }
+
+  navinfo->navinfo.content_type = g_strdup(mapping->output_mimetype);
+
+  return;
+
+ out:
+  navinfo->navinfo.actual_uri = g_strdup(navinfo->navinfo.requested_uri);
+}
 
 NautilusNavigationInfo *
 nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
@@ -35,9 +199,9 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
 		     NautilusView *requesting_view)
 {
   const char *meta_keys[] = {"icon-filename", NULL};
+
   memset(navinfo, 0, sizeof(*navinfo));
 
-  navinfo->navinfo.requested_uri = g_strdup(nri->requested_uri);
   if(old_navinfo)
     {
       navinfo->navinfo.referring_uri = old_navinfo->requested_uri;
@@ -47,13 +211,23 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
 
   navinfo->requesting_view = requesting_view;
 
-  navinfo->vfs_fileinfo = gnome_vfs_file_info_new();
-  gnome_vfs_get_file_info(navinfo->navinfo.requested_uri,
-                          navinfo->vfs_fileinfo,
-                          GNOME_VFS_FILE_INFO_GETMIMETYPE
-                          |GNOME_VFS_FILE_INFO_FOLLOWLINKS,
-                          meta_keys);
-  navinfo->navinfo.content_type = (char *)gnome_vfs_file_info_get_mime_type(navinfo->vfs_fileinfo);
+  navinfo->navinfo.requested_uri = g_strdup(nri->requested_uri);
+
+  nautilus_navinfo_map(navinfo);
+
+  if(!navinfo->navinfo.content_type) /* May have already been filed in by nautilus_navinfo_map() */
+    {
+      GnomeVFSFileInfo *vfs_fileinfo;
+
+      vfs_fileinfo = gnome_vfs_file_info_new();
+      gnome_vfs_get_file_info(navinfo->navinfo.actual_uri,
+                              vfs_fileinfo,
+                              GNOME_VFS_FILE_INFO_GETMIMETYPE
+                              |GNOME_VFS_FILE_INFO_FOLLOWLINKS,
+                              meta_keys);
+      navinfo->navinfo.content_type = g_strdup(gnome_vfs_file_info_get_mime_type(vfs_fileinfo));
+      gnome_vfs_file_info_destroy(vfs_fileinfo);
+    }
 
   /* Given a content type and a URI, what do we do? Basically the "expert system" below
      tries to answer that question
@@ -76,10 +250,6 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
          Find if the user has specified any default(s) per-page, modify selection.
   */
 
-  g_message("Content type of %s is %s",
-            navinfo->navinfo.requested_uri,
-            navinfo->navinfo.content_type);
-
   /* This is just a hardcoded hack until OAF works with Bonobo.
      In the future we will use OAF queries to determine this information. */
   if(navinfo->navinfo.content_type)
@@ -92,7 +262,8 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
         {
           navinfo->content_iid = "embeddable:text-plain";
         }
-      else if(!strcmp(navinfo->navinfo.content_type, "special/directory"))
+      else if(!strcmp(navinfo->navinfo.content_type, "special/directory")
+              || !strcmp(navinfo->navinfo.content_type, "application/x-nautilus-vdir"))
         {
           navinfo->content_iid = "ntl_file_manager";
         }
@@ -102,7 +273,7 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
         }
     }
 
-  navinfo->meta_iids = g_slist_append(navinfo->meta_iids, "ntl_history_view");
+  navinfo->meta_iids = g_slist_append(navinfo->meta_iids, g_strdup("ntl_history_view"));
 
   return navinfo;
 }
@@ -110,8 +281,9 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
 void
 nautilus_navinfo_free(NautilusNavigationInfo *navinfo)
 {
-  gnome_vfs_file_info_destroy(navinfo->vfs_fileinfo);
-
+  g_slist_foreach(navinfo->meta_iids, (GFunc)g_free, NULL);
   g_slist_free(navinfo->meta_iids);
   g_free(navinfo->navinfo.requested_uri);
+  g_free(navinfo->navinfo.actual_uri);
+  g_free(navinfo->navinfo.content_type);
 }

src/nautilus-applicable-views.h

@@ -30,6 +30,7 @@
 #include "ntl-types.h"
 #include "ntl-view.h"
 
+void nautilus_navinfo_init(void);
 NautilusNavigationInfo *nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
 					     Nautilus_NavigationRequestInfo *nri,
                                              Nautilus_NavigationInfo *old_navinfo,

src/nautilus-application.c

@@ -33,6 +33,8 @@ nautilus_app_init(const char *initial_url)
 {
   NautilusWindow *mainwin;
 
+  nautilus_navinfo_init();
+
   /* Create our CORBA objects */
   gnome_generic_factory_new_multi("nautilus_factory", nautilus_make_object, NULL);
 

src/ntl-app.c

@@ -33,6 +33,8 @@ nautilus_app_init(const char *initial_url)
 {
   NautilusWindow *mainwin;
 
+  nautilus_navinfo_init();
+
   /* Create our CORBA objects */
   gnome_generic_factory_new_multi("nautilus_factory", nautilus_make_object, NULL);
 

src/ntl-types.h

@@ -38,8 +38,6 @@ typedef struct {
 
   gpointer requesting_view;
 
-  GnomeVFSFileInfo *vfs_fileinfo;
-
   const char *content_iid;
   GSList *meta_iids;
 } NautilusNavigationInfo;

src/ntl-uri-map.c

@@ -27,6 +27,170 @@
 
 #include "ntl-uri-map.h"
 #include <libgnorba/gnorba.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <limits.h>
+#include <ctype.h>
+
+typedef struct {
+  enum { MAP_COMPONENT, MAP_TRANSFORM } type;
+  union {
+    char *component_iid;
+    char *transform_info;
+  } u;
+  char *output_mimetype;
+} SchemeMapping;
+
+static GHashTable *scheme_mappings = NULL;
+
+static void
+nautilus_navinfo_add_mapping(const char *scheme, int type, const char *data, const char *mimetype)
+{
+  SchemeMapping *ent;
+
+  ent = g_new0(SchemeMapping, 1);
+
+  ent->type = type;
+  ent->u.component_iid = g_strdup(data);
+  ent->output_mimetype = g_strdup(mimetype);
+
+  g_hash_table_insert(scheme_mappings, g_strdup(scheme), ent);
+}
+
+static void
+navinfo_read_map_file(const char *fn)
+{
+  FILE *fh;
+  char aline[LINE_MAX];
+
+  fh = fopen(fn, "r");
+  if(!fh)
+    return;
+
+  while(fgets(aline, sizeof(aline), fh))
+    {
+      char *sname, *type, *mimetype, *data;
+      int typeval;
+
+      if(isspace(aline[0]) || aline[0] == '#')
+        continue;
+
+      sname = strtok(aline, " \t");
+      type = strtok(NULL, " \t");
+      mimetype = strtok(NULL, " \t");
+      data = strtok(NULL, "\n");
+
+      if(!sname || !type || !mimetype || !data)
+        continue;
+
+      if(!strcasecmp(type, "component"))
+        typeval = MAP_COMPONENT;
+      else if(!strcasecmp(type, "transform"))
+        typeval = MAP_TRANSFORM;
+      else
+        {
+          g_warning("Unrecognized scheme mapping type %s", type);
+          continue;
+        }
+
+      if(!strcasecmp(mimetype, "NULL"))
+        mimetype = NULL;
+
+      g_message("Adding mapping of %s -> [%s, %s, %s]",
+                sname, type, mimetype, data);
+
+      nautilus_navinfo_add_mapping(sname, typeval, data, mimetype);
+    }
+  
+
+  fclose(fh);
+}
+
+static void
+navinfo_load_mappings(char *dir)
+{
+  DIR *dirh;
+  struct dirent *dent;
+
+  dirh = opendir(dir);
+  if(!dirh)
+    goto out;
+
+  readdir(dirh);
+  readdir(dirh);
+
+  while((dent = readdir(dirh))) {
+    char full_name[PATH_MAX];
+
+    g_snprintf(full_name, sizeof(full_name), "%s/%s", dir, dent->d_name);
+    navinfo_read_map_file(full_name);
+  }
+  closedir(dirh);
+  
+ out:
+  g_free(dir);
+}
+
+void
+nautilus_navinfo_init(void)
+{
+  GSList *dirs = NULL;
+
+  if(!scheme_mappings)
+    scheme_mappings = g_hash_table_new(g_str_hash, g_str_equal);
+
+#if 0
+  gnome_file_locate(gnome_file_domain_config, "nautilus/scheme-mappings", TRUE, &dirs);
+#else
+  {
+    char *ctmp;
+    ctmp = gnome_config_file("nautilus/scheme-mappings");
+    if(ctmp)
+      dirs = g_slist_append(NULL, ctmp);
+  }
+#endif
+
+  g_slist_foreach(dirs, (GFunc)navinfo_load_mappings, NULL);
+  g_slist_free(dirs); /* The contents are already freed by navinfo_load_mappings */
+}
+
+static void
+nautilus_navinfo_map(NautilusNavigationInfo *navinfo)
+{
+  SchemeMapping *mapping;
+  char scheme[128], *ctmp;
+
+  g_assert(scheme_mappings);
+
+  ctmp = strchr(navinfo->navinfo.requested_uri, ':');
+
+  if(!ctmp)
+    goto out;
+  g_snprintf(scheme, sizeof(scheme), "%.*s", (int)(ctmp - navinfo->navinfo.requested_uri), navinfo->navinfo.requested_uri);
+
+  mapping = g_hash_table_lookup(scheme_mappings, scheme);
+  if(!mapping)
+    goto out;
+
+  switch(mapping->type)
+    {
+    case MAP_COMPONENT:
+      navinfo->navinfo.actual_uri = g_strdup_printf("component:%s", mapping->u.component_iid);
+      break;
+    case MAP_TRANSFORM:
+      navinfo->navinfo.actual_uri = g_strdup_printf(mapping->u.transform_info,
+                                                    ctmp+1, ctmp+1, ctmp+1, /* hello, lame hack! :) */
+                                                    ctmp+1, ctmp+1, ctmp+1);
+      break;
+    }
+
+  navinfo->navinfo.content_type = g_strdup(mapping->output_mimetype);
+
+  return;
+
+ out:
+  navinfo->navinfo.actual_uri = g_strdup(navinfo->navinfo.requested_uri);
+}
 
 NautilusNavigationInfo *
 nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
@@ -35,9 +199,9 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
 		     NautilusView *requesting_view)
 {
   const char *meta_keys[] = {"icon-filename", NULL};
+
   memset(navinfo, 0, sizeof(*navinfo));
 
-  navinfo->navinfo.requested_uri = g_strdup(nri->requested_uri);
   if(old_navinfo)
     {
       navinfo->navinfo.referring_uri = old_navinfo->requested_uri;
@@ -47,13 +211,23 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
 
   navinfo->requesting_view = requesting_view;
 
-  navinfo->vfs_fileinfo = gnome_vfs_file_info_new();
-  gnome_vfs_get_file_info(navinfo->navinfo.requested_uri,
-                          navinfo->vfs_fileinfo,
-                          GNOME_VFS_FILE_INFO_GETMIMETYPE
-                          |GNOME_VFS_FILE_INFO_FOLLOWLINKS,
-                          meta_keys);
-  navinfo->navinfo.content_type = (char *)gnome_vfs_file_info_get_mime_type(navinfo->vfs_fileinfo);
+  navinfo->navinfo.requested_uri = g_strdup(nri->requested_uri);
+
+  nautilus_navinfo_map(navinfo);
+
+  if(!navinfo->navinfo.content_type) /* May have already been filed in by nautilus_navinfo_map() */
+    {
+      GnomeVFSFileInfo *vfs_fileinfo;
+
+      vfs_fileinfo = gnome_vfs_file_info_new();
+      gnome_vfs_get_file_info(navinfo->navinfo.actual_uri,
+                              vfs_fileinfo,
+                              GNOME_VFS_FILE_INFO_GETMIMETYPE
+                              |GNOME_VFS_FILE_INFO_FOLLOWLINKS,
+                              meta_keys);
+      navinfo->navinfo.content_type = g_strdup(gnome_vfs_file_info_get_mime_type(vfs_fileinfo));
+      gnome_vfs_file_info_destroy(vfs_fileinfo);
+    }
 
   /* Given a content type and a URI, what do we do? Basically the "expert system" below
      tries to answer that question
@@ -76,10 +250,6 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
          Find if the user has specified any default(s) per-page, modify selection.
   */
 
-  g_message("Content type of %s is %s",
-            navinfo->navinfo.requested_uri,
-            navinfo->navinfo.content_type);
-
   /* This is just a hardcoded hack until OAF works with Bonobo.
      In the future we will use OAF queries to determine this information. */
   if(navinfo->navinfo.content_type)
@@ -92,7 +262,8 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
         {
           navinfo->content_iid = "embeddable:text-plain";
         }
-      else if(!strcmp(navinfo->navinfo.content_type, "special/directory"))
+      else if(!strcmp(navinfo->navinfo.content_type, "special/directory")
+              || !strcmp(navinfo->navinfo.content_type, "application/x-nautilus-vdir"))
         {
           navinfo->content_iid = "ntl_file_manager";
         }
@@ -102,7 +273,7 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
         }
     }
 
-  navinfo->meta_iids = g_slist_append(navinfo->meta_iids, "ntl_history_view");
+  navinfo->meta_iids = g_slist_append(navinfo->meta_iids, g_strdup("ntl_history_view"));
 
   return navinfo;
 }
@@ -110,8 +281,9 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
 void
 nautilus_navinfo_free(NautilusNavigationInfo *navinfo)
 {
-  gnome_vfs_file_info_destroy(navinfo->vfs_fileinfo);
-
+  g_slist_foreach(navinfo->meta_iids, (GFunc)g_free, NULL);
   g_slist_free(navinfo->meta_iids);
   g_free(navinfo->navinfo.requested_uri);
+  g_free(navinfo->navinfo.actual_uri);
+  g_free(navinfo->navinfo.content_type);
 }

src/ntl-uri-map.h

@@ -30,6 +30,7 @@
 #include "ntl-types.h"
 #include "ntl-view.h"
 
+void nautilus_navinfo_init(void);
 NautilusNavigationInfo *nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
 					     Nautilus_NavigationRequestInfo *nri,
                                              Nautilus_NavigationInfo *old_navinfo,