git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix Base64 but breaks compat
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
Importer.java
diff --git
a/src/be/nikiroo/utils/serial/Importer.java
b/src/be/nikiroo/utils/serial/Importer.java
index f7fece064d6028d8fca8ff5a742cf997f52f52b2..80a8684bd92f97433faf9d6ece457e0b41fa29be 100644
(file)
--- 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.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.IOUtils;
-import be.nikiroo.utils.
StringUtils
;
+import be.nikiroo.utils.
streams.Base64InputStream
;
import be.nikiroo.utils.streams.NextableInputStream;
import be.nikiroo.utils.streams.NextableInputStreamStep;
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());
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 {
try {
read(decoded);
} finally {