# HG changeset patch
# User ali <ali@juiblex.co.uk>
# Date 1382893307 0
# Node ID c25e023cb9fe6043c22a0628857381685153ed96
# Parent  f1d85b36e188308646fd62129e71fc5954455f89
Bugs #13+14: charsets in configuration files

diff -r f1d85b36e188 -r c25e023cb9fe bookloupe/bookloupe.c
--- a/bookloupe/bookloupe.c	Sun Oct 27 16:58:50 2013 +0000
+++ b/bookloupe/bookloupe.c	Sun Oct 27 17:01:47 2013 +0000
@@ -202,6 +202,8 @@
     { "no-verbose", 0, G_OPTION_FLAG_HIDDEN|G_OPTION_FLAG_REVERSE,
       G_OPTION_ARG_NONE, pswit+VERBOSE_SWITCH,
       "Switch off verbose mode", NULL },
+    { "charset", 0, 0, G_OPTION_ARG_STRING, &opt_charset,
+      "Set of characters valid for this ebook", "NAME" },
     { NULL }
 };
 
@@ -215,8 +217,6 @@
       "Defaults for use on www upload", NULL },
     { "dump-config", 0, 0, G_OPTION_ARG_NONE, pswit+DUMP_CONFIG_SWITCH,
       "Dump current config settings", NULL },
-    { "charset", 0, 0, G_OPTION_ARG_STRING, &opt_charset,
-      "Set of characters valid for this ebook", "NAME" },
     { NULL }
 };
 
@@ -268,11 +268,55 @@
 UINT saved_cp;
 #endif
 
+gboolean set_charset(const char *name,GError **err)
+{
+    /* The various UNICODE encodings all share the same character set. */
+    const char *unicode_aliases[]={ "UCS-2", "UCS-2BE", "UCS-2LE", "UCS-4",
+      "UCS-4BE", "UCS-4LE", "UCS2", "UCS4", "UNICODE", "UNICODEBIG",
+      "UNICODELITTLE", "UTF-7", "UTF-8", "UTF-16", "UTF-16BE", "UTF-16LE",
+      "UTF-32", "UTF-32BE", "UTF-32LE", "UTF7", "UTF8", "UTF16", "UTF16BE",
+      "UTF16LE", "UTF32", "UTF32BE", "UTF32LE" };
+    int i;
+    if (charset)
+	g_free(charset);
+    if (charset_validator!=(GIConv)-1)
+	g_iconv_close(charset_validator);
+    if (!name || !g_strcasecmp(name,"auto"))
+    {
+	charset=NULL;
+	charset_validator=(GIConv)-1;
+	return TRUE;
+    }
+    else
+	charset=g_strdup(name);
+    for(i=0;i<G_N_ELEMENTS(unicode_aliases);i++)
+	if (!g_strcasecmp(charset,unicode_aliases[i]))
+	{
+	    g_free(charset);
+	    charset=g_strdup("UTF-8");
+	    break;
+	}
+    if (!strcmp(charset,"UTF-8"))
+	charset_validator=(GIConv)-1;
+    else
+    {
+	charset_validator=g_iconv_open(charset,"UTF-8");
+	if (charset_validator==(GIConv)-1)
+	{
+	    g_set_error(err,G_CONVERT_ERROR,G_CONVERT_ERROR_NO_CONVERSION,
+	      "Unknown character set \"%s\"",charset);
+	    return FALSE;
+	}
+    }
+    return TRUE;
+}
+
 GKeyFile *config;
 
 void config_file_update(GKeyFile *kf)
 {
     int i;
+    const char *s;
     gboolean sw;
     for(i=0;options[i].long_name;i++)
     {
@@ -285,6 +329,13 @@
 		sw=!sw;
 	    g_key_file_set_boolean(kf,"options",options[i].long_name,sw);
 	}
+	else if (options[i].arg==G_OPTION_ARG_STRING)
+	{
+	    s=*(gchar **)options[i].arg_data;
+	    if (!s)
+		s="auto";
+	    g_key_file_set_string(kf,"options",options[i].long_name,s);
+	}
 	else
 	    g_assert_not_reached();
     }
@@ -381,7 +432,7 @@
 void parse_config_file(void)
 {
     int i,j;
-    gchar *path;
+    gchar *path,*s;
     gchar **keys;
     gboolean sw;
     GError *err=NULL;
@@ -410,9 +461,35 @@
 			      path,keys[i],err->message);
 			    g_clear_error(&err);
 			}
-			if (options[j].flags&G_OPTION_FLAG_REVERSE)
-			    sw=!sw;
-			*(gboolean *)options[j].arg_data=sw;
+			else
+			{
+			    if (options[j].flags&G_OPTION_FLAG_REVERSE)
+				sw=!sw;
+			    *(gboolean *)options[j].arg_data=sw;
+			}
+			break;
+		    }
+		    else if (options[j].arg==G_OPTION_ARG_STRING)
+		    {
+			s=g_key_file_get_string(config,"options",keys[i],
+			  &err);
+			if (err)
+			{
+			    g_printerr("Bookloupe: %s: options.%s: %s\n",
+			      path,keys[i],err->message);
+			    g_clear_error(&err);
+			}
+			else
+			{
+			    g_free(*(gchar **)options[j].arg_data);
+			    if (!g_strcmp0(s,"auto"))
+			    {
+				*(gchar **)options[j].arg_data=NULL;
+				g_free(s);
+			    }
+			    else
+				*(gchar **)options[j].arg_data=s;
+			}
 			break;
 		    }
 		    else
@@ -429,49 +506,6 @@
 	g_free(path);
 }
 
-gboolean set_charset(const char *name,GError **err)
-{
-    /* The various UNICODE encodings all share the same character set. */
-    const char *unicode_aliases[]={ "UCS-2", "UCS-2BE", "UCS-2LE", "UCS-4",
-      "UCS-4BE", "UCS-4LE", "UCS2", "UCS4", "UNICODE", "UNICODEBIG",
-      "UNICODELITTLE", "UTF-7", "UTF-8", "UTF-16", "UTF-16BE", "UTF-16LE",
-      "UTF-32", "UTF-32BE", "UTF-32LE", "UTF7", "UTF8", "UTF16", "UTF16BE",
-      "UTF16LE", "UTF32", "UTF32BE", "UTF32LE" };
-    int i;
-    if (charset)
-	g_free(charset);
-    if (charset_validator!=(GIConv)-1)
-	g_iconv_close(charset_validator);
-    if (!name || !g_strcasecmp(name,"auto"))
-    {
-	charset=NULL;
-	charset_validator=(GIConv)-1;
-	return TRUE;
-    }
-    else
-	charset=g_strdup(name);
-    for(i=0;i<G_N_ELEMENTS(unicode_aliases);i++)
-	if (!g_strcasecmp(charset,unicode_aliases[i]))
-	{
-	    g_free(charset);
-	    charset=g_strdup("UTF-8");
-	    break;
-	}
-    if (!strcmp(charset,"UTF-8"))
-	charset_validator=(GIConv)-1;
-    else
-    {
-	charset_validator=g_iconv_open(charset,"UTF-8");
-	if (charset_validator==(GIConv)-1)
-	{
-	    g_set_error(err,G_CONVERT_ERROR,G_CONVERT_ERROR_NO_CONVERSION,
-	      "Unknown character set \"%s\"",charset);
-	    return FALSE;
-	}
-    }
-    return TRUE;
-}
-
 void parse_options(int *argc,char ***argv)
 {
     GError *err=NULL;
diff -r f1d85b36e188 -r c25e023cb9fe sample.ini
--- a/sample.ini	Sun Oct 27 16:58:50 2013 +0000
+++ b/sample.ini	Sun Oct 27 17:01:47 2013 +0000
@@ -29,3 +29,5 @@
 web=false
 # Verbose - list everything
 verbose=false
+# Set of characters valid for this ebook
+charset=auto
diff -r f1d85b36e188 -r c25e023cb9fe test/bookloupe/config-default.tst
--- a/test/bookloupe/config-default.tst	Sun Oct 27 16:58:50 2013 +0000
+++ b/test/bookloupe/config-default.tst	Sun Oct 27 17:01:47 2013 +0000
@@ -30,6 +30,8 @@
 usertypo=false
 # Verbose - list everything
 verbose=false
+# Set of characters valid for this ebook
+charset=auto
 **************** EXPECTED(stdout) ****************
 # Default configuration for bookloupe
 
@@ -60,3 +62,5 @@
 usertypo=false
 # Verbose - list everything
 verbose=false
+# Set of characters valid for this ebook
+charset=auto
diff -r f1d85b36e188 -r c25e023cb9fe test/bookloupe/config-internal.tst
--- a/test/bookloupe/config-internal.tst	Sun Oct 27 16:58:50 2013 +0000
+++ b/test/bookloupe/config-internal.tst	Sun Oct 27 17:01:47 2013 +0000
@@ -30,3 +30,5 @@
 usertypo=false
 # Verbose - list everything
 verbose=false
+# Set of characters valid for this ebook
+charset=auto
diff -r f1d85b36e188 -r c25e023cb9fe test/bookloupe/config-override.tst
--- a/test/bookloupe/config-override.tst	Sun Oct 27 16:58:50 2013 +0000
+++ b/test/bookloupe/config-override.tst	Sun Oct 27 17:01:47 2013 +0000
@@ -1,5 +1,6 @@
 **************** OPTIONS ****************
 --usertypo
+--charset=auto
 --dump-config
 **************** INPUT(bookloupe.ini) ****************
 # Relaxed configuration for bookloupe
@@ -31,6 +32,8 @@
 usertypo=false
 # Verbose - list everything
 verbose=false
+# Set of characters valid for this ebook
+charset=UNICODE
 **************** EXPECTED(stdout) ****************
 # Relaxed configuration for bookloupe
 
@@ -61,3 +64,5 @@
 usertypo=true
 # Verbose - list everything
 verbose=false
+# Set of characters valid for this ebook
+charset=auto
diff -r f1d85b36e188 -r c25e023cb9fe test/bookloupe/config-user.tst
--- a/test/bookloupe/config-user.tst	Sun Oct 27 16:58:50 2013 +0000
+++ b/test/bookloupe/config-user.tst	Sun Oct 27 17:01:47 2013 +0000
@@ -35,6 +35,8 @@
 usertypo=true
 # Verbose - list everything - Contrary by name...
 verbose=true
+# Set of characters valid for this ebook - Let's stick with Latin1
+charset=ISO-8859-1
 **************** EXPECTED(stdout) ****************
 # Mary Contrary's configuration for bookloupe
 
@@ -70,3 +72,5 @@
 usertypo=true
 # Verbose - list everything - Contrary by name...
 verbose=true
+# Set of characters valid for this ebook - Let's stick with Latin1
+charset=ISO-8859-1