if ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) >= 0) {
f = fdopen(fd_src, "w");
- a_gpx_write_file(vt, f);
+ a_gpx_write_file(vt, f, NULL);
fclose(f);
f = NULL;
ret = a_babel_convert_from ( vt, bargs, name_src, cb, user_data );
return ret;
}
-#ifdef WINDOWS
-static gboolean babel_general_convert( BabelStatusFunc cb, gchar **args, gpointer user_data )
+/**
+ * Perform any cleanup actions once GPSBabel has completed running
+ */
+static void babel_watch ( GPid pid,
+ gint status,
+ gpointer user_data )
{
- gboolean ret;
- FILE *f;
- gchar *cmd;
- gchar **args2;
-
- STARTUPINFO si;
- PROCESS_INFORMATION pi;
-
- ZeroMemory( &si, sizeof(si) );
- ZeroMemory( &pi, sizeof(pi) );
- si.cb = sizeof(si);
- si.dwFlags = STARTF_USESHOWWINDOW;
- si.wShowWindow = SW_HIDE;
-
- cmd = g_strjoinv( " ", args);
- args2 = g_strsplit(cmd, "\\", 0);
- g_free(cmd);
- cmd = g_strjoinv( "\\\\", args2);
- g_free(args2);
- args2 = g_strsplit(cmd, "/", 0);
- g_free(cmd);
- cmd = g_strjoinv( "\\\\", args2);
-
- if( !CreateProcess(
- NULL, // No module name (use command line).
- (LPTSTR)cmd, // Command line.
- NULL, // Process handle not inheritable.
- NULL, // Thread handle not inheritable.
- FALSE, // Set handle inheritance to FALSE.
- 0, // No creation flags.
- NULL, // Use parent's environment block.
- NULL, // Use parent's starting directory.
- &si, // Pointer to STARTUPINFO structure.
- &pi ) // Pointer to PROCESS_INFORMATION structure.
- ){
- g_error ( "CreateProcess failed" );
- ret = FALSE;
- }
- else {
- WaitForSingleObject(pi.hProcess, INFINITE);
- WaitForSingleObject(pi.hThread, INFINITE);
-
- CloseHandle(pi.hThread);
- CloseHandle(pi.hProcess);
-
- if ( cb )
- cb(BABEL_DONE, NULL, user_data);
-
- ret = TRUE;
- }
-
- g_strfreev( args2 );
- g_free( cmd );
-
- return ret;
+ g_spawn_close_pid ( pid );
}
-/* Windows */
-#else
-/* Posix */
+
+/**
+ * babel_general_convert:
+ * @args: The command line arguments passed to GPSBabel
+ * @cb: callback that is run for each line of GPSBabel output and at completion of the run
+ * callback may be NULL
+ * @user_data: passed along to cb
+ *
+ * The function to actually invoke the GPSBabel external command
+ *
+ * Returns: %TRUE on successful invocation of GPSBabel command
+ */
static gboolean babel_general_convert( BabelStatusFunc cb, gchar **args, gpointer user_data )
{
gboolean ret = FALSE;
GError *error = NULL;
gint babel_stdout;
- if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL, &pid, NULL, &babel_stdout, NULL, &error)) {
+ if (!g_spawn_async_with_pipes (NULL, args, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL, &babel_stdout, NULL, &error)) {
g_error("Async command failed: %s", error->message);
g_error_free(error);
ret = FALSE;
cb(BABEL_DONE, NULL, user_data);
fclose(diag);
diag = NULL;
- waitpid(pid, NULL, 0);
- g_spawn_close_pid(pid);
+
+ g_child_watch_add ( pid, (GChildWatchFunc) babel_watch, NULL );
ret = TRUE;
}
return ret;
}
-#endif /* Posix */
/**
* babel_general_convert_from:
f = g_fopen(name_dst, "r");
if (f) {
- a_gpx_read_file ( vt, f );
+ ret = a_gpx_read_file ( vt, f );
fclose(f);
f = NULL;
- ret = TRUE;
}
}
g_strfreev(sub_args);
} else
- g_error("gpsbabel not found in PATH");
+ g_critical("gpsbabel not found in PATH");
g_remove(name_dst);
g_free(name_dst);
}
return ret;
}
-static gboolean babel_general_convert_to( VikTrwLayer *vt, BabelStatusFunc cb, gchar **args, const gchar *name_src, gpointer user_data )
+static gboolean babel_general_convert_to( VikTrwLayer *vt, VikTrack *trk, BabelStatusFunc cb, gchar **args, const gchar *name_src, gpointer user_data )
{
- if (!a_file_export(vt, name_src, FILE_TYPE_GPX, NULL)) {
- g_error("Error exporting to %s", name_src);
+ // Now strips out invisible tracks and waypoints
+ if (!a_file_export(vt, name_src, FILE_TYPE_GPX, trk, FALSE)) {
+ g_critical("Error exporting to %s", name_src);
return FALSE;
}
return babel_general_convert (cb, args, user_data);
}
-gboolean a_babel_convert_to( VikTrwLayer *vt, const char *babelargs, const char *to, BabelStatusFunc cb, gpointer user_data )
+/**
+ * a_babel_convert_to:
+ * @vt The TRW layer from which data is taken.
+ * @track Operate on the individual track if specified. Use NULL when operating on a TRW layer
+ * @babelargs A string containing gpsbabel command line options. In addition to any filters, this string
+ * must include the input file type (-i) option.
+ * @to Filename or device the data is written to.
+ * @cb Optional callback function. Same usage as in a_babel_convert.
+ *
+ * Exports data using gpsbabel. This routine is synchronous;
+ * that is, it will block the calling program until the conversion is done. To avoid blocking, call
+ * this routine from a worker thread.
+ *
+ * Returns: %TRUE on successful invocation of GPSBabel command
+ */
+gboolean a_babel_convert_to( VikTrwLayer *vt, VikTrack *track, const char *babelargs, const char *to, BabelStatusFunc cb, gpointer user_data )
{
int i,j;
int fd_src;
args[i++] = (char *)to;
args[i] = NULL;
- ret = babel_general_convert_to ( vt, cb, args, name_src, user_data );
+ ret = babel_general_convert_to ( vt, track, cb, args, name_src, user_data );
g_strfreev(sub_args);
} else
- g_error("gpsbabel not found in PATH");
+ g_critical("gpsbabel not found in PATH");
g_remove(name_src);
g_free(name_src);
}
BabelDevice *device = g_malloc ( sizeof (BabelDevice) );
set_mode (device->mode, tokens[1]);
device->name = g_strdup (tokens[2]);
- device->label = g_strdup (tokens[4]);
+ device->label = g_strndup (tokens[4], 50); // Limit really long label text
a_babel_device_list = g_list_append (a_babel_device_list, device);
g_debug ("New gpsbabel device: %s", device->name);
} else {
ret = babel_general_convert (load_feature_cb, args, NULL);
} else
- g_error("gpsbabel not found in PATH");
+ g_critical("gpsbabel not found in PATH");
return ret;
}
/* TODO allow to set gpsbabel path via command line */
gpsbabel_loc = g_find_program_in_path( "gpsbabel" );
if ( !gpsbabel_loc )
- g_error( "gpsbabel not found in PATH" );
+ g_critical( "gpsbabel not found in PATH" );
unbuffer_loc = g_find_program_in_path( "unbuffer" );
if ( !unbuffer_loc )
g_warning( "unbuffer not found in PATH" );
{
g_free ( gpsbabel_loc );
g_free ( unbuffer_loc );
+
+ if ( a_babel_file_list ) {
+ GList *gl;
+ for (gl = a_babel_file_list; gl != NULL; gl = g_list_next(gl)) {
+ BabelFile *file = gl->data;
+ g_free ( file->name );
+ g_free ( file->ext );
+ g_free ( file->label );
+ g_free ( gl->data );
+ }
+ g_list_free ( a_babel_file_list );
+ }
+
+ if ( a_babel_device_list ) {
+ GList *gl;
+ for (gl = a_babel_device_list; gl != NULL; gl = g_list_next(gl)) {
+ BabelDevice *device = gl->data;
+ g_free ( device->name );
+ g_free ( device->label );
+ g_free ( gl->data );
+ }
+ g_list_free ( a_babel_device_list );
+ }
+
}
projects / andy / viking.git / blobdiff