Changeset 36c665a68f197cfe5edceffa0807e2b4e5275845

Timestamp:

03/07/10 20:46:35 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

52f513bb146e410efbdc3bc58f0ab3001d9ba77f

Parents:

4beb0f8a3d942274015a4c700d470cf64bdc0c98

git-committer:

Matias De la Puente <mfpuente.ar@…> (03/07/10 20:46:35)

Message:

Documents: Add basic support for encodings

Fixes Ticket #1

Location:

libi4uc

Files:

• Makefile.am (modified) (1 diff)
• i4ucdocument.vala (modified) (4 diffs)
• i4ucencodings.vala (added)

libi4uc/Makefile.am

@@ -42 +42 @@
         i4ucdocumentsview.vala \
         i4ucdocumentsviewiface.vala \
+        i4ucencodings.vala \
         i4ucfileslist.vala \
         i4ucitemscombo.vala \

libi4uc/i4ucdocument.vala

@@ -70 +70 @@
         }
         
+        public string encoding { set; get; default = "UTF-8"; }
+        
         public string load_contents (string uri) throws GLib.Error
         {
@@ -79 +81 @@
                         _file = file;
                 this.etag = new_etag;
-                return contents;
+                string utf8_contents;
+                to_utf8 (contents, out utf8_contents);
+                return utf8_contents;
         }
         
@@ -89 +93 @@
                 else
                         file = _file;
-                var buffer = contents + "\n";
+                var buffer = from_utf8 (contents + "\n");
                 string new_etag;
                 string? etag = force_save ? null: _etag;
@@ -97 +101 @@
                 this.etag = new_etag;
         }
+        
+        private void to_utf8 (string encoded_string, out string utf8_string) throws GLib.ConvertError
+        {
+                foreach (var charset in Encodings.CHARSETS)
+                {
+                        try
+                        {
+                                utf8_string = convert (encoded_string, (ssize_t)encoded_string.size (), "UTF-8", charset);
+                                this.encoding = charset;
+                                return;
+                        }
+                        catch (ConvertError e)
+                        {
+                                continue;
+                        }
+                }
+                throw new GLib.ConvertError.FAILED (_("Error trying to convert the document to UTF-8"));
+        }
+        
+        private string from_utf8 (string utf8_string) throws GLib.ConvertError
+        {
+                return convert (utf8_string, (ssize_t)utf8_string.size (), _encoding, "UTF-8");
+        }
 }