Changeset 13350 in josm for trunk/src/org/openstreetmap/josm/io/Compression.java

Timestamp:

2018-01-21T22:05:06+01:00 (6 years ago)

Author:

stoecker

Message:

see #15816 - add XZ support

File:

• trunk/src/org/openstreetmap/josm/io/Compression.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/Compression.java

@@ -16 +16 @@
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
+import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -38 +40 @@
      * zip compression
      */
-    ZIP;
+    ZIP,
+    /**
+     * xz compression
+     */
+    XZ;
 
     /**
@@ -52 +58 @@
                 : name != null && name.endsWith(".zip")
                 ? ZIP
+                : name != null && name.endsWith(".xz")
+                ? XZ
                 : NONE;
     }
@@ -68 +76 @@
         case "application/x-bzip2":
             return BZIP2;
+        case "application/x-xz":
+            return XZ;
         default:
             return NONE;
@@ -88 +98 @@
             case ZIP:
                 return getZipInputStream(in);
+            case XZ:
+                return getXZInputStream(in);
             case NONE:
             default:
                 return in;
         }
+    }
+
+    /**
+     * Returns a XZ input stream wrapping given input stream.
+     * @param in The raw input stream
+     * @return a XZ input stream wrapping given input stream, or {@code null} if {@code in} is {@code null}
+     * @throws IOException if the given input stream does not contain valid BZ2 header
+     * @since 13350
+     */
+    public static XZCompressorInputStream getXZInputStream(InputStream in) throws IOException {
+        if (in == null) {
+            return null;
+        }
+        return new XZCompressorInputStream(in, true);
     }
 
@@ -173 +199 @@
             case ZIP:
                 return new ZipOutputStream(out, StandardCharsets.UTF_8);
+            case XZ:
+                return new XZCompressorOutputStream(out);
             case NONE:
             default: