Merge lp:~garrettdreyfus/scratch/encode-fix into lp:~elementary-apps/scratch/scratch

[Garrett]

Use ConverterInputStream to properly read encoded files to fix bug #1114439

This patch should fix this bug https://bugs.launchpad.net/scratch/+bug/1114439. The only file changed is ./src/Services/Encoding.vala/ This is my first patch ever so I apologize for any mistakes.

[Raphael Isemann (teemperor)]

Some comments on formatting the code:
Line 302 -> Needs a space behind the )

Otherwise: Use 4 spaces instead of Tabs. Look at the settings in Scratch (Gear on the upper right): There is a switch for turning a tab automatically into 4 spaces. There is also a switch for showing whitespace-characters which helps you to see where you did formatting errors. You never need to use tabs when you code with the styleguide of elementary. You can also activate the addon which automatically strips whitespace from the end of a line. That's already wrong in that sourcefile so you could also fix that in the same merge-request :)

Here is the styleguide for further reading: http://elementaryos.org/docs/code/code-style

When you corrected your branch you can just push your new commit to the branch and this merge-requests gets updated ;)

[lp:~garrettdreyfus/scratch/encode-fix]

1256. By Garrett Finucane <email address hidden> on 2014-03-14

I fixed my styling I believe

[Garrett (garrettdreyfus)]

Thank you very much I believe I fixed the styling you mentioned.

On Thu, Mar 13, 2014 at 9:00 PM, Raphael Isemann
<email address hidden> wrote:
> Some comments on formatting the code:
> Line 302 -> Needs a space behind the )
>
> Otherwise: Use 4 spaces instead of Tabs. Look at the settings in Scratch (Gear on the upper right): There is a switch for turning a tab automatically into 4 spaces. There is also a switch for showing whitespace-characters which helps you to see where you did formatting errors. You never need to use tabs when you code with the styleguide of elementary. You can also activate the addon which automatically strips whitespace from the end of a line. That's already wrong in that sourcefile so you could also fix that in the same merge-request :)
>
> Here is the styleguide for further reading: http://elementaryos.org/docs/code/code-style
>
> When you corrected your branch you can just push your new commit to the branch and this merge-requests gets updated ;)
> --
> https://code.launchpad.net/~garrettdreyfus/scratch/encode-fix/+merge/210939
> You are the owner of lp:~garrettdreyfus/scratch/encode-fix.

[Raphael Isemann (teemperor)]

I missed two things:
"encoding.down()" should be "encoding.down ()" as there has to be a space before that opening-bracket.
Same goes for "new ConverterInputStream(" should be "new ConverterInputStream (".

I can't test it at the moment as i'm not on Isis (or my Luna install is broken), so you have to wait for someone else to review if your patch work as intended. I'll test otherwise tomorrow by myself :)

[lp:~garrettdreyfus/scratch/encode-fix]

1257. By Garrett Finucane <email address hidden> on 2014-03-14

Spaced out the parantheses

1258. By Garrett Finucane <email address hidden> on 2014-03-14

Changed stdout.printf to warning

[Mario Guerriero (mefrio-g)]

you did a great job! It should fix all Scatch's encoding problems.

review: Approve

[Mario Guerriero (mefrio-g)]

review: Approve

=== modified file 'src/Services/Encoding.vala'
--- src/Services/Encoding.vala	2013-05-01 18:28:34 +0000
+++ src/Services/Encoding.vala	2014-03-14 01:43:42 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /***
-  BEGIN LICENSE  
+  BEGIN LICENSE
 
   Copyright (C) 2012-2013 Mario Guerriero <[e-mail]>
   This program is free software: you can redistribute it and/or modify it
@@ -241,13 +241,12 @@
         { EncodingType.WINDOWS_1258,
             "WINDOWS-1258", "Vietnamese" }
     };
-    
+
     private static bool test (string text, string charset) {
           bool valid = false;
 
         try {
             string convert;
-
             convert = GLib.convert (text, -1, "UTF-8", charset);
             valid = true;
         }
@@ -256,7 +255,7 @@
         }
         return valid;
     }
-    
+
     public static string get_charset (string path) {
         // Get correct encoding via chardect.py script
 
@@ -278,22 +277,35 @@
         }
         return charset;
     }
-    
+
     public string? file_content_to_utf8 (File file, string content, string mode = "r" /* it means read or write */) {
-        
+
         string? encoding = null;
         string? encoded_content = null;
-        
+
         encoding = get_charset (file.get_path ());
-        
+
         try {
-            encoded_content = GLib.convert (content, -1, "UTF-8", encoding);
+            InputStream @is = file.read ();
+            CharsetConverter iconverter = new CharsetConverter ("utf-8", encoding.down ());
+            ConverterInputStream @converted = new ConverterInputStream (@is, iconverter);
+            DataInputStream dis = new DataInputStream (@converted);
+            string line = dis.read_line ();
+            string str = line;
+            while ((line = dis.read_line (null)) != null) {
+                str += line + "\n";
+            }
+            encoded_content = str;
         } catch (GLib.ConvertError ce) {
             warning (ce.message);
+        } catch (IOError e) {
+            warning (e.message);
+        } catch (Error e) {
+            warning (e.message);
         }
-                
+
         return encoded_content;
-    
+
     }
 
 }