gtk_object_sink has been deprecated since gtk version 2.10, use g_object_ref_sink...

[andy/viking.git] / src / file.c

diff --git a/src/file.c b/src/file.c
index d7cc89d4c0802b5dc78379df0dcb492bcc4ecb4e..408e6cb1db1508a17e0aa60792abd91f5d318761 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -28,8 +28,13 @@
 
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>

+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif

 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib.h>
 #include <glib/gstdio.h>

+#include <glib/gi18n.h>

 
 /* Relax some dependencies */
 #if ! GLIB_CHECK_VERSION(2,12,0)
 
 /* Relax some dependencies */
 #if ! GLIB_CHECK_VERSION(2,12,0)


@@ -147,7 +152,7 @@ static void write_layer_params_and_data ( VikLayer *l, FILE *f )
     guint16 i, params_count = vik_layer_get_interface(l->type)->params_count;
     for ( i = 0; i < params_count; i++ )
     {
     guint16 i, params_count = vik_layer_get_interface(l->type)->params_count;
     for ( i = 0; i < params_count; i++ )
     {

-      data = get_param(l,i);
+      data = get_param(l, i, TRUE);

       file_write_layer_param(f, params[i].name, params[i].type, data);
     }
   }
       file_write_layer_param(f, params[i].name, params[i].type, data);
     }
   }


@@ -168,6 +173,7 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
   Stack *stack = NULL;
   VikLayer *current_layer;
   struct LatLon ll;
   Stack *stack = NULL;
   VikLayer *current_layer;
   struct LatLon ll;

+  VikViewportDrawMode mode;

   gchar *modestring;
 
   push(&stack);
   gchar *modestring;
 
   push(&stack);


@@ -177,15 +183,17 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
   /* crazhy CRAZHY */
   vik_coord_to_latlon ( vik_viewport_get_center ( VIK_VIEWPORT(vp) ), &ll );
 
   /* crazhy CRAZHY */
   vik_coord_to_latlon ( vik_viewport_get_center ( VIK_VIEWPORT(vp) ), &ll );
 

-  switch ( vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) ) ) {
+  mode = vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) );
+  switch ( mode ) {

     case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
     case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;
     case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
     case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;

-    case VIK_VIEWPORT_DRAWMODE_GOOGLE: modestring = "google"; break;
-    case VIK_VIEWPORT_DRAWMODE_KH: modestring = "kh"; break;
-    default: modestring = "mercator";
+    case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break;
+    case VIK_VIEWPORT_DRAWMODE_LATLON: modestring = "latlon"; break;
+    default:
+      g_critical("Houston, we've had a problem. mode=%d", mode);

   }
 
   }
 

-  fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\ndrawscale=%s\ndrawcentermark=%s",
+  fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\ndrawscale=%s\ndrawcentermark=%s\n",

       vik_viewport_get_xmpp ( VIK_VIEWPORT(vp) ), vik_viewport_get_ympp ( VIK_VIEWPORT(vp) ), ll.lat, ll.lon,
       modestring, vik_viewport_get_background_color(VIK_VIEWPORT(vp)),
       vik_viewport_get_draw_scale(VIK_VIEWPORT(vp)) ? "t" : "f",
       vik_viewport_get_xmpp ( VIK_VIEWPORT(vp) ), vik_viewport_get_ympp ( VIK_VIEWPORT(vp) ), ll.lat, ll.lon,
       modestring, vik_viewport_get_background_color(VIK_VIEWPORT(vp)),
       vik_viewport_get_draw_scale(VIK_VIEWPORT(vp)) ? "t" : "f",


@@ -252,7 +260,7 @@ static void string_list_set_param (gint i, GList *list, gpointer *layer_and_vp)
 {
   VikLayerParamData x;
   x.sl = list;
 {
   VikLayerParamData x;
   x.sl = list;

-  vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), i, x, layer_and_vp[1] );
+  vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), i, x, layer_and_vp[1], TRUE );

 }
 
 static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
 }
 
 static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )


@@ -316,7 +324,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
           push(&stack);
           if ( type == -1 )
           {
           push(&stack);
           if ( type == -1 )
           {

-            g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 );
+            g_warning ( "Line %ld: Unknown type %s", line_num, line+6 );

             stack->data = NULL;
           }
           else if (parent_type == VIK_LAYER_GPS)
             stack->data = NULL;
           }
           else if (parent_type == VIK_LAYER_GPS)


@@ -415,11 +423,17 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_EXPEDIA );
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "google" ) == 0)
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_EXPEDIA );
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "google" ) == 0)

-        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_GOOGLE );
+      {
+        g_warning ( _("Draw mode '%s' no more supported"), "google" );
+      }

       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "kh" ) == 0)
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "kh" ) == 0)

-        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_KH );
+      {
+        g_warning ( _("Draw mode '%s' no more supported"), "kh" );
+      }

       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "mercator" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "mercator" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );

+      else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "latlon" ) == 0)
+        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_LATLON );

       else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 )
         vik_viewport_set_background_color ( VIK_VIEWPORT(vp), line+6 );
       else if ( stack->under == NULL && eq_pos == 9 && strncasecmp ( line, "drawscale", eq_pos ) == 0 )
       else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 )
         vik_viewport_set_background_color ( VIK_VIEWPORT(vp), line+6 );
       else if ( stack->under == NULL && eq_pos == 9 && strncasecmp ( line, "drawscale", eq_pos ) == 0 )


@@ -449,8 +463,9 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
             VikLayerParamData x;
             line += eq_pos+1;
             if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) {
             VikLayerParamData x;
             line += eq_pos+1;
             if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) {

-              GList *l = g_list_append ( g_hash_table_lookup ( string_lists, (gpointer) ((gint) i) ), g_strdup(line) );
-              g_hash_table_replace ( string_lists, (gpointer) ((gint)i), l );
+              GList *l = g_list_append ( g_hash_table_lookup ( string_lists, GINT_TO_POINTER ((gint) i) ), 
+                                        g_strdup(line) );
+              g_hash_table_replace ( string_lists, GINT_TO_POINTER ((gint)i), l );

               /* add the value to a list, possibly making a new list.
                * this will be passed to the layer when we read an ~EndLayer */
             } else {
               /* add the value to a list, possibly making a new list.
                * this will be passed to the layer when we read an ~EndLayer */
             } else {


@@ -465,7 +480,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
                 /* STRING or STRING_LIST -- if STRING_LIST, just set param to add a STRING */
                 default: x.s = line;
               }
                 /* STRING or STRING_LIST -- if STRING_LIST, just set param to add a STRING */
                 default: x.s = line;
               }

-              vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp );
+              vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp, TRUE );

             }
             found_match = TRUE;
             break;
             }
             found_match = TRUE;
             break;


@@ -527,18 +542,25 @@ static FILE *xfopen ( const char *fn, const char *mode )
   if ( strcmp(fn,"-") == 0 )
     return stdin;
   else
   if ( strcmp(fn,"-") == 0 )
     return stdin;
   else

-    return fopen(fn, "r");
+    return g_fopen(fn, "r");

 }
 
 static void xfclose ( FILE *f )
 {
 }
 
 static void xfclose ( FILE *f )
 {

-  if ( f != stdin && f != stdout )
+  if ( f != stdin && f != stdout ) {

     fclose ( f );
     fclose ( f );

+    f = NULL;
+  }

 }
 
 /* 0 on failure, 1 on success (vik file) 2 on success (other file) */
 }
 
 /* 0 on failure, 1 on success (vik file) 2 on success (other file) */

-gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename )
+gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename_or_uri )

 {
 {

+  char *filename = (char *)filename_or_uri;
+  if (strncmp(filename, "file://", 7) == 0)
+    filename = filename + 7;
+
+  gboolean is_gpx_file = check_file_ext ( filename, ".gpx" );

   FILE *f = xfopen ( filename, "r" );
 
   g_assert ( vp );
   FILE *f = xfopen ( filename, "r" );
 
   g_assert ( vp );


@@ -546,7 +568,7 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen
   if ( ! f )
     return 0;
 
   if ( ! f )
     return 0;
 

-  if ( check_magic ( f, VIK_MAGIC ) )
+  if ( !is_gpx_file && check_magic ( f, VIK_MAGIC ) )

   {
     file_read ( top, f, vp );
     if ( f != stdin )
   {
     file_read ( top, f, vp );
     if ( f != stdin )


@@ -555,11 +577,10 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen
   }
   else
   {
   }
   else
   {

-    VikCoord new_center;

     VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );
     vik_layer_rename ( vtl, a_file_basename ( filename ) );
 
     VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );
     vik_layer_rename ( vtl, a_file_basename ( filename ) );
 

-    if ( check_magic ( f, GPX_MAGIC ) )
+    if ( is_gpx_file || check_magic ( f, GPX_MAGIC ) )

       a_gpx_read_file ( VIK_TRW_LAYER(vtl), f );
     else
      a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f );
       a_gpx_read_file ( VIK_TRW_LAYER(vtl), f );
     else
      a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f );


@@ -568,8 +589,8 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen
 
     vik_aggregate_layer_add_layer ( top, vtl );
 
 
     vik_aggregate_layer_add_layer ( top, vtl );
 

-    if ( vik_trw_layer_find_center ( VIK_TRW_LAYER(vtl), &new_center ) )
-      vik_viewport_set_center_coord ( VIK_VIEWPORT(vp), &new_center );
+    vik_trw_layer_auto_set_view ( VIK_TRW_LAYER(vtl), vp );
+

     xfclose(f);
     return 2;
   }
     xfclose(f);
     return 2;
   }


@@ -577,7 +598,12 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen
 
 gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
 {
 
 gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
 {

-  FILE *f = fopen(filename, "w");
+  FILE *f;
+
+  if (strncmp(filename, "file://", 7) == 0)
+    filename = filename + 7;
+
+  f = g_fopen(filename, "w");

 
   if ( ! f )
     return FALSE;
 
   if ( ! f )
     return FALSE;


@@ -585,6 +611,7 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam
   file_write ( top, f, vp );
 
   fclose(f);
   file_write ( top, f, vp );
 
   fclose(f);

+  f = NULL;

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -601,18 +628,55 @@ const gchar *a_file_basename ( const gchar *filename )
   return filename;
 }
 
   return filename;
 }
 

-gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type )
+/* example: 
+     gboolean is_gpx = check_file_ext ( "a/b/c.gpx", ".gpx" );
+*/
+gboolean check_file_ext ( const gchar *filename, const gchar *fileext )

 {
 {

-  FILE *f = fopen ( filename, "w" );
+  const gchar *basename = a_file_basename(filename);
+  g_assert( filename );
+  g_assert( fileext && fileext[0]=='.' );
+  if (!basename)
+    return FALSE;
+
+  const char * dot = strrchr(basename, '.');
+  if (dot && !strcmp(dot, fileext))
+    return TRUE;
+
+  return FALSE;
+}
+
+gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, const gchar *trackname )
+{
+  FILE *f = g_fopen ( filename, "w" );

   if ( f )
   {
   if ( f )
   {

-    if ( file_type == FILE_TYPE_GPSMAPPER )
-      a_gpsmapper_write_file ( vtl, f );
-    else if ( file_type == FILE_TYPE_GPX )
-      a_gpx_write_file ( vtl, f );
-    else
-      a_gpspoint_write_file ( vtl, f );
+    if (trackname) {
+      VikTrack *vt = vik_trw_layer_get_track ( vtl, trackname );
+      switch ( file_type ) {
+        case FILE_TYPE_GPX:
+          a_gpx_write_track_file ( trackname, vt, f );
+          break;
+        default:
+          g_critical("Houston, we've had a problem. file_type=%d", file_type);
+      }
+    } else {
+      switch ( file_type ) {
+        case FILE_TYPE_GPSMAPPER:
+          a_gpsmapper_write_file ( vtl, f );
+          break;
+        case FILE_TYPE_GPX:
+          a_gpx_write_file ( vtl, f );
+          break;
+        case FILE_TYPE_GPSPOINT:
+          a_gpspoint_write_file ( vtl, f );
+          break;
+        default:
+          g_critical("Houston, we've had a problem. file_type=%d", file_type);
+      }
+    }

     fclose ( f );
     fclose ( f );

+    f = NULL;

     return TRUE;
   }
   return FALSE;
     return TRUE;
   }
   return FALSE;


@@ -626,22 +690,22 @@ const gchar *a_get_viking_dir()
 
   if (!viking_dir) {
     const gchar *home = g_getenv("HOME");
 
   if (!viking_dir) {
     const gchar *home = g_getenv("HOME");

-    if (!home || access(home, W_OK))
+    if (!home || g_access(home, W_OK))

       home = g_get_home_dir ();
 #ifdef HAVE_MKDTEMP
       home = g_get_home_dir ();
 #ifdef HAVE_MKDTEMP

-    if (!home || access(home, W_OK))
+    if (!home || g_access(home, W_OK))

     {
       static gchar temp[] = {"/tmp/vikXXXXXX"};
       home = mkdtemp(temp);
     }
 #endif
     {
       static gchar temp[] = {"/tmp/vikXXXXXX"};
       home = mkdtemp(temp);
     }
 #endif

-    if (!home || access(home, W_OK))
+    if (!home || g_access(home, W_OK))

       /* Fatal error */
       g_critical("Unable to find a base directory");
 
     /* Build the name of the directory */
     viking_dir = g_build_filename(home, ".viking", NULL);
       /* Fatal error */
       g_critical("Unable to find a base directory");
 
     /* Build the name of the directory */
     viking_dir = g_build_filename(home, ".viking", NULL);

-    if (access(viking_dir, F_OK))
+    if (g_file_test(viking_dir, G_FILE_TEST_EXISTS) == FALSE)

       g_mkdir(viking_dir, 0755);
   }
 
       g_mkdir(viking_dir, 0755);
   }