X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FImporter.java;h=84fb5aae5742f49bcf68cd915906a2b7322a399b;hp=e7285c42ca329c7a6e84c73fba0189c228493781;hb=a359464fcf59af8abc6f69ae0e88e42adc6018df;hpb=bb60bd13efae59e804e5d7a5a7590a020835966f diff --git a/src/be/nikiroo/utils/serial/Importer.java b/src/be/nikiroo/utils/serial/Importer.java index e7285c4..84fb5aa 100644 --- a/src/be/nikiroo/utils/serial/Importer.java +++ b/src/be/nikiroo/utils/serial/Importer.java @@ -70,13 +70,22 @@ public class Importer { if (line.startsWith("ZIP:")) { try { - line = StringUtils.unzip64(line.substring("ZIP:" - .length())); + line = StringUtils.unbase64s( + line.substring("ZIP:".length()), true); } catch (IOException e) { throw new IOException( "Internal error when decoding ZIP content: input may be corrupt"); } read(line); + } else if (line.startsWith("B64:")) { + try { + line = StringUtils.unbase64s( + line.substring("B64:".length()), false); + } catch (IOException e) { + throw new IOException( + "Internal error when decoding B64 content: input may be corrupt"); + } + read(line); } else { processLine(line); }