X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FImporter.java;h=80a8684bd92f97433faf9d6ece457e0b41fa29be;hb=a6a73de36765b85947ac885529da82d3e7189269;hp=f7fece064d6028d8fca8ff5a742cf997f52f52b2;hpb=a20e02bbb6efd91f99af9ad37dc5a1414393b008;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/Importer.java b/src/be/nikiroo/utils/serial/Importer.java
index f7fece0..80a8684 100644
--- a/src/be/nikiroo/utils/serial/Importer.java
+++ b/src/be/nikiroo/utils/serial/Importer.java
@@ -5,9 +5,10 @@ import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.zip.GZIPInputStream;
 
 import be.nikiroo.utils.IOUtils;
-import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.streams.Base64InputStream;
 import be.nikiroo.utils.streams.NextableInputStream;
 import be.nikiroo.utils.streams.NextableInputStreamStep;
 
@@ -92,8 +93,13 @@ public class Importer {
 
 				if (zip || b64) {
 					stream.skip("XXX:".length());
-					InputStream decoded = StringUtils.unbase64(stream.open(),
-							zip);
+
+					InputStream decoded = stream.open();
+					if (zip) {
+						decoded = new GZIPInputStream(decoded);
+					}
+					decoded = new Base64InputStream(decoded, false);
+
 					try {
 						read(decoded);
 					} finally {