Merge lp:~shnatsel/scratch/fix-1101448 into lp:~elementary-apps/scratch/scratch

[Sergey "Shnatsel" Davidoff]

* Use Process.spawn_sync instead of Process.spawn_command_line_sync, for proper handling of filenames with spaces in them and GREAT JUSTICE
* Fall back to UTF-8 if encoding detection fails //TODO: prompt the user to meddle with encoding until satisfied

[lp:~shnatsel/scratch/fix-1101448]

977. By Sergey "Shnatsel" Davidoff on 2013-01-18

Turns out the proper value for no spawn flags is 0

978. By Sergey "Shnatsel" Davidoff on 2013-01-18

added a pair of empty lines to make Munchor happy

979. By Sergey "Shnatsel" Davidoff on 2013-01-18

more meaningful debug message

980. By Sergey "Shnatsel" Davidoff on 2013-01-18

renamed 'output' variable into 'charset' that it actually is; renamed FALLBACK_ENCODING constant into FALLBACK_CHARSET

981. By Sergey "Shnatsel" Davidoff on 2013-01-21

oops, forgot this

=== modified file 'src/Services/Encoding.vala'
--- src/Services/Encoding.vala	2012-11-24 13:46:56 +0000
+++ src/Services/Encoding.vala	2013-01-21 14:44:21 +0000
@@ -259,16 +259,24 @@
     
     public static string get_charset (string path) {
         // Get correct encoding via chardect.py script
-        string script = Constants.SCRIPTDIR + "/chardetect.py ";
-        string command = "python " + script + path;
-        string? output = null; 
+
+        const string FALLBACK_CHARSET = "UTF-8";
+        string script = Constants.SCRIPTDIR + "/chardetect.py";
+        string[] command = { "python", script, path };
+        string? charset = null;
+
         try {
-            GLib.Process.spawn_command_line_sync (command, out output);
+            GLib.Process.spawn_sync (null, command, null, 0, null, out charset, null, null);
         } catch (SpawnError e) {
-            warning (e.message);
-        }
-        debug (output);
-        return output;
+            warning ("Could not execute \"%s\": %s", script, e.message);
+        }
+        if ( charset == null ) {
+            warning ("Could not automatically detect encoding, assuming %s", FALLBACK_CHARSET);
+            charset = FALLBACK_CHARSET; //TODO: prompt the user to meddle with encoding manually, until satisfied
+        } else {
+            debug ("Detected encoding of file \"%s\" to be \"%s\"", path, charset);
+        }
+        return charset;
     }
     
     public string? file_content_to_utf8 (File file, string content, string mode = "r" /* it means read or write */) {