[gnumeric] ssconvert: allow name templates for multi-sheet ssconvert.

[Morten Welinder <mortenw src gnome org>]

commit ba9b4c006270a2247e9aa917ce2facc4814fe559
Author: Morten Welinder <terra gnome org>
Date:   Tue Mar 22 15:50:44 2011 -0400

    ssconvert: allow name templates for multi-sheet ssconvert.

 ChangeLog         |    6 ++
 NEWS              |    1 +
 doc/C/ssconvert.1 |    4 +-
 src/ssconvert.c   |  201 +++++++++++++++++++++++++++++++++--------------------
 4 files changed, 136 insertions(+), 76 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 67818fb..b424433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-22  Morten Welinder  <terra gnome org>
+
+	* src/ssconvert.c (resolve_template): New function.
+	(convert): Simplify code.  Treat output filename as template when
+	ssconvert_one_file_per_sheet is set.
+
 2011-03-21  Morten Welinder  <terra gnome org>
 
 	* src/dependent.c (dependent_set_expr): Make sure we clear dynamic
diff --git a/NEWS b/NEWS
index 0af3813..4c47c04 100644
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,7 @@ Morten:
 	* Make print-preview work on win32 by avoiding gtk+.  [#533795]
 	* Fix crash related to dynamic deps.  [#645209]
 	* Fix stf import crash.  [#645555]
+	* Allow templates for multi-sheet ssconvert.  [#645287]
 
 Stanley Pinchak:
 	* Improve "dif" output.
diff --git a/doc/C/ssconvert.1 b/doc/C/ssconvert.1
index ea5323a..3fc7d93 100644
--- a/doc/C/ssconvert.1
+++ b/doc/C/ssconvert.1
@@ -64,7 +64,9 @@ workbook.  The merge will be aborted if there are name conflicts.
 .TP
 .B \-S, \-\-export\-file\-per\-sheet
 Export a file for each sheet if the exporter only supports one sheet at a
-time.
+time.  The output filename is treated as a template in which sheet number
+is substituted for %n and/or sheet name is substituted for %s.  If there
+are not substitutions, a default of ".%s" is added.
 
 .SS "Help options"
 .TP
diff --git a/src/ssconvert.c b/src/ssconvert.c
index 12f5189..63a9360 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -420,6 +420,42 @@ merge (Workbook *wb, char const *inputs[],
 	return result;
 }
 
+static char *
+resolve_template (const char *template, Sheet *sheet)
+{
+	GString *s = g_string_new (NULL);
+	while (1) {
+		switch (*template) {
+		done:
+		case 0: {
+			char *res = go_shell_arg_to_uri (s->str);
+			g_string_free (s, TRUE);
+			return res;
+		}
+		case '%':
+			template++;
+			switch (*template) {
+			case 0:
+				goto done;
+			case 'n':
+				g_string_append_printf (s, "%d", sheet->index_in_wb);
+				break;
+			case 's':
+				g_string_append (s, sheet->name_unquoted);
+				break;
+			case '%':
+				g_string_append_c (s, '%');
+				break;
+			}
+			template++;
+			break;
+		default:
+			g_string_append_c (s, *template);
+			template++;
+		}
+	}
+}
+
 static void
 run_solver (Sheet *sheet, WorkbookView *wbv)
 {
@@ -493,6 +529,9 @@ convert (char const *inarg, char const *outarg, char const *mergeargs[],
 	GOFileOpener *fo = NULL;
 	char *infile = go_shell_arg_to_uri (inarg);
 	char *outfile = outarg ? go_shell_arg_to_uri (outarg) : NULL;
+	WorkbookView *wbv;
+	GOIOContext *io_context = NULL;
+	Workbook *wb = NULL;
 
 	if (ssconvert_export_id != NULL) {
 		fs = go_file_saver_for_id (ssconvert_export_id);
@@ -545,91 +584,103 @@ convert (char const *inarg, char const *outarg, char const *mergeargs[],
 		}
 	}
 
-	if (fs != NULL) {
-		GOIOContext *io_context = go_io_context_new (cc);
-		WorkbookView *wbv;
-		if (mergeargs==NULL) {
-			wbv = wb_view_new_from_uri (infile, fo,
-						    io_context,
-						    ssconvert_import_encoding);
-		} else {
-			wbv = workbook_view_new (NULL);
-		}
+	if (!fs)
+		goto out;
 
-		if (wbv == NULL || go_io_error_occurred (io_context)) {
-			go_io_error_display (io_context);
-			res = 1;
-		} else {
-			Workbook *wb = wb_view_get_workbook (wbv);
-			Sheet *sheet = wb_view_cur_sheet (wbv);
+	io_context = go_io_context_new (cc);
+	if (mergeargs == NULL) {
+		wbv = wb_view_new_from_uri (infile, fo,
+					    io_context,
+					    ssconvert_import_encoding);
+	} else {
+		wbv = workbook_view_new (NULL);
+	}
 
-			res = handle_export_options (fs, GO_DOC (wb));
-			if (res) {
-				g_object_unref (wb);
-				goto out;
-			}
+	if (wbv == NULL || go_io_error_occurred (io_context)) {
+		go_io_error_display (io_context);
+		res = 1;
+		goto out;
+	}
 
-			if (mergeargs!=NULL) {
-				if (merge (wb, mergeargs, fo, io_context, cc))
-					goto out;
-			}
+	wb = wb_view_get_workbook (wbv);
+
+	res = handle_export_options (fs, GO_DOC (wb));
+	if (res) {
+		g_object_unref (wb);
+		goto out;
+	}
 
-			if (ssconvert_goal_seek) {
-				int i;
+	if (mergeargs != NULL) {
+		if (merge (wb, mergeargs, fo, io_context, cc))
+			goto out;
+	}
 
-				for (i = 0; ssconvert_goal_seek[i]; i++) {
-					setup_range (G_OBJECT (sheet),
-						     "ssconvert-goal-seek",
-						     wb,
-						     ssconvert_goal_seek[i]);
-					dialog_goal_seek (NULL, sheet);
-				}
-			}
+	if (ssconvert_goal_seek) {
+		int i;
+		Sheet *sheet = wb_view_cur_sheet (wbv);
 
-			if (ssconvert_solve)
-				run_solver (sheet, wbv);
-
-			if (ssconvert_recalc)
-				workbook_recalc_all (wb);
-			else
-				workbook_recalc (wb);
-
-			if (ssconvert_range)
-				setup_range (G_OBJECT (wb),
-					     "ssconvert-range",
-					     wb,
-					     ssconvert_range);
-			else if (workbook_sheet_count (wb) > 1 &&
-				 go_file_saver_get_save_scope (fs) != GO_FILE_SAVE_WORKBOOK) {
-				if (ssconvert_one_file_per_sheet) {
-					GSList *ptr;
-					GString *s;
-					char *tmpfile;
-					int idx = 0;
-					res = 0;
-
-					for (ptr = workbook_sheets(wb); ptr && !res; ptr = ptr->next, idx++) {
-						wb_view_sheet_focus(wbv, (Sheet *)ptr->data);
-						s = g_string_new (outfile);
-						g_string_append_printf(s, ".%d", idx);
-						tmpfile = g_string_free (s, FALSE);
-						res = !wb_view_save_as (wbv, fs, tmpfile, cc);
-						g_free(tmpfile);
-					}
-					goto printing_done;
-				} else
-					g_printerr (_("Selected exporter (%s) does not support saving multiple sheets in one file.\n"
-						      "Only the current sheet will be saved.\n"),
-						    go_file_saver_get_id (fs));
-			}
-			res = !wb_view_save_as (wbv, fs, outfile, cc);
-		printing_done:
-			g_object_unref (wb);
+		for (i = 0; ssconvert_goal_seek[i]; i++) {
+			setup_range (G_OBJECT (sheet),
+				     "ssconvert-goal-seek",
+				     wb,
+				     ssconvert_goal_seek[i]);
+			dialog_goal_seek (NULL, sheet);
 		}
-		g_object_unref (io_context);
 	}
 
+	if (ssconvert_solve) {
+		Sheet *sheet = wb_view_cur_sheet (wbv);
+		run_solver (sheet, wbv);
+	}
+
+	if (ssconvert_recalc)
+		workbook_recalc_all (wb);
+	else
+		workbook_recalc (wb);
+
+	if (ssconvert_range)
+		setup_range (G_OBJECT (wb),
+			     "ssconvert-range",
+			     wb,
+			     ssconvert_range);
+	else if (ssconvert_one_file_per_sheet ||
+		 (workbook_sheet_count (wb) > 1 &&
+		  go_file_saver_get_save_scope (fs) != GO_FILE_SAVE_WORKBOOK)) {
+		if (ssconvert_one_file_per_sheet) {
+			GSList *ptr, *sheets;
+			char *template;
+			res = 0;
+
+			template = strchr (outarg, '%')
+				? g_strdup (outarg)
+				: g_strconcat (outarg, ".%n", NULL);
+
+			sheets = workbook_sheets (wb);
+			for (ptr = sheets; ptr; ptr = ptr->next) {
+				Sheet *sheet = ptr->data;
+				char *tmpfile =	resolve_template (template, sheet);
+				wb_view_sheet_focus (wbv, sheet);
+				res = !wb_view_save_as (wbv, fs, tmpfile, cc);
+				g_free (tmpfile);
+				if (res)
+					break;
+			}
+
+			g_free (template);
+			g_slist_free (sheets);
+			goto out;
+		} else
+			g_printerr (_("Selected exporter (%s) does not support saving multiple sheets in one file.\n"
+				      "Only the current sheet will be saved.  To get around this limitation, use -S.\n"),
+				    go_file_saver_get_id (fs));
+	}
+	res = !wb_view_save_as (wbv, fs, outfile, cc);
+
  out:
+	if (wb)
+		g_object_unref (wb);
+	if (io_context)
+		g_object_unref (io_context);
 	g_free (infile);
 	g_free (outfile);