Attached is reworked version of a previous patch to automatically
import downloaded gpx and loc files into a specified trackwaypoint
layer. Some style issued were corrected, some common code refactored,
options added for how to do the import.
Eric
diff --git a/src/dialog.c b/src/dialog.c
index 6413555..2aabfa8 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -913,3 +913,82 @@ void a_dialog_license ( GtkWindow *parent, const gchar *map, const gchar *licens
} while (response != GTK_RESPONSE_DELETE_EVENT && response != GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);
}
+
+
+void import_repeatcheck_changed_cb(GtkWidget *widget, gpointer data)
+{
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(data), GTK_TOGGLE_BUTTON (widget)->active );
+ gtk_widget_set_sensitive(GTK_WIDGET(data), ! GTK_TOGGLE_BUTTON (widget)->active);
+}
+
+
+gint a_dialog_auto_import ( GtkWindow *parent, gboolean repeat_active, gchar **dir, gchar **patterns, gboolean *dorepeat, gboolean *dodelete)
+{
+ gint resp = GTK_RESPONSE_CANCEL;
+ GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Import Files With Pattern"),
+ parent,
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ GTK_STOCK_STOP,
+ GTK_RESPONSE_YES,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_OK,
+ NULL);
+ GtkWidget *dirlabel, *direntry, *patternlabel, *patternentry;
+ GtkWidget *repeatcheck, *deletecheck;
+
+ //table = gtk_table_new ( 4, 2, FALSE );
+ //gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), table, TRUE, TRUE, 0 );
+
+ dirlabel = gtk_label_new (_("Directory:"));
+ direntry = gtk_entry_new ();
+ patternlabel = gtk_label_new (_("Patterns:"));
+ patternentry = gtk_entry_new ();
+ repeatcheck = gtk_check_button_new_with_label ( "Repeat scan every second (implies delete)" );
+ deletecheck = gtk_check_button_new_with_label ( "Delete after import" );
+
+ gtk_entry_set_text ( GTK_ENTRY(direntry), *dir);
+ gtk_entry_set_text ( GTK_ENTRY(patternentry), *patterns);
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(repeatcheck), *dorepeat );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(deletecheck), *dorepeat || *dodelete );
+ g_signal_connect(G_OBJECT(repeatcheck), "clicked", G_CALLBACK(import_repeatcheck_changed_cb), deletecheck);
+
+
+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), GTK_RESPONSE_YES, repeat_active);
+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), GTK_RESPONSE_OK, !repeat_active);
+ gtk_widget_set_sensitive(GTK_WIDGET(direntry), !repeat_active);
+ gtk_widget_set_sensitive(GTK_WIDGET(patternentry), !repeat_active);
+ gtk_widget_set_sensitive(GTK_WIDGET(repeatcheck), !repeat_active);
+ gtk_widget_set_sensitive(GTK_WIDGET(deletecheck), !repeat_active && !*dorepeat);
+
+
+
+ //gtk_table_attach_defaults ( GTK_TABLE(table), dirlabel, 0, 1, 0, 1 );
+ //gtk_table_attach_defaults ( GTK_TABLE(table), direntry, 1, 2, 0, 1 );
+ //gtk_table_attach_defaults ( GTK_TABLE(table), patlabel, 0, 1, 1, 2 );
+ //gtk_table_attach_defaults ( GTK_TABLE(table), patentry, 1, 2, 1, 2 );
+
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), dirlabel, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), direntry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), patternlabel, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), patternentry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), repeatcheck, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), deletecheck, FALSE, FALSE, 0);
+
+ gtk_widget_show_all ( GTK_DIALOG(dialog)->vbox );
+
+ resp = gtk_dialog_run ( GTK_DIALOG(dialog) );
+ if ( resp == GTK_RESPONSE_OK ) {
+ if (*dir)
+ g_free(*dir);
+ *dir = g_strdup(gtk_entry_get_text(GTK_ENTRY(direntry)));
+ if (*patterns)
+ g_free(*patterns);
+ *patterns = g_strdup(gtk_entry_get_text(GTK_ENTRY(patternentry)));
+ *dorepeat = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(repeatcheck) );
+ *dodelete = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(deletecheck) );
+ }
+ gtk_widget_destroy ( dialog );
+ return resp;
+}
diff --git a/src/dialog.h b/src/dialog.h
index 74b2c87..e1d018e 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -76,4 +76,6 @@ gboolean a_dialog_map_n_zoom(GtkWindow *parent, gchar *mapnames[], gint default_
GList *a_dialog_select_from_list ( GtkWindow *parent, GList *names, gboolean multiple_selection_allowed, const gchar *title, const gchar *msg );
void a_dialog_license ( GtkWindow *parent, const gchar *map, const gchar *license, const gchar *url);
+
+gint a_dialog_auto_import ( GtkWindow *parent, gboolean repeat_active, gchar **dir, gchar **patterns, gboolean *dorepeat, gboolean *dodelete);
#endif
diff --git a/src/file.c b/src/file.c
index bfc1fc5..2946a3b 100644
--- a/src/file.c
+++ b/src/file.c
@@ -572,7 +572,7 @@ gboolean check_file_magic_vik ( const gchar *filename )
return result;
}
-VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename_or_uri )
+VikLoadType_t a_file_load ( VikLayer *layer, VikViewport *vp, const gchar *filename_or_uri )
{
char *filename = (char *)filename_or_uri;
if (strncmp(filename, "file://", 7) == 0)
@@ -588,16 +588,26 @@ VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar
if ( !is_gpx_file && check_magic ( f, VIK_MAGIC ) )
{
- file_read ( top, f, vp );
+ if (layer->type != VIK_LAYER_AGGREGATE )
+ return LOAD_TYPE_READ_FAILURE;
+ file_read ( VIK_AGGREGATE_LAYER(layer), f, vp );
+ // FIXME, how to check if file was read properly
if ( f != stdin )
xfclose(f);
return LOAD_TYPE_VIK_SUCCESS;
}
else
{
- VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );
- vik_layer_rename ( vtl, a_file_basename ( filename ) );
-
+ VikLayer *vtl = NULL;
+ if (layer->type == VIK_LAYER_AGGREGATE )
+ {
+ VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );
+ vik_layer_rename ( vtl, a_file_basename ( filename ) );
+ }
+ else if (layer->type == VIK_LAYER_TRW)
+ vtl = layer;
+ else
+ return LOAD_TYPE_READ_FAILURE;
// In fact both kml & gpx files start the same as they are in xml
if ( check_file_ext ( filename, ".kml" ) && check_magic ( f, GPX_MAGIC ) ) {
// Implicit Conversion
@@ -615,7 +625,8 @@ VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar
vik_layer_post_read ( vtl, vp, TRUE );
- vik_aggregate_layer_add_layer ( top, vtl );
+ if (layer->type == VIK_LAYER_AGGREGATE )
+ vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(layer), vtl );
vik_trw_layer_auto_set_view ( VIK_TRW_LAYER(vtl), vp );
@@ -715,6 +726,25 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t
return FALSE;
}
+
+const gchar *a_get_home_dir()
+{
+ const gchar *home = g_getenv("HOME");
+ if (!home || g_access(home, W_OK))
+ home = g_get_home_dir ();
+#ifdef HAVE_MKDTEMP
+ if (!home || g_access(home, W_OK))
+ {
+ static gchar temp[] = {"/tmp/vikXXXXXX"};
+ home = mkdtemp(temp);
+ }
+#endif
+ if (!home || g_access(home, W_OK))
+ return NULL;
+ return home;
+}
+
+
const gchar *a_get_viking_dir()
{
static gchar *viking_dir = NULL;
@@ -722,17 +752,8 @@ const gchar *a_get_viking_dir()
// TODO: use g_get_user_config_dir ?
if (!viking_dir) {
- const gchar *home = g_getenv("HOME");
- if (!home || g_access(home, W_OK))
- home = g_get_home_dir ();
-#ifdef HAVE_MKDTEMP
- if (!home || g_access(home, W_OK))
- {
- static gchar temp[] = {"/tmp/vikXXXXXX"};
- home = mkdtemp(temp);
- }
-#endif
- if (!home || g_access(home, W_OK))
+ const gchar *home = a_get_home_dir();
+ if (!home)
/* Fatal error */
g_critical("Unable to find a base directory");
@@ -748,3 +769,4 @@ const gchar *a_get_viking_dir()
return viking_dir;
}
+
diff --git a/src/file.h b/src/file.h
index e081558..9f2fc89 100644
--- a/src/file.h
+++ b/src/file.h
@@ -50,13 +50,13 @@ typedef enum {
LOAD_TYPE_OTHER_SUCCESS,
} VikLoadType_t;
-VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename );
+VikLoadType_t a_file_load ( VikLayer *layer, VikViewport *vp, const gchar *filename );
gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename );
/* Only need to define VikTrack and trackname if the file type is FILE_TYPE_GPX_TRACK */
gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, const gchar *trackname );
+const gchar *a_get_home_dir();
const gchar *a_get_viking_dir();
void file_write_layer_param ( FILE *f, const gchar *name, guint8 type, VikLayerParamData data );
-
#endif
diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index debeead..3aac0ef 100644
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -48,6 +48,7 @@
#endif
#include "acquire.h"
#include "util.h"
+#include "file.h"
#include "icons/icons.h"
@@ -188,6 +189,12 @@ struct _VikTrwLayer {
VikStdLayerMenuItem menu_selection;
gint highest_wp_number;
+
+ gchar* import_dir;
+ gchar* import_patterns;
+ gboolean import_dorepeat;
+ gboolean import_dodelete;
+ gboolean import_is_active;
};
/* A caached waypoint image. */
@@ -209,6 +216,7 @@ struct DrawingParams {
static void vik_trw_layer_set_menu_selection(VikTrwLayer *vtl, guint16);
static guint16 vik_trw_layer_get_menu_selection(VikTrwLayer *vtl);
+static gboolean trw_layer_auto_import_callback(VikTrwLayer *vtl);
static void trw_layer_delete_item ( gpointer pass_along[6] );
static void trw_layer_copy_item_cb ( gpointer pass_along[6] );
@@ -256,6 +264,7 @@ static void trw_layer_delete_all_waypoints ( gpointer lav[2] );
static void trw_layer_delete_waypoints_from_selection ( gpointer lav[2] );
static void trw_layer_new_wikipedia_wp_viewport ( gpointer lav[2] );
static void trw_layer_new_wikipedia_wp_layer ( gpointer lav[2] );
+static void trw_layer_auto_import ( gpointer lav[2] );
/* pop-up items */
static void trw_layer_properties_item ( gpointer pass_along[6] );
@@ -2348,6 +2357,11 @@ void vik_trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vl
item = gtk_menu_item_new_with_mnemonic ( _("Export as _KML...") );
g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_export_kml), pass_along );
gtk_menu_shell_append (GTK_MENU_SHELL (export_submenu), item);
+
+ gtk_widget_show ( item );
+ item = gtk_menu_item_new_with_mnemonic ( _("Import Files With Pattern...") );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_auto_import), pass_along );
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show ( item );
item = gtk_menu_item_new_with_mnemonic ( _("_New Waypoint...") );
@@ -3397,6 +3411,45 @@ static void trw_layer_delete_waypoints_from_selection ( gpointer lav[2] )
}
+
+/**
+ *
+ */
+static void trw_layer_auto_import ( gpointer lav[2] )
+{
+ VikTrwLayer *vtl = VIK_TRW_LAYER(lav[0]);
+ if (vtl->import_dir == NULL) {
+ const gchar *home = a_get_home_dir();
+ if (home)
+ vtl->import_dir = g_build_filename(home, "gpx", NULL);
+ else
+ vtl->import_dir = g_strdup("");
+ }
+ if (vtl->import_patterns == NULL)
+ vtl->import_patterns = g_strdup("*.gpx;*.loc");
+
+ gint ret = a_dialog_auto_import(VIK_GTK_WINDOW_FROM_LAYER(vtl),
+ vtl->import_is_active,
+ &vtl->import_dir,
+ &vtl->import_patterns,
+ &vtl->import_dorepeat,
+ &vtl->import_dodelete);
+ if (ret == GTK_RESPONSE_OK) {
+ vtl->import_is_active = TRUE;
+ if (vtl->import_dorepeat)
+ g_timeout_add_seconds(1, (GSourceFunc) trw_layer_auto_import_callback, vtl);
+ else {
+ trw_layer_auto_import_callback(vtl);
+ vtl->import_is_active = FALSE;
+ }
+ }
+ else if (ret == GTK_RESPONSE_YES) { /* dialog return YES for stop button */
+ vtl->import_is_active = FALSE;
+ }
+}
+
+
+
static void trw_layer_goto_waypoint ( gpointer pass_along[6] )
{
VikWaypoint *wp = g_hash_table_lookup ( VIK_TRW_LAYER(pass_along[0])->waypoints, pass_along[3] );
@@ -5529,3 +5582,58 @@ static gchar *highest_wp_number_get(VikTrwLayer *vtl)
g_snprintf(buf,4,"%03d", vtl->highest_wp_number+1 );
return g_strdup(buf);
}
+
+
+static gboolean trw_layer_auto_import_callback(VikTrwLayer *vtl)
+{
+ GDir* dir;
+ VikWindow *vw = (VikWindow *)(VIK_GTK_WINDOW_FROM_LAYER(vtl));
+ VikViewport *vvp = vik_window_viewport(vw);
+ gchar** glob_list;
+ gboolean ret;
+
+ if (vtl->import_is_active == FALSE)
+ return FALSE;
+ dir = g_dir_open(vtl->import_dir, 0, NULL);
+ if (dir == NULL) {
+ vtl->import_is_active = FALSE;
+ // TODO signal the user
+ return FALSE;
+ }
+
+ ret = TRUE;
+ glob_list = g_strsplit(vtl->import_patterns, ";", 0);
+ while (ret == TRUE) {
+ const gchar* filename = g_dir_read_name(dir);
+ gchar* full_path;
+
+ if (filename == NULL)
+ break;
+ else {
+ gchar** glob_list2 = glob_list;
+ gboolean match = FALSE;
+ while (*glob_list2 != NULL && !match) {
+ match = g_pattern_match_simple(*glob_list2, filename);
+ glob_list2++;
+ }
+ if (!match)
+ continue;
+ }
+
+ full_path = g_build_filename(vtl->import_dir, filename, NULL);
+ if (a_file_load(VIK_LAYER(vtl), vvp, full_path) == LOAD_TYPE_OTHER_SUCCESS) {
+ if (vtl->import_dodelete)
+ g_unlink(full_path);
+ }
+ else {
+ vtl->import_is_active = FALSE;
+ ret = FALSE;
+ // TODO signal user about failure, but right now most failures are not detected
+ }
+ g_free(full_path);
+ }
+ g_strfreev(glob_list);
+
+ g_dir_close(dir);
+ return ret;
+}
diff --git a/src/vikwindow.c b/src/vikwindow.c
index 8e8fa89..f9fdbd4 100644
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -1729,7 +1729,7 @@ static void update_recently_used_document(const gchar *filename)
void vik_window_open_file ( VikWindow *vw, const gchar *filename, gboolean change_filename )
{
- switch ( a_file_load ( vik_layers_panel_get_top_layer(vw->viking_vlp), vw->viking_vvp, filename ) )
+ switch ( a_file_load ( VIK_LAYER(vik_layers_panel_get_top_layer(vw->viking_vlp)), vw->viking_vvp, filename ) )
{
case LOAD_TYPE_READ_FAILURE:
a_dialog_error_msg ( GTK_WINDOW(vw), _("The file you requested could not be opened.") );
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/
